From 4eea662b5354cd37ff72ab97aa381165a0d0c8a3 Mon Sep 17 00:00:00 2001 From: Alexey Kravchenko Date: Fri, 6 Sep 2024 16:04:37 +0300 Subject: [PATCH] FRW-8766: order matrix integration --- composer.lock | 131 +++++++++++++++--- config/Zed/cronjobs/jenkins.php | 8 ++ config/Zed/navigation.xml | 2 +- .../Zed/Console/ConsoleDependencyProvider.php | 2 + 4 files changed, 125 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 37edf0128f..1fa5c22263 100644 --- a/composer.lock +++ b/composer.lock @@ -7235,12 +7235,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-feature/order-management.git", - "reference": "1e09b0727a27910f4c3932d8ce8af377e032ba1f" + "reference": "5bd90bcb276c6a42c0b31092effd9f43b1c72eeb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-feature/order-management/zipball/1e09b0727a27910f4c3932d8ce8af377e032ba1f", - "reference": "1e09b0727a27910f4c3932d8ce8af377e032ba1f", + "url": "https://api.github.com/repos/spryker-feature/order-management/zipball/5bd90bcb276c6a42c0b31092effd9f43b1c72eeb", + "reference": "5bd90bcb276c6a42c0b31092effd9f43b1c72eeb", "shasum": "" }, "require": { @@ -7250,6 +7250,8 @@ "spryker/oms": "^11.31.0", "spryker/order-custom-reference": "^1.0.0", "spryker/order-custom-reference-gui": "^1.0.0", + "spryker/order-matrix": "^1.0.0", + "spryker/order-matrix-gui": "^1.0.0", "spryker/sales": "^11.47.0", "spryker/sales-data-export": "^0.2.0", "spryker/sales-invoice": "^1.4.0", @@ -7263,7 +7265,7 @@ "type": "metapackage", "extra": { "branch-alias": { - "dev-master": "202404.x-dev" + "dev-master": "202407.x-dev" } }, "notification-url": "https://packagist.org/downloads/", @@ -7272,9 +7274,9 @@ ], "description": "Order Management [feature]", "support": { - "source": "https://github.com/spryker-feature/order-management/tree/202404.0" + "source": "https://github.com/spryker-feature/order-management/tree/master" }, - "time": "2024-04-23T08:48:54+00:00" + "time": "2024-08-29T11:26:34+00:00" }, { "name": "spryker-feature/payments", @@ -8488,12 +8490,12 @@ "source": { "type": "git", "url": "https://github.com/spryker-feature/spryker-core.git", - "reference": "bf7a8803af5519b862a96f514992b05c74c608ef" + "reference": "c9fa350afb608096233720e78c97889f949ec66a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-feature/spryker-core/zipball/bf7a8803af5519b862a96f514992b05c74c608ef", - "reference": "bf7a8803af5519b862a96f514992b05c74c608ef", + "url": "https://api.github.com/repos/spryker-feature/spryker-core/zipball/c9fa350afb608096233720e78c97889f949ec66a", + "reference": "c9fa350afb608096233720e78c97889f949ec66a", "shasum": "" }, "require": { @@ -8600,7 +8602,7 @@ "support": { "source": "https://github.com/spryker-feature/spryker-core/tree/master" }, - "time": "2024-08-07T09:07:15+00:00" + "time": "2024-09-06T11:45:45+00:00" }, { "name": "spryker-feature/spryker-core-back-office", @@ -38084,19 +38086,20 @@ }, { "name": "spryker/oms", - "version": "11.31.0", + "version": "11.35.0", "source": { "type": "git", "url": "https://github.com/spryker/oms.git", - "reference": "8d0c3ba4530f225c362aec8d6bc9cf3a210e45fd" + "reference": "52bd9a804b191b0d2201a87bfc01825366d070c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/oms/zipball/8d0c3ba4530f225c362aec8d6bc9cf3a210e45fd", - "reference": "8d0c3ba4530f225c362aec8d6bc9cf3a210e45fd", + "url": "https://api.github.com/repos/spryker/oms/zipball/52bd9a804b191b0d2201a87bfc01825366d070c1", + "reference": "52bd9a804b191b0d2201a87bfc01825366d070c1", "shasum": "" }, "require": { + "ext-simplexml": "*", "php": ">=8.1", "spryker/acl-merchant-portal-extension": "^1.0.0", "spryker/decimal-object": "^1.0.0", @@ -38150,9 +38153,9 @@ ], "description": "Oms module", "support": { - "source": "https://github.com/spryker/oms/tree/11.31.0" + "source": "https://github.com/spryker/oms/tree/11.35.0" }, - "time": "2024-03-07T13:22:26+00:00" + "time": "2024-08-29T09:44:14+00:00" }, { "name": "spryker/oms-discount-connector", @@ -38446,6 +38449,100 @@ }, "time": "2020-03-18T13:04:41+00:00" }, + { + "name": "spryker/order-matrix", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/order-matrix.git", + "reference": "d93852808cc527987b2629a91bb7982a013bbce1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/order-matrix/zipball/d93852808cc527987b2629a91bb7982a013bbce1", + "reference": "d93852808cc527987b2629a91bb7982a013bbce1", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/kernel": "^3.30.0", + "spryker/oms": "^11.35.0", + "spryker/storage-redis": "^1.0.0", + "spryker/symfony": "^3.0.0", + "spryker/transfer": "^3.27.0", + "spryker/util-encoding": "^2.1.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "OrderMatrix module", + "support": { + "source": "https://github.com/spryker/order-matrix/tree/1.0.0" + }, + "time": "2024-08-29T09:44:14+00:00" + }, + { + "name": "spryker/order-matrix-gui", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/order-matrix-gui.git", + "reference": "f2d49f56a19a6056c029bac08a361f75356c4f2e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/order-matrix-gui/zipball/f2d49f56a19a6056c029bac08a361f75356c4f2e", + "reference": "f2d49f56a19a6056c029bac08a361f75356c4f2e", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "spryker/kernel": "^3.30.0", + "spryker/order-matrix": "^1.0.0", + "spryker/sales": "^11.0.0", + "spryker/transfer": "^3.27.0", + "spryker/util-sanitize": "^2.0.0" + }, + "require-dev": { + "spryker/code-sniffer": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "OrderMatrixGui module", + "support": { + "source": "https://github.com/spryker/order-matrix-gui/tree/1.0.0" + }, + "time": "2024-08-29T09:44:14+00:00" + }, { "name": "spryker/order-payments-rest-api", "version": "1.0.1", @@ -74715,5 +74812,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } diff --git a/config/Zed/cronjobs/jenkins.php b/config/Zed/cronjobs/jenkins.php index 79afd22db5..bd3d8f139d 100644 --- a/config/Zed/cronjobs/jenkins.php +++ b/config/Zed/cronjobs/jenkins.php @@ -181,6 +181,14 @@ 'enable' => true, ]; +$jobs[] = [ + 'name' => 'sync-order-matrix', + 'command' => '$PHP_BIN vendor/bin/console order-matrix:sync', + 'schedule' => '*/1 * * * *', + 'enable' => true, + 'global' => true, +]; + if (getenv('SPRYKER_CURRENT_REGION')) { foreach ($jobs as $job) { $job['region'] = getenv('SPRYKER_CURRENT_REGION'); diff --git a/config/Zed/navigation.xml b/config/Zed/navigation.xml index 455245e9d4..674044ff7c 100644 --- a/config/Zed/navigation.xml +++ b/config/Zed/navigation.xml @@ -18,7 +18,7 @@ Order Matrix - sales + order-matrix-gui matrix index 1 diff --git a/src/Pyz/Zed/Console/ConsoleDependencyProvider.php b/src/Pyz/Zed/Console/ConsoleDependencyProvider.php index fb0cd435f0..0e6dcb90b2 100644 --- a/src/Pyz/Zed/Console/ConsoleDependencyProvider.php +++ b/src/Pyz/Zed/Console/ConsoleDependencyProvider.php @@ -74,6 +74,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\OrderMatrix\Communication\Console\OrderMatrixConsole; use Spryker\Zed\PaymentDataImport\PaymentDataImportConfig; use Spryker\Zed\PriceProduct\Communication\Console\PriceProductStoreOptimizeConsole; use Spryker\Zed\PriceProductDataImport\PriceProductDataImportConfig; @@ -400,6 +401,7 @@ protected function getConsoleCommands(Container $container): array new DateTimeProductConfiguratorBuildFrontendConsole(), new DeleteExpiredPushNotificationSubscriptionConsole(), new SendPushNotificationConsole(), + new OrderMatrixConsole(), ]; $propelCommands = $container->getLocator()->propel()->facade()->getConsoleCommands();