Merge branch 'bugfix/adjustment-for-mini-numbers' into release-week-15

mollie · Apr 18, 2024 · 2ae14ed · 2ae14ed
2 parents d29e239 + d4b5f13
commit 2ae14ed
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Service/Order/Lines/Order.php b/Service/Order/Lines/Order.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -363,7 +363,7 @@ private function getAdjustment(OrderInterface $order, array $orderLines): ?array
             return null;
         }
 
-        $difference = $grandTotal - $orderLinesTotal;
+        $difference = round($grandTotal - $orderLinesTotal, 2);
         if (abs($difference) < 0.01) {
             return null;
         }

diff --git a/Test/Integration/Service/Order/Lines/OrderTest.php b/Test/Integration/Service/Order/Lines/OrderTest.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * Copyright Magmodules.eu. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -157,14 +157,17 @@ public function testAddsAdjustmentsWhenTheTotalIsOff($adjustment)
         $lastLine = end($result);
 
         $this->assertEquals('discount', $lastLine['type']);
-        $this->assertEquals($adjustment, $lastLine['totalAmount']['value']);
+        $this->assertEquals(round($adjustment, 2), $lastLine['totalAmount']['value']);
 
         $total = 0;
         foreach ($result as $orderLine) {
             $total += $orderLine['totalAmount']['value'];
         }
 
-        $this->assertEquals($order->getBaseGrandTotal(), $total);
+        $this->assertEquals(
+            round($order->getBaseGrandTotal(), 2),
+            $total
+        );
     }
 
     /**
@@ -242,6 +245,8 @@ public function adjustmentsDataProvider(): array
             [-0.03],
             [-0.02],
             [-0.01],
+            [0.0051111111], // Rounds up to 0.1, so valid
+            [0.0099999999], // Rounds up to 0.1, so valid
             [0.01],
             [0.02],
             [0.03],