Merge pull request #501 from myparcelnl/MY-25102-weight-calculation-w…

…ith-decimal My 25102 weight calculation with decimal
myparcelnl · Oct 27, 2020 · 504ea10 · 504ea10
2 parents cb53bb1 + eb1cc06
commit 504ea10
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/Model/Sales/Package.php b/Model/Sales/Package.php
@@ -18,14 +18,7 @@
 
 namespace MyParcelNL\Magento\Model\Sales;
 
-
-use Magento\Framework\App\ObjectManager;
-use Magento\Framework\Module\ModuleListInterface;
-use Magento\Framework\App\Helper\Context;
-use Magento\Quote\Api\Data\EstimateAddressInterfaceFactory;
 use MyParcelNL\Magento\Helper\Data;
-use MyParcelNL\Sdk\src\Services\CheckApiKeyService;
-use Psr\Log\LoggerInterface;
 
 class Package extends Data implements PackageInterface
 {
@@ -85,27 +78,27 @@ class Package extends Data implements PackageInterface
     private $package_type = null;
 
     /**
-     * @return int
+     * @return float
      */
     public function getWeight()
     {
         return $this->weight;
     }
 
     /**
-     * @param $weight
+     * @param float $weight
      */
-    public function setWeight(int $weight)
+    public function setWeight(float $weight)
     {
-        $this->weight = (int) $weight;
+        $this->weight = $weight;
     }
 
     /**
-     * @param int $weight
+     * @param float $weight
      */
-    public function addWeight(int $weight)
+    public function addWeight(float $weight)
     {
-        $this->weight += (int) $weight;
+        $this->weight += $weight;
     }
 
     /**
@@ -117,14 +110,13 @@ public function getMaxWeight(): int
     }
 
     /**
-     * @param int $max_weight
+     * @param float $max_weight
      */
-    public function setMaxWeight(int $max_weight)
+    public function setMaxWeight(float $max_weight)
     {
         $this->max_weight = $max_weight;
     }
 
-
     /**
      * @return bool
      */
@@ -222,7 +214,6 @@ public function setAllProductsFit(bool $all_products_fit)
         }
     }
 
-
     /**
      * package = 1
      *

diff --git a/Model/Sales/PackageInterface.php b/Model/Sales/PackageInterface.php
@@ -22,17 +22,17 @@
 interface PackageInterface
 {
     /**
-     * @return int
+     * @return float
      */
     public function getWeight();
     /**
      * @param $weight
      */
-    public function setWeight(int $weight);
+    public function setWeight(float $weight);
     /**
-     * @param int $weight
+     * @param float $weight
      */
-    public function addWeight(int $weight);
+    public function addWeight(float $weight);
     /**
      * @return bool
      */

diff --git a/Model/Sales/TrackTraceHolder.php b/Model/Sales/TrackTraceHolder.php
@@ -331,7 +331,7 @@ private function convertDataForCdCountry($magentoTrack)
                 $myParcelProduct = (new MyParcelCustomsItem())
                     ->setDescription($product->getName())
                     ->setAmount($product->getQty())
-                    ->setWeight($product->getWeight() ?: 1)
+                    ->setWeight($this->getWeightTypeOfOption($product->getWeight()) ?: 1)
                     ->setItemValue($this->getCentsByPrice($product->getPrice()))
                     ->setClassification(
                         (int) $this->getAttributeValue('catalog_product_entity_int', $product['product_id'], 'classification')
@@ -347,7 +347,7 @@ private function convertDataForCdCountry($magentoTrack)
             $myParcelProduct = (new MyParcelCustomsItem())
                 ->setDescription($item->getName())
                 ->setAmount($item->getQty())
-                ->setWeight($this->getWeightTypeOfOption($item->getWeight()))
+                ->setWeight($this->getWeightTypeOfOption($item->getWeight() * $item->getQty()))
                 ->setItemValue($item->getPrice() * 100)
                 ->setClassification((int) $this->getAttributeValue('catalog_product_entity_int', $item->getProductId(), 'classification'))
                 ->setCountry($this->getCountryOfOrigin($item->getProductId()));