ACP2E-1196: Minimum order amount error when discount rule is applied for shipping amount

Anna Bukatar · Anna Bukatar · commit f749e83b02d9 · 2022-10-24T16:32:11.000-07:00
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1228,9 +1228,10 @@ public function validateMinimumAmount()
             ? $this->getBaseTaxAmount() + $this->getBaseDiscountTaxCompensationAmount()
             : 0;
 
+        // Note: ($x > $y - 0.0001) means ($x >= $y) for floats
         return $includeDiscount ?
-            ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount) :
-            ($this->getBaseSubtotal() + $taxes >= $amount);
+            ($this->getBaseSubtotalWithDiscount() + $taxes > $amount - 0.0001) :
+            ($this->getBaseSubtotal() + $taxes > $amount - 0.0001);
     }
 
     /**
@@ -1386,7 +1387,7 @@ public function getBaseTotalAmount($code)
      */
     public function getBaseSubtotalWithDiscount()
     {
-        return $this->getBaseSubtotal() + $this->getBaseDiscountAmount();
+        return $this->getBaseSubtotal() + $this->getBaseDiscountAmount() + $this->getBaseShippingDiscountAmount();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1228,9 +1228,10 @@ public function validateMinimumAmount()`
`1228`	`1228`	`? $this->getBaseTaxAmount() + $this->getBaseDiscountTaxCompensationAmount()`
`1229`	`1229`	`: 0;`
`1230`	`1230`
	`1231`	`+ // Note: ($x > $y - 0.0001) means ($x >= $y) for floats`
`1231`	`1232`	`return $includeDiscount ?`
`1232`		`- ($this->getBaseSubtotalWithDiscount() + $taxes >= $amount) :`
`1233`		`- ($this->getBaseSubtotal() + $taxes >= $amount);`
	`1233`	`+ ($this->getBaseSubtotalWithDiscount() + $taxes > $amount - 0.0001) :`
	`1234`	`+ ($this->getBaseSubtotal() + $taxes > $amount - 0.0001);`
`1234`	`1235`	`}`
`1235`	`1236`
`1236`	`1237`	`/**`
`@@ -1386,7 +1387,7 @@ public function getBaseTotalAmount($code)`
`1386`	`1387`	`*/`
`1387`	`1388`	`public function getBaseSubtotalWithDiscount()`
`1388`	`1389`	`{`
`1389`		`- return $this->getBaseSubtotal() + $this->getBaseDiscountAmount();`
	`1390`	`+ return $this->getBaseSubtotal() + $this->getBaseDiscountAmount() + $this->getBaseShippingDiscountAmount();`
`1390`	`1391`	`}`
`1391`	`1392`
`1392`	`1393`	`/**`