Merge remote-tracking branch 'af/MC-13860' into MC-13852

Author: rganin

app/code/Magento/ProductAlert/Model/Email.php

@@ -39,6 +39,8 @@
  *
  * @api
  * @since 100.0.2
+ * @method int getStoreId()
+ * @method $this setStoreId()
  */
 class Email extends AbstractModel
 {
@@ -136,11 +138,6 @@ class Email extends AbstractModel
      */
     protected $_customerHelper;
 
-    /**
-     * @var int
-     */
-    private $storeId = null;
-
     /**
      * @param Context $context
      * @param Registry $registry
@@ -215,18 +212,6 @@ public function setWebsite(\Magento\Store\Model\Website $website)
         return $this;
     }
 
-    /**
-     * Set store id from product alert.
-     *
-     * @param int $storeId
-     * @return $this
-     */
-    public function setStoreId(int $storeId)
-    {
-        $this->storeId = $storeId;
-        return $this;
-    }
-
     /**
      * Set website id
      *
@@ -357,7 +342,7 @@ public function send()
             return false;
         }
 
-        $storeId = $this->storeId ?: (int) $this->_customer->getStoreId();
+        $storeId = $this->getStoreId() ?: (int) $this->_customer->getStoreId();
         $store = $this->getStore($storeId);
 
         $this->_appEmulation->startEnvironmentEmulation($storeId);

app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php

@@ -270,23 +270,6 @@ public function getTotalAmount($item)
         return $totalAmount;
     }
 
-    /**
-     * Return the base total amount minus discount.
-     *
-     * @param OrderItem|InvoiceItem|CreditmemoItem $item
-     * @return mixed
-     */
-    public function getBaseTotalAmount($item)
-    {
-        $baseTotalAmount = $item->getBaseRowTotal()
-            + $item->getBaseTaxAmount()
-            + $item->getBaseDiscountTaxCompensationAmount()
-            + $item->getBaseWeeeTaxAppliedAmount()
-            - $item->getBaseDiscountAmount();
-
-        return $baseTotalAmount;
-    }
-
     /**
      * Return HTML for item total after discount
      *

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

@@ -696,7 +696,7 @@ private function canCreditmemoForZeroTotalRefunded($totalRefunded)
      * @param float $totalRefunded
      * @return bool
      */
-    public function canCreditmemoForZeroTotal($totalRefunded)
+    private function canCreditmemoForZeroTotal($totalRefunded)
     {
         $totalPaid = $this->getTotalPaid();
         //check if total paid is less than grandtotal

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

@@ -650,7 +650,7 @@ public function isValidGrandTotal()
      *
      * @return bool
      */
-    public function isAllowZeroGrandTotal()
+    private function isAllowZeroGrandTotal()
     {
         $isAllowed = $this->scopeConfig->getValue(
             'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',

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

@@ -52,7 +52,11 @@ public function execute(
         $result[OrderItemInterface::ROW_TOTAL] = $this->priceRenderer->getTotalAmount($dataObject);
         $result[OrderItemInterface::BASE_ROW_TOTAL] = $this->priceRenderer->getBaseTotalAmount($dataObject);
         $result[OrderItemInterface::ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getTotalAmount($dataObject);
-        $result[OrderItemInterface::BASE_ROW_TOTAL_INCL_TAX] = $this->defaultRenderer->getBaseTotalAmount($dataObject);
+        $result[OrderItemInterface::BASE_ROW_TOTAL_INCL_TAX] = $dataObject->getBaseRowTotal()
+            + $dataObject->getBaseTaxAmount()
+            + $dataObject->getBaseDiscountTaxCompensationAmount()
+            + $dataObject->getBaseWeeeTaxAppliedAmount()
+            - $dataObject->getBaseDiscountAmount();
 
         return $result;
     }

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Creditmemo/SaveTest.php

@@ -203,10 +203,9 @@ public function testSaveActionWithNegativeCreditmemo()
 
         $creditmemoMock = $this->createPartialMock(
             \Magento\Sales\Model\Order\Creditmemo::class,
-            ['load', 'getGrandTotal', 'isAllowZeroGrandTotal', '__wakeup']
+            ['load', 'isValidGrandTotal', '__wakeup']
         );
-        $creditmemoMock->expects($this->once())->method('getGrandTotal')->will($this->returnValue('0'));
-        $creditmemoMock->expects($this->once())->method('isAllowZeroGrandTotal')->will($this->returnValue(false));
+        $creditmemoMock->expects($this->once())->method('isValidGrandTotal')->will($this->returnValue(false));
         $this->memoLoaderMock->expects(
             $this->once()
         )->method(

app/code/Magento/Sales/Test/Unit/Model/Order/CreditmemoTest.php

@@ -117,27 +117,9 @@ public function testIsValidGrandTotalGrandTotalEmpty()
     public function testIsValidGrandTotalGrandTotal()
     {
         $this->creditmemo->setGrandTotal(0);
-        $this->creditmemo->isAllowZeroGrandTotal(true);
         $this->assertFalse($this->creditmemo->isValidGrandTotal());
     }
 
-    /**
-     * Test for isAllowZeroGrandTotal method.
-     *
-     * @return void
-     */
-    public function testIsAllowZeroGrandTotal()
-    {
-        $isAllowed = 0;
-        $this->scopeConfigMock->expects($this->once())
-            ->method('getValue')
-            ->with(
-                'sales/zerograndtotal_creditmemo/allow_zero_grandtotal',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-            )->willReturn($isAllowed);
-        $this->assertEquals($isAllowed, $this->creditmemo->isAllowZeroGrandTotal());
-    }
-
     public function testIsValidGrandTotal()
     {
         $this->creditmemo->setGrandTotal(1);

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

@@ -428,22 +428,6 @@ public function testCanCreditMemo()
         $this->assertTrue($this->order->canCreditmemo());
     }
 
-    /**
-     * Test canCreditMemo method when grand total and paid total are zero.
-     *
-     * @return void
-     */
-    public function testCanCreditMemoForZeroTotal()
-    {
-        $grandTotal = 0;
-        $totalPaid = 0;
-        $totalRefunded = 0;
-        $this->prepareOrderItem();
-        $this->order->setGrandTotal($grandTotal);
-        $this->order->setTotalPaid($totalPaid);
-        $this->assertFalse($this->order->canCreditmemoForZeroTotal($totalRefunded));
-    }
-
     public function testCanNotCreditMemoWithTotalNull()
     {
         $totalPaid = 0;