[ECP-9225] Use Magento_Tax module to build open invoice line items

Helper/ChargedCurrency.php

@@ -17,6 +17,7 @@
 use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Invoice;
 use Magento\Sales\Api\Data\CreditmemoItemInterface;
+use Magento\Tax\Block\Item\Price\RendererFactory;
 
 class ChargedCurrency
 {
@@ -26,16 +27,10 @@ class ChargedCurrency
      */
     const BASE = "base";
 
-    /**
-     * @var Config
-     */
-    private $config;
-
     public function __construct(
-        Config $config
-    ) {
-        $this->config = $config;
-    }
+        private readonly Config $config,
+        private readonly RendererFactory $priceRendererFactory
+    ) { }
 
     /**
      * @param Order $order
@@ -44,7 +39,7 @@ public function __construct(
      *
      * @return AdyenAmountCurrency
      */
-    public function getOrderAmountCurrency(Order $order, bool $orderPlacement = true)
+    public function getOrderAmountCurrency(Order $order, bool $orderPlacement = true): AdyenAmountCurrency
     {
         $chargedCurrency = $orderPlacement
             ? $this->config->getChargedCurrency($order->getStoreId())
@@ -71,7 +66,7 @@ public function getOrderAmountCurrency(Order $order, bool $orderPlacement = true
      * @param Quote $quote
      * @return AdyenAmountCurrency
      */
-    public function getQuoteAmountCurrency(Quote $quote)
+    public function getQuoteAmountCurrency(Quote $quote): AdyenAmountCurrency
     {
         $chargedCurrency = $this->config->getChargedCurrency($quote->getStoreId());
         if ($chargedCurrency == self::BASE) {
@@ -83,6 +78,7 @@ public function getQuoteAmountCurrency(Quote $quote)
     public function getQuoteItemAmountCurrency(Quote\Item $item): AdyenAmountCurrency
     {
         $chargedCurrency = $this->config->getChargedCurrency($item->getStoreId());
+        $priceRenderer = $this->priceRendererFactory->create();
 
         if ($chargedCurrency == self::BASE) {
             return new AdyenAmountCurrency(
@@ -91,8 +87,7 @@ public function getQuoteItemAmountCurrency(Quote\Item $item): AdyenAmountCurrenc
                 $item->getBaseDiscountAmount() / $item->getQty(),
                 $item->getBaseTaxAmount() / $item->getQty(),
                 null,
-                $item->getBaseRowTotalInclTax() / $item->getQty(),
-                $item->getBaseDiscountTaxCompensationAmount() / $item->getQty()
+                $priceRenderer->getBaseTotalAmount($item) / $item->getQty()
             );
         }
 
@@ -102,14 +97,14 @@ public function getQuoteItemAmountCurrency(Quote\Item $item): AdyenAmountCurrenc
             $item->getDiscountAmount() / $item->getQty(),
             $item->getTaxAmount() / $item->getQty(),
             null,
-            $item->getRowTotalInclTax() / $item->getQty(),
-            $item->getDiscountTaxCompensationAmount() / $item->getQty()
+            $priceRenderer->getTotalAmount($item) / $item->getQty()
         );
     }
 
     public function getInvoiceItemAmountCurrency(Invoice\Item $item): AdyenAmountCurrency
     {
         $chargedCurrency = $item->getInvoice()->getOrder()->getAdyenChargedCurrency();
+        $priceRenderer = $this->priceRendererFactory->create();
 
         if ($chargedCurrency == self::BASE) {
             return new AdyenAmountCurrency(
@@ -118,8 +113,7 @@ public function getInvoiceItemAmountCurrency(Invoice\Item $item): AdyenAmountCur
                 $item->getBaseDiscountAmount() / $item->getQty(),
                 $item->getBaseTaxAmount() / $item->getQty(),
                 null,
-                $item->getBaseRowTotalInclTax() / $item->getQty(),
-                $item->getBaseDiscountTaxCompensationAmount() / $item->getQty()
+                $priceRenderer->getBaseTotalAmount($item)
             );
         }
 
@@ -129,16 +123,15 @@ public function getInvoiceItemAmountCurrency(Invoice\Item $item): AdyenAmountCur
             $item->getDiscountAmount() / $item->getQty(),
             $item->getTaxAmount() / $item->getQty(),
             null,
-            $item->getRowTotalInclTax() / $item->getQty(),
-            $item->getDiscountTaxCompensationAmount() / $item->getQty()
+            $priceRenderer->getTotalAmount($item)
         );
     }
 
     /**
      * @param CreditmemoInterface $creditMemo
      * @return AdyenAmountCurrency
      */
-    public function getCreditMemoAmountCurrency(CreditmemoInterface $creditMemo)
+    public function getCreditMemoAmountCurrency(CreditmemoInterface $creditMemo): AdyenAmountCurrency
     {
         $chargedCurrency = $creditMemo->getOrder()->getAdyenChargedCurrency();
         if ($chargedCurrency == self::BASE) {
@@ -162,7 +155,7 @@ public function getCreditMemoAmountCurrency(CreditmemoInterface $creditMemo)
      * @param CreditmemoInterface $creditMemo
      * @return AdyenAmountCurrency
      */
-    public function getCreditMemoAdjustmentAmountCurrency(CreditmemoInterface $creditMemo)
+    public function getCreditMemoAdjustmentAmountCurrency(CreditmemoInterface $creditMemo): AdyenAmountCurrency
     {
         $chargedCurrency = $creditMemo->getOrder()->getAdyenChargedCurrency();
         if ($chargedCurrency == self::BASE) {
@@ -188,8 +181,7 @@ public function getCreditMemoShippingAmountCurrency(CreditmemoInterface $creditM
                 null,
                 $creditMemo->getBaseShippingTaxAmount(),
                 null,
-                $creditMemo->getBaseShippingInclTax(),
-                $creditMemo->getBaseShippingDiscountTaxCompensationAmnt()
+                $creditMemo->getBaseShippingInclTax()
             );
         }
         return new AdyenAmountCurrency(
@@ -198,14 +190,14 @@ public function getCreditMemoShippingAmountCurrency(CreditmemoInterface $creditM
             null,
             $creditMemo->getShippingTaxAmount(),
             null,
-            $creditMemo->getShippingInclTax(),
-            $creditMemo->getShippingDiscountTaxCompensationAmount()
+            $creditMemo->getShippingInclTax()
         );
     }
 
     public function getCreditMemoItemAmountCurrency(CreditmemoItemInterface $item): AdyenAmountCurrency
     {
         $chargedCurrency = $item->getCreditMemo()->getOrder()->getAdyenChargedCurrency();
+        $priceRenderer = $this->priceRendererFactory->create();
 
         if ($chargedCurrency == self::BASE) {
             return new AdyenAmountCurrency(
@@ -214,8 +206,7 @@ public function getCreditMemoItemAmountCurrency(CreditmemoItemInterface $item):
                 $item->getBaseDiscountAmount() / $item->getQty(),
                 $item->getBaseTaxAmount() / $item->getQty(),
                 null,
-                $item->getBaseRowTotalInclTax() / $item->getQty(),
-                $item->getBaseDiscountTaxCompensationAmount() / $item->getQty()
+                $priceRenderer->getBaseTotalAmount($item)
             );
         }
         return new AdyenAmountCurrency(
@@ -224,8 +215,7 @@ public function getCreditMemoItemAmountCurrency(CreditmemoItemInterface $item):
             $item->getDiscountAmount() / $item->getQty(),
             $item->getTaxAmount() / $item->getQty(),
             null,
-            $item->getRowTotalInclTax() / $item->getQty(),
-            $item->getDiscountTaxCompensationAmount() / $item->getQty()
+            $priceRenderer->getTotalAmount($item)
         );
     }
 
@@ -240,8 +230,7 @@ public function getQuoteShippingAmountCurrency(Quote $quote): AdyenAmountCurrenc
                 $quote->getShippingAddress()->getBaseShippingDiscountAmount(),
                 $quote->getShippingAddress()->getBaseShippingTaxAmount(),
                 null,
-                $quote->getShippingAddress()->getBaseShippingInclTax(),
-                $quote->getShippingAddress()->getBaseShippingDiscountTaxCompensationAmnt()
+                $quote->getShippingAddress()->getBaseShippingInclTax()
             );
         }
 
@@ -251,8 +240,7 @@ public function getQuoteShippingAmountCurrency(Quote $quote): AdyenAmountCurrenc
             $quote->getShippingAddress()->getShippingDiscountAmount(),
             $quote->getShippingAddress()->getShippingTaxAmount(),
             null,
-            $quote->getShippingAddress()->getShippingInclTax(),
-            $quote->getShippingAddress()->getShippingDiscountTaxCompensationAmount()
+            $quote->getShippingAddress()->getShippingInclTax()
         );
     }
 
@@ -267,8 +255,7 @@ public function getInvoiceShippingAmountCurrency(Invoice $invoice): AdyenAmountC
                 null,
                 $invoice->getBaseShippingTaxAmount(),
                 null,
-                $invoice->getBaseShippingInclTax(),
-                $invoice->getBaseShippingDiscountTaxCompensationAmnt()
+                $invoice->getBaseShippingInclTax()
             );
         }
 
@@ -278,8 +265,7 @@ public function getInvoiceShippingAmountCurrency(Invoice $invoice): AdyenAmountC
             null,
             $invoice->getShippingTaxAmount(),
             null,
-            $invoice->getShippingInclTax(),
-            $invoice->getShippingDiscountTaxCompensationAmount()
+            $invoice->getShippingInclTax()
         );
     }
 

Helper/OpenInvoice.php

@@ -142,42 +142,28 @@ protected function formatShippingLineItem(
     ): array {
         $currency = $shippingAmount->getCurrencyCode();
 
-        $formattedPriceExcludingTax = $this->adyenHelper->formatAmount(
-            $shippingAmount->getAmountWithDiscount(),
-            $currency
-        );
         $formattedPriceIncludingTax = $this->adyenHelper->formatAmount(
-            $shippingAmount->getAmountIncludingTaxWithDiscount(),
+            $shippingAmount->getAmountIncludingTax(),
             $currency
         );
 
         $formattedTaxAmount = $this->adyenHelper->formatAmount($shippingAmount->getTaxAmount(), $currency);
-        $formattedTaxPercentage = $this->adyenHelper->formatAmount(
-            $shippingAmount->getCalculatedTaxPercentage(),
-            $currency
-        );
 
         return [
             'id' => 'shippingCost',
-            'amountExcludingTax' => $formattedPriceExcludingTax,
             'amountIncludingTax' => $formattedPriceIncludingTax,
             'taxAmount' => $formattedTaxAmount,
             'description' => $shippingDescription,
-            'quantity' => 1,
-            'taxPercentage' => $formattedTaxPercentage
+            'quantity' => 1
         ];
     }
 
     protected function formatLineItem(AdyenAmountCurrency $itemAmountCurrency, $item, $qty = null): array
     {
         $currency = $itemAmountCurrency->getCurrencyCode();
 
-        $formattedPriceExcludingTax = $this->adyenHelper->formatAmount(
-            $itemAmountCurrency->getAmountWithDiscount(),
-            $currency
-        );
         $formattedPriceIncludingTax = $this->adyenHelper->formatAmount(
-            $itemAmountCurrency->getAmountIncludingTaxWithDiscount(),
+            $itemAmountCurrency->getAmountIncludingTax(),
             $currency
         );
 
@@ -188,7 +174,6 @@ protected function formatLineItem(AdyenAmountCurrency $itemAmountCurrency, $item
 
         return [
             'id' => $product ? $product->getId() : $item->getProductId(),
-            'amountExcludingTax' => $formattedPriceExcludingTax,
             'amountIncludingTax' => $formattedPriceIncludingTax,
             'taxAmount' => $formattedTaxAmount,
             'description' => $item->getName(),
@@ -199,6 +184,9 @@ protected function formatLineItem(AdyenAmountCurrency $itemAmountCurrency, $item
         ];
     }
 
+    /**
+     * @deprecated
+     */
     protected function formatInvoiceDiscount(
         mixed $discountAmount, $shippingDiscountAmount, AdyenAmountCurrency $itemAmountCurrency
     ): array
@@ -210,7 +198,6 @@ protected function formatInvoiceDiscount(
 
         return [
             'id' => 'Discount',
-            'amountExcludingTax' => $itemAmount,
             'amountIncludingTax' => $itemAmount,
             'taxAmount' => 0,
             'description' => $description,

Model/AdyenAmountCurrency.php

@@ -25,6 +25,9 @@ class AdyenAmountCurrency
 
     protected $amountDue;
 
+    /**
+     * @deprecated
+     */
     protected $discountTaxCompensationAmount;
 
     public function __construct(
@@ -75,11 +78,17 @@ public function getAmountDue()
         return $this->amountDue;
     }
 
+    /**
+     * @deprecated
+     */
     public function getDiscountTaxCompensationAmount()
     {
         return $this->discountTaxCompensationAmount;
     }
 
+    /**
+     * @deprecated
+     */
     public function getAmountIncludingTaxWithDiscount()
     {
         if ($this->getDiscountTaxCompensationAmount() > 0) {
@@ -90,11 +99,17 @@ public function getAmountIncludingTaxWithDiscount()
         }
     }
 
+    /**
+     * @deprecated
+     */
     public function getAmountWithDiscount()
     {
         return $this->getAmount() - $this->getDiscountAmount() + $this->getDiscountTaxCompensationAmount();
     }
 
+    /**
+     * @deprecated
+     */
     public function getCalculatedTaxPercentage()
     {
         if ($this->getAmountWithDiscount() > 0) {