Changeset 2997508

Timestamp:

11/17/2023 09:46:29 AM (2 years ago)

Author:

shipdepot

Message:

Update version 1.2.2 fix some bugs

Location:

ship-depot/trunk

Files:

• Ship_Depot_init.php (modified) (2 diffs)
• assets/css/fe-checkout.css (modified) (1 diff)
• helper/class-function-helper.php (modified) (1 diff)
• includes/Settings/class-ship-depot-settings-backend.php (modified) (3 diffs)
• page/admin/settings/sd-couriers.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• rest-api/class-shipdepot-webhook.php (modified) (2 diffs)

ship-depot/trunk/Ship_Depot_init.php

@@ -5 +5 @@
  * Plugin URI:        https://shipdepot.vn/
  * Description:       Ship Depot support shipping couriers in Vietnam like GHN, GHTK, AhaMove.
- * Version:           1.2.1
+ * Version:           1.2.2
  * Author:            ShipDepot.vn
  * Text Domain:       ship-depot-translate
@@ -35 +35 @@
 
 if (!defined('SHIP_DEPOT_VERSION')) {
-    define('SHIP_DEPOT_VERSION', '1.2.1');
+    define('SHIP_DEPOT_VERSION', '1.2.2');
 }
 

ship-depot/trunk/assets/css/fe-checkout.css

@@ -54 +54 @@
   align-items: flex-start;
   width: 100%;
+  flex-wrap: wrap;
 }
 
 #shipping_fee_content div.courier-fee img {
   width: var(--img-service-width);
-  margin-top: 3px;
+  margin: 5px 0 10px 0;
 }
 

ship-depot/trunk/helper/class-function-helper.php

@@ -60 +60 @@
         {
             if (!isset($valueCheck)) return true;
-            if (is_null(($valueCheck) || empty($valueCheck))) return true;
-            if (!$valueCheck) return true;
+            if (is_null($valueCheck) || $valueCheck == '') return true;
             return false;
         }

ship-depot/trunk/includes/Settings/class-ship-depot-settings-backend.php

@@ -419 +419 @@
                         }
 
-                        Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $fee_index_id . ' data: ' . print_r(sanitize_text_field($_POST[$fee_index_id]), true));
+                        Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $fee_index_id . ' data: ' . print_r(($_POST[$fee_index_id]), true));
                         //Order conditions
                         $fee->ListOrderConditions = [];
@@ -425 +425 @@
                             foreach ($_POST[$fee_index_id]['if'] as $index => $id) {
                                 $if_id = sanitize_text_field($id);
-                                Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $if_id . ' data: ' . print_r(sanitize_text_field($_POST[$fee_index_id][$if_id]), true));
+                                Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $if_id . ' data: ' . print_r(($_POST[$fee_index_id][$if_id]), true));
                                 $if = new Ship_Depot_Fee_Markup_Order_Condition();
                                 $idx = intval($index);
@@ -432 +432 @@
                                 switch ($if->Type) {
                                     case "total_amount":
-                                        $if->FromValue = Ship_Depot_Helper::check_null_or_empty(sanitize_text_field($_POST[$fee_index_id][$if_id]['from'])) ? -9999 : str_replace('.', '', sanitize_text_field($_POST[$fee_index_id][$if_id]['from']));
-                                        $if->ToValue = Ship_Depot_Helper::check_null_or_empty(sanitize_text_field($_POST[$fee_index_id][$if_id]['to'])) ? -9999 : str_replace('.', '', sanitize_text_field($_POST[$fee_index_id][$if_id]['to']));
+                                        $from = sanitize_text_field($_POST[$fee_index_id][$if_id]['from']);
+                                        $to = sanitize_text_field($_POST[$fee_index_id][$if_id]['to']);
+                                        Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $if_id . ' from: ' . print_r($from, true));
+                                        Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $if_id . ' to: ' . print_r($to, true));
+                                        Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $if_id . ' check_null_or_empty to: ' . print_r(Ship_Depot_Helper::check_null_or_empty(($to)), true));
+                                        Ship_Depot_Logger::wrlog('[save_fee_modify] ' . $if_id . ' check_null_or_empty from: ' . print_r(Ship_Depot_Helper::check_null_or_empty(($from)), true));
+                                        $if->FromValue = Ship_Depot_Helper::check_null_or_empty($from) ? -9999 : intval(str_replace('.', '', $from));
+                                        $if->ToValue = Ship_Depot_Helper::check_null_or_empty($to) ? -9999 : intval(str_replace('.', '', $to));
                                         break;
                                     case "item_existed":

ship-depot/trunk/page/admin/settings/sd-couriers.php

@@ -230 +230 @@
                     <!-- Ship from station -->
                     <div class="row">
-                        <div class="div-pick-station">
+                        <div class="div-pick-station<?php echo $st_courier->IsUsed ? '' : ' disable-element' ?>">
                             <input type="hidden" class="courier_data" name="<?php echo esc_attr($courier->CourierID) ?>[Data]" value="<?php echo esc_attr(Ship_Depot_Helper::ParseObjectToJsonHTML($courier_only)) ?>" />
                             <p><?php esc_html_e('Hình thức gửi hàng', 'ship-depot-translate') ?></p>

ship-depot/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.3.2
 Requires PHP: 7.4.3
-Stable tag: 1.2.1
+Stable tag: 1.2.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -65 +65 @@
 
 == Changelog ==
+= 1.2.2 =
+* Sửa một số lỗi nhỏ.
+
 = 1.2.1 =
 * Sửa một số lỗi nhỏ.

ship-depot/trunk/rest-api/class-shipdepot-webhook.php

@@ -60 +60 @@
             ]);
 
-            register_rest_route('shipdepot/webhook/v1', '/Test', [
-                'methods' => 'POST',
-                'callback' => [$this, 'sd_update_shipping_status'],
+            register_rest_route('shipdepot/webhook/v1', '/PostHello', [
+                'methods' => 'POST',
+                'callback' => [$this, 'sd_post_hello'],
+                'permission_callback' => '__return_true'
+            ]);
+
+            register_rest_route('shipdepot/webhook/v1', '/GetHello', [
+                'methods' => 'GET',
+                'callback' => [$this, 'sd_get_hello'],
                 'permission_callback' => '__return_true'
             ]);
@@ -329 +335 @@
             return 'OK';
         }
+
+        function sd_post_hello($request)
+        {
+            Ship_Depot_Logger::wrlog('[Ship_Depot_Webhook][sd_post_hello] Begin');
+            $params = wp_parse_args($request->get_params(), '');
+            Ship_Depot_Logger::wrlog('[Ship_Depot_Webhook][sd_post_hello] params: ' . print_r($params, true));
+            Ship_Depot_Logger::wrlog('[Ship_Depot_Webhook][sd_post_hello] End');
+
+            nocache_headers();
+            $result = new WP_REST_Response($params, 200);
+            return $result;
+        }
+
+        function sd_get_hello($request)
+        {
+            Ship_Depot_Logger::wrlog('[Ship_Depot_Webhook][sd_get_hello] Begin');
+            $params = wp_parse_args($request->get_params(), '');
+            Ship_Depot_Logger::wrlog('[Ship_Depot_Webhook][sd_get_hello] params: ' . print_r($params, true));
+            Ship_Depot_Logger::wrlog('[Ship_Depot_Webhook][sd_get_hello] End');
+
+            nocache_headers();
+            $reponse = new stdClass();
+            $reponse->message = 'ShipDepot Hello!';
+            $reponse->params = $params;
+            $result = new WP_REST_Response($reponse, 200);
+            return $result;
+        }
     }
     new Ship_Depot_Webhook();