[BUGFIX] Proper storage of taxes for an order

Classes/EventListener/Order/Create/PersistOrder/Products.php

@@ -16,7 +16,6 @@
 use Extcode\Cart\Domain\Model\Cart\Product;
 use Extcode\Cart\Domain\Model\Order\Item;
 use Extcode\Cart\Domain\Model\Order\ProductAdditional;
-use Extcode\Cart\Domain\Model\Order\Tax;
 use Extcode\Cart\Domain\Repository\Order\ProductAdditionalRepository;
 use Extcode\Cart\Domain\Repository\Order\ProductRepository;
 use Extcode\Cart\Domain\Repository\Order\TaxRepository;
@@ -185,15 +184,6 @@ protected function addVariantsOfVariant(BeVariant $variant, int $level): void
      */
     protected function addBeVariant(BeVariant $variant, int $level): void
     {
-        $orderTax = GeneralUtility::makeInstance(
-            Tax::class,
-            $variant->getTax(),
-            $this->taxClasses[$variant->getTaxClass()->getId()]
-        );
-        $orderTax->setPid($this->storagePid);
-
-        $this->taxRepository->add($orderTax);
-
         $variantInner = $variant;
         for ($count = $level; $count > 0; $count--) {
             if ($count > 1) {

Classes/EventListener/Order/Create/PersistOrder/Taxes.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Extcode\Cart\EventListener\Order\Create\PersistOrder;
+
+/*
+ * This file is part of the package extcode/cart.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE file that was distributed with this source code.
+ */
+
+use Extcode\Cart\Domain\Model\Order\Item as OrderItem;
+use Extcode\Cart\Domain\Model\Order\Tax as OrderTax;
+use Extcode\Cart\Domain\Repository\Order\ItemRepository;
+use Extcode\Cart\Domain\Repository\Order\TaxRepository;
+use Extcode\Cart\Event\Order\PersistOrderEventInterface;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
+
+class Taxes
+{
+    public function __construct(
+        private PersistenceManager $persistenceManager,
+        private ItemRepository $itemRepository,
+        private TaxRepository $taxRepository
+    ) {}
+
+    public function __invoke(PersistOrderEventInterface $event): void
+    {
+        $orderItem = $event->getOrderItem();
+
+        $orderItem = $this->addTaxToRepositoryAndItem($event, $orderItem, 'tax');
+        $orderItem = $this->addTaxToRepositoryAndItem($event, $orderItem, 'totalTax');
+
+        $this->itemRepository->update($orderItem);
+        $this->persistenceManager->persistAll();
+    }
+
+    protected function addTaxToRepositoryAndItem(
+        PersistOrderEventInterface $event,
+        OrderItem $orderItem,
+        string $typeOfTax
+    ): OrderItem {
+        $cart = $event->getCart();
+        $storagePid = $event->getStoragePid();
+        $taxClasses = $event->getTaxClasses();
+
+        $taxes = $typeOfTax === 'tax' ? $cart->getTaxes() : $cart->getTotalTaxes();
+
+        /** @var int $taxClassId */
+        /** @var float $tax */
+        foreach ($taxes as $taxClassId => $tax) {
+            $taxValue = $tax;
+            $taxClass = $taxClasses[$taxClassId];
+            $orderTax = GeneralUtility::makeInstance(OrderTax::class, $taxValue, $taxClass);
+            $orderTax->setPid($storagePid);
+
+            $this->taxRepository->add($orderTax);
+
+            if ($typeOfTax === 'tax') {
+                $orderItem->addTax($orderTax);
+            } else {
+                $orderItem->addTotalTax($orderTax);
+            }
+        }
+
+        return $orderItem;
+    }
+}

Configuration/Services.yaml

@@ -49,6 +49,13 @@ services:
         event: Extcode\Cart\Event\Order\PersistOrderEvent
         after: 'cart--order--create--persist-order--item'
 
+  Extcode\Cart\EventListener\Order\Create\PersistOrder\Taxes:
+    tags:
+      - name: event.listener
+        identifier: 'cart--order--create--persist-order--tax'
+        event: Extcode\Cart\Event\Order\PersistOrderEvent
+        after: 'cart--order--create--persist-order--tax-classes'
+
   Extcode\Cart\EventListener\Order\Create\PersistOrder\Products:
     tags:
       - name: event.listener

Configuration/TCA/tx_cart_domain_model_order_item.php

@@ -48,23 +48,18 @@
         ],
         'addresses' => [
             'showitem' => 'billing_address, shipping_address',
-            'canNotCollapse' => 0,
         ],
         'numbers' => [
             'showitem' => 'order_number, order_date, --linebreak--, invoice_number, invoice_date, --linebreak--, delivery_number, delivery_date',
-            'canNotCollapse' => 1,
         ],
         'price' => [
-            'showitem' => 'currency, --linebreak--, currency_code, currency_sign, currency_translation, --linebreak--, gross, net, --linebreak--, order_tax',
-            'canNotCollapse' => 1,
+            'showitem' => 'currency, --linebreak--, currency_code, currency_sign, currency_translation, --linebreak--, gross, net, --linebreak--, tax',
         ],
         'total_price' => [
-            'showitem' => 'total_gross, total_net, --linebreak--, order_total_tax',
-            'canNotCollapse' => 1,
+            'showitem' => 'total_gross, total_net, --linebreak--, total_tax',
         ],
         'pdfs' => [
             'showitem' => 'order_pdfs, --linebreak--, invoice_pdfs, --linebreak--, delivery_pdfs',
-            'canNotCollapse' => 1,
         ],
     ],
     'columns' => [
@@ -412,6 +407,9 @@
                 'readOnly' => 1,
                 'foreign_table' => 'tx_cart_domain_model_order_tax',
                 'foreign_field' => 'item',
+                'foreign_match_fields' => [
+                    'record_type' => 'tax',
+                ],
                 'maxitems' => 9999,
                 'default' => 0,
             ],
@@ -424,6 +422,9 @@
                 'readOnly' => 1,
                 'foreign_table' => 'tx_cart_domain_model_order_tax',
                 'foreign_field' => 'item',
+                'foreign_match_fields' => [
+                    'record_type' => 'total_tax',
+                ],
                 'maxitems' => 9999,
                 'default' => 0,
             ],

Configuration/TCA/tx_cart_domain_model_order_payment.php

@@ -30,12 +30,10 @@
             'showitem' => '',
             'service' => [
                 'showitem' => 'service_country, service_id',
-                'canNotCollapse' => 0,
             ],
         ],
         'service' => [
             'showitem' => 'service_country, service_id',
-            'canNotCollapse' => 0,
         ],
     ],
     'columns' => [

Configuration/TCA/tx_cart_domain_model_order_product.php

@@ -33,11 +33,9 @@
         ],
         'price' => [
             'showitem' => 'price, discount, --linebreak--, gross, net, --linebreak--, tax, tax_class',
-            'canNotCollapse' => 1,
         ],
         'product_type_and_id' => [
             'showitem' => 'product_type, product_id',
-            'canNotCollapse' => 1,
         ],
     ],
     'columns' => [

Configuration/TCA/tx_cart_domain_model_order_shipping.php

@@ -30,12 +30,10 @@
             'showitem' => '',
             'service' => [
                 'showitem' => 'service_country, service_id',
-                'canNotCollapse' => 0,
             ],
         ],
         'service' => [
             'showitem' => 'service_country, service_id',
-            'canNotCollapse' => 0,
         ],
     ],
     'columns' => [

Configuration/TCA/tx_cart_domain_model_order_tax.php

@@ -18,10 +18,14 @@
         'enablecolumns' => [],
         'searchFields' => '',
         'iconfile' => 'EXT:cart/Resources/Public/Icons/Order/Tax.svg',
+        'type' => 'record_type',
     ],
     'hideTable' => 1,
     'types' => [
-        '1' => [
+        'tax' => [
+            'showitem' => 'tax, tax_class',
+        ],
+        'total_tax' => [
             'showitem' => 'tax, tax_class',
         ],
     ],

ext_tables.sql

@@ -105,6 +105,7 @@ CREATE TABLE tx_cart_domain_model_order_tax (
     pid int(11) DEFAULT '0' NOT NULL,
 
     item int(11) unsigned DEFAULT '0' NOT NULL,
+    record_type varchar(255) DEFAULT '' NOT NULL,
 
     tax double(11,2) DEFAULT '0.00' NOT NULL,
     tax_class int(11) unsigned DEFAULT '0' NOT NULL,