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
] )
] );

72
autoload/front/controls/class.ShopClient.php
View File

@@ -4,32 +4,32 @@ class ShopClient
{
public static function mark_address_as_current()
{
if ( !$client = \S::get_session( 'client' ) )
if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
return false;
\front\factory\ShopClient::mark_address_as_current( $client['id'], \S::get( 'address_id' ) );
\front\factory\ShopClient::mark_address_as_current( $client['id'], \Shared\Helpers\Helpers::get( 'address_id' ) );
exit;
}
public static function address_delete()
{
if ( !$client = \S::get_session( 'client' ) )
if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
{
header( 'Location: /logowanie' );
exit;
}
$address = \front\factory\ShopClient::address_details( \S::get( 'id' ) );
$address = \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) );
if ( $address['client_id'] != $client['id'] )
{
header( 'Location: /panel-klienta/adresy' );
exit;
}
if ( \front\factory\ShopClient::address_delete( \S::get( 'id' ) ) )
\S::alert( \S::lang( 'adres-usuniety-komunikat' ) );
if ( \front\factory\ShopClient::address_delete( \Shared\Helpers\Helpers::get( 'id' ) ) )
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'adres-usuniety-komunikat' ) );
else
\S::error( \S::lang( 'adres-usuniety-blad' ) );
\Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'adres-usuniety-blad' ) );
header( 'Location: /panel-klienta/adresy' );
exit;
}
@@ -38,38 +38,38 @@ class ShopClient
{
global $page, $settings;
$page['language']['meta_title'] = \S::lang( 'meta-title-edycja-adresu' ) . ' | ' . $settings['firm_name'];
$page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-edycja-adresu' ) . ' | ' . $settings['firm_name'];
if ( !$client = \S::get_session( 'client' ) )
if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
{
header( 'Location: /logowanie' );
exit;
}
$address = \front\factory\ShopClient::address_details( \S::get( 'id' ) );
$address = \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) );
if ( $address['client_id'] != $client['id'] )
unset( $address );
return \front\view\ShopClient::address_edit( [
'address' => \front\factory\ShopClient::address_details( \S::get( 'id' ) )
'address' => \front\factory\ShopClient::address_details( \Shared\Helpers\Helpers::get( 'id' ) )
] );
}
public static function address_save()
{
if ( !$client = \S::get_session( 'client' ) )
if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
{
header( 'Location: /logowanie' );
exit;
}
if ( \front\factory\ShopClient::address_save( $client['id'], \S::get( 'address_id' ), \S::get( 'name', true ), \S::get( 'surname', true ), \S::get( 'street' ), \S::get( 'postal_code', true ), \S::get( 'city', true ), \S::get( 'phone', true ) ) )
if ( \front\factory\ShopClient::address_save( $client['id'], \Shared\Helpers\Helpers::get( 'address_id' ), \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( 'phone', true ) ) )
{
\S::get( 'address_id' ) ? \S::alert( \S::lang( 'zmiana-adresu-sukces' ) ) : \S::alert( \S::lang( 'dodawanie-nowego-adresu-sukces' ) );
\Shared\Helpers\Helpers::get( 'address_id' ) ? \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'zmiana-adresu-sukces' ) ) : \Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'dodawanie-nowego-adresu-sukces' ) );
}
else
{
\S::get( 'address_id' ) ? \S::error( \S::lang( 'zmiana-adresu-blad' ) ) : \S::error( \S::lang( 'dodawanie-nowego-adresu-blad' ) );
\Shared\Helpers\Helpers::get( 'address_id' ) ? \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'zmiana-adresu-blad' ) ) : \Shared\Helpers\Helpers::error( \Shared\Helpers\Helpers::lang( 'dodawanie-nowego-adresu-blad' ) );
}
header( 'Location: /panel-klienta/adresy' );
@@ -80,9 +80,9 @@ class ShopClient
{
global $page, $settings;
$page['language']['meta_title'] = \S::lang( 'meta-title-lista-adresow' ) . ' | ' . $settings['firm_name'];
$page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-lista-adresow' ) . ' | ' . $settings['firm_name'];
if ( !$client = \S::get_session( 'client' ) )
if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
{
header( 'Location: /logowanie' );
exit;
@@ -98,9 +98,9 @@ class ShopClient
{
global $page, $settings;
$page['language']['meta_title'] = \S::lang( 'meta-title-historia-zamowien' ) . ' | ' . $settings['firm_name'];
$page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-historia-zamowien' ) . ' | ' . $settings['firm_name'];
if ( !$client = \S::get_session( 'client' ) )
if ( !$client = \Shared\Helpers\Helpers::get_session( 'client' ) )
{
header( 'Location: /logowanie' );
exit;
@@ -115,8 +115,8 @@ class ShopClient
public static function new_password()
{
if ( \front\factory\ShopClient::new_password( \S::get( 'hash' ) ) )
\S::alert( \S::lang( 'nowe-haslo-zostalo-wyslane-na-twoj-adres-email' ) );
if ( \front\factory\ShopClient::new_password( \Shared\Helpers\Helpers::get( 'hash' ) ) )
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'nowe-haslo-zostalo-wyslane-na-twoj-adres-email' ) );
header( 'Location: /logowanie' );
exit;
@@ -124,10 +124,10 @@ class ShopClient
public static function send_email_password_recovery()
{
if ( \front\factory\ShopClient::send_email_password_recovery( \S::get( 'email' ) ) )
\S::alert( \S::lang( 'odzyskiwanie-hasla-link-komunikat' ) );
if ( \front\factory\ShopClient::send_email_password_recovery( \Shared\Helpers\Helpers::get( 'email' ) ) )
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'odzyskiwanie-hasla-link-komunikat' ) );
else
\S::alert( \S::lang( 'odzyskiwanie-hasla-blad' ) );
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'odzyskiwanie-hasla-blad' ) );
header( 'Location: /logowanie' );
exit;
}
@@ -136,26 +136,26 @@ class ShopClient
{
global $page, $settings;
$page['language']['meta_title'] = \S::lang( 'meta-title-odzyskiwanie-hasla' ) . ' | ' . $settings['firm_name'];
$page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-odzyskiwanie-hasla' ) . ' | ' . $settings['firm_name'];
return \front\view\ShopClient::recover_password();
}
public static function logout()
{
\S::delete_session( 'client' );
\Shared\Helpers\Helpers::delete_session( 'client' );
header( 'Location: /' );
exit;
}
public static function login()
{
if ( !\front\factory\ShopClient::login( \S::get( 'email' ), \S::get( 'password' ) ) )
if ( !\front\factory\ShopClient::login( \Shared\Helpers\Helpers::get( 'email' ), \Shared\Helpers\Helpers::get( 'password' ) ) )
header( 'Location: /logowanie' );
else
{
$client = \S::get_session( 'client' );
if ( $redirect = \S::get( 'redirect' ) )
$client = \Shared\Helpers\Helpers::get_session( 'client' );
if ( $redirect = \Shared\Helpers\Helpers::get( 'redirect' ) )
header( 'Location: ' . $redirect );
else
header( 'Location: /panel-klienta' );
@@ -165,8 +165,8 @@ class ShopClient
public static function confirm()
{
if ( \front\factory\ShopClient::register_confirm( \S::get( 'hash' ) ) )
\S::alert( \S::lang( 'rejestracja-potwierdzenie' ) );
if ( \front\factory\ShopClient::register_confirm( \Shared\Helpers\Helpers::get( 'hash' ) ) )
\Shared\Helpers\Helpers::alert( \Shared\Helpers\Helpers::lang( 'rejestracja-potwierdzenie' ) );
header( 'Location: /logowanie' );
exit;
@@ -174,7 +174,7 @@ class ShopClient
public static function signup()
{
$result = \front\factory\ShopClient::signup( \S::get( 'email' ), \S::get( 'password' ), \S::get( 'agremment_marketing' ) );
$result = \front\factory\ShopClient::signup( \Shared\Helpers\Helpers::get( 'email' ), \Shared\Helpers\Helpers::get( 'password' ), \Shared\Helpers\Helpers::get( 'agremment_marketing' ) );
echo json_encode( $result );
exit;
}
@@ -183,10 +183,10 @@ class ShopClient
{
global $page, $settings;
$page['language']['meta_title'] = \S::lang( 'meta-title-logowanie' ) . ' | ' . $settings['firm_name'];
$page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-logowanie' ) . ' | ' . $settings['firm_name'];
$page['class'] = 'page-login-form';
if ( $client = \S::get_session( 'client' ) )
if ( $client = \Shared\Helpers\Helpers::get_session( 'client' ) )
{
header( 'Location: /panel-klienta/zamowienia' );
exit;
@@ -199,9 +199,9 @@ class ShopClient
{
global $page, $settings;
$page['language']['meta_title'] = \S::lang( 'meta-title-rejestracja' ) . ' | ' . $settings['firm_name'];
$page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-rejestracja' ) . ' | ' . $settings['firm_name'];
if ( $client = \S::get_session( 'client' ) )
if ( $client = \Shared\Helpers\Helpers::get_session( 'client' ) )
{
header( 'Location: /panel-klienta/zamowienia' );
exit;

8
autoload/front/controls/class.ShopCoupon.php
View File

@@ -4,7 +4,7 @@ class ShopCoupon
{
public static function delete_coupon()
{
\S::delete_session( 'coupon' );
\Shared\Helpers\Helpers::delete_session( 'coupon' );
header( 'Location: /koszyk' );
exit;
}
@@ -12,12 +12,12 @@ class ShopCoupon
public static function use_coupon()
{
$coupon = new \shop\Coupon( 0 );
$coupon -> load_from_db_by_name( (string)\S::get( 'coupon' ) );
$coupon -> load_from_db_by_name( (string)\Shared\Helpers\Helpers::get( 'coupon' ) );
if ( $coupon -> is_available() )
\S::set_session( 'coupon', $coupon );
\Shared\Helpers\Helpers::set_session( 'coupon', $coupon );
else
\S::alert( 'Podany kod rabatowy jest nieprawidłowy.' );
\Shared\Helpers\Helpers::alert( 'Podany kod rabatowy jest nieprawidłowy.' );
header( 'Location: /koszyk' );
exit;

42
autoload/front/controls/class.ShopOrder.php
View File

@@ -6,7 +6,7 @@ class ShopOrder
{
global $settings;
$order = \front\factory\ShopOrder::order_details( null, \S::get( 'order_hash' ) );
$order = \front\factory\ShopOrder::order_details( null, \Shared\Helpers\Helpers::get( 'order_hash' ) );
return \Tpl::view( 'shop-order/payment-confirmation', [
'order' => $order,
@@ -20,9 +20,9 @@ class ShopOrder
file_put_contents( 'tpay.txt', print_r( $_POST, true ) . print_r( $_GET, true ), FILE_APPEND );
if ( \S::get( 'tr_status' ) == 'TRUE' and \S::get( 'tr_crc' ) )
if ( \Shared\Helpers\Helpers::get( 'tr_status' ) == 'TRUE' and \Shared\Helpers\Helpers::get( 'tr_crc' ) )
{
$order = new \shop\Order( 0, \S::get( 'tr_crc' ) );
$order = new \shop\Order( 0, \Shared\Helpers\Helpers::get( 'tr_crc' ) );
if ( $order -> id )
{
@@ -42,13 +42,13 @@ class ShopOrder
global $mdb, $settings;
$post = [
'p24_merchant_id' => \S::get( 'p24_merchant_id' ),
'p24_pos_id' => \S::get( 'p24_pos_id' ),
'p24_session_id' => \S::get( 'p24_session_id' ),
'p24_amount' => \S::get( 'p24_amount' ),
'p24_currency' => \S::get( 'p24_currency' ),
'p24_order_id' => \S::get( 'p24_order_id' ),
'p24_sign' => md5( \S::get( 'p24_session_id' ) . '|' . \S::get( 'p24_order_id' ) . '|' . \S::get( 'p24_amount' ) . '|' . \S::get( 'p24_currency' ) . '|' . $settings['przelewy24_crc_key'] )
'p24_merchant_id' => \Shared\Helpers\Helpers::get( 'p24_merchant_id' ),
'p24_pos_id' => \Shared\Helpers\Helpers::get( 'p24_pos_id' ),
'p24_session_id' => \Shared\Helpers\Helpers::get( 'p24_session_id' ),
'p24_amount' => \Shared\Helpers\Helpers::get( 'p24_amount' ),
'p24_currency' => \Shared\Helpers\Helpers::get( 'p24_currency' ),
'p24_order_id' => \Shared\Helpers\Helpers::get( 'p24_order_id' ),
'p24_sign' => md5( \Shared\Helpers\Helpers::get( 'p24_session_id' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_order_id' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_amount' ) . '|' . \Shared\Helpers\Helpers::get( 'p24_currency' ) . '|' . $settings['przelewy24_crc_key'] )
];
$ch = curl_init();
@@ -60,9 +60,9 @@ class ShopOrder
curl_setopt( $ch, CURLOPT_POSTFIELDS, http_build_query( $post ) );
$response = curl_exec( $ch );
$order = new \shop\Order( 0, '', \S::get( 'p24_session_id' ) );
$order = new \shop\Order( 0, '', \Shared\Helpers\Helpers::get( 'p24_session_id' ) );
if ( $order['status'] == 0 and $order['summary'] * 100 == \S::get( 'p24_amount' ) )
if ( $order['status'] == 0 and $order['summary'] * 100 == \Shared\Helpers\Helpers::get( 'p24_amount' ) )
{
if ( $order['id'] )
{
@@ -71,7 +71,6 @@ class ShopOrder
$order -> status = 4;
$order -> send_status_change_email();
\Log::save_log( 'Zamówienie opłacone przez przelewy24 | ID: ' . $order['id'] );
}
}
@@ -91,7 +90,7 @@ class ShopOrder
if ( is_array( $order['products'] ) and count( $order['products'] ) ):
foreach ( $order['products'] as $product ):
$product_tmp = \front\factory\ShopProduct::product_details( $product['product_id'], $lang['id'] );
$summary_tmp += \S::normalize_decimal( $product['price_netto'] + $product['price_netto'] * $product['vat'] / 100 ) * $product['quantity'];
$summary_tmp += \Shared\Helpers\Helpers::normalize_decimal( $product['price_netto'] + $product['price_netto'] * $product['vat'] / 100 ) * $product['quantity'];
endforeach;
$summary_tmp += $order['transport_cost'];
endif;
@@ -105,9 +104,8 @@ class ShopOrder
$order -> status = 4;
$order -> send_status_change_email();
\Log::save_log( 'Zamówienie opłacone przez hotpay | ID: ' . $order['id'] );
echo \S::lang( 'zamowienie-zostalo-oplacone' );
echo \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-oplacone' );
}
else if ( $_POST["STATUS"] == "FAILURE" )
{
@@ -116,9 +114,8 @@ class ShopOrder
$order -> status = 2;
$order -> send_status_change_email();
\Log::save_log( 'Płatność odrzucona hotpay | ID: ' . $order['id'] );
echo \S::lang( 'platnosc-zostala-odrzucona' );
echo \Shared\Helpers\Helpers::lang( 'platnosc-zostala-odrzucona' );
}
}
else
@@ -128,9 +125,8 @@ class ShopOrder
$order -> status = 3;
$order -> send_status_change_email();
\Log::save_log( 'Płatność sprawdzana ręcznie hotpay | ID: ' . $order['id'] );
echo \S::lang( 'zamowienie-zostalo-oplacone-reczne' );
echo \Shared\Helpers\Helpers::lang( 'zamowienie-zostalo-oplacone-reczne' );
}
}
}
@@ -141,16 +137,16 @@ class ShopOrder
{
global $page, $settings;
$page['language']['meta_title'] = \S::lang( 'meta-title-szczegoly-zamowienia' ) . ' | ' . $settings['firm_name'];
$page['language']['meta_title'] = \Shared\Helpers\Helpers::lang( 'meta-title-szczegoly-zamowienia' ) . ' | ' . $settings['firm_name'];
$order = \front\factory\ShopOrder::order_details(
\front\factory\ShopOrder::order_id( \S::get( 'order_hash' ) )
\front\factory\ShopOrder::order_id( \Shared\Helpers\Helpers::get( 'order_hash' ) )
);
$coupon = (int)$order['coupon_id'] ? new \shop\Coupon( (int)$order['coupon_id'] ) : null;
return \Tpl::view( 'shop-order/order-details', [
'order' => $order,
'coupon' => $coupon,
'client' => \S::get_session( 'client' ),
'client' => \Shared\Helpers\Helpers::get_session( 'client' ),
'settings' => $settings
] );
}

10
autoload/front/controls/class.ShopProducer.php
View File

@@ -6,20 +6,20 @@ class ShopProducer
{
global $page, $lang_id;
$producer = new \shop\Producer( \S::get( 'producer_id' ) );
$producer = new \shop\Producer( \Shared\Helpers\Helpers::get( 'producer_id' ) );
$page['show_title'] = true;
$page['language']['title'] = $producer['name'];
$results = \shop\Producer::producer_products( $producer['id'], $lang_id, (int) \S::get( 'bs' ) );
$results = \shop\Producer::producer_products( $producer['id'], $lang_id, (int) \Shared\Helpers\Helpers::get( 'bs' ) );
if ( $results['ls'] > 1 )
{
$pager = \Tpl::view( 'site/pager', [
'ls' => $results['ls'],
'bs' => (int) \S::get( 'bs' ) ? (int) \S::get( 'bs' ) : 1,
'bs' => (int) \Shared\Helpers\Helpers::get( 'bs' ) ? (int) \Shared\Helpers\Helpers::get( 'bs' ) : 1,
'page' => $page,
'link' => 'producent/' . \S::seo( $producer['name'] )
'link' => 'producent/' . \Shared\Helpers\Helpers::seo( $producer['name'] )
] );
}
@@ -38,7 +38,7 @@ class ShopProducer
$page['language']['title'] = 'Producenci';
$rows = $mdb -> select( 'pp_shop_producer', 'id', [ 'status' => 1, 'ORDER' => [ 'name' => 'ASC' ] ] );
if ( \S::is_array_fix( $rows ) ) foreach ( $rows as $row )
if ( \Shared\Helpers\Helpers::is_array_fix( $rows ) ) foreach ( $rows as $row )
$producers[] = new \shop\Producer( $row );
return \Tpl::view( 'shop-producer/list', [

8
autoload/front/controls/class.ShopProduct.php
View File

@@ -9,7 +9,7 @@ class ShopProduct
global $lang_id;
$output = '';
$products_ids = \front\factory\ShopCategory::products_id( \S::get( 'category_id' ), \front\factory\ShopCategory::get_category_sort( (int)\S::get( 'category_id' ) ), $lang_id, 8, \S::get( 'offset' ) );
$products_ids = \front\factory\ShopCategory::products_id( \Shared\Helpers\Helpers::get( 'category_id' ), \front\factory\ShopCategory::get_category_sort( (int)\Shared\Helpers\Helpers::get( 'category_id' ) ), $lang_id, 8, \Shared\Helpers\Helpers::get( 'offset' ) );
if ( is_array( $products_ids ) ): foreach ( $products_ids as $product_id ):
$output .= \Tpl::view('shop-product/product-mini', [
@@ -26,7 +26,7 @@ class ShopProduct
{
global $lang_id;
$values = json_decode( \S::get( 'values' ), true );
$values = json_decode( \Shared\Helpers\Helpers::get( 'values' ), true );
foreach( $values as $key => $val )
{
@@ -46,14 +46,14 @@ class ShopProduct
$combination = '';
$selected_values = \S::get( 'selected_values' );
$selected_values = \Shared\Helpers\Helpers::get( 'selected_values' );
foreach ( $selected_values as $value ) {
$combination .= $value;
if ( $value != end( $selected_values ) )
$combination .= '|';
}
$product_id = \S::get( 'product_id' );
$product_id = \Shared\Helpers\Helpers::get( 'product_id' );
$product = Product::getFromCache( $product_id, $lang_id );
$product_data = $product -> getProductDataBySelectedAttributes( $combination );

36
autoload/front/controls/class.Site.php
View File

@@ -7,11 +7,11 @@ class Site
{
$class = '\front\controls\\';
$results = explode( '_', \S::get( 'module' ) );
$results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
if ( is_array( $results ) ) foreach ( $results as $row )
$class .= ucfirst( $row );
$property = \S::get( 'action' );
$property = \Shared\Helpers\Helpers::get( 'action' );
if ( class_exists( $class ) and property_exists( new $class, 'page_title' ) )
return $class::$title[$property];
}
@@ -22,11 +22,11 @@ class Site
$class = '\front\controls\\';
$results = explode( '_', \S::get( 'module' ) );
$results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
if ( is_array( $results ) ) foreach ( $results as $row )
$class .= ucfirst( $row );
$property = \S::get( 'action' );
$property = \Shared\Helpers\Helpers::get( 'action' );
if ( class_exists( $class ) and property_exists( new $class, 'title' ) )
return $class::$title[$property] . ' | ' . $settings['firm_name'];
}
@@ -37,8 +37,8 @@ class Site
$articleRepo = new \Domain\Article\ArticleRepository( $GLOBALS['mdb'] );
if ( \S::get( 'article' ) )
return \front\Views\Articles::fullArticle( $articleRepo->articleDetailsFrontend( (int)\S::get( 'article' ), $lang_id ) );
if ( \Shared\Helpers\Helpers::get( 'article' ) )
return \front\Views\Articles::fullArticle( $articleRepo->articleDetailsFrontend( (int)\Shared\Helpers\Helpers::get( 'article' ), $lang_id ) );
// wyświetlenie pojedynczego produktu
if ( $product )
@@ -53,11 +53,11 @@ class Site
}
if ( $category )
return \front\view\ShopCategory::category_view( $category, $lang_id, \S::get( 'bs' ) );
return \front\view\ShopCategory::category_view( $category, $lang_id, \Shared\Helpers\Helpers::get( 'bs' ) );
// nowe kontrolery z DI
$module = \S::get( 'module' );
$action = \S::get( 'action' );
$module = \Shared\Helpers\Helpers::get( 'module' );
$action = \Shared\Helpers\Helpers::get( 'action' );
$controllerFactories = self::getControllerFactories();
$moduleName = implode( '', array_map( 'ucfirst', explode( '_', $module ) ) );
@@ -77,18 +77,18 @@ class Site
// klasy sklepowe
$class = '\shop\\';
$results = explode( '_', \S::get( 'module' ) );
$results = explode( '_', \Shared\Helpers\Helpers::get( 'module' ) );
if ( is_array( $results ) ) foreach ( $results as $row )
$class .= ucfirst( $row );
$action = \S::get( 'action' );
$action = \Shared\Helpers\Helpers::get( 'action' );
if ( class_exists( $class ) and method_exists( new $class, $action ) )
return call_user_func_array( array( $class, $action ), array() );
if ( $page['id'] )
{
$bs = (int)\S::get( 'bs' );
$bs = (int)\Shared\Helpers\Helpers::get( 'bs' );
$pageArticlesResult = $articleRepo->pageArticles( $page, $lang_id, $bs ?: 1 );
$articlesForPage = [];
if ( is_array( $pageArticlesResult['articles'] ) ) {
@@ -128,24 +128,24 @@ class Site
{
global $lang, $config;
$a = \S::get( 'a' );
$a = \Shared\Helpers\Helpers::get( 'a' );
switch ( $a )
{
case 'page':
$page = \front\factory\Pages::page_details( \S::get( 'id' ) );
\S::set_session( 'page', $page );
$page = \front\factory\Pages::page_details( \Shared\Helpers\Helpers::get( 'id' ) );
\Shared\Helpers\Helpers::set_session( 'page', $page );
break;
case 'change_language':
\S::set_session( 'current-lang', \S::get( 'id' ) );
\Shared\Helpers\Helpers::set_session( 'current-lang', \Shared\Helpers\Helpers::get( 'id' ) );
header( 'Location: /' );
exit;
break;
}
if ( \S::get( 'lang' ) )
\S::set_session( 'current-lang', \S::get( 'lang' ) );
if ( \Shared\Helpers\Helpers::get( 'lang' ) )
\Shared\Helpers\Helpers::set_session( 'current-lang', \Shared\Helpers\Helpers::get( 'lang' ) );
if ( file_exists( 'modules/actions.php' ) )
include 'modules/actions.php';