Merge pull request #27 from mygento/LIT-74

Fixed Division by zero
mygento · Mar 24, 2021 · 2406e0b · 2406e0b
2 parents dc8e518 + b1dfd9d
commit 2406e0b
Show file tree

Hide file tree

Showing 8 changed files with 110 additions and 3 deletions.
diff --git a/Helper/Discount.php b/Helper/Discount.php
@@ -773,12 +773,14 @@ private function addTaxValue($taxAttributeCode, $item)
      * It checks do we need to spread discount on all units and sets flag
      * $this->spreadDiscOnAllUnits
      * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     private function checkSpread()
     {
         $items = $this->getAllItems();
 
         $this->discountlessSum = 0.00;
+        $discountSum = 0;
         foreach ($items as $item) {
             $qty = $item->getQty() ?: $item->getQtyOrdered();
             $discountAmountInclTax = $this->getItemDiscountAmountInclTax($item);
@@ -795,10 +797,13 @@ private function checkSpread()
 
                 $this->wryItemUnitPriceExists = $decimals > 2 ? true : false;
             }
+
+            $discountSum += $discountAmountInclTax;
         }
 
         //Есть ли общая скидка на Чек. bccomp returns 0 if operands are equal
-        if (bccomp((string) $this->getGlobalDiscount(), '0.00', 2) !== 0) {
+        $isGlobalDiscountExist = bccomp((string) $this->getGlobalDiscount(), '0.00', 2) !== 0;
+        if ($isGlobalDiscountExist) {
             $this->generalHelper->debug('1. Global discount on whole cheque.');
 
             return true;
@@ -811,7 +816,8 @@ private function checkSpread()
             return true;
         }
 
-        if ($this->spreadDiscOnAllUnits) {
+        $isDiscountExist = bccomp($discountSum, '0.00', 2) !== 0;
+        if ($this->spreadDiscOnAllUnits && $isDiscountExist) {
             $this->generalHelper->debug('3. SpreadDiscount = Yes.');
 
             return true;

diff --git a/Test/Unit/DiscountAffectsShippingTest.php b/Test/Unit/DiscountAffectsShippingTest.php
@@ -1191,6 +1191,25 @@ protected static function getExpected()
             ],
         ];
 
+        $actualData[parent::TEST_CASE_NAME_27] = [
+            'sum' => '0.00',
+            'origGrandTotal' => 100.0,
+            'items' => [
+                100630 => [
+                    'price' => 0.0,
+                    'quantity' => 1.0,
+                    'sum' => 0.0,
+                    'tax' => 'vat20',
+                ],
+                'shipping' => [
+                    'price' => 100.0,
+                    'quantity' => 1.0,
+                    'sum' => 100.0,
+                    'tax' => '',
+                ],
+            ],
+        ];
+
         return $actualData;
     }
 }
diff --git a/Test/Unit/DiscountGeneralTestCase.php b/Test/Unit/DiscountGeneralTestCase.php
@@ -39,6 +39,7 @@ class DiscountGeneralTestCase extends TestCase
     const TEST_CASE_NAME_24 = '#case 24. Bug with shipping discount. Доставка со скидкой 100%. Настройки налогов как в #23';
     const TEST_CASE_NAME_25 = '#case 25. Баг с отрицательной суммой товара (макс. цена в заказе) и отрицательной суммой доставки';
     const TEST_CASE_NAME_26 = '#case 26. Баг с отрицательной стоимостью товара если есть Reward Points';
+    const TEST_CASE_NAME_27 = '#case 27. Division by zero';
 
     const CHARS_LOWERS = 'abcdefghijklmnopqrstuvwxyz';
     const CHARS_UPPERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
@@ -437,6 +438,11 @@ public function getOrders()
         $this->addItem($order, $this->getItem(0.0000, 0.0000, 0.0000, 1, 20, 0));
         $final[self::TEST_CASE_NAME_26] = $order;
 
+        //Заказ бесплатного пробника. Клиент оплачивает только доставку
+        $order = $this->getNewOrderInstance(0.0000, 100.0000, 100, 0);
+        $this->addItem($order, $this->getItem(0.0000, 0.0000, 0.0000, 1, 20, 0));
+        $final[self::TEST_CASE_NAME_27] = $order;
+
         return $final;
     }
 

diff --git a/Test/Unit/DiscountSplitItemsTest.php b/Test/Unit/DiscountSplitItemsTest.php
@@ -1692,6 +1692,25 @@ protected static function getExpected()
             ],
         ];
 
+        $actualData[parent::TEST_CASE_NAME_27] = [
+            'sum' => '0.00',
+            'origGrandTotal' => 100.0,
+            'items' => [
+                100630 => [
+                    'price' => 0.0,
+                    'quantity' => 1.0,
+                    'sum' => 0.0,
+                    'tax' => 'vat20',
+                ],
+                'shipping' => [
+                    'price' => 100.0,
+                    'quantity' => 1.0,
+                    'sum' => 100.0,
+                    'tax' => '',
+                ],
+            ],
+        ];
+
         return $actualData;
     }
 }
diff --git a/Test/Unit/DiscountSpreadAndSplitTest.php b/Test/Unit/DiscountSpreadAndSplitTest.php
@@ -1786,6 +1786,25 @@ protected static function getExpected()
             ],
         ];
 
+        $actualData[parent::TEST_CASE_NAME_27] = [
+            'sum' => '0.00',
+            'origGrandTotal' => 100.0,
+            'items' => [
+                100630 => [
+                    'price' => 0.0,
+                    'quantity' => 1.0,
+                    'sum' => 0.0,
+                    'tax' => 'vat20',
+                ],
+                'shipping' => [
+                    'price' => 100.0,
+                    'quantity' => 1.0,
+                    'sum' => 100.0,
+                    'tax' => '',
+                ],
+            ],
+        ];
+
         return $actualData;
     }
 }
diff --git a/Test/Unit/DiscountSpreadOnAllItemsTest.php b/Test/Unit/DiscountSpreadOnAllItemsTest.php
@@ -1144,6 +1144,25 @@ protected static function getExpected()
             ],
         ];
 
+        $actualData[parent::TEST_CASE_NAME_27] = [
+            'sum' => '0.00',
+            'origGrandTotal' => 100.0,
+            'items' => [
+                100630 => [
+                    'price' => 0.0,
+                    'quantity' => 1.0,
+                    'sum' => 0.0,
+                    'tax' => 'vat20',
+                ],
+                'shipping' => [
+                    'price' => 100.0,
+                    'quantity' => 1.0,
+                    'sum' => 100.0,
+                    'tax' => '',
+                ],
+            ],
+        ];
+
         return $actualData;
     }
 }
diff --git a/Test/Unit/DiscountWithoutCalcTest.php b/Test/Unit/DiscountWithoutCalcTest.php
@@ -1157,6 +1157,25 @@ protected static function getExpected()
             ],
         ];
 
+        $actualData[parent::TEST_CASE_NAME_27] = [
+            'sum' => '0.00',
+            'origGrandTotal' => 100.0,
+            'items' => [
+                100630 => [
+                    'price' => 1,
+                    'quantity' => 1.0,
+                    'sum' => 0.0,
+                    'tax' => 'vat20',
+                ],
+                'shipping' => [
+                    'price' => 100.0,
+                    'quantity' => 1.0,
+                    'sum' => 100.0,
+                    'tax' => '',
+                ],
+            ],
+        ];
+
         return $actualData;
     }
 }
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mygento/module-base",
   "type": "magento2-module",
-  "version": "2.3.17",
+  "version": "2.3.18",
   "license": "OSL-3.0",
   "homepage": "https://github.com/mygento/module-base",
   "description": "Mygento Base",