From 76de41068354ac84abe2117d921a1f3117387cad Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Wed, 26 Jul 2023 13:44:53 +0200 Subject: [PATCH 1/5] CC-30448: Integration CC-24108 --- composer.lock | 60 +++++++++---------- .../Publisher/PublisherDependencyProvider.php | 4 ++ .../Propel/Schema/spy_stock.schema.xml | 21 +++++++ 3 files changed, 55 insertions(+), 30 deletions(-) create mode 100644 src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml diff --git a/composer.lock b/composer.lock index 98af7df419..0ceaf148a6 100644 --- a/composer.lock +++ b/composer.lock @@ -47358,16 +47358,16 @@ }, { "name": "spryker/product-offer-availability", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/spryker/product-offer-availability.git", - "reference": "af45c57b57c14c3b36df18e0c239aaddd321bf17" + "reference": "14f3541e025f872f716483f69d17af1bf0a5af1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-offer-availability/zipball/af45c57b57c14c3b36df18e0c239aaddd321bf17", - "reference": "af45c57b57c14c3b36df18e0c239aaddd321bf17", + "url": "https://api.github.com/repos/spryker/product-offer-availability/zipball/14f3541e025f872f716483f69d17af1bf0a5af1f", + "reference": "14f3541e025f872f716483f69d17af1bf0a5af1f", "shasum": "" }, "require": { @@ -47377,7 +47377,7 @@ "spryker/kernel": "^3.33.0", "spryker/oms": "^11.7.0", "spryker/product-offer": "^1.8.0", - "spryker/product-offer-stock": "^1.1.0", + "spryker/product-offer-stock": "^1.3.0", "spryker/transfer": "^3.27.0" }, "require-dev": { @@ -47405,22 +47405,22 @@ ], "description": "ProductOfferAvailability module", "support": { - "source": "https://github.com/spryker/product-offer-availability/tree/1.2.0" + "source": "https://github.com/spryker/product-offer-availability/tree/1.3.0" }, - "time": "2023-05-15T10:55:04+00:00" + "time": "2023-07-25T12:51:44+00:00" }, { "name": "spryker/product-offer-availability-storage", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/spryker/product-offer-availability-storage.git", - "reference": "bd444d2c9262bd36a1d3792da852bcda46aa4dc9" + "reference": "4a2059cf30e27c6fd91c00271b367a0145743726" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-offer-availability-storage/zipball/bd444d2c9262bd36a1d3792da852bcda46aa4dc9", - "reference": "bd444d2c9262bd36a1d3792da852bcda46aa4dc9", + "url": "https://api.github.com/repos/spryker/product-offer-availability-storage/zipball/4a2059cf30e27c6fd91c00271b367a0145743726", + "reference": "4a2059cf30e27c6fd91c00271b367a0145743726", "shasum": "" }, "require": { @@ -47430,16 +47430,17 @@ "spryker/kernel": "^3.33.0", "spryker/oms-product-offer-reservation": "^1.0.0", "spryker/product-offer": "^1.0.0", - "spryker/product-offer-availability": "^1.0.0", + "spryker/product-offer-availability": "^1.3.0", "spryker/product-offer-stock": "^1.0.0", "spryker/propel-orm": "^1.3.0", "spryker/publisher-extension": "^1.0.0", + "spryker/stock": "^8.8.3", "spryker/storage": "^3.0.0", - "spryker/store": "^1.0.0", + "spryker/store": "^1.19.0", "spryker/synchronization": "^1.0.0", "spryker/synchronization-behavior": "^1.0.0", "spryker/synchronization-extension": "^1.1.0", - "spryker/transfer": "^3.18.0", + "spryker/transfer": "^3.27.0", "spryker/util-encoding": "^2.0.0" }, "require-dev": { @@ -47450,7 +47451,6 @@ "spryker/product": "*", "spryker/propel": "*", "spryker/queue": "*", - "spryker/stock": "*", "spryker/testify": "*" }, "suggest": { @@ -47473,9 +47473,9 @@ ], "description": "ProductOfferAvailabilityStorage module", "support": { - "source": "https://github.com/spryker/product-offer-availability-storage/tree/1.1.0" + "source": "https://github.com/spryker/product-offer-availability-storage/tree/1.2.0" }, - "time": "2023-05-15T10:55:04+00:00" + "time": "2023-07-25T12:51:44+00:00" }, { "name": "spryker/product-offer-extension", @@ -48155,16 +48155,16 @@ }, { "name": "spryker/product-offer-stock", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/spryker/product-offer-stock.git", - "reference": "2898084b76757fb298b84fef4a74e8819984f7a8" + "reference": "ecfd3e5536b32c71fc502d9f3f5193236857585a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/product-offer-stock/zipball/2898084b76757fb298b84fef4a74e8819984f7a8", - "reference": "2898084b76757fb298b84fef4a74e8819984f7a8", + "url": "https://api.github.com/repos/spryker/product-offer-stock/zipball/ecfd3e5536b32c71fc502d9f3f5193236857585a", + "reference": "ecfd3e5536b32c71fc502d9f3f5193236857585a", "shasum": "" }, "require": { @@ -48176,7 +48176,7 @@ "spryker/product-offer-extension": "^1.0.0", "spryker/propel-orm": "^1.0.0", "spryker/stock": "^7.0.0 || ^8.0.0", - "spryker/transfer": "^3.25.0" + "spryker/transfer": "^3.27.0" }, "require-dev": { "spryker/code-sniffer": "*", @@ -48203,9 +48203,9 @@ ], "description": "ProductOfferStock module", "support": { - "source": "https://github.com/spryker/product-offer-stock/tree/1.2.0" + "source": "https://github.com/spryker/product-offer-stock/tree/1.3.0" }, - "time": "2023-03-10T14:11:16+00:00" + "time": "2023-07-25T12:51:44+00:00" }, { "name": "spryker/product-offer-stock-data-import", @@ -57945,16 +57945,16 @@ }, { "name": "spryker/stock", - "version": "8.8.2", + "version": "8.8.3", "source": { "type": "git", "url": "https://github.com/spryker/stock.git", - "reference": "7255d93e4ec1f640bd3d3d8f16e7baaf02c236f8" + "reference": "5261ab0f27009e6e3bae8d9edc44b83f52353138" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/stock/zipball/7255d93e4ec1f640bd3d3d8f16e7baaf02c236f8", - "reference": "7255d93e4ec1f640bd3d3d8f16e7baaf02c236f8", + "url": "https://api.github.com/repos/spryker/stock/zipball/5261ab0f27009e6e3bae8d9edc44b83f52353138", + "reference": "5261ab0f27009e6e3bae8d9edc44b83f52353138", "shasum": "" }, "require": { @@ -57993,9 +57993,9 @@ ], "description": "Stock module", "support": { - "source": "https://github.com/spryker/stock/tree/8.8.2" + "source": "https://github.com/spryker/stock/tree/8.8.3" }, - "time": "2023-05-05T18:20:59+00:00" + "time": "2023-07-25T12:51:44+00:00" }, { "name": "spryker/stock-address", diff --git a/src/Pyz/Zed/Publisher/PublisherDependencyProvider.php b/src/Pyz/Zed/Publisher/PublisherDependencyProvider.php index b70450e7ab..4103b6d963 100644 --- a/src/Pyz/Zed/Publisher/PublisherDependencyProvider.php +++ b/src/Pyz/Zed/Publisher/PublisherDependencyProvider.php @@ -114,6 +114,8 @@ use Spryker\Zed\ProductListSearch\Communication\Plugin\Publisher\ProductListSearchPublisherTriggerPlugin; use Spryker\Zed\ProductListStorage\Communication\Plugin\Publisher\ProductListPublisherTriggerPlugin; use Spryker\Zed\ProductOfferAvailabilityStorage\Communication\Plugin\Publisher\ProductOfferAvailability\ProductOfferAvailabilityProductOfferStoreStoragePublisherPlugin; +use Spryker\Zed\ProductOfferAvailabilityStorage\Communication\Plugin\Publisher\Stock\ProductOfferAvailabilityStockStoragePublisherPlugin; +use Spryker\Zed\ProductOfferAvailabilityStorage\Communication\Plugin\Publisher\StockStore\ProductOfferAvailabilityStockStoreStoragePublisherPlugin; use Spryker\Zed\ProductOfferStorage\Communication\Plugin\Publisher\ProductConcreteOffers\ProductConcreteProductOffersDeletePublisherPlugin; use Spryker\Zed\ProductOfferStorage\Communication\Plugin\Publisher\ProductConcreteOffers\ProductConcreteProductOffersStoreDeletePublisherPlugin; use Spryker\Zed\ProductOfferStorage\Communication\Plugin\Publisher\ProductConcreteOffers\ProductConcreteProductOffersStoreWritePublisherPlugin; @@ -522,6 +524,8 @@ protected function getProductOfferAvailabilityStoragePlugins(): array { return [ new ProductOfferAvailabilityProductOfferStoreStoragePublisherPlugin(), + new ProductOfferAvailabilityStockStoragePublisherPlugin(), + new ProductOfferAvailabilityStockStoreStoragePublisherPlugin(), ]; } diff --git a/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml b/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml new file mode 100644 index 0000000000..f68deabca2 --- /dev/null +++ b/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml @@ -0,0 +1,21 @@ + + + + + + + +
+ + + + + + + +
+ + + +
+
From c5db55157243ed3e0a9eb1d528b2b245ef2e7646 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Fri, 28 Jul 2023 11:25:13 +0200 Subject: [PATCH 2/5] CC-30448: Integration CC-24108 --- composer.json | 2 +- composer.lock | 25 +++++++++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 0a518636d2..6c32ae1507 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "spryker-feature/invoice": "^202307.0", "spryker-feature/mailing-notifications": "^202307.0", "spryker-feature/marketplace-cart": "^202307.0", - "spryker-feature/marketplace-inventory-management": "^202307.0", + "spryker-feature/marketplace-inventory-management": "dev-master as 202400.0", "spryker-feature/marketplace-merchant": "^202307.0", "spryker-feature/marketplace-merchant-custom-prices": "^202307.0", "spryker-feature/marketplace-merchant-order-threshold": "^202307.0", diff --git a/composer.lock b/composer.lock index b33912b9b2..71575a3add 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f7c3ac624caf848c85c3d440454b88e4", + "content-hash": "ea101f386c683a9e26c9988937acb3b7", "packages": [ { "name": "async-aws/core", @@ -5686,16 +5686,16 @@ }, { "name": "spryker-feature/marketplace-inventory-management", - "version": "202307.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/spryker-feature/marketplace-inventory-management.git", - "reference": "a1691d291db3a4e99725c1c230c5d9f6fff58539" + "reference": "b9dca9afc45d1d4847551c07bc3102c5bc527d65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-feature/marketplace-inventory-management/zipball/a1691d291db3a4e99725c1c230c5d9f6fff58539", - "reference": "a1691d291db3a4e99725c1c230c5d9f6fff58539", + "url": "https://api.github.com/repos/spryker-feature/marketplace-inventory-management/zipball/b9dca9afc45d1d4847551c07bc3102c5bc527d65", + "reference": "b9dca9afc45d1d4847551c07bc3102c5bc527d65", "shasum": "" }, "require": { @@ -5720,6 +5720,7 @@ "spryker-feature/inventory-management": "Recommended feature dependency.", "spryker-feature/marketplace-product-offer": "Recommended feature dependency." }, + "default-branch": true, "type": "metapackage", "extra": { "branch-alias": { @@ -5732,9 +5733,9 @@ ], "description": "Marketplace Inventory Management [feature]", "support": { - "source": "https://github.com/spryker-feature/marketplace-inventory-management/tree/202307.0" + "source": "https://github.com/spryker-feature/marketplace-inventory-management/tree/master" }, - "time": "2023-07-26T14:50:34+00:00" + "time": "2023-07-27T11:23:39+00:00" }, { "name": "spryker-feature/marketplace-merchant", @@ -73501,9 +73502,17 @@ "time": "2022-06-03T18:03:27+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "spryker-feature/marketplace-inventory-management", + "version": "9999999-dev", + "alias": "202400.0", + "alias_normalized": "202400.0" + } + ], "minimum-stability": "dev", "stability-flags": { + "spryker-feature/marketplace-inventory-management": 20, "spryker/docker-chromedriver": 20, "spryker/robotframework-suite-tests": 20 }, From 21b5a43f4d0160804fce064afcbac1acb48a6aff Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Tue, 1 Aug 2023 18:23:08 +0200 Subject: [PATCH 3/5] CC-30448: Integration CC-24108 --- .../Stock/Persistence/Propel/Schema/spy_stock.schema.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml b/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml index f68deabca2..27662ebbe4 100644 --- a/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml +++ b/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml @@ -8,14 +8,8 @@ - -
- - - -
From ff4ae0ca4c4e22e95178b4fb447bbd4ef381d933 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Tue, 1 Aug 2023 18:26:22 +0200 Subject: [PATCH 4/5] CC-30448: Integration CC-24108 --- composer.json | 2 +- composer.lock | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 6c32ae1507..985132a6f6 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "spryker-feature/customer-account-management": "^202307.0", "spryker-feature/deployment-tools": "^202307.0", "spryker-feature/file-manager": "^202307.0", - "spryker-feature/inventory-management": "^202307.0", + "spryker-feature/inventory-management": "dev-master as 202400.0", "spryker-feature/invoice": "^202307.0", "spryker-feature/mailing-notifications": "^202307.0", "spryker-feature/marketplace-cart": "^202307.0", diff --git a/composer.lock b/composer.lock index 71575a3add..3ec0a4140b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ea101f386c683a9e26c9988937acb3b7", + "content-hash": "eefa318a2eb0a0721e98e80e04a1b0aa", "packages": [ { "name": "async-aws/core", @@ -5528,16 +5528,16 @@ }, { "name": "spryker-feature/inventory-management", - "version": "202307.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/spryker-feature/inventory-management.git", - "reference": "5001ee7d6e6a1d77899ec6e665304bd1ed319440" + "reference": "dbc53c59323d3eef4198f6edc75c3dc2d699a4c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-feature/inventory-management/zipball/5001ee7d6e6a1d77899ec6e665304bd1ed319440", - "reference": "5001ee7d6e6a1d77899ec6e665304bd1ed319440", + "url": "https://api.github.com/repos/spryker-feature/inventory-management/zipball/dbc53c59323d3eef4198f6edc75c3dc2d699a4c2", + "reference": "dbc53c59323d3eef4198f6edc75c3dc2d699a4c2", "shasum": "" }, "require": { @@ -5558,6 +5558,7 @@ "suggest": { "spryker-feature/product": "Recommended feature dependency." }, + "default-branch": true, "type": "metapackage", "extra": { "branch-alias": { @@ -5570,9 +5571,9 @@ ], "description": "Inventory Management [feature]", "support": { - "source": "https://github.com/spryker-feature/inventory-management/tree/202307.0" + "source": "https://github.com/spryker-feature/inventory-management/tree/master" }, - "time": "2023-07-26T14:50:32+00:00" + "time": "2023-07-27T11:42:22+00:00" }, { "name": "spryker-feature/invoice", @@ -73503,6 +73504,12 @@ } ], "aliases": [ + { + "package": "spryker-feature/inventory-management", + "version": "9999999-dev", + "alias": "202400.0", + "alias_normalized": "202400.0" + }, { "package": "spryker-feature/marketplace-inventory-management", "version": "9999999-dev", @@ -73512,6 +73519,7 @@ ], "minimum-stability": "dev", "stability-flags": { + "spryker-feature/inventory-management": 20, "spryker-feature/marketplace-inventory-management": 20, "spryker/docker-chromedriver": 20, "spryker/robotframework-suite-tests": 20 From 5c8e223897cb25d310dd31ee5d714ef17daa8feb Mon Sep 17 00:00:00 2001 From: Artem Date: Thu, 3 Aug 2023 12:07:12 +0200 Subject: [PATCH 5/5] CC-24108 change schema directory --- .../Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{src => }/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml (100%) diff --git a/src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml b/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml similarity index 100% rename from src/src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml rename to src/Pyz/Zed/Stock/Persistence/Propel/Schema/spy_stock.schema.xml