Dodanie obsługi punktów Orlen w zamówieniach oraz poprawa logiki i formatowania w różnych plikach

This commit is contained in:
2024-11-16 10:54:33 +01:00
parent a91d37736d
commit 49f8a3f8a0
25 changed files with 946 additions and 422 deletions

View File

@@ -245,6 +245,18 @@ class ShopBasket
exit;
}
}
if ( \S::get_session( 'basket-transport-method-id' ) === '9' )
{
if ( !\S::get_session( 'basket_orlen_point_id' ) )
{
echo json_encode( [
'result' => 'bad'
] );
exit;
}
}
echo json_encode( [
'result' => 'ok'
] );
@@ -264,6 +276,16 @@ class ShopBasket
exit;
}
static public function orlen_save()
{
\S::set_session( 'basket_orlen_point_id', \S::get( 'orlen_point_id' ) );
\S::set_session( 'basket_orlen_point_info', \S::get( 'orlen_point_name' ) );
echo json_encode( [
'result' => 'ok'
] );
exit;
}
public static function inpost_save()
{
\S::set_session( 'basket-inpost-info', \S::get( 'paczkomat' ) );
@@ -343,9 +365,23 @@ class ShopBasket
}
if ( $order_id = \front\factory\ShopOrder::basket_save(
$client[ 'id' ], \S::get_session( 'basket' ), \S::get_session( 'basket-transport-method-id' ), \S::get_session( 'basket-payment-method-id' ),
\S::get( 'email', true ), \S::get( 'phone', true ), \S::get( 'name', true ), \S::get( 'surname', true ), \S::get( 'firm', true ), \S::get( 'street' ), \S::get( 'postal_code', true ), \S::get( 'city', true ),
\S::get_session( 'basket-inpost-info' ), \S::get_session( 'coupon' ), \S::get_session( 'basket_message' )
$client[ 'id' ],
\S::get_session( 'basket' ),
\S::get_session( 'basket-transport-method-id' ),
\S::get_session( 'basket-payment-method-id' ),
\S::get( 'email', true ),
\S::get( 'phone', true ),
\S::get( 'name', true ),
\S::get( 'surname', true ),
\S::get( 'firm', true ),
\S::get( 'street' ),
\S::get( 'postal_code', true ),
\S::get( 'city', true ),
\S::get_session( 'basket-inpost-info' ),
\S::get_session( 'basket_orlen_point_id' ),
\S::get_session( 'basket_orlen_point_info' ),
\S::get_session( 'coupon' ),
\S::get_session( 'basket_message' )
) )
{
\S::alert( \S::lang( 'zamowienie-zostalo-zlozone-komunikat' ) );
@@ -353,6 +389,8 @@ class ShopBasket
\S::delete_session( 'basket-transport-method-id' );
\S::delete_session( 'basket-payment-method-id' );
\S::delete_session( 'basket-inpost-info' );
\S::delete_session( 'basket_orlen_point_id' );
\S::delete_session( 'basket_orlen_point_info' );
\S::delete_session( 'coupon' );
\S::delete_session( 'basket_message' );
@@ -362,7 +400,8 @@ class ShopBasket
\S::set_session( 'ekomi-purchase', true );
$redis = \RedisConnection::getInstance() -> getConnection();
$redis -> flushAll();
if ( $redis )
$redis -> flushAll();
header( 'Location: /zamowienie/' . \front\factory\ShopOrder::order_hash( $order_id ) );
exit;