Merge remote-tracking branch 'origin/MC-41438' into 2.4-develop-pr57

Author: Serhii Balko

app/code/Magento/Sales/Model/Order/Invoice/Total/Discount.php

@@ -71,9 +71,9 @@ public function collect(Invoice $invoice)
         $invoice->setDiscountAmount(-$totalDiscountAmount);
         $invoice->setBaseDiscountAmount(-$baseTotalDiscountAmount);
 
-        $grandTotal = $invoice->getGrandTotal() - $totalDiscountAmount < 0.0001
+        $grandTotal = abs($invoice->getGrandTotal() - $totalDiscountAmount) < 0.0001
             ? 0 : $invoice->getGrandTotal() - $totalDiscountAmount;
-        $baseGrandTotal = $invoice->getBaseGrandTotal() - $baseTotalDiscountAmount < 0.0001
+        $baseGrandTotal = abs($invoice->getBaseGrandTotal() - $baseTotalDiscountAmount) < 0.0001
             ? 0 : $invoice->getBaseGrandTotal() - $baseTotalDiscountAmount;
         $invoice->setGrandTotal($grandTotal);
         $invoice->setBaseGrandTotal($baseGrandTotal);

app/code/Magento/Sales/Test/Unit/Model/Order/Invoice/Total/DiscountTest.php

@@ -98,6 +98,43 @@ public function testCollectInvoiceWithZeroGrandTotal(array $invoiceData): void
         $this->model->collect($this->invoice);
     }
 
+    /**
+     * Test for collect invoice with negative grand total
+     *
+     * @return void
+     */
+    public function testCollectInvoiceWithNegativeGrandTotal(): void
+    {
+        $invoiceData = [
+            'order_item' => [
+                'qty_ordered' => 1,
+                'discount_amount' => 25.34,
+                'base_discount_amount' => 25.34,
+            ],
+            'is_last' => true,
+            'qty' => 1,
+        ];
+        $invoiceItem[] = $this->getInvoiceItem($invoiceData);
+        $this->invoice->method('getOrder')
+            ->willReturn($this->order);
+        $this->order->method('getInvoiceCollection')
+            ->willReturn([]);
+        $this->invoice->method('getAllItems')
+            ->willReturn($invoiceItem);
+        $this->invoice->method('getGrandTotal')
+            ->willReturn(15.6801);
+        $this->invoice->method('getBaseGrandTotal')
+            ->willReturn(15.6801);
+
+        $this->invoice->expects($this->exactly(1))
+            ->method('setGrandTotal')
+            ->with(-9.6599);
+        $this->invoice->expects($this->exactly(1))
+            ->method('setBaseGrandTotal')
+            ->with(-9.6599);
+        $this->model->collect($this->invoice);
+    }
+
     /**
      * @return array
      */