Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FRW-9686 Integrations #507

Merged
merged 3 commits into from
Jan 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .git.docker
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ac17ea980d151c6b4dd83b7093c0c05a9205c244
ad894a70aad294f37781b1c362957822500f061c
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@
"spryker/products-categories-resource-relationship": "^1.4.0",
"spryker/products-rest-api": "^2.15.1",
"spryker/push-notifications-backend-api": "^1.0.1",
"spryker/quote-checkout-connector": "^1.0",
"spryker/related-products-rest-api": "^1.3.2",
"spryker/rest-request-validator": "^1.6.0",
"spryker/sales-discount-connector": "^1.0.0",
Expand Down
77 changes: 62 additions & 15 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/Shared/config_default.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@

$config[CustomerConstants::CUSTOMER_SECURED_PATTERN] = '(^/login_check$|^(/en|/de)?/customer($|/)|^(/en|/de)?/wishlist($|/)|^(/en|/de)?/shopping-list($|/)|^(/en|/de)?/quote-request($|/)|^(/en|/de)?/comment($|/)|^(/en|/de)?/company(?!/register)($|/)|^(/en|/de)?/multi-cart($|/)|^(/en|/de)?/shared-cart($|/)|^(/en|/de)?/cart(?!/add)($|/)|^(/en|/de)?/checkout($|/))';
$config[CustomerConstants::CUSTOMER_ANONYMOUS_PATTERN] = '^/.*';
$config[CustomerPageConstants::CUSTOMER_REMEMBER_ME_SECRET] = 'hundnase';
$config[CustomerPageConstants::CUSTOMER_REMEMBER_ME_SECRET] = getenv('SPRYKER_CUSTOMER_REMEMBER_ME_SECRET');
$config[CustomerPageConstants::CUSTOMER_REMEMBER_ME_LIFETIME] = 31536000;

$config[LogConstants::LOG_SANITIZE_FIELDS] = [
Expand Down
3 changes: 3 additions & 0 deletions config/install/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/docker.ci.acceptance.cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/docker.ci.acceptance.dynamic-store-off.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/docker.ci.acceptance.robot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/docker.ci.acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/docker.ci.api.dynamic-store-off.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/docker.ci.api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
3 changes: 3 additions & 0 deletions config/install/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ sections:
router-cache-warmup-backoffice:
command: 'vendor/bin/console router:cache:warm-up:backoffice'

oms-process-cache-warmup:
command: 'vendor/bin/console oms:process-cache:warm-up'

router-cache-warmup-backend-gateway:
command: 'vendor/bin/console router:cache:warm-up:backend-gateway'

Expand Down
2 changes: 2 additions & 0 deletions data/import/common/common/glossary.csv
Original file line number Diff line number Diff line change
Expand Up @@ -1381,6 +1381,8 @@ checkout.payment.provider.DummyPayment,Payment Methods,en_US
checkout.payment.provider.DummyPayment,Zahlungsarten,de_DE
checkout.order.duplicate,Order with given reference {{reference}} already exists,en_US
checkout.order.duplicate,Bestellung mit gegebener Referenz {{reference}} existiert bereits,de_DE
checkout.order.checkout.error.duplicate-order-processing,Cart with given uid %quote-uid% has already been processed,en_US
checkout.order.checkout.error.duplicate-order-processing,Der Warenkorb mit der angegebenen UID %quote-uid% wurde bereits verarbeitet,de_DE
checkout.item.option.pre.condition.validation.error.exists,"Product option of %name% is not available anymore.",en_US
checkout.item.option.pre.condition.validation.error.exists,"Produktoption von %name% ist nicht mehr verfügbar.",de_DE
cms.preview.access_denied,You are not logged in or you do not have permission to access this page.,en_US
Expand Down
4 changes: 3 additions & 1 deletion src/Pyz/Zed/Checkout/CheckoutDependencyProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use Spryker\Zed\ProductOffer\Communication\Plugin\Checkout\ProductOfferCheckoutPreConditionPlugin;
use Spryker\Zed\ProductOption\Communication\Plugin\Checkout\ProductOptionOrderSaverPlugin;
use Spryker\Zed\ProductQuantity\Communication\Plugin\Checkout\ProductQuantityRestrictionCheckoutPreConditionPlugin;
use Spryker\Zed\QuoteCheckoutConnector\Communication\Plugin\Checkout\DisallowQuoteCheckoutPreSavePlugin;
use Spryker\Zed\Sales\Communication\Plugin\Checkout\DuplicateOrderCheckoutPreConditionPlugin;
use Spryker\Zed\Sales\Communication\Plugin\Checkout\OrderItemsSaverPlugin;
use Spryker\Zed\Sales\Communication\Plugin\Checkout\OrderSaverPlugin;
Expand Down Expand Up @@ -136,11 +137,12 @@ protected function getCheckoutPostHooks(Container $container): array // phpcs:ig
/**
* @param \Spryker\Zed\Kernel\Container $container
*
* @return array<\Spryker\Zed\Checkout\Dependency\Plugin\CheckoutPreSaveHookInterface>|array<\Spryker\Zed\Checkout\Dependency\Plugin\CheckoutPreSaveInterface>
* @return array<\Spryker\Zed\Checkout\Dependency\Plugin\CheckoutPreSaveHookInterface|\Spryker\Zed\Checkout\Dependency\Plugin\CheckoutPreSaveInterface|\Spryker\Zed\CheckoutExtension\Dependency\Plugin\CheckoutPreSavePluginInterface>
*/
protected function getCheckoutPreSaveHooks(Container $container): array // phpcs:ignore SlevomatCodingStandard.Functions.UnusedParameter
{
return [
new DisallowQuoteCheckoutPreSavePlugin(),
new SalesOrderExpanderPlugin(),
];
}
Expand Down
2 changes: 2 additions & 0 deletions src/Pyz/Zed/Console/ConsoleDependencyProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
use Spryker\Zed\Oms\Communication\Console\CheckConditionConsole as OmsCheckConditionConsole;
use Spryker\Zed\Oms\Communication\Console\CheckTimeoutConsole as OmsCheckTimeoutConsole;
use Spryker\Zed\Oms\Communication\Console\ClearLocksConsole as OmsClearLocksConsole;
use Spryker\Zed\Oms\Communication\Console\ProcessCacheWarmUpConsole as OmsProcessCacheWarmUpConsole;
use Spryker\Zed\OrderMatrix\Communication\Console\OrderMatrixConsole;
use Spryker\Zed\PaymentDataImport\PaymentDataImportConfig;
use Spryker\Zed\PriceProduct\Communication\Console\PriceProductStoreOptimizeConsole;
Expand Down Expand Up @@ -221,6 +222,7 @@ protected function getConsoleCommands(Container $container): array
new OmsCheckConditionConsole(),
new OmsCheckTimeoutConsole(),
new OmsClearLocksConsole(),
new OmsProcessCacheWarmUpConsole(),
new StateMachineCheckTimeoutConsole(),
new StateMachineCheckConditionConsole(),
new StateMachineClearLocksConsole(),
Expand Down
Loading