MAGETWO-30913: Error when trying to apply coupon code in backend reorder after unchecking the discount apply checkbox

Author: Olexandr Lysenko

app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php

@@ -285,7 +285,7 @@ protected function _processActionData($action = null)
         if (!empty($couponCode)) {
             $isApplyDiscount = false;
             foreach ($this->_getQuote()->getAllItems() as $item) {
-                if ($item->getIsApplyDiscount() === true) {
+                if (!$item->getNoDiscount()) {
                     $isApplyDiscount = true;
                     break;
                 }

app/code/Magento/SalesRule/Model/Quote/Discount.php

@@ -87,7 +87,6 @@ public function collect(Address $address)
         foreach ($items as $item) {
             if ($item->getNoDiscount() || !$this->_calculator->canApplyDiscount($item)) {
                 $item->setDiscountAmount(0);
-                $item->setIsApplyDiscount(false);
                 $item->setBaseDiscountAmount(0);
 
                 // ensure my children are zeroed out
@@ -120,7 +119,6 @@ public function collect(Address $address)
                 $this->_calculator->process($item);
                 $this->_aggregateItemDiscount($item);
             }
-            $item->setIsApplyDiscount(true);
         }
 
         /**

dev/tests/unit/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/ProcessDataTest.php

@@ -123,13 +123,13 @@ protected function setUp()
     }
 
     /**
-     * @param bool $isApplyDiscount
+     * @param bool $noDiscount
      * @param string $couponCode
      * @param string $errorMessage
      * @param string $actualCouponCode
      * @dataProvider isApplyDiscountDataProvider
      */
-    public function testExecute($isApplyDiscount, $couponCode, $errorMessage, $actualCouponCode)
+    public function testExecute($noDiscount, $couponCode, $errorMessage, $actualCouponCode)
     {
         $quote = $this->getMock(
             'Magento\Sales\Model\Quote',
@@ -200,11 +200,11 @@ public function testExecute($isApplyDiscount, $couponCode, $errorMessage, $actua
             false,
             true,
             true,
-            ['getIsApplyDiscount']
+            ['getNoDiscount']
         );
         $quote->expects($this->any())->method('getAllItems')->willReturn([$item]);
-        $item->expects($this->any())->method('getIsApplyDiscount')->willReturn($isApplyDiscount);
-        if ($isApplyDiscount) {
+        $item->expects($this->any())->method('getNoDiscount')->willReturn($noDiscount);
+        if (!$noDiscount) {
             $quote->expects($this->once())->method('getCouponCode')->willReturn($actualCouponCode);
         }
 
@@ -227,8 +227,8 @@ public function testExecute($isApplyDiscount, $couponCode, $errorMessage, $actua
     public function isApplyDiscountDataProvider()
     {
         return [
-            [false, '123', '"%1" coupon code was not applied. Do not apply discount is selected for item(s)', null],
-            [true, '123', '"%1" coupon code is not valid.', '132'],
+            [true, '123', '"%1" coupon code was not applied. Do not apply discount is selected for item(s)', null],
+            [false, '123', '"%1" coupon code is not valid.', '132'],
         ];
     }
 }

dev/tests/unit/testsuite/Magento/SalesRule/Model/Quote/DiscountTest.php

@@ -89,14 +89,11 @@ public function testCollectItemNoDiscount()
     {
         $itemNoDiscount = $this->getMockBuilder('Magento\Sales\Model\Quote\Item')
             ->disableOriginalConstructor()
-            ->setMethods(['getNoDiscount', 'setIsApplyDiscount', '__wakeup'])
+            ->setMethods(['getNoDiscount', '__wakeup'])
             ->getMock();
         $itemNoDiscount->expects($this->once())
             ->method('getNoDiscount')
             ->willReturn(true);
-        $itemNoDiscount->expects($this->once())
-            ->method('setIsApplyDiscount')
-            ->willReturn(false);
 
         $this->validatorMock->expects($this->any())
             ->method('sortItemsByPriority')
@@ -204,7 +201,6 @@ public function testCollectItemHasChildren($childItemData, $parentData, $expecte
                     'getHasChildren',
                     'isChildrenCalculated',
                     'getChildren',
-                    'setIsApplyDiscount',
                     '__wakeup',
                 ]
             )
@@ -218,9 +214,6 @@ public function testCollectItemHasChildren($childItemData, $parentData, $expecte
         $itemWithChildren->expects($this->once())
             ->method('getHasChildren')
             ->willReturn(true);
-        $itemWithChildren->expects($this->once())
-            ->method('setIsApplyDiscount')
-            ->willReturn(true);
         $itemWithChildren->expects($this->once())
             ->method('isChildrenCalculated')
             ->willReturn(true);
@@ -339,17 +332,13 @@ public function testCollectItemHasNoChildren()
                     'getHasChildren',
                     'isChildrenCalculated',
                     'getChildren',
-                    'setIsApplyDiscount',
                     '__wakeup',
                 ]
             )
             ->getMock();
         $itemWithChildren->expects($this->once())
             ->method('getNoDiscount')
             ->willReturn(false);
-        $itemWithChildren->expects($this->once())
-            ->method('setIsApplyDiscount')
-            ->willReturn(true);
         $itemWithChildren->expects($this->once())
             ->method('getParentItem')
             ->willReturn(false);