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

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