MC-39864: [Magento Cloud] - Tax Miscalculation

Author: Serhii Balko

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

@@ -5,13 +5,31 @@
  */
 namespace Magento\Sales\Model\Order\Creditmemo\Total;
 
+use Magento\Sales\Api\Data\CreditmemoInterface;
 use Magento\Sales\Model\Order\Creditmemo;
+use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\ResourceModel\Order\Invoice as ResourceInvoice;
 
 /**
  * Collects credit memo taxes.
  */
 class Tax extends AbstractTotal
 {
+    /**
+     * @var ResourceInvoice
+     */
+    private $resourceInvoice;
+
+    /**
+     * @param ResourceInvoice $resourceInvoice
+     * @param array $data
+     */
+    public function __construct(ResourceInvoice $resourceInvoice, array $data = [])
+    {
+        $this->resourceInvoice = $resourceInvoice;
+        parent::__construct($data);
+    }
+
     /**
      * {@inheritdoc}
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -182,8 +200,12 @@ private function calculateAllowedTax(Creditmemo $creditMemo): float
     {
         $invoice = $creditMemo->getInvoice();
         $order = $creditMemo->getOrder();
-        $amount = $invoice !== null ? $invoice->getTaxAmount()
-            : $order->getTaxInvoiced() - $order->getTaxRefunded();
+        if ($invoice!== null) {
+            $amount = $invoice->getTaxAmount()
+                - $this->calculateInvoiceRefundedAmount($invoice, CreditmemoInterface::TAX_AMOUNT);
+        } else {
+            $amount = $order->getTaxInvoiced() - $order->getTaxRefunded();
+        }
 
         return (float) $amount - $creditMemo->getTaxAmount();
     }
@@ -198,8 +220,13 @@ private function calculateAllowedBaseTax(Creditmemo $creditMemo): float
     {
         $invoice = $creditMemo->getInvoice();
         $order = $creditMemo->getOrder();
-        $amount = $invoice !== null ? $invoice->getBaseTaxAmount()
-            : $order->getBaseTaxInvoiced() - $order->getBaseTaxRefunded();
+
+        if ($invoice!== null) {
+            $amount = $invoice->getBaseTaxAmount()
+                - $this->calculateInvoiceRefundedAmount($invoice, CreditmemoInterface::BASE_TAX_AMOUNT);
+        } else {
+            $amount = $order->getBaseTaxInvoiced() - $order->getBaseTaxRefunded();
+        }
 
         return (float) $amount - $creditMemo->getBaseTaxAmount();
     }
@@ -217,7 +244,14 @@ private function calculateAllowedDiscountTaxCompensation(Creditmemo $creditMemo)
 
         if ($invoice) {
             $amount = $invoice->getDiscountTaxCompensationAmount()
-                + $invoice->getShippingDiscountTaxCompensationAmount();
+                + $invoice->getShippingDiscountTaxCompensationAmount()
+                - $this->calculateInvoiceRefundedAmount(
+                    $invoice,
+                    CreditmemoInterface::DISCOUNT_TAX_COMPENSATION_AMOUNT
+                ) - $this->calculateInvoiceRefundedAmount(
+                    $invoice,
+                    CreditmemoInterface::SHIPPING_DISCOUNT_TAX_COMPENSATION_AMOUNT
+                );
         } else {
             $amount = $order->getDiscountTaxCompensationInvoiced()
                 + $order->getShippingDiscountTaxCompensationAmount()
@@ -243,7 +277,14 @@ private function calculateAllowedBaseDiscountTaxCompensation(Creditmemo $creditM
 
         if ($invoice) {
             $amount = $invoice->getBaseDiscountTaxCompensationAmount()
-                + $invoice->getBaseShippingDiscountTaxCompensationAmnt();
+                + $invoice->getBaseShippingDiscountTaxCompensationAmnt()
+                - $this->calculateInvoiceRefundedAmount(
+                    $invoice,
+                    CreditmemoInterface::BASE_DISCOUNT_TAX_COMPENSATION_AMOUNT
+                ) - $this->calculateInvoiceRefundedAmount(
+                    $invoice,
+                    CreditmemoInterface::BASE_SHIPPING_DISCOUNT_TAX_COMPENSATION_AMNT
+                );
         } else {
             $amount = $order->getBaseDiscountTaxCompensationInvoiced()
                 + $order->getBaseShippingDiscountTaxCompensationAmnt()
@@ -255,4 +296,20 @@ private function calculateAllowedBaseDiscountTaxCompensation(Creditmemo $creditM
             - $creditMemo->getBaseShippingDiscountTaxCompensationAmnt()
             - $creditMemo->getBaseDiscountTaxCompensationAmount();
     }
+
+    /**
+     * Calculate refunded amount for invoice
+     *
+     * @param Invoice $invoice
+     * @param string $field
+     * @return float
+     */
+    private function calculateInvoiceRefundedAmount(Invoice $invoice, string $field): float
+    {
+        if (empty($invoice->getId())) {
+            return 0;
+        }
+
+        return $this->resourceInvoice->calculateRefundedAmount((int)$invoice->getId(), $field);
+    }
 }

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

@@ -5,11 +5,9 @@
  */
 namespace Magento\Sales\Model\ResourceModel\Order;
 
-use Magento\Framework\App\ResourceConnection;
-use Magento\SalesSequence\Model\Manager;
-use Magento\Sales\Model\ResourceModel\Attribute;
+use Magento\Framework\DataObject;
+use Magento\Framework\Model\AbstractModel;
 use Magento\Sales\Model\ResourceModel\EntityAbstract as SalesResource;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
 use Magento\Sales\Model\Spi\InvoiceResourceInterface;
 
 /**
@@ -37,10 +35,10 @@ protected function _construct()
     /**
      * Perform actions before object save
      *
-     * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
+     * @param AbstractModel|DataObject $object
      * @return $this
      */
-    protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
+    protected function _beforeSave(AbstractModel $object)
     {
         /** @var \Magento\Sales\Model\Order\Invoice $object */
         if (!$object->getOrderId() && $object->getOrder()) {
@@ -50,4 +48,29 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
 
         return parent::_beforeSave($object);
     }
+
+    /**
+     * Calculate refunded amount for invoice
+     *
+     * @param int $invoiceId
+     * @param string $filed
+     * @return float
+     * @throws \InvalidArgumentException
+     */
+    public function calculateRefundedAmount(int $invoiceId, string $filed): float
+    {
+        if (empty($filed)) {
+            throw new \InvalidArgumentException('The field param must be passed');
+        }
+
+        $select = $this->getConnection()->select();
+        $select->from(
+            ['credit_memo' => $this->getTable('sales_creditmemo')],
+            ['total' => new \Zend_Db_Expr("SUM(credit_memo.{$filed})")]
+        )->where(
+            "credit_memo.invoice_id = ?", $invoiceId
+        );
+
+        return (float) $this->getConnection()->fetchOne($select);
+    }
 }