[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\Weee\Block\Adminhtml\Items\Price\Renderer;
 
 class ChargedCurrency
 {
@@ -31,10 +32,17 @@ class ChargedCurrency
      */
     private $config;
 
+    /**
+     * @var Renderer
+     */
+    private $weeeRenderer;
+
     public function __construct(
-        Config $config
+        Config $config,
+        Renderer $weeeRenderer
     ) {
         $this->config = $config;
+        $this->weeeRenderer = $weeeRenderer;
     }
 
     /**
@@ -91,8 +99,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()
+                $this->weeeRenderer->getBaseTotalAmount($item)
             );
         }
 
@@ -102,8 +109,7 @@ public function getQuoteItemAmountCurrency(Quote\Item $item): AdyenAmountCurrenc
             $item->getDiscountAmount() / $item->getQty(),
             $item->getTaxAmount() / $item->getQty(),
             null,
-            $item->getRowTotalInclTax() / $item->getQty(),
-            $item->getDiscountTaxCompensationAmount() / $item->getQty()
+            $this->weeeRenderer->getTotalAmount($item)
         );
     }
 
@@ -118,8 +124,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()
+                $this->weeeRenderer->getBaseTotalAmount($item)
             );
         }
 
@@ -129,8 +134,7 @@ public function getInvoiceItemAmountCurrency(Invoice\Item $item): AdyenAmountCur
             $item->getDiscountAmount() / $item->getQty(),
             $item->getTaxAmount() / $item->getQty(),
             null,
-            $item->getRowTotalInclTax() / $item->getQty(),
-            $item->getDiscountTaxCompensationAmount() / $item->getQty()
+            $this->weeeRenderer->getTotalAmount($item)
         );
     }
 
@@ -188,8 +192,7 @@ public function getCreditMemoShippingAmountCurrency(CreditmemoInterface $creditM
                 null,
                 $creditMemo->getBaseShippingTaxAmount(),
                 null,
-                $creditMemo->getBaseShippingInclTax(),
-                $creditMemo->getBaseShippingDiscountTaxCompensationAmnt()
+                $creditMemo->getBaseShippingInclTax()
             );
         }
         return new AdyenAmountCurrency(
@@ -198,8 +201,7 @@ public function getCreditMemoShippingAmountCurrency(CreditmemoInterface $creditM
             null,
             $creditMemo->getShippingTaxAmount(),
             null,
-            $creditMemo->getShippingInclTax(),
-            $creditMemo->getShippingDiscountTaxCompensationAmount()
+            $creditMemo->getShippingInclTax()
         );
     }
 
@@ -214,8 +216,7 @@ public function getCreditMemoItemAmountCurrency(CreditmemoItemInterface $item):
                 $item->getBaseDiscountAmount() / $item->getQty(),
                 $item->getBaseTaxAmount() / $item->getQty(),
                 null,
-                $item->getBaseRowTotalInclTax() / $item->getQty(),
-                $item->getBaseDiscountTaxCompensationAmount() / $item->getQty()
+                $this->weeeRenderer->getBaseTotalAmount($item)
             );
         }
         return new AdyenAmountCurrency(
@@ -224,8 +225,7 @@ public function getCreditMemoItemAmountCurrency(CreditmemoItemInterface $item):
             $item->getDiscountAmount() / $item->getQty(),
             $item->getTaxAmount() / $item->getQty(),
             null,
-            $item->getRowTotalInclTax() / $item->getQty(),
-            $item->getDiscountTaxCompensationAmount() / $item->getQty()
+            $this->weeeRenderer->getTotalAmount($item)
         );
     }
 
@@ -240,8 +240,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 +250,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 +265,7 @@ public function getInvoiceShippingAmountCurrency(Invoice $invoice): AdyenAmountC
                 null,
                 $invoice->getBaseShippingTaxAmount(),
                 null,
-                $invoice->getBaseShippingInclTax(),
-                $invoice->getBaseShippingDiscountTaxCompensationAmnt()
+                $invoice->getBaseShippingInclTax()
             );
         }
 
@@ -278,8 +275,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->getId(),
-            '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) {

composer.json

@@ -17,6 +17,7 @@
     "magento/framework": ">=103.0.4",
     "magento/module-vault": ">=101.2.4",
     "magento/module-multishipping": ">=100.4.4",
+    "magento/module-weee":  "*",
     "ext-json": "*"
   },
   "require-dev": {

etc/module.xml

@@ -21,6 +21,7 @@
             <module name="Magento_AdminNotification"/>
             <module name="Magento_Vault"/>
             <module name="Magento_Multishipping"/>
+            <module name="Magento_Weee"/>
         </sequence>
     </module>
 </config>