Changeset 3166359

Timestamp:

10/10/2024 09:07:30 AM (17 months ago)

Author:

shipdepot

Message:

Update version 1.2.18

Location:

ship-depot/trunk

Files:

• Ship_Depot_init.php (modified) (2 diffs)
• includes/Model/class-item.php (modified) (1 diff)
• includes/Model/class-package.php (modified) (1 diff)
• page/admin/orders/sd-order-list.php (modified) (1 diff)
• page/frontend/sd-checkout-page.php (modified) (7 diffs)
• readme.txt (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.17
+ * Version:           1.2.18
  * Author:            ShipDepot.vn
  * Text Domain:       ship-depot-translate
@@ -35 +35 @@
 
 if (!defined('SHIP_DEPOT_VERSION')) {
-    define('SHIP_DEPOT_VERSION', '1.2.17');
+    define('SHIP_DEPOT_VERSION', '1.2.18');
 }
 

ship-depot/trunk/includes/Model/class-item.php

@@ -9 +9 @@
         public string $Name = "";
         public string $ImageURL = "";
-        public int $Quantity = 0;
         public int $Price = 0;
         public int $TotalPrice = 0;

ship-depot/trunk/includes/Model/class-package.php

@@ -9 +9 @@
         public float $Height = 0;
         public float $Weight = 0;
+        public int $Quantity = 1;
         function __construct($object = null)
         {

ship-depot/trunk/page/admin/orders/sd-order-list.php

@@ -97 +97 @@
     wp_add_inline_style('woocommerce_admin_styles', "table.wp-list-table .column-sd-shipping-status{ width: 16%; }");
 }
+
+
+
+

ship-depot/trunk/page/frontend/sd-checkout-page.php

@@ -40 +40 @@
 // Disable all payment gateways on the checkout page and replace the "Pay" button with "Place order".
 //add_filter('woocommerce_cart_needs_payment', '__return_false');
-
 
 //Current hook: woocommerce_review_order_before_order_total => after list item
@@ -67 +66 @@
         foreach ($list_cart_items as $item) {
             //Ship_Depot_Logger::wrlog('[sd_woocommerce_review_order_before_order_total] item: ' . print_r($item, true));
-            Ship_Depot_Logger::wrlog('[sd_woocommerce_review_order_before_order_total] item qty: ' . print_r($item['quantity'], true));
-            $total_qty += floatval($item['quantity']);
+            $item_quantity = floatval($item['quantity']);
+            Ship_Depot_Logger::wrlog('[sd_woocommerce_review_order_before_order_total] item qty: ' . print_r($item_quantity, true));
+            $total_qty += $item_quantity;
             $product = $item['data'];
             $product_data = $product->get_data();
+
             //Ship_Depot_Logger::wrlog('[sd_woocommerce_review_order_before_order_total] product_data: ' . print_r($product_data, true));
             $package_size = new Ship_Depot_Package();
@@ -76 +77 @@
             $package_size->Width = isset($product_data['width']) ? Ship_Depot_Helper::ConvertToShipDepotDimension($product_data['width']) : 0;
             $package_size->Height = isset($product_data['height']) ? Ship_Depot_Helper::ConvertToShipDepotDimension($product_data['height']) : 0;
-            $package_size->Weight = isset($product_data['weight']) ? Ship_Depot_Helper::ConvertToShipDepotWeight($product_data['weight']) : 0;
-
+            $package_size->Weight = isset($product_data['weight']) ? Ship_Depot_Helper::ConvertToShipDepotWeight($product_data['weight']) * $item_quantity : 0;
+            $package_size->Quantity = 1;
+            //Update 1.2.18: calculate package size with quantity
+            if ($item_quantity > 1) {
+                $min_value = min($package_size->Length, $package_size->Width, $package_size->Height);
+                if ($min_value == $package_size->Width) {
+                    $package_size->Width = $package_size->Width * $item_quantity;
+                } else if ($min_value == $package_size->Length) {
+                    $package_size->Length = $package_size->Length * $item_quantity;
+                } else {
+                    $package_size->Height = $package_size->Height * $item_quantity;
+                }
+            }
+            Ship_Depot_Logger::wrlog('[sd_woocommerce_review_order_before_order_total] package_size: ' . print_r($package_size, true));
             $it = new Ship_Depot_Item();
             $it->Sku = $product_data['sku'];
             $it->ID = $item['product_id'];
             $it->Name = $product_data['name'];
-            $it->Quantity = $item['quantity'];
+            $it->Quantity = $item_quantity;
             $it->TotalPrice = $item['line_total'];
             $it->Length = isset($product_data['length']) ? Ship_Depot_Helper::ConvertToShipDepotDimension($product_data['length']) : 0;
@@ -92 +105 @@
             $item_regular_price_total += floatval($regular_price) * floatval($item['quantity']);
             $it->RegularPrice = $regular_price;
-            // Ship_Depot_Logger::wrlog('[sd_woocommerce_review_order_before_order_total] it: ' . print_r($it, true));
+            Ship_Depot_Logger::wrlog('[sd_woocommerce_review_order_before_order_total] it: ' . print_r($it, true));
             //
             array_push($list_packages_sizes, $package_size);
@@ -450 +463 @@
         $order = wc_get_order($order_id);
     }
-    //$order = wc_get_order($order_id);
     //Set shipping item
     $shippings = $order->get_items('shipping');
@@ -485 +497 @@
         $product = $item_product->get_product();
         // Ship_Depot_Logger::wrlog('[sd_action_checkout_order_processed] product: ' . print_r($product, true));
-        // $item_product = new WC_Order_Item_Product($item);
-        // $product = new WC_Product($item_product->get_product_id());
+        $item_quantity = $item->get_quantity();
 
         $package_size = new Ship_Depot_Package();
@@ -492 +503 @@
         $package_size->Width = Ship_Depot_Helper::ConvertToShipDepotDimension($product->get_width());
         $package_size->Height = Ship_Depot_Helper::ConvertToShipDepotDimension($product->get_height());
-        $package_size->Weight = Ship_Depot_Helper::ConvertToShipDepotWeight($product->get_weight());
+        $package_size->Weight = Ship_Depot_Helper::ConvertToShipDepotWeight($product->get_weight()) * $item_quantity;
+        $package_size->Quantity = 1;
+        //Update 1.2.18: calculate package size with quantity
+        if ($item_quantity > 1) {
+            $min_value = min($package_size->Length, $package_size->Width, $package_size->Height);
+            if ($min_value == $package_size->Width) {
+                $package_size->Width = $package_size->Width * $item_quantity;
+            } else if ($min_value == $package_size->Length) {
+                $package_size->Length = $package_size->Length * $item_quantity;
+            } else {
+                $package_size->Height = $package_size->Height * $item_quantity;
+            }
+        }
         array_push($list_packages_sizes, $package_size);
     }

ship-depot/trunk/readme.txt

@@ -3 +3 @@
 Tags: shipping, couriers, ghn, ghtk, aha
 Requires at least: 6.1.1
-Tested up to: 6.4.3
+Tested up to: 6.6.2
 Requires PHP: 7.4.3
-Stable tag: 1.2.17
+Stable tag: 1.2.18
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -65 +65 @@
 
 == Changelog ==
+= 1.2.18 =
+* Sửa lỗi tính phí vận chuyển ở trang thanh toán.
+
 = 1.2.17 =
 * Sửa một số lỗi nhỏ.
-
 
 = 1.2.16 =