1.3.3

dpdconnect · May 31, 2024 · dc38a3b · dc38a3b
1 parent 3cc7ebc
commit dc38a3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Controller/Adminhtml/Order/Shipment/Save.php b/Controller/Adminhtml/Order/Shipment/Save.php
@@ -172,7 +172,7 @@ public function execute()
                 }
 
                 $order->setData(Constants::ORDER_EXTRA_SHIPPING_DATA, $rows);
-                $this->dataHelper->generateShippingLabel($order);
+                $this->dataHelper->generateShippingLabel($order, null, $packages);
 
                 $order->setCustomerNoteNotify(!empty($data['send_email']));
 

diff --git a/Helper/Services/OrderConvertService.php b/Helper/Services/OrderConvertService.php
@@ -198,13 +198,13 @@ public function addParcelsFromPackages(Order $order, ?Order\Shipment $shipment =
         $parcels = [];
 
         foreach ($packages as $package) {
-
             $weight = floatval($package['weight'] ?? $package['params']['weight'] ?? 0);
-            $unit = $package['weight_units'] ?? $package['params']['weight_units'] ?? \Zend_Measure_Weight::KILOGRAM;
+            $unit = $package['weight_units'] ?? $package['params']['weight_units'] ?? 'KILOGRAM';
+
+            if ($unit === 'POUND') {
+                $weight = $weight * 0.45359237;
+            }
 
-            $unit = new \Zend_Measure_Weight($weight, $unit);
-            $unit->convertTo(\Zend_Measure_Weight::KILOGRAM, 2);
-            $weight = round(floatval($unit->getValue(2)) * 100, 0);
             $parcel = [
                 'customerReferences' => [
                     $order->getIncrementId() ?? '',