Merge remote-tracking branch 'l3/ACP2E-2583' into Tier4-PR-Delivery-12-1-23

Author: veloraven

app/code/Magento/Sales/Model/Order.php

@@ -1378,9 +1378,11 @@ public function registerCancellation($comment = '', $graceful = true)
             $this->setShippingCanceled($this->getShippingAmount() - $this->getShippingInvoiced());
             $this->setBaseShippingCanceled($this->getBaseShippingAmount() - $this->getBaseShippingInvoiced());
 
-            $this->setDiscountCanceled(abs((float) $this->getDiscountAmount()) - $this->getDiscountInvoiced());
+            $this->setDiscountCanceled(
+                abs((float) $this->getDiscountAmount()) - abs((float) $this->getDiscountInvoiced())
+            );
             $this->setBaseDiscountCanceled(
-                abs((float) $this->getBaseDiscountAmount()) - $this->getBaseDiscountInvoiced()
+                abs((float) $this->getBaseDiscountAmount()) - abs((float) $this->getBaseDiscountInvoiced())
             );
 
             $this->setTotalCanceled($this->getGrandTotal() - $this->getTotalPaid());

app/code/Magento/Sales/Test/Unit/Model/OrderTest.php

@@ -881,6 +881,20 @@ public function testCanCancelActionFlag($cancelActionFlag)
         $this->assertEquals($cancelActionFlag, $this->order->canCancel());
     }
 
+    public function testRegisterDiscountCanceled()
+    {
+        $this->item->expects($this->any())
+            ->method('getQtyToInvoice')
+            ->willReturn(42);
+        $this->prepareOrderItem();
+        $this->order->setDiscountAmount(-30);
+        $this->order->setDiscountInvoiced(-10);
+        $this->order->setBaseDiscountAmount(-30);
+        $this->order->setBaseDiscountInvoiced(-10);
+        $this->order->registerCancellation();
+        $this->assertEquals(20, abs((float) $this->order->getDiscountCanceled()));
+    }
+
     /**
      * @param array $actionFlags
      * @param string $orderState