Project-Pro/shopPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ver. 0.283: Legacy class cleanup — S, Html, Email, Image, Log, Mobile_Detect → Shared namespace

Browse Source 
- Migrate class.S → Shared\Helpers\Helpers (140+ files), remove 12 unused methods
- Migrate class.Html → Shared\Html\Html
- Migrate class.Email → Shared\Email\Email
- Migrate class.Image → Shared\Image\ImageManipulator
- Delete class.Log (unused), class.Mobile_Detect (outdated UA detection)
- Remove grid library loading from admin (index.php, ajax.php)
- Replace gridEdit usage in 10 admin templates with grid-edit-replacement.php
- Fix grid-edit-replacement.php AJAX to send values as JSON (grid.js compat)
- Remove mobile layout conditionals (m_html/m_css/m_js) from Site + LayoutsRepository
- Remove \Log::save_log() calls from OrderAdminService, ShopOrder, Order

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Jacek Pyziak
2026-02-16 23:06:06 +01:00
parent 285cbe5515
commit 319491975d
159 changed files with 1501 additions and 3043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
autoload/front/controls/class.ShopBasket.php
View File

@@ -9,7 +9,7 @@ class ShopBasket
public static function basket_message_save()
{
\S::set_session( 'basket_message', \S::get( 'basket_message' ) );
\Shared\Helpers\Helpers::set_session( 'basket_message', \Shared\Helpers\Helpers::get( 'basket_message' ) );
echo json_encode( [
'result' => 'ok'
] );
@@ -20,16 +20,16 @@ class ShopBasket
{
global $lang_id;
$basket = \S::get_session( 'basket' );
$coupon = \S::get_session( 'coupon' );
$product_hash = \S::get( 'product_hash' );
$basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
$coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
$product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
$basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
unset( $basket[ $product_hash ] );
$basket = \shop\Promotion::find_promotion( $basket );
\S::set_session( 'basket', $basket );
\Shared\Helpers\Helpers::set_session( 'basket', $basket );
echo json_encode( [
'basket' => \Tpl::view( 'shop-basket/basket-details', [
@@ -52,19 +52,19 @@ class ShopBasket
{
global $lang_id;
$basket = \S::get_session( 'basket' );
$coupon = \S::get_session( 'coupon' );
$product_hash = \S::get( 'product_hash' );
$basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
$coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
$product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
$basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
$basket[ $product_hash ][ 'quantity' ]++;
\shop\Basket::check_product_quantity_in_stock( $basket, false );
$basket = \S::get_session( 'basket' );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
$basket = \shop\Promotion::find_promotion( $basket );
\S::set_session( 'basket', $basket );
\Shared\Helpers\Helpers::set_session( 'basket', $basket );
echo json_encode( [
'basket' => \Tpl::view( 'shop-basket/basket-details', [
@@ -88,10 +88,10 @@ class ShopBasket
{
global $lang_id;
$basket = \S::get_session( 'basket' );
$coupon = \S::get_session( 'coupon' );
$product_hash = \S::get( 'product_hash' );
$basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
$coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
$product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
$basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
$basket[ $product_hash ][ 'quantity' ]--;
@@ -100,7 +100,7 @@ class ShopBasket
$basket = \shop\Promotion::find_promotion( $basket );
\S::set_session( 'basket', $basket );
\Shared\Helpers\Helpers::set_session( 'basket', $basket );
echo json_encode( [
'basket' => \Tpl::view( 'shop-basket/basket-details', [
@@ -123,12 +123,12 @@ class ShopBasket
{
global $lang_id;
$basket = \S::get_session( 'basket' );
$coupon = \S::get_session( 'coupon' );
$product_hash = \S::get( 'product_hash' );
$basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
$coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
$product_hash = \Shared\Helpers\Helpers::get( 'product_hash' );
$basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
$basket[ $product_hash ][ 'quantity' ] = (int)\S::get( 'quantity' );
$basket[ $product_hash ][ 'quantity' ] = (int)\Shared\Helpers\Helpers::get( 'quantity' );
if ( $basket[ $product_hash ][ 'quantity' ] < 1 )
unset( $basket[ $product_hash ] );
@@ -137,7 +137,7 @@ class ShopBasket
\shop\Basket::check_product_quantity_in_stock( $basket, false );
$basket = \S::get_session( 'basket' );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
echo json_encode( [
'basket' => \Tpl::view( 'shop-basket/basket-details', [
@@ -158,16 +158,16 @@ class ShopBasket
static public function product_message_change()
{
$basket = \S::get_session( 'basket' );
$basket[ \S::get( 'position_code' ) ]['message'] = \S::get( 'product_message' );
\S::set_session( 'basket', $basket );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
$basket[ \Shared\Helpers\Helpers::get( 'position_code' ) ]['message'] = \Shared\Helpers\Helpers::get( 'product_message' );
\Shared\Helpers\Helpers::set_session( 'basket', $basket );
exit;
}
public static function basket_add_product()
{
$basket = \shop\Basket::validate_basket( \S::get_session( 'basket' ) );
$values_tmp = json_decode( \S::get( 'values' ), true );
$basket = \shop\Basket::validate_basket( \Shared\Helpers\Helpers::get_session( 'basket' ) );
$values_tmp = json_decode( \Shared\Helpers\Helpers::get( 'values' ), true );
foreach( $values_tmp as $key => $val )
$values[ $val['name'] ] = $val['value'];
@@ -192,7 +192,7 @@ class ShopBasket
}
}
if ( \S::is_array_fix( $attributes ) )
if ( \Shared\Helpers\Helpers::is_array_fix( $attributes ) )
{
$values['parent_id'] = $values[ 'product-id' ];
$values['product-id'] = \shop\Product::get_product_id_by_attributes( $values[ 'product-id' ], $attributes );
@@ -219,9 +219,9 @@ class ShopBasket
$basket = \shop\Promotion::find_promotion( $basket );
\S::set_session( 'basket', $basket );
\Shared\Helpers\Helpers::set_session( 'basket', $basket );
$coupon = \S::get_session( 'coupon' );
$coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
echo json_encode( [
'result' => 'ok',
@@ -235,9 +235,9 @@ class ShopBasket
// sprawdzam czy została wybrana forma wysylki inpost i czy został wybrany paczkomat
static public function transport_method_inpost_check()
{
if ( \S::get_session( 'basket-transport-method-id' ) === '2' or \S::get_session( 'basket-transport-method-id' ) === '1' )
if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '2' or \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '1' )
{
if ( !\S::get_session( 'basket-inpost-info' ) )
if ( !\Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ) )
{
echo json_encode( [
'result' => 'bad'
@@ -246,9 +246,9 @@ class ShopBasket
}
}
if ( \S::get_session( 'basket-transport-method-id' ) === '9' )
if ( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) === '9' )
{
if ( !\S::get_session( 'basket_orlen_point_id' ) )
if ( !\Shared\Helpers\Helpers::get_session( 'basket_orlen_point_id' ) )
{
echo json_encode( [
'result' => 'bad'
@@ -265,7 +265,7 @@ class ShopBasket
// sprawdzam czy został wybrany paczkomat
static public function inpost_check() {
if ( !\S::get_session( 'basket-inpost-info' ) )
if ( !\Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ) )
echo json_encode( [
'result' => 'bad'
] );
@@ -278,8 +278,8 @@ class ShopBasket
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' ) );
\Shared\Helpers\Helpers::set_session( 'basket_orlen_point_id', \Shared\Helpers\Helpers::get( 'orlen_point_id' ) );
\Shared\Helpers\Helpers::set_session( 'basket_orlen_point_info', \Shared\Helpers\Helpers::get( 'orlen_point_name' ) );
echo json_encode( [
'result' => 'ok'
] );
@@ -288,7 +288,7 @@ class ShopBasket
public static function inpost_save()
{
\S::set_session( 'basket-inpost-info', \S::get( 'paczkomat' ) );
\Shared\Helpers\Helpers::set_session( 'basket-inpost-info', \Shared\Helpers\Helpers::get( 'paczkomat' ) );
echo json_encode( [
'result' => 'ok'
] );
@@ -297,7 +297,7 @@ class ShopBasket
public static function basket_payment_method_set()
{
\S::set_session( 'basket-payment-method-id', \S::get( 'payment_method_id' ) );
\Shared\Helpers\Helpers::set_session( 'basket-payment-method-id', \Shared\Helpers\Helpers::get( 'payment_method_id' ) );
echo json_encode( [
'result' => 'ok'
] );
@@ -306,7 +306,7 @@ class ShopBasket
public static function basket_transport_method_set()
{
\S::set_session( 'basket-transport-method-id', \S::get( 'transport_method_id' ) );
\Shared\Helpers\Helpers::set_session( 'basket-transport-method-id', \Shared\Helpers\Helpers::get( 'transport_method_id' ) );
echo json_encode( [
'result' => 'ok'
] );
@@ -315,13 +315,13 @@ class ShopBasket
public static function basket_payments_methods()
{
\S::set_session( 'basket-transport-method-id', \S::get( 'transport_method_id' ) );
\Shared\Helpers\Helpers::set_session( 'basket-transport-method-id', \Shared\Helpers\Helpers::get( 'transport_method_id' ) );
echo json_encode( [
'result' => 'ok',
'payment_methods' => \front\view\ShopPaymentMethod::basket_payment_methods(
\front\factory\ShopPaymentMethod::payment_methods_by_transport( \S::get( 'transport_method_id' ) ),
\S::get( 'payment_method_id' )
\front\factory\ShopPaymentMethod::payment_methods_by_transport( \Shared\Helpers\Helpers::get( 'transport_method_id' ) ),
\Shared\Helpers\Helpers::get( 'payment_method_id' )
)
] );
exit;
@@ -331,34 +331,34 @@ class ShopBasket
{
global $lang_id, $settings;
if ( \shop\Basket::check_product_quantity_in_stock( \S::get_session( 'basket' ) ) )
if ( \shop\Basket::check_product_quantity_in_stock( \Shared\Helpers\Helpers::get_session( 'basket' ) ) )
{
header( 'Location: /koszyk' );
exit;
}
$client = \S::get_session( 'client' );
$client = \Shared\Helpers\Helpers::get_session( 'client' );
return \Tpl::view( 'shop-basket/summary-view', [
'lang_id' => $lang_id,
'client' => \S::get_session( 'client' ),
'basket' => \S::get_session( 'basket' ),
'transport' => \front\factory\ShopTransport::transport( \S::get_session( 'basket-transport-method-id' ) ),
'payment_method' => \front\factory\ShopPaymentMethod::payment_method( \S::get_session( 'basket-payment-method-id' ) ),
'client' => \Shared\Helpers\Helpers::get_session( 'client' ),
'basket' => \Shared\Helpers\Helpers::get_session( 'basket' ),
'transport' => \front\factory\ShopTransport::transport( \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ) ),
'payment_method' => \front\factory\ShopPaymentMethod::payment_method( \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ) ),
'addresses' => \front\factory\ShopClient::client_addresses( $client[ 'id' ] ),
'settings' => $settings,
'coupon' => \S::get_session( 'coupon' ),
'basket_message' => \S::get_session( 'basket_message' )
'coupon' => \Shared\Helpers\Helpers::get_session( 'coupon' ),
'basket_message' => \Shared\Helpers\Helpers::get_session( 'basket_message' )
] );
}
// zapisanie koszyka jako zamówienie
static public function basket_save()
{
$client = \S::get_session( 'client' );
$payment_method = \S::get_session( 'basket-payment-method-id' );
$client = \Shared\Helpers\Helpers::get_session( 'client' );
$payment_method = \Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' );
if ( \shop\Basket::check_product_quantity_in_stock( \S::get_session( 'basket' ) ) )
if ( \shop\Basket::check_product_quantity_in_stock( \Shared\Helpers\Helpers::get_session( 'basket' ) ) )
{
header( 'Location: /koszyk' );
exit;
@@ -366,42 +366,42 @@ 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( 'street' ),
\S::get( 'postal_code', true ),
\S::get( 'city', true ),
\S::get( 'firm_name', true ),
\S::get( 'firm_street', true ),
\S::get( 'firm_postal_code', true ),
\S::get( 'firm_city', true ),
\S::get( 'firm_nip', 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' )
\Shared\Helpers\Helpers::get_session( 'basket' ),
\Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ),
\Shared\Helpers\Helpers::get_session( 'basket-payment-method-id' ),
\Shared\Helpers\Helpers::get( 'email', true ),
\Shared\Helpers\Helpers::get( 'phone', true ),
\Shared\Helpers\Helpers::get( 'name', true ),
\Shared\Helpers\Helpers::get( 'surname', true ),
\Shared\Helpers\Helpers::get( 'street' ),
\Shared\Helpers\Helpers::get( 'postal_code', true ),
\Shared\Helpers\Helpers::get( 'city', true ),
\Shared\Helpers\Helpers::get( 'firm_name', true ),
\Shared\Helpers\Helpers::get( 'firm_street', true ),
\Shared\Helpers\Helpers::get( 'firm_postal_code', true ),
\Shared\Helpers\Helpers::get( 'firm_city', true ),
\Shared\Helpers\Helpers::get( 'firm_nip', true ),
\Shared\Helpers\Helpers::get_session( 'basket-inpost-info' ),
\Shared\Helpers\Helpers::get_session( 'basket_orlen_point_id' ),
\Shared\Helpers\Helpers::get_session( 'basket_orlen_point_info' ),
\Shared\Helpers\Helpers::get_session( 'coupon' ),
\Shared\Helpers\Helpers::get_session( 'basket_message' )
) )
{
\S::alert( \S::lang( 'zamowienie-zostalo-zlozone-komunikat' ) );
\S::delete_session( 'basket' );
\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' );
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-zlozone-komunikat' ) );
\Shared\Helpers\Helpers::delete_session( 'basket' );
\Shared\Helpers\Helpers::delete_session( 'basket-transport-method-id' );
\Shared\Helpers\Helpers::delete_session( 'basket-payment-method-id' );
\Shared\Helpers\Helpers::delete_session( 'basket-inpost-info' );
\Shared\Helpers\Helpers::delete_session( 'basket_orlen_point_id' );
\Shared\Helpers\Helpers::delete_session( 'basket_orlen_point_info' );
\Shared\Helpers\Helpers::delete_session( 'coupon' );
\Shared\Helpers\Helpers::delete_session( 'basket_message' );
\S::set_session( 'piksel_purchase', true );
\S::set_session( 'google-adwords-purchase', true );
\S::set_session( 'google-analytics-purchase', true );
\S::set_session( 'ekomi-purchase', true );
\Shared\Helpers\Helpers::set_session( 'piksel_purchase', true );
\Shared\Helpers\Helpers::set_session( 'google-adwords-purchase', true );
\Shared\Helpers\Helpers::set_session( 'google-analytics-purchase', true );
\Shared\Helpers\Helpers::set_session( 'ekomi-purchase', true );
$redis = \Shared\Cache\RedisConnection::getInstance() -> getConnection();
if ( $redis )
@@ -412,7 +412,7 @@ class ShopBasket
}
else
{
\S::error( \S::lang( 'zamowienie-zostalo-zlozone-komunikat-blad' ) );
\Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-zlozone-komunikat-blad' ) );
header( 'Location: /koszyk' );
exit;
}
@@ -424,10 +424,10 @@ class ShopBasket
$page[ 'language' ][ 'meta_title' ] = 'Koszyk';
$basket = \S::get_session( 'basket' );
$coupon = \S::get_session( 'coupon' );
$payment_method_id = \S::get_session( 'payment_method_id' );
$basket_transport_method_id = \S::get_session( 'basket-transport-method-id' );
$basket = \Shared\Helpers\Helpers::get_session( 'basket' );
$coupon = \Shared\Helpers\Helpers::get_session( 'coupon' );
$payment_method_id = \Shared\Helpers\Helpers::get_session( 'payment_method_id' );
$basket_transport_method_id = \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' );
if ( \shop\Basket::check_product_quantity_in_stock( $basket ) )
{
@@ -440,7 +440,7 @@ class ShopBasket
return \Tpl::view( 'shop-basket/basket', [
'basket' => $basket,
'coupon' => $coupon,
'transport_id' => \S::get_session( 'basket-transport-method-id' ),
'transport_id' => \Shared\Helpers\Helpers::get_session( 'basket-transport-method-id' ),
'transport_methods' => \Tpl::view( 'shop-basket/basket-transport-methods', [
'transports_methods' => \front\factory\ShopTransport::transport_methods( $basket, $coupon ),
'transport_id' => $basket_transport_method_id
@@ -450,7 +450,7 @@ class ShopBasket
'basket' => $basket,
'lang_id' => $lang_id,
'coupon' => $coupon,
'basket_message' => \S::get_session( 'basket_message' ),
'basket_message' => \Shared\Helpers\Helpers::get_session( 'basket_message' ),
'settings' => $settings
] )
] );