Auto-updating Spryker modules on 2023-12-07 10:46 for release group #…

…5164 / Jira ticket PBC-3553 (#403) * Applied release group `PBC-3553 Added TaxApp compatibility with Dynamic Multi Store`, RG link https://api.release.spryker.com/release-group/5164 * ACP-1420: Fixed TaxApp tests * ACP-1420: Composer update * ACP-1420: Composer update * PBC-3241: Integration * PBC-3241: Integration [1] * PBC-3241: Integration [2] * PBC-3241: Integration [3] --------- Co-authored-by: upgrader <upgrader@spryker.com> Co-authored-by: Anton Zubariev <anton.zubariev@spryker.com>
spryker-shop · Jan 11, 2024 · 2c1eae1 · 2c1eae1
1 parent 40140e9
commit 2c1eae1
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 58 deletions.
diff --git a/composer.json b/composer.json
@@ -211,7 +211,7 @@
         "spryker/stores-api": "^1.0.0",
         "spryker/stores-backend-api": "^1.0.0",
         "spryker/stores-rest-api": "^1.2.0",
-        "spryker/tax-app": "^0.2.0",
+        "spryker/tax-app": "^0.3.1",
         "spryker/tax-product-connector": "^4.7.1",
         "spryker/up-selling-products-rest-api": "^1.2.2",
         "spryker/urls-rest-api": "^1.0.2",

diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/config_default.php b/config/Shared/config_default.php
@@ -705,6 +705,7 @@
     = $config[OauthClientConstants::TENANT_IDENTIFIER]
     = $config[PaymentConstants::TENANT_IDENTIFIER]
     = $config[AppCatalogGuiConstants::TENANT_IDENTIFIER]
+    = $config[TaxAppConstants::TENANT_IDENTIFIER]
     = getenv('SPRYKER_TENANT_IDENTIFIER') ?: '';
 
 $config[MessageBrokerConstants::MESSAGE_TO_CHANNEL_MAP] =

diff --git a/config/Zed/oms/DummyPayment01.xml b/config/Zed/oms/DummyPayment01.xml
@@ -32,9 +32,7 @@
             <state name="waiting" reserved="true" display="oms.state.waiting"/>
             <state name="exported" reserved="true" display="oms.state.exported"/>
             <state name="product review requested" reserved="true" display="oms.state.paid"/>
-            <state name="confirmed" reserved="true" display="oms.state.confirmed">
-                <flag>cancellable</flag>
-            </state>
+            <state name="confirmed" reserved="true" display="oms.state.confirmed"/>
             <state name="shipped" reserved="true" display="oms.state.shipped"/>
             <state name="delivered" display="oms.state.delivered"/>
             <state name="closed" display="oms.state.closed"/>
@@ -107,12 +105,6 @@
                 <event>skip timeout</event>
             </transition>
 
-            <transition>
-                <source>confirmed</source>
-                <target>cancelled</target>
-                <event>cancel</event>
-            </transition>
-
             <transition happy="true">
                 <source>waiting</source>
                 <target>picking list generation scheduled</target>

diff --git a/src/Pyz/Zed/Calculation/CalculationDependencyProvider.php b/src/Pyz/Zed/Calculation/CalculationDependencyProvider.php
@@ -17,7 +17,6 @@
 use Spryker\Zed\Calculation\Communication\Plugin\Calculator\ItemDiscountAmountFullAggregatorPlugin;
 use Spryker\Zed\Calculation\Communication\Plugin\Calculator\ItemProductOptionPriceAggregatorPlugin;
 use Spryker\Zed\Calculation\Communication\Plugin\Calculator\ItemSubtotalAggregatorPlugin;
-use Spryker\Zed\Calculation\Communication\Plugin\Calculator\ItemTaxAmountFullAggregatorPlugin;
 use Spryker\Zed\Calculation\Communication\Plugin\Calculator\NetTotalCalculatorPlugin;
 use Spryker\Zed\Calculation\Communication\Plugin\Calculator\OrderTaxTotalCalculationPlugin;
 use Spryker\Zed\Calculation\Communication\Plugin\Calculator\PriceCalculatorPlugin;
@@ -42,9 +41,6 @@
 use Spryker\Zed\Shipment\Communication\Plugin\Calculation\FilterObsoleteShipmentExpensesCalculatorPlugin;
 use Spryker\Zed\Shipment\Communication\Plugin\Calculation\ShipmentTaxRateCalculatorPlugin;
 use Spryker\Zed\Shipment\Communication\Plugin\Calculation\ShipmentTotalCalculatorPlugin;
-use Spryker\Zed\Tax\Communication\Plugin\Calculator\TaxAmountAfterCancellationCalculatorPlugin;
-use Spryker\Zed\Tax\Communication\Plugin\Calculator\TaxAmountCalculatorPlugin;
-use Spryker\Zed\Tax\Communication\Plugin\Calculator\TaxRateAverageAggregatorPlugin;
 use Spryker\Zed\TaxApp\Communication\Plugin\Calculation\TaxAppCalculationPlugin;
 use Spryker\Zed\TaxProductConnector\Communication\Plugin\Calculation\ProductItemTaxRateCalculatorPlugin;
 
@@ -122,6 +118,10 @@ class CalculationDependencyProvider extends SprykerCalculationDependencyProvider
      * TaxRateAverageAggregatorPlugin - average tax rate for item, used when recalculating canceled amount when refunded
      *    - Item.taxRateAverageAggregation
      *
+     *  TaxAppCalculationPlugin - Calculate tax using external tax application. Replaces all tax calculation plugins above.
+     *  Replaced tax calculation plugins should be moved to {@link \Spryker\Zed\TaxApp\TaxAppDependencyProvider::getFallbackQuoteCalculationPlugins} method.
+     *  Replaced tax calculation plugin stack should include all plugins which were present between extracted tax-related plugins.
+     *
      * ProductItemTaxRateCalculatorPlugin - Sets tax rate to item based on shipping address
      *    - Item.taxRate
      *
@@ -213,13 +213,10 @@ protected function getQuoteCalculatorPluginStack(Container $container): array
             new DiscountAmountAggregatorForGenericAmountPlugin(),
             new ItemDiscountAmountFullAggregatorPlugin(),
 
-            new TaxAmountCalculatorPlugin(),
-            new ItemTaxAmountFullAggregatorPlugin(),
+            new TaxAppCalculationPlugin(),
 
             new PriceToPayAggregatorPlugin(),
 
-            new TaxRateAverageAggregatorPlugin(),
-
             new RefundableAmountCalculatorPlugin(),
 
             new CalculateBundlePricesPlugin(),
@@ -229,7 +226,6 @@ protected function getQuoteCalculatorPluginStack(Container $container): array
             new DiscountTotalCalculatorPlugin(),
             new RefundTotalCalculatorPlugin(),
             new TaxTotalCalculatorPlugin(),
-            new TaxAppCalculationPlugin(),
             new GrandTotalCalculatorPlugin(),
             new NetTotalCalculatorPlugin(),
 
@@ -261,21 +257,18 @@ protected function getOrderCalculatorPluginStack(Container $container): array
             new DiscountAmountAggregatorForGenericAmountPlugin(),
             new ItemDiscountAmountFullAggregatorPlugin(),
 
-            new TaxAmountCalculatorPlugin(),
-            new ItemTaxAmountFullAggregatorPlugin(),
+            new TaxAppCalculationPlugin(),
 
             new PriceToPayAggregatorPlugin(),
 
-            new TaxAmountAfterCancellationCalculatorPlugin(),
-
             new RefundableAmountCalculatorPlugin(),
 
             new ExpenseTotalCalculatorPlugin(),
             new DiscountTotalCalculatorPlugin(),
             new RefundTotalCalculatorPlugin(),
             new CanceledTotalCalculationPlugin(),
             new OrderTaxTotalCalculationPlugin(),
-            new TaxAppCalculationPlugin(),
+
             new GrandTotalCalculatorPlugin(),
             new NetTotalCalculatorPlugin(),
         ];

diff --git a/src/Pyz/Zed/Oms/OmsDependencyProvider.php b/src/Pyz/Zed/Oms/OmsDependencyProvider.php
@@ -33,6 +33,7 @@
 use Spryker\Zed\Shipment\Dependency\Plugin\Oms\ShipmentManualEventGrouperPlugin;
 use Spryker\Zed\Shipment\Dependency\Plugin\Oms\ShipmentOrderMailExpanderPlugin;
 use Spryker\Zed\TaxApp\Communication\Plugin\Oms\Command\SubmitPaymentTaxInvoicePlugin;
+use Spryker\Zed\TaxApp\Communication\Plugin\Oms\OrderRefundedEventListenerPlugin;
 use Spryker\Zed\WarehouseAllocation\Communication\Plugin\Oms\SalesOrderWarehouseAllocationCommandPlugin;
 
 class OmsDependencyProvider extends SprykerOmsDependencyProvider
@@ -175,4 +176,14 @@ protected function getTimeoutProcessorPlugins(): array
             new InitiationTimeoutProcessorPlugin(),
         ];
     }
+
+    /**
+     * @return array<\Spryker\Zed\OmsExtension\Dependency\Plugin\OmsEventTriggeredListenerPluginInterface>
+     */
+    protected function getOmsEventTriggeredListenerPlugins(): array
+    {
+        return [
+            new OrderRefundedEventListenerPlugin(),
+        ];
+    }
 }
diff --git a/src/Pyz/Zed/TaxApp/TaxAppDependencyProvider.php b/src/Pyz/Zed/TaxApp/TaxAppDependencyProvider.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the Spryker Commerce OS.
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace Pyz\Zed\TaxApp;
+
+use Spryker\Zed\Calculation\Communication\Plugin\Calculator\ItemTaxAmountFullAggregatorPlugin;
+use Spryker\Zed\Calculation\Communication\Plugin\Calculator\PriceToPayAggregatorPlugin;
+use Spryker\Zed\Tax\Communication\Plugin\Calculator\TaxAmountAfterCancellationCalculatorPlugin;
+use Spryker\Zed\Tax\Communication\Plugin\Calculator\TaxAmountCalculatorPlugin;
+use Spryker\Zed\Tax\Communication\Plugin\Calculator\TaxRateAverageAggregatorPlugin;
+use Spryker\Zed\TaxApp\TaxAppDependencyProvider as SprykerTaxAppDependencyProvider;
+
+class TaxAppDependencyProvider extends SprykerTaxAppDependencyProvider
+{
+    /**
+     * {@inheritDoc}
+     *
+     * @return array<\Spryker\Zed\CalculationExtension\Dependency\Plugin\CalculationPluginInterface>
+     */
+    protected function getFallbackQuoteCalculationPlugins(): array
+    {
+        return [
+            new TaxAmountCalculatorPlugin(),
+            new ItemTaxAmountFullAggregatorPlugin(),
+            new PriceToPayAggregatorPlugin(),
+            new TaxRateAverageAggregatorPlugin(),
+        ];
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return array<\Spryker\Zed\CalculationExtension\Dependency\Plugin\CalculationPluginInterface>
+     */
+    protected function getFallbackOrderCalculationPlugins(): array
+    {
+        return [
+            new TaxAmountCalculatorPlugin(),
+            new ItemTaxAmountFullAggregatorPlugin(),
+            new PriceToPayAggregatorPlugin(),
+            new TaxAmountAfterCancellationCalculatorPlugin(),
+        ];
+    }
+}
diff --git a/...yzTest/Zed/MessageBroker/MessageHandlers/TaxApp/Communication/TaxAppConfigMessageTest.php b/...yzTest/Zed/MessageBroker/MessageHandlers/TaxApp/Communication/TaxAppConfigMessageTest.php
@@ -9,8 +9,8 @@
 
 use Codeception\Test\Unit;
 use Generated\Shared\Transfer\ConfigureTaxAppTransfer;
+use Generated\Shared\Transfer\DeleteTaxAppTransfer;
 use Generated\Shared\Transfer\MessageAttributesTransfer;
-use Generated\Shared\Transfer\StoreTransfer;
 use PyzTest\Zed\MessageBroker\TaxAppCommunicationTester;
 
 /**
@@ -55,7 +55,6 @@ public function testConfigureTaxAppMessageIsSuccessfullyHandled(): void
             MessageAttributesTransfer::STORE_REFERENCE => static::STORE_REFERENCE,
         ], [
             ConfigureTaxAppTransfer::VENDOR_CODE => static::VENDOR_CODE,
-            ConfigureTaxAppTransfer::API_URL => 'url',
             ConfigureTaxAppTransfer::IS_ACTIVE => true,
         ]);
 
@@ -75,12 +74,12 @@ public function testDeleteTaxAppMessageIsSuccessfullyHandled(): void
         $storeTransfer = $this->tester->getAllowedStore();
         $this->tester->setStoreReferenceData([$storeTransfer->getName() => static::STORE_REFERENCE]);
 
-        $this->createDummyTaxAppConfig($storeTransfer);
+        $this->createDummyTaxAppConfig();
 
         $deleteTaxAppTransfer = $this->tester->buildDeleteTaxAppTransfer([
             MessageAttributesTransfer::STORE_REFERENCE => static::STORE_REFERENCE,
         ], [
-            ConfigureTaxAppTransfer::VENDOR_CODE => static::VENDOR_CODE,
+            DeleteTaxAppTransfer::VENDOR_CODE => static::VENDOR_CODE,
         ]);
 
         // Act
@@ -91,16 +90,15 @@ public function testDeleteTaxAppMessageIsSuccessfullyHandled(): void
     }
 
     /**
-     * @param \Generated\Shared\Transfer\StoreTransfer $storeTransfer
-     *
      * @return void
      */
-    protected function createDummyTaxAppConfig(StoreTransfer $storeTransfer): void
+    protected function createDummyTaxAppConfig(): void
     {
         $this->tester->handleTaxAppMessage(
             $this->tester->buildConfigureTaxAppTransfer([
                 MessageAttributesTransfer::STORE_REFERENCE => static::STORE_REFERENCE,
                 ConfigureTaxAppTransfer::VENDOR_CODE => static::VENDOR_CODE,
+                ConfigureTaxAppTransfer::IS_ACTIVE => true,
             ]),
         );
     }