From 84c9e285d65e2a4c6f67a564323f255db4ea3ec9 Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Fri, 20 Dec 2024 21:30:18 +0100 Subject: [PATCH] =?UTF-8?q?Dodanie=20funkcji=20czyszczenia=20cache=20oraz?= =?UTF-8?q?=20przycisku=20do=20ponownego=20wysy=C5=82ania=20zam=C3=B3wieni?= =?UTF-8?q?a=20do=20apilo.com;=20poprawa=20sortowania=20transport=C3=B3w?= =?UTF-8?q?=20w=20bazie=20danych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/templates/shop-order/order-details.php | 38 ++++++++ admin/templates/site/main-layout.php | 5 +- autoload/admin/controls/class.Settings.php | 13 +++ autoload/admin/controls/class.ShopOrder.php | 12 +++ autoload/admin/factory/class.ShopOrder.php | 90 ++++++++++++++++++ autoload/admin/factory/class.Update.php | 38 ++++++-- .../front/factory/class.ShopTransport.php | 2 +- autoload/shop/class.Transport.php | 2 +- templates/.DS_Store | Bin 6148 -> 0 bytes 9 files changed, 187 insertions(+), 13 deletions(-) delete mode 100644 templates/.DS_Store diff --git a/admin/templates/shop-order/order-details.php b/admin/templates/shop-order/order-details.php index be003e2..a877733 100644 --- a/admin/templates/shop-order/order-details.php +++ b/admin/templates/shop-order/order-details.php @@ -206,6 +206,12 @@ if ( $this -> next_order_id ) 'class' => 'btn btn-success btn-sm mr5 ml5' ]; } +$grid -> buttons[] = [ + 'label' => 'Wyślij ponownie zamówienie do apilo.com', + 'url' => '/admin/shop_order/send_order_to_apilo/order_id=' . $this -> order['id'], + 'icon' => 'fa-refresh', + 'class' => 'btn btn-primary btn-sm mr5 ml5 pull-right btn-send-order-to-apilo' +]; $grid -> default_buttons = false; $grid -> external_code = $out; echo $grid -> draw(); @@ -241,6 +247,38 @@ echo $grid -> draw(); }); }, 500 ); }); + + $( 'body' ).on( 'click', '.btn-send-order-to-apilo', function(e) { + e.preventDefault(); + var href = $( this ).attr( 'href' ); + $.alert({ + title: 'Potwierdź', + content: 'Czy na pewno chcesz wysłać zamówienie do apilo.com?', + type: 'orange', + closeIcon: true, + closeIconClass: 'fa fa-times', + typeAnimated: true, + animation: 'opacity', + columnClass: 'col-12 col-lg-10', + theme: 'modern', + icon: 'fa fa-question', + buttons: { + confirm: { + text: 'Tak', + btnClass: 'btn-success', + keys: ['enter'], + action: function() { + document.location.href = href; + } + }, + cancel: { + text: 'Nie', + btnClass: 'btn-dark', + action: function() {} + } + } + }); + }); }); // set_order_as_unpaid diff --git a/admin/templates/site/main-layout.php b/admin/templates/site/main-layout.php index fbb9af0..87e167d 100644 --- a/admin/templates/site/main-layout.php +++ b/admin/templates/site/main-layout.php @@ -168,7 +168,10 @@
-
+
+ Wyczyść cache +
+
getConnection(); + $redis -> flushAll(); + + \S::alert( 'Cache został wyczyszczony.' ); + header( 'Location: /admin/dashboard/main_view/' ); + exit; + } + public static function settings_save() { $values = json_decode( \S::get( 'values' ), true ); diff --git a/autoload/admin/controls/class.ShopOrder.php b/autoload/admin/controls/class.ShopOrder.php index d5ad043..032dad7 100644 --- a/autoload/admin/controls/class.ShopOrder.php +++ b/autoload/admin/controls/class.ShopOrder.php @@ -2,6 +2,18 @@ namespace admin\controls; class ShopOrder { + static public function send_order_to_apilo() + { + $order_id = \S::get( 'order_id' ); + if ( \admin\factory\ShopOrder::send_order_to_apilo( $order_id ) ) { + \S::alert( 'Zamówienie zostanie wysłane ponownie do apilo.com' ); + } else { + \S::alert( 'Wystąpił błąd podczas wysyłania zamówienia do apilo.com' ); + } + header( 'Location: /admin/shop_order/order_details/order_id=' . $order_id ); + exit; + } + static public function order_resend_confirmation_email() { $order = new \shop\Order( (int)\S::get( 'order_id' ) ); diff --git a/autoload/admin/factory/class.ShopOrder.php b/autoload/admin/factory/class.ShopOrder.php index 692ad76..27f6138 100644 --- a/autoload/admin/factory/class.ShopOrder.php +++ b/autoload/admin/factory/class.ShopOrder.php @@ -2,6 +2,86 @@ namespace admin\factory; class ShopOrder { + static public function send_order_to_apilo( int $order_id ) { + + global $mdb; + + // początek - anulowanie zamówienia w apilo + $apilo_settings = \admin\factory\Integrations::apilo_settings(); + + $new_status = 8; // zamówienie anulowwane + + $order = \admin\factory\ShopOrder::order_details( $order_id ); + + if ( $order['apilo_order_id'] ) { + + $access_token = \admin\factory\Integrations::apilo_get_access_token(); + + $ch = curl_init(); + curl_setopt( $ch, CURLOPT_URL, "https://projectpro.apilo.com/rest/api/orders/" . $order['apilo_order_id'] . '/status/' ); + curl_setopt( $ch, CURLOPT_POST, 1 ); + curl_setopt( $ch, CURLOPT_CUSTOMREQUEST, "PUT"); + curl_setopt( $ch, CURLOPT_POSTFIELDS, json_encode( [ + 'id' => $order['apilo_order_id'], + 'status' => (int)\front\factory\ShopStatuses::get_apilo_status_id( $new_status ) + ] ) ); + curl_setopt( $ch, CURLOPT_HTTPHEADER, [ + "Authorization: Bearer " . $access_token, + "Accept: application/json", + "Content-Type: application/json" + ] ); + curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true); + $apilo_result = curl_exec( $ch ); + + $apilo_result = json_decode( $apilo_result, true ); + + if ( $apilo_result['updates'] == 1 ) { + + // zmień ID zamówienia na największe ID zamówienia + 1, oraz usuń ID zamówienia z apilo + $new_order_id = $mdb -> max( 'pp_shop_orders', 'id' ) + 1; + + // pobierz listę kolumn zamówienia + $query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'pp_shop_orders' AND COLUMN_NAME != 'id'"; + $columns = $mdb -> query( $query ) -> fetchAll( \PDO::FETCH_COLUMN ); + $columns_list = implode( ', ', $columns ); + + // kopiuj stare zamówienie do nowego ID + $mdb -> query( 'INSERT INTO pp_shop_orders (' . $columns_list . ') SELECT ' . $columns_list . ' FROM pp_shop_orders pso WHERE pso.id = ' . $order_id ); + $new_order_id = $mdb -> id(); + + // pobierz listę kolumn produktów zamówienia + $query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'pp_shop_order_products' AND COLUMN_NAME != 'id' AND COLUMN_NAME != 'order_id'"; + $columns = $mdb -> query( $query ) -> fetchAll( \PDO::FETCH_COLUMN ); + $columns_list = implode( ', ', $columns ); + + // kopiuj produkty zamówienia do nowego zamówienia + $mdb -> query( 'INSERT INTO pp_shop_order_products (order_id, ' . $columns_list . ') SELECT ' . $new_order_id . ',' . $columns_list . ' FROM pp_shop_order_products psop WHERE psop.order_id = ' . $order_id ); + + // pobierz listę kolumn z tabeli pp_shop_order_statuses + $query = "SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'pp_shop_order_statuses' AND COLUMN_NAME != 'id' AND COLUMN_NAME != 'order_id'"; + $columns = $mdb -> query( $query ) -> fetchAll( \PDO::FETCH_COLUMN ); + $columns_list = implode( ', ', $columns ); + + // kopiuj statusy zamówienia do nowego zamówienia + $mdb -> query( 'INSERT INTO pp_shop_order_statuses (order_id, ' . $columns_list . ') SELECT ' . $new_order_id . ',' . $columns_list . ' FROM pp_shop_order_statuses psos WHERE psos.order_id = ' . $order_id ); + + // usuń stare zamówienie + $mdb -> delete( 'pp_shop_orders', [ 'id' => $order_id ] ); + $mdb -> delete( 'pp_shop_order_products', [ 'order_id' => $order_id ] ); + $mdb -> delete( 'pp_shop_order_statuses', [ 'order_id' => $order_id ] ); + + // zmień wartość kolumny apilo_order_id na NULL + $mdb -> update( 'pp_shop_orders', [ 'apilo_order_id' => NULL ], [ 'id' => $new_order_id ] ); + + return true; + } + + curl_close( $ch ); + } + + return false; + } + static public function next_order_id( int $order_id ) { global $mdb; @@ -21,4 +101,14 @@ class ShopOrder return $mdb -> get( 'pp_shop_orders', 'id', [ 'id[<]' => $order_id, 'ORDER' => [ 'id' => 'DESC' ], 'LIMIT' => 1 ] ); } + + static public function order_details( int $order_id ) + { + global $mdb; + + $order = $mdb -> get( 'pp_shop_orders', '*', [ 'id' => $order_id ] ); + $order['products'] = $mdb -> select( 'pp_shop_order_products', '*', [ 'order_id' => $order_id ] ); + + return $order; + } } diff --git a/autoload/admin/factory/class.Update.php b/autoload/admin/factory/class.Update.php index f42c5c1..c215123 100644 --- a/autoload/admin/factory/class.Update.php +++ b/autoload/admin/factory/class.Update.php @@ -15,7 +15,7 @@ class Update foreach ( $versions as $ver ) { $ver = trim( $ver ); - if ( (float)$ver > (float)\S::get_version() ) + if ( floatval( $ver ) > (float)\S::get_version() ) { if ( strlen( $ver ) == 5 ) $dir = substr( $ver, 0, strlen( $ver ) - 2 ) . 0; @@ -34,29 +34,47 @@ class Update else { /* aktualizacja bazy danych */ - $sql = file_get_contents( 'http://www.shoppro.project-dc.pl/updates/' . $dir . '/ver_' . $ver . '_sql.txt' ); - $sql = explode( PHP_EOL, $sql ); + $url = 'http://www.shoppro.project-dc.pl/updates/' . $dir . '/ver_' . $ver . '_sql.txt'; + $ch = curl_init( $url ); + curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true ); + curl_setopt( $ch, CURLOPT_HEADER, true ); + $response = curl_exec( $ch ); + $content_type = curl_getinfo( $ch, CURLINFO_CONTENT_TYPE ); + + if ( $response and strpos( $content_type, 'text/plain' ) !== false ) + $sql = explode( PHP_EOL, $response ); + if ( is_array( $sql ) and !empty( $sql ) ) foreach ( $sql as $query ) { if ( $sql ) + { $result = $mdb -> query( $query ); + } } /* usuwanie zbędnych plików */ - $lines = file_get_contents( 'http://www.shoppro.project-dc.pl/updates/' . $dir . '/ver_' . $ver . '_files.txt' ); - $lines = explode( PHP_EOL, $lines ); - if ( is_array( $lines ) ) foreach ( $lines as $line ) + $url = 'http://www.shoppro.project-dc.pl/updates/' . $dir . '/ver_' . $ver . '_files.txt'; + $ch = curl_init( $url ); + curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true ); + curl_setopt( $ch, CURLOPT_HEADER, true ); + $response = curl_exec( $ch ); + $content_type = curl_getinfo( $ch, CURLINFO_CONTENT_TYPE ); + + if ( $response and strpos( $content_type, 'text/plain' ) !== false ) + $files = explode( PHP_EOL, $response ); + + if ( is_array( $files ) and !empty( $files ) ) foreach ( $files as $file ) { - if ( strpos( $line, 'F: ' ) !== false ) + if ( strpos( $file, 'F: ' ) !== false ) { - $file = substr( $line, 3, strlen( $line ) ); + $file = substr( $file, 3, strlen( $file ) ); if ( file_exists( $file ) ) unlink( $file ); } - if ( strpos( $line, 'D: ' ) !== false ) + if ( strpos( $file, 'D: ' ) !== false ) { - $dir = substr( $line, 3, strlen( $line ) ); + $dir = substr( $file, 3, strlen( $file ) ); if ( is_dir( $dir ) ) \S::delete_dir( $dir ); } diff --git a/autoload/front/factory/class.ShopTransport.php b/autoload/front/factory/class.ShopTransport.php index daf0b52..f708776 100644 --- a/autoload/front/factory/class.ShopTransport.php +++ b/autoload/front/factory/class.ShopTransport.php @@ -31,7 +31,7 @@ class ShopTransport . 'FROM ' . 'pp_shop_transports AS pst ' . 'WHERE ' - . 'status = 1' ) -> fetchAll( \PDO::FETCH_ASSOC ); + . 'status = 1 ORDER BY o ASC' ) -> fetchAll( \PDO::FETCH_ASSOC ); if ( is_array( $results ) and !empty( $results ) ) foreach ( $results as $row ) $transports_tmp[] = $row; diff --git a/autoload/shop/class.Transport.php b/autoload/shop/class.Transport.php index 03b8ced..aa71607 100644 --- a/autoload/shop/class.Transport.php +++ b/autoload/shop/class.Transport.php @@ -6,7 +6,7 @@ class Transport implements \ArrayAccess static public function transport_list() { global $mdb; - return $mdb -> select( 'pp_shop_transports', '*', [ 'status' => 1 ] ); + return $mdb -> select( 'pp_shop_transports', '*', [ 'status' => 1 ], [ 'ORDER' => [ 'o' => 'ASC' ] ] ); } public function offsetExists( $offset ) 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