From ee240f7dbda273cedb892732980d7706aca024db Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Wed, 30 Oct 2024 09:38:37 +0100 Subject: [PATCH] Refactor value handling in multiple classes for improved data processing --- autoload/admin/controls/class.Articles.php | 12 ++++- autoload/admin/controls/class.Banners.php | 12 ++++- .../admin/controls/class.Dictionaries.php | 12 ++++- autoload/admin/controls/class.Languages.php | 23 ++++++++- autoload/admin/controls/class.Layouts.php | 12 ++++- autoload/admin/controls/class.Newsletter.php | 24 ++++++++- autoload/admin/controls/class.Pages.php | 24 ++++++++- autoload/admin/controls/class.Scontainers.php | 12 ++++- autoload/admin/controls/class.Settings.php | 13 ++++- .../admin/controls/class.ShopAttribute.php | 24 ++++++++- .../admin/controls/class.ShopCategory.php | 12 ++++- autoload/admin/controls/class.ShopCoupon.php | 12 ++++- .../admin/controls/class.ShopProducer.php | 12 ++++- autoload/admin/controls/class.ShopProduct.php | 12 ++++- .../admin/controls/class.ShopProductSets.php | 12 ++++- .../admin/controls/class.ShopPromotion.php | 12 ++++- .../admin/controls/class.ShopStatuses.php | 12 ++++- .../admin/controls/class.ShopTransport.php | 12 ++++- autoload/admin/controls/class.Users.php | 13 ++++- autoload/admin/factory/class.ShopProduct.php | 2 +- autoload/class.S.php | 48 ++++++++++++++++++ autoload/curl.class.php | 48 ++++++++++++++++++ autoload/front/controls/class.ShopOrder.php | 2 + autoload/front/controls/class.ShopProduct.php | 12 ++++- templates/.DS_Store | Bin 6148 -> 0 bytes 25 files changed, 364 insertions(+), 25 deletions(-) create mode 100644 autoload/curl.class.php delete mode 100644 templates/.DS_Store diff --git a/autoload/admin/controls/class.Articles.php b/autoload/admin/controls/class.Articles.php index 376df2d..b5d8380 100644 --- a/autoload/admin/controls/class.Articles.php +++ b/autoload/admin/controls/class.Articles.php @@ -27,7 +27,17 @@ class Articles public static function article_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania artykułu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\Articles::article_save( $values['id'], $values['title'], $values['main_image'], $values['entry'], $values['text'], $values['table_of_contents'], $values['status'], $values['show_title'], $values['show_table_of_contents'], $values['show_date_add'], $values['date_add'], $values['show_date_modify'], $values['date_modify'], $values['seo_link'], $values['meta_title'], diff --git a/autoload/admin/controls/class.Banners.php b/autoload/admin/controls/class.Banners.php index 4914355..54ec06d 100644 --- a/autoload/admin/controls/class.Banners.php +++ b/autoload/admin/controls/class.Banners.php @@ -15,7 +15,17 @@ class Banners public static function banner_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania baneru wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $banner_id = \admin\factory\Banners::banner_save( $values['id'], $values['name'], $values['status'], $values['date_start'], $values['date_end'], $values['home_page'], $values['src'], $values['url'], $values['html'], $values['text'] ) ) diff --git a/autoload/admin/controls/class.Dictionaries.php b/autoload/admin/controls/class.Dictionaries.php index 365795f..7f47ae9 100644 --- a/autoload/admin/controls/class.Dictionaries.php +++ b/autoload/admin/controls/class.Dictionaries.php @@ -18,7 +18,17 @@ class Dictionaries { static public function unit_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania jednostki miary wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\Dictionaries::unit_save( $values['id'], $values['text']) ) $response = [ 'status' => 'ok', 'msg' => 'Jednostka miary została zapisana.', 'id' => $id ]; diff --git a/autoload/admin/controls/class.Languages.php b/autoload/admin/controls/class.Languages.php index 4dcf079..ef3c8e3 100644 --- a/autoload/admin/controls/class.Languages.php +++ b/autoload/admin/controls/class.Languages.php @@ -14,8 +14,17 @@ class Languages public static function language_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania języka wystąpił błąd. Proszę spróbować ponownie.' ]; + $values_tmp = json_decode( \S::get( 'values' ), true ); - $values = json_decode( \S::get( 'values' ), true ); + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( \admin\factory\Languages::language_save( $values['id'], $values['name'], $values['status'], @@ -51,7 +60,17 @@ class Languages public static function translation_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania tłumaczenia wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } $languages_list = \admin\factory\Languages::languages_list(); if ( is_array( $languages_list ) and !empty( $languages_list ) ) foreach ( $languages_list as $language ) diff --git a/autoload/admin/controls/class.Layouts.php b/autoload/admin/controls/class.Layouts.php index 9325906..a8ed88a 100644 --- a/autoload/admin/controls/class.Layouts.php +++ b/autoload/admin/controls/class.Layouts.php @@ -14,7 +14,17 @@ class Layouts public static function layout_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania szablonu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\Layouts::layout_save( $values['id'], $values['name'], $values['status'], $values['pages'], $values['html'], $values['css'], $values['js'], $values['m_html'], $values['m_css'], $values['m_js'], $values['categories'], $values['categories_default'] ) diff --git a/autoload/admin/controls/class.Newsletter.php b/autoload/admin/controls/class.Newsletter.php index 17ebe58..242a80c 100644 --- a/autoload/admin/controls/class.Newsletter.php +++ b/autoload/admin/controls/class.Newsletter.php @@ -27,7 +27,17 @@ class Newsletter public static function settings_save() { $settings = \admin\factory\Settings::settings_details(); - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } \admin\factory\Settings::settings_update( 'newsletter_footer', $values['newsletter_footer'] ); \admin\factory\Settings::settings_update( 'newsletter_header', $values['newsletter_header'] ); @@ -81,7 +91,17 @@ class Newsletter public static function template_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\Newsletter::template_save( $values['id'], $values['name'], $values['text'] ) ) $response = [ 'status' => 'ok', 'msg' => 'Zmiany zostały zapisane.', 'id' => $id ]; diff --git a/autoload/admin/controls/class.Pages.php b/autoload/admin/controls/class.Pages.php index 4ec7b89..9ed6105 100644 --- a/autoload/admin/controls/class.Pages.php +++ b/autoload/admin/controls/class.Pages.php @@ -46,7 +46,17 @@ class Pages public static function page_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania strony wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\Pages::page_save( $values['id'], $values['title'], $values['seo_link'], $values['meta_title'], $values['meta_description'], $values['meta_keywords'], $values['menu_id'], $values['parent_id'], $values['page_type'], @@ -74,7 +84,17 @@ class Pages public static function menu_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania menu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( \admin\factory\Pages::menu_save( $values['id'], $values['name'], $values['status'] ) ) $response = [ 'status' => 'ok', 'msg' => 'Menu zostało zapisane.' ]; diff --git a/autoload/admin/controls/class.Scontainers.php b/autoload/admin/controls/class.Scontainers.php index 3fa2279..7163f53 100644 --- a/autoload/admin/controls/class.Scontainers.php +++ b/autoload/admin/controls/class.Scontainers.php @@ -14,7 +14,17 @@ class Scontainers public static function container_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania kontenera wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\Scontainers::container_save( $values['id'], $values['title'], $values['text'], $values['status'], $values['show_title'] ) ) $response = [ 'status' => 'ok', 'msg' => 'Kontener został zapisany.', 'id' => $id ]; diff --git a/autoload/admin/controls/class.Settings.php b/autoload/admin/controls/class.Settings.php index 2886b3d..4e35bd0 100644 --- a/autoload/admin/controls/class.Settings.php +++ b/autoload/admin/controls/class.Settings.php @@ -5,7 +5,18 @@ class Settings { public static function settings_save() { - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } + $settings = \admin\factory\Settings::settings_details( true ); $response = \admin\factory\Settings::settings_save( diff --git a/autoload/admin/controls/class.ShopAttribute.php b/autoload/admin/controls/class.ShopAttribute.php index 09f2985..db14345 100644 --- a/autoload/admin/controls/class.ShopAttribute.php +++ b/autoload/admin/controls/class.ShopAttribute.php @@ -17,7 +17,17 @@ class ShopAttribute static public function values_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania wartości atrybutu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } ; if ( $id = \admin\factory\ShopAttribute::values_save( (int) \S::get( 'attribute_id' ), $values['name'], $values['value'], $values['ids'], $values['default_value'], $values['impact_on_the_price'] ) ) $response = [ 'status' => 'ok', 'msg' => 'Wartości atrybutu zostały zapisane.', 'id' => $id ]; @@ -47,7 +57,17 @@ class ShopAttribute public static function attribute_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania atrybutu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\ShopAttribute::attribute_save( (int) $values['id'], $values['name'], $values['status'] == 'on' ? 1 : 0, (int) $values['type'], (int) $values['o'] ) ) $response = [ 'status' => 'ok', 'msg' => 'Atrybut został zapisany.', 'id' => $id ]; diff --git a/autoload/admin/controls/class.ShopCategory.php b/autoload/admin/controls/class.ShopCategory.php index f3dd42f..61c0fcf 100644 --- a/autoload/admin/controls/class.ShopCategory.php +++ b/autoload/admin/controls/class.ShopCategory.php @@ -32,7 +32,17 @@ class ShopCategory static public function save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania kategorii wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\ShopCategory::save( $values['id'], $values['title'], $values['text'], $values['text_hidden'], $values['seo_link'], $values['meta_title'], $values['meta_description'], $values['meta_keywords'], $values['parent_id'], $values['status'], diff --git a/autoload/admin/controls/class.ShopCoupon.php b/autoload/admin/controls/class.ShopCoupon.php index 2ce1ea2..19f8cc5 100644 --- a/autoload/admin/controls/class.ShopCoupon.php +++ b/autoload/admin/controls/class.ShopCoupon.php @@ -15,7 +15,17 @@ class ShopCoupon public static function coupon_save() { $response = ['status' => 'error', 'msg' => 'Podczas zapisywania kuponu wystąpił błąd. Proszę spróbować ponownie.']; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $values['categories'] != null ) $categories = is_array( $values['categories'] ) ? json_encode( $values['categories'] ) : json_encode( [ $values['categories'] ] ); diff --git a/autoload/admin/controls/class.ShopProducer.php b/autoload/admin/controls/class.ShopProducer.php index 932cbc1..31182ce 100644 --- a/autoload/admin/controls/class.ShopProducer.php +++ b/autoload/admin/controls/class.ShopProducer.php @@ -13,7 +13,17 @@ class ShopProducer static public function save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania producenta wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $producer_id = \admin\factory\ShopProducer::save( $values['id'], $values['name'], $values['status'] == 'on' ? 1 : 0, $values['img'], $values['description'], $values['meta_title'] ) ) $response = [ 'status' => 'ok', 'msg' => 'Producent został zapisany.', 'id' => $producer_id ]; diff --git a/autoload/admin/controls/class.ShopProduct.php b/autoload/admin/controls/class.ShopProduct.php index 71e2ba4..7373090 100644 --- a/autoload/admin/controls/class.ShopProduct.php +++ b/autoload/admin/controls/class.ShopProduct.php @@ -180,7 +180,17 @@ class ShopProduct public static function save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania produktu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\ShopProduct::save( $values['id'], $values['name'], $values['short_description'], $values['description'], $values['status'], $values['meta_description'], $values['meta_keywords'], $values['seo_link'], diff --git a/autoload/admin/controls/class.ShopProductSets.php b/autoload/admin/controls/class.ShopProductSets.php index 757a2d5..4514bc4 100644 --- a/autoload/admin/controls/class.ShopProductSets.php +++ b/autoload/admin/controls/class.ShopProductSets.php @@ -16,7 +16,17 @@ class ShopProductSets static public function save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania kompletu produktów wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\ShopProductSet::save( (int)$values['id'], $values['name'], (string) $values['status'], $values['set_products_id'] diff --git a/autoload/admin/controls/class.ShopPromotion.php b/autoload/admin/controls/class.ShopPromotion.php index ae27a20..3ce3e67 100644 --- a/autoload/admin/controls/class.ShopPromotion.php +++ b/autoload/admin/controls/class.ShopPromotion.php @@ -17,7 +17,17 @@ class ShopPromotion static public function save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania promocji wystąpił błąd. Proszę spróbować ponownie' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\ShopPromotion::save( $values['id'], diff --git a/autoload/admin/controls/class.ShopStatuses.php b/autoload/admin/controls/class.ShopStatuses.php index fa14645..23331b4 100644 --- a/autoload/admin/controls/class.ShopStatuses.php +++ b/autoload/admin/controls/class.ShopStatuses.php @@ -7,7 +7,17 @@ class ShopStatuses { public static function status_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania statusu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\ShopStatuses::status_save( $values['id'], $values['color'], $values['apilo_status_id'], $values['sellasist_status_id'], $values['baselinker_status_id'] ) ) $response = [ 'status' => 'ok', 'msg' => 'Status został zapisany.', 'id' => $id ]; diff --git a/autoload/admin/controls/class.ShopTransport.php b/autoload/admin/controls/class.ShopTransport.php index cbe05fb..443dcf5 100644 --- a/autoload/admin/controls/class.ShopTransport.php +++ b/autoload/admin/controls/class.ShopTransport.php @@ -5,7 +5,17 @@ class ShopTransport public static function transport_save() { $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania rodzaju transportu wystąpił błąd. Proszę spróbować ponownie.' ]; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } if ( $id = \admin\factory\ShopTransport::transport_save( $values['id'], $values['name'], $values['name_visible'], $values['description'], $values['status'], $values['cost'], $values['payment_methods'], $values['max_wp'], $values['default'], $values['apilo_carrier_account_id'], $values['sellasist_shipment_method_id'], $values['delivery_free'] diff --git a/autoload/admin/controls/class.Users.php b/autoload/admin/controls/class.Users.php index 7c32e88..25a1af0 100644 --- a/autoload/admin/controls/class.Users.php +++ b/autoload/admin/controls/class.Users.php @@ -13,7 +13,18 @@ class Users public static function user_save() { - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } + $response = \admin\factory\Users::user_save( $values['id'], $values['login'], $values['status'], $values['password'], $values['password_re'], $values['admin'] ); echo json_encode( $response ); exit; diff --git a/autoload/admin/factory/class.ShopProduct.php b/autoload/admin/factory/class.ShopProduct.php index c2e8c4a..7437b8d 100644 --- a/autoload/admin/factory/class.ShopProduct.php +++ b/autoload/admin/factory/class.ShopProduct.php @@ -1014,7 +1014,7 @@ class ShopProduct else $new_seo_link = \S::seo( 'p-' . $product_id . '-' . $name[$key] ); - if ( $new_seo_link !== $current_seo_link ) + if ( $new_seo_link !== $current_seo_link and $current_seo_link != '' ) { if ( !$mdb -> count( 'pp_redirects', [ 'from' => $current_seo_link, 'to' => $new_seo_link, 'lang_id' => $key, 'product_id' => $product_id ] ) ) { diff --git a/autoload/class.S.php b/autoload/class.S.php index 4495c14..a811a4a 100644 --- a/autoload/class.S.php +++ b/autoload/class.S.php @@ -1,6 +1,54 @@ access_token = $token; + } + + function post_request($url, $submitJson, $debug = false ) + { + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_POSTFIELDS, $submitJson); + curl_setopt($ch, CURLOPT_HTTPHEADER, array('Authorization: Bearer ' . $this->access_token, 'Content-Type: application/json')); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + $server_output = curl_exec($ch); + curl_close($ch); + $serverReponseObject = json_decode($server_output); + + // Debug + if ( $debug ) + print_r($serverReponseObject); + } + function get_request($url) + { + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_POST, false); + curl_setopt($ch, CURLOPT_HTTPHEADER, array('Authorization: Bearer ' . $this->access_token)); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + $server_output = curl_exec($ch); + curl_close($ch); + $serverReponseObject = json_decode($server_output); + + // Debug + //print_r ( $server_output ); + print_r($serverReponseObject); + } +} \ No newline at end of file diff --git a/autoload/front/controls/class.ShopOrder.php b/autoload/front/controls/class.ShopOrder.php index c7de541..170b66a 100644 --- a/autoload/front/controls/class.ShopOrder.php +++ b/autoload/front/controls/class.ShopOrder.php @@ -18,6 +18,8 @@ class ShopOrder { global $mdb; + 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' ) ) { $order = new \shop\Order( 0, \S::get( 'tr_crc' ) ); diff --git a/autoload/front/controls/class.ShopProduct.php b/autoload/front/controls/class.ShopProduct.php index 26e55bb..ffe7e2a 100644 --- a/autoload/front/controls/class.ShopProduct.php +++ b/autoload/front/controls/class.ShopProduct.php @@ -26,7 +26,17 @@ class ShopProduct { global $lang_id; - $values = json_decode( \S::get( 'values' ), true ); + $values_tmp = json_decode( \S::get( 'values' ), true ); + + $values = []; + + foreach ( $values_tmp as $item ) + { + $name = $item['name']; + $value = $item['value']; + $keys = \S::parse_name( $name ); + \S::set_array_value( $values, $keys, $value ); + } foreach( $values as $key => $val ) { diff --git a/templates/.DS_Store b/templates/.DS_Store deleted file mode 100644 index 96797d4292e50044254a7be6c0d61b9e1f76789e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKu};H44E2=`fr8Yr3)1lc4BZ(*6uzKrEKq`|M5Bue?D+-w0(K-mgYV+`Y?VZ5 zidayEY{`BX$G$l4+W3x$T=rZ{iN-{fKp6-7FdKyLvvy>l9=_?~9H%s=8+xP%y6Z%n zV;33VwHsl@78IzW=K4J?@29idP*zg*@mqgn8S;F-40A*zua_S$+1cm$w&>y)(bb|^ zg~zmX(5N@iiVFPNR_$t!PWs}SwN4JN-nG_^bC%(|(w}16b@Kno#27FJjDekH06m)} z83~#-28;n?V9fx3A3T&XRjdW$rvoM)0f0leqhK8OK0wb7V5(RP!UJ)V3Y1i*M+_(F z@OzC*6>C9BCl{ZLdGyInPbf}zUe3pGa;czMW55__Gq5L@WA6VK{pbI7l3f`C#=yT~ zzzy?Rp5c|Ww{~8Rd##6FLs>Yk7F?%b5L+=~xfM^KQQ-GH0H%tyAUqJ;2t*pp7z2OG Fz!x5GRMh|g