Merge pull request #1588 from spryker-shop/feature/acp-2642/acp-3621-…

…merchant-payment-expenses-support ACP-3558 nonsplit to split merge
spryker-shop · Sep 5, 2024 · 988c9a9 · 988c9a9
2 parents 1e39a86 + 34607f3
commit 988c9a9
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 39 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/config_default-docker.dev.php b/config/Shared/config_default-docker.dev.php
@@ -180,6 +180,7 @@
 $config[AppCatalogGuiConstants::OAUTH_PROVIDER_NAME] = OauthDummyConfig::PROVIDER_NAME;
 $config[OauthClientConstants::OAUTH_PROVIDER_NAME_FOR_PAYMENT_AUTHORIZE] = OauthDummyConfig::PROVIDER_NAME;
 $config[OauthClientConstants::OAUTH_PROVIDER_NAME_FOR_MESSAGE_BROKER] = OauthDummyConfig::PROVIDER_NAME;
+$config[OauthClientConstants::OAUTH_PROVIDER_NAME_FOR_ACP] = OauthDummyConfig::PROVIDER_NAME;
 $config[TaxAppConstants::OAUTH_PROVIDER_NAME] = OauthDummyConfig::PROVIDER_NAME;
 
 // ----------------------------------------------------------------------------

diff --git a/src/Pyz/Zed/SalesPaymentMerchant/SalesPaymentMerchantConfig.php b/src/Pyz/Zed/SalesPaymentMerchant/SalesPaymentMerchantConfig.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the Spryker Suite.
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace Pyz\Zed\SalesPaymentMerchant;
+
+use Spryker\Shared\Shipment\ShipmentConfig;
+use Spryker\Zed\SalesPaymentMerchant\SalesPaymentMerchantConfig as SprykerSalesPaymentMerchantConfig;
+
+class SalesPaymentMerchantConfig extends SprykerSalesPaymentMerchantConfig
+{
+    /**
+     * @var bool
+     */
+    protected const ORDER_EXPENSE_INCLUDED_IN_PAYMENT_PROCESS = true;
+
+    /**
+     * @var array<string, list<string>>
+     */
+    protected const EXCLUDED_EXPENSE_TYPES_FOR_STORE = [
+        'AT' => [ShipmentConfig::SHIPMENT_EXPENSE_TYPE],
+    ];
+}