MAGETWO-53060: Cannot refund order partially

mlogvin · mlogvin · commit 2a722c781464 · 2016-05-30T18:00:45.000+03:00
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Item.php
@@ -42,6 +42,11 @@ class Item extends AbstractModel implements CreditmemoItemInterface
      */
     protected $_orderItemFactory;
 
+    /**
+     * @var bool
+     */
+    private $qtyProcessed = false;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -127,28 +132,16 @@ public function setOrderItem(\Magento\Sales\Model\Order\Item $item)
     public function getOrderItem()
     {
         if ($this->_orderItem === null) {
-            $this->_orderItem = $this->getOrderItemWithoutCaching();
+            if ($this->getCreditmemo()) {
+                $orderItem = $this->getCreditmemo()->getOrder()->getItemById($this->getOrderItemId());
+            } else {
+                $orderItem = $this->_orderItemFactory->create()->load($this->getOrderItemId());
+            }
+            $this->_orderItem = $orderItem;
         }
         return $this->_orderItem;
     }
 
-    /**
-     * Retrieve order item instance without set it to property.
-     * It is need for ability to process setQty on api when credit memo and order has not built yet.
-     *
-     * @return \Magento\Sales\Model\Order\Item
-     */
-    private function getOrderItemWithoutCaching()
-    {
-        if ($this->getCreditmemo()) {
-            $orderItem = $this->getCreditmemo()->getOrder()->getItemById($this->getOrderItemId());
-        } else {
-            $orderItem = $this->_orderItemFactory->create()->load($this->getOrderItemId());
-        }
-
-        return $orderItem;
-    }
-
     /**
      * Checks if quantity available for refund
      *
@@ -164,26 +157,13 @@ private function isQtyAvailable($qty, \Magento\Sales\Model\Order\Item $orderItem
     /**
      * Declare qty
      *
-     * @param   float $qty
+     * @param float $qty
      * @return $this
-     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function setQty($qty)
     {
-        $orderItem = $this->getOrderItem();
-        if ($orderItem->getIsQtyDecimal()) {
-            $qty = (double)$qty;
-        } else {
-            $qty = (int)$qty;
-        }
-        $qty = $qty > 0 ? $qty : 0;
-        if ($this->isQtyAvailable($qty, $orderItem)) {
-            $this->setData('qty', $qty);
-        } else {
-            throw new \Magento\Framework\Exception\LocalizedException(
-                __('We found an invalid quantity to refund item "%1".', $this->getName())
-            );
-        }
+        $this->setData('qty', $qty);
+        $this->qtyProcessed = false;
         return $this;
     }
 
@@ -213,6 +193,29 @@ public function register()
         return $this;
     }
 
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function processQty()
+    {
+        $orderItem = $this->getOrderItem();
+        $qty = $this->getData(CreditmemoItemInterface::QTY);
+        if ($orderItem->getIsQtyDecimal()) {
+            $qty = (double)$qty;
+        } else {
+            $qty = (int)$qty;
+        }
+        $qty = $qty > 0 ? $qty : 0;
+        if ($this->isQtyAvailable($qty, $orderItem)) {
+            $this->setData('qty', $qty);
+        } else {
+            throw new \Magento\Framework\Exception\LocalizedException(
+                __('We found an invalid quantity to refund item "%1".', $this->getName())
+            );
+        }
+    }
+
     /**
      * @return $this
      */
@@ -511,6 +514,10 @@ public function getProductId()
      */
     public function getQty()
     {
+        if (!$this->qtyProcessed) {
+            $this->processQty();
+            $this->qtyProcessed = true;
+        }
         return $this->getData(CreditmemoItemInterface::QTY);
     }
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Creditmemo/ItemTest.php
@@ -111,15 +111,10 @@ public function testSetQtyDecimalException()
         $orderItemMock->expects($this->once())
             ->method('getQtyToRefund')
             ->willReturn($orderItemQty);
-        $orderItemMock->expects($this->atLeastOnce())
-            ->method('load')
-            ->willReturnSelf();
-        $this->orderItemFactoryMock->expects($this->atLeastOnce())
-            ->method('create')
-            ->willReturn($orderItemMock);
         $this->item->setData(CreditmemoItemInterface::NAME, $name);
         $this->item->setOrderItem($orderItemMock);
         $this->item->setQty($qty);
+        $this->item->getQty();
     }
 
     /**
@@ -141,15 +136,10 @@ public function testSetQtyNumericException()
         $orderItemMock->expects($this->once())
             ->method('getQtyToRefund')
             ->willReturn($orderItemQty);
-        $orderItemMock->expects($this->atLeastOnce())
-            ->method('load')
-            ->willReturnSelf();
-        $this->orderItemFactoryMock->expects($this->atLeastOnce())
-            ->method('create')
-            ->willReturn($orderItemMock);
         $this->item->setData(CreditmemoItemInterface::NAME, $name);
         $this->item->setOrderItem($orderItemMock);
         $this->item->setQty($qty);
+        $this->item->getQty();
     }
 
     public function testSetQty()
@@ -166,12 +156,6 @@ public function testSetQty()
         $orderItemMock->expects($this->once())
             ->method('getQtyToRefund')
             ->willReturn($orderItemQty);
-        $orderItemMock->expects($this->atLeastOnce())
-            ->method('load')
-            ->willReturnSelf();
-        $this->orderItemFactoryMock->expects($this->atLeastOnce())
-            ->method('create')
-            ->willReturn($orderItemMock);
         $this->item->setOrderItem($orderItemMock);
         $this->item->setQty($qty);
         $this->assertEquals($qty, $this->item->getQty());
@@ -209,19 +193,19 @@ public function testRegister()
         $orderItemMock->expects($this->once())
             ->method('getBaseDiscountRefunded')
             ->willReturn(1);
-        $data = [
-            'qty' => 1,
-            'tax_amount' => 1,
-            'base_tax_amount' => 1,
-            'discount_tax_compensation_amount' => 1,
-            'base_discount_tax_compensation_amount' => 1,
-            'row_total' => 1,
-            'base_row_total' => 1,
-            'discount_amount' => 1,
-            'base_discount_amount' => 1
-        ];
+        $orderItemMock->expects($this->once())
+            ->method('getQtyToRefund')
+            ->willReturn(1);
+        $this->item->setQty(1);
+        $this->item->setTaxAmount(1);
+        $this->item->setBaseTaxAmount(1);
+        $this->item->setDiscountTaxCompensationAmount(1);
+        $this->item->setBaseDiscountTaxCompensationAmount(1);
+        $this->item->setRowTotal(1);
+        $this->item->setBaseRowTotal(1);
+        $this->item->setDiscountAmount(1);
+        $this->item->setBaseDiscountAmount(1);
         $this->item->setOrderItem($orderItemMock);
-        $this->item->setData($data);
         $result = $this->item->register();
         $this->assertInstanceOf('Magento\Sales\Model\Order\Creditmemo\Item', $result);
     }
@@ -230,19 +214,6 @@ public function testCancel()
     {
         $orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
             ->disableOriginalConstructor()
-            ->setMethods(
-                [
-                    'setQtyRefunded',
-                    'getQtyRefunded',
-                    'getTaxRefunded',
-                    'getBaseTaxAmount',
-                    'getQtyOrdered',
-                    'setTaxRefunded',
-                    'setDiscountTaxCompensationRefunded',
-                    'getDiscountTaxCompensationRefunded',
-                    'getDiscountTaxCompensationAmount'
-                ]
-            )
             ->getMock();
         $orderItemMock->expects($this->once())
             ->method('getQtyRefunded')
@@ -272,8 +243,11 @@ public function testCancel()
         $orderItemMock->expects($this->once())
             ->method('getDiscountTaxCompensationAmount')
             ->willReturn(10);
+        $orderItemMock->expects($this->once())
+            ->method('getQtyToRefund')
+            ->willReturn(1);
 
-        $this->item->setData('qty', 1);
+        $this->item->setQty(1);
         $this->item->setOrderItem($orderItemMock);
         $result = $this->item->cancel();
         $this->assertInstanceOf('Magento\Sales\Model\Order\Creditmemo\Item', $result);
@@ -342,7 +316,7 @@ function ($arg) {
             ->method('getQtyToRefund')
             ->willReturn($qtyAvailable);
 
-        $this->item->setData('qty', $qty);
+        $this->item->setQty($qty);
         $this->item->setCreditmemo($creditmemoMock);
         $this->item->setOrderItem($orderItemMock);
         $result = $this->item->calcRowTotal();
@@ -362,4 +336,38 @@ public function calcRowTotalDataProvider()
             'qty 0' => [0],
         ];
     }
+
+    public function testSetQtyWithProcess()
+    {
+        $orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
+            ->disableOriginalConstructor()
+            ->setMethods(['getQtyToRefund'])
+            ->getMock();
+        $orderItemMock->expects($this->once())
+            ->method('getQtyToRefund')
+            ->willReturn(2);
+
+        $this->item->setOrderItem($orderItemMock);
+
+        $this->item->setQty(2);
+        $this->assertEquals(2, $this->item->getQty());
+    }
+
+    public function testSetQtyWithProcessDecimal()
+    {
+        $orderItemMock = $this->getMockBuilder('Magento\Sales\Model\Order\Item')
+            ->disableOriginalConstructor()
+            ->setMethods(['getQtyToRefund', 'getIsQtyDecimal'])
+            ->getMock();
+        $orderItemMock->expects($this->once())
+            ->method('getQtyToRefund')
+            ->willReturn(3.3);
+        $orderItemMock->expects($this->once())
+            ->method('getIsQtyDecimal')
+            ->willReturn(true);
+        $this->item->setOrderItem($orderItemMock);
+
+        $this->item->setQty(3.3);
+        $this->assertEquals(3.3, $this->item->getQty());
+    }
 }
