Merge branch 'master' into feature/frw-9030/master-integrations

spryker-shop · Oct 10, 2024 · 3194f3d · 3194f3d
2 parents 4790493 + d8b39c7
commit 3194f3d
Show file tree

Hide file tree

Showing 31 changed files with 530 additions and 260 deletions.
diff --git a/composer.json b/composer.json
@@ -193,7 +193,7 @@
         "spryker/merchants-rest-api": "^1.0.0",
         "spryker/message-broker": "^1.10.0",
         "spryker/message-broker-aws": "^1.7.0",
-        "spryker/money-gui": "^1.1.0",
+        "spryker/money-gui": "^1.2.0",
         "spryker/navigations-category-nodes-resource-relationship": "^1.0.1",
         "spryker/navigations-rest-api": "^2.1.1",
         "spryker/oauth-agent-connector": "^1.2.0",
@@ -258,7 +258,8 @@
         "spryker/products-rest-api": "^2.15.1",
         "spryker/push-notifications-backend-api": "^1.0.1",
         "spryker/related-products-rest-api": "^1.3.2",
-        "spryker/rest-request-validator": "^1.5.0",
+        "spryker/rest-request-validator": "^1.6.0",
+        "spryker/sales-discount-connector": "^1.0.0",
         "spryker/sales-merchant-portal-gui": "^3.0.2",
         "spryker/sales-order-thresholds-rest-api": "^1.0.0",
         "spryker/sales-orders-backend-api": "^1.0.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/Zed/navigation-main-merchant-portal.xml b/config/Zed/navigation-main-merchant-portal.xml
@@ -16,6 +16,22 @@
         <controller>profile</controller>
         <action>index</action>
     </merchant-portal-profile>
+    <product-merchant-portal-gui>
+        <label>Products</label>
+        <title>Products</title>
+        <icon>products</icon>
+        <bundle>product-merchant-portal-gui</bundle>
+        <controller>products</controller>
+        <action>index</action>
+    </product-merchant-portal-gui>
+    <variants-product-merchant-portal-gui>
+        <label>Variants</label>
+        <title>Variants</title>
+        <icon>variants</icon>
+        <bundle>product-merchant-portal-gui</bundle>
+        <controller>products-concrete</controller>
+        <action>index</action>
+    </variants-product-merchant-portal-gui>
     <product-offer-merchant-portal-gui>
         <label>Offers</label>
         <title>Offers</title>
@@ -42,14 +58,6 @@
         <controller>orders</controller>
         <action>index</action>
     </sales-merchant-portal-gui>
-    <product-merchant-portal-gui>
-        <label>Products</label>
-        <title>Products</title>
-        <icon>products</icon>
-        <bundle>product-merchant-portal-gui</bundle>
-        <controller>products</controller>
-        <action>index</action>
-    </product-merchant-portal-gui>
     <agent-dashboard-merchant-portal-gui>
         <label>Merchant Users</label>
         <title>Merchant Users</title>

diff --git a/config/Zed/navigation.xml b/config/Zed/navigation.xml
@@ -330,7 +330,7 @@
             <merchant-commission-gui>
                 <label>Merchant Commissions</label>
                 <title>Merchant Commissions</title>
-                <bundle>merchant_commission-gui</bundle>
+                <bundle>merchant-commission-gui</bundle>
                 <controller>list</controller>
                 <action>index</action>
             </merchant-commission-gui>

diff --git a/data/import/common/AT/discount_store.csv b/data/import/common/AT/discount_store.csv
@@ -7,3 +7,4 @@ discount_5,AT
 discount_6,AT
 discount_7,AT
 discount_8,AT
+discount_12,AT
diff --git a/data/import/common/AT/store_context.csv b/data/import/common/AT/store_context.csv
@@ -0,0 +1,2 @@
+store_name,appication_context_collection
+AT,"{""application_contexts"":[{""application"": null, ""timezone"": ""Europe/Berlin""}]}"
diff --git a/data/import/common/DE/discount_store.csv b/data/import/common/DE/discount_store.csv
@@ -7,3 +7,4 @@ discount_5,DE
 discount_6,DE
 discount_7,DE
 discount_8,DE
+discount_12,DE
diff --git a/data/import/common/DE/store_context.csv b/data/import/common/DE/store_context.csv
@@ -0,0 +1,2 @@
+store_name,appication_context_collection
+DE,"{""application_contexts"":[{""application"": null, ""timezone"": ""Europe/Berlin""}]}"
diff --git a/data/import/common/EU/store_context.csv b/data/import/common/EU/store_context.csv
@@ -0,0 +1,3 @@
+store_name,appication_context_collection
+DE,"{""application_contexts"":[{""application"": null, ""timezone"": ""Europe/Berlin""}]}"
+AT,"{""application_contexts"":[{""application"": null, ""timezone"": ""Europe/Berlin""}]}"
diff --git a/data/import/common/US/discount_store.csv b/data/import/common/US/discount_store.csv
@@ -7,3 +7,4 @@ discount_8,US
 discount_9,US
 discount_10,US
 discount_11,US
+discount_12,US
diff --git a/data/import/common/US/store_context.csv b/data/import/common/US/store_context.csv
@@ -0,0 +1,2 @@
+store_name,appication_context_collection
+US,"{""application_contexts"":[{""application"": null, ""timezone"": ""America/New_York""}]}"
diff --git a/data/import/common/commerce_setup_import_config_EU.yml b/data/import/common/commerce_setup_import_config_EU.yml
@@ -21,6 +21,14 @@ actions:
     source: data/import/common/DE/default_locale_store.csv
   - data_entity: default-locale-store
     source: data/import/common/AT/default_locale_store.csv
+  - data_entity: context-store
+    source: data/import/common/DE/store_context.csv
+  - data_entity: context-store
+    source: data/import/common/AT/store_context.csv
+  - data_entity: context-store
+    source: data/import/common/DE/store_context.csv
+  - data_entity: context-store
+    source: data/import/common/AT/store_context.csv
   - data_entity: customer
     source: data/import/common/common/customer.csv
   - data_entity: glossary

diff --git a/data/import/common/commerce_setup_import_config_US.yml b/data/import/common/commerce_setup_import_config_US.yml
@@ -13,6 +13,8 @@ actions:
     source: data/import/common/US/locale_store.csv
   - data_entity: default-locale-store
     source: data/import/common/US/default_locale_store.csv
+  - data_entity: context-store
+    source: data/import/common/US/store_context.csv
   - data_entity: customer
     source: data/import/common/common/customer.csv
   - data_entity: glossary

diff --git a/data/import/common/common/discount.csv b/data/import/common/common/discount.csv
@@ -10,3 +10,4 @@ discount_8,Free smartphone,"Buy any laptop, get a free smartphone (select smartp
 discount_9,10% off $100+,Get a 10% discount on all orders above $100,1000,PLUGIN_CALCULATOR_PERCENTAGE,1,5000,0,2016-01-01 00:00:00,2037-12-31 00:00:00,sub-total >= '100',"sku = ""*""",cart_rule,,
 discount_10,Tu & Wed $5 off 5 or more,Get $5 off on Tuesdays and Wednesdays when you buy at least 5 items,,PLUGIN_CALCULATOR_FIXED,1,,0,2016-01-01 00:00:00,2037-12-31 00:00:00,"(day-of-week = ""2"" OR day-of-week = ""3"") AND item-quantity >= ""5""","item-quantity = ""5""",cart_rule,,
 discount_11,Free Acer Notebook,"For every purchase above $600, you get this promotional product for free.",10000,PLUGIN_CALCULATOR_PERCENTAGE,1,100,0,2016-01-01 00:00:00,2037-12-31 00:00:00,sub-total >= '600',,cart_rule,112,1
+discount_12,5% for the first order,"5% for the first order of a logged-in customer",500,PLUGIN_CALCULATOR_PERCENTAGE,0,300,0,2021-10-11 00:00:00,2037-10-11 11:59:00,customer-order-count = '0',"sku = ""*""",cart_rule,,
diff --git a/data/import/common/minimal.yml b/data/import/common/minimal.yml
@@ -23,6 +23,10 @@ actions:
       source: data/import/common/DE/default_locale_store.csv
     - data_entity: default-locale-store
       source: data/import/common/AT/default_locale_store.csv
+    - data_entity: context-store
+      source: data/import/common/DE/store_context.csv
+    - data_entity: context-store
+      source: data/import/common/AT/store_context.csv
     - data_entity: customer
       source: data/import/common/common/customer.csv
     - data_entity: glossary

diff --git a/data/import/local/full_EU.yml b/data/import/local/full_EU.yml
@@ -23,6 +23,10 @@ actions:
     source: data/import/common/DE/default_locale_store.csv
   - data_entity: default-locale-store
     source: data/import/common/AT/default_locale_store.csv
+  - data_entity: context-store
+    source: data/import/common/DE/store_context.csv
+  - data_entity: context-store
+    source: data/import/common/AT/store_context.csv
   - data_entity: customer
     source: data/import/common/common/customer.csv
   - data_entity: glossary

diff --git a/data/import/local/full_US.yml b/data/import/local/full_US.yml
@@ -15,6 +15,8 @@ actions:
     source: data/import/common/US/locale_store.csv
   - data_entity: default-locale-store
     source: data/import/common/US/default_locale_store.csv
+  - data_entity: context-store
+    source: data/import/common/US/store_context.csv
   - data_entity: customer
     source: data/import/common/common/customer.csv
   - data_entity: glossary

diff --git a/data/import/production/full_EU.yml b/data/import/production/full_EU.yml
@@ -23,6 +23,10 @@ actions:
     source: data/import/common/DE/default_locale_store.csv
   - data_entity: default-locale-store
     source: data/import/common/AT/default_locale_store.csv
+  - data_entity: context-store
+    source: data/import/common/DE/store_context.csv
+  - data_entity: context-store
+    source: data/import/common/AT/store_context.csv
   - data_entity: customer
     source: data/import/common/common/customer.csv
   - data_entity: glossary

diff --git a/data/import/production/full_US.yml b/data/import/production/full_US.yml
@@ -15,6 +15,8 @@ actions:
     source: data/import/common/US/locale_store.csv
   - data_entity: default-locale-store
     source: data/import/common/US/default_locale_store.csv
+  - data_entity: context-store
+    source: data/import/common/US/store_context.csv
   - data_entity: customer
     source: data/import/common/common/customer.csv
   - data_entity: glossary

diff --git a/deploy.aop-b2c-testing.yml b/deploy.aop-b2c-testing.yml
@@ -42,7 +42,7 @@ tag: '1.0'
 
 environment: docker.demo
 image:
-    tag: spryker/php:8.1
+    tag: spryker/php:8.2
     environment:
         SPRYKER_DEFAULT_STORE: "DE"
         SPRYKER_ACTIVE_STORES: "DE,AT"

diff --git a/deploy.aop-demoshop-b2c.yml b/deploy.aop-demoshop-b2c.yml
@@ -42,7 +42,7 @@ tag: '1.0'
 
 environment: docker.demo
 image:
-    tag: spryker/php:8.1
+    tag: spryker/php:8.2
     environment:
         SPRYKER_DEFAULT_STORE: "DE"
         SPRYKER_ACTIVE_STORES: "DE,AT"

diff --git a/src/Pyz/Client/Store/StoreDependencyProvider.php b/src/Pyz/Client/Store/StoreDependencyProvider.php
@@ -8,6 +8,7 @@
 namespace Pyz\Client\Store;
 
 use Spryker\Client\Store\StoreDependencyProvider as SprykerStoreDependencyProvider;
+use Spryker\Client\StoreContextStorage\Plugin\Store\TimezoneStoreStorageStoreExpanderPlugin;
 use Spryker\Client\StoreStorage\Plugin\Store\StoreStorageStoreExpanderPlugin;
 
 class StoreDependencyProvider extends SprykerStoreDependencyProvider
@@ -19,6 +20,7 @@ protected function getStoreExpanderPlugins(): array
     {
         return [
             new StoreStorageStoreExpanderPlugin(),
+            new TimezoneStoreStorageStoreExpanderPlugin(),
         ];
     }
 }
diff --git a/src/Pyz/Zed/Console/ConsoleDependencyProvider.php b/src/Pyz/Zed/Console/ConsoleDependencyProvider.php
@@ -163,6 +163,7 @@
 use Spryker\Zed\Storage\Communication\Console\StorageDeleteAllConsole;
 use Spryker\Zed\StorageRedis\Communication\Console\StorageRedisExportRdbConsole;
 use Spryker\Zed\StorageRedis\Communication\Console\StorageRedisImportRdbConsole;
+use Spryker\Zed\StoreContextDataImport\StoreContextDataImportConfig;
 use Spryker\Zed\StoreDataImport\StoreDataImportConfig;
 use Spryker\Zed\Synchronization\Communication\Console\ExportSynchronizedDataConsole;
 use Spryker\Zed\Synchronization\Communication\Plugin\Console\DirectSynchronizationConsolePlugin;
@@ -298,6 +299,7 @@ protected function getConsoleCommands(Container $container): array
             new DataImportConsole(DataImportConsole::DEFAULT_NAME . static::COMMAND_SEPARATOR . CurrencyDataImportConfig::IMPORT_TYPE_CURRENCY_STORE),
             new DataImportConsole(DataImportConsole::DEFAULT_NAME . static::COMMAND_SEPARATOR . LocaleDataImportConfig::IMPORT_TYPE_LOCALE_STORE),
             new DataImportConsole(DataImportConsole::DEFAULT_NAME . static::COMMAND_SEPARATOR . LocaleDataImportConfig::IMPORT_TYPE_DEFAULT_LOCALE_STORE),
+            new DataImportConsole(DataImportConsole::DEFAULT_NAME . static::COMMAND_SEPARATOR . StoreContextDataImportConfig::IMPORT_TYPE_STORE_CONTEXT),
             new DataImportConsole(DataImportConsole::DEFAULT_NAME . static::COMMAND_SEPARATOR . StoreDataImportConfig::IMPORT_TYPE_STORE),
             new DataImportConsole(DataImportConsole::DEFAULT_NAME . static::COMMAND_SEPARATOR . ServicePointDataImportConfig::IMPORT_TYPE_SERVICE_TYPE),
             new DataImportConsole(DataImportConsole::DEFAULT_NAME . static::COMMAND_SEPARATOR . ServicePointDataImportConfig::IMPORT_TYPE_SERVICE_POINT),

diff --git a/src/Pyz/Zed/DataImport/DataImportDependencyProvider.php b/src/Pyz/Zed/DataImport/DataImportDependencyProvider.php
@@ -98,6 +98,7 @@
 use Spryker\Zed\StockAddressDataImport\Communication\Plugin\DataImport\StockAddressDataImportPlugin;
 use Spryker\Zed\StockDataImport\Communication\Plugin\StockDataImportPlugin;
 use Spryker\Zed\StockDataImport\Communication\Plugin\StockStoreDataImportPlugin;
+use Spryker\Zed\StoreContextDataImport\Communication\Plugin\DataImport\StoreContextDataImportPlugin;
 use Spryker\Zed\StoreDataImport\Communication\Plugin\DataImport\StoreDataImportPlugin;
 
 class DataImportDependencyProvider extends SprykerDataImportDependencyProvider
@@ -326,6 +327,7 @@ protected function getDataImporterPlugins(): array
             new CurrencyStoreDataImportPlugin(),
             new LocaleStoreDataImportPlugin(),
             new DefaultLocaleStoreDataImportPlugin(),
+            new StoreContextDataImportPlugin(),
             new CategoryDataImportPlugin(),
             new ContentBannerDataImportPlugin(),
             new ContentProductAbstractListDataImportPlugin(),

diff --git a/src/Pyz/Zed/Discount/DiscountDependencyProvider.php b/src/Pyz/Zed/Discount/DiscountDependencyProvider.php
@@ -29,6 +29,7 @@
 use Spryker\Zed\ProductDiscountConnector\Communication\Plugin\DecisionRule\ProductAttributeDecisionRulePlugin;
 use Spryker\Zed\ProductLabelDiscountConnector\Communication\Plugin\Discount\ProductLabelDiscountableItemCollectorPlugin;
 use Spryker\Zed\ProductLabelDiscountConnector\Communication\Plugin\Discount\ProductLabelListDecisionRulePlugin;
+use Spryker\Zed\SalesDiscountConnector\Communication\Plugin\Discount\CustomerOrderCountDecisionRulePlugin;
 use Spryker\Zed\SalesQuantity\Communication\Plugin\DiscountExtension\NonSplittableDiscountableItemTransformerStrategyPlugin;
 use Spryker\Zed\ShipmentDiscountConnector\Communication\Plugin\DecisionRule\ShipmentCarrierDecisionRulePlugin;
 use Spryker\Zed\ShipmentDiscountConnector\Communication\Plugin\DecisionRule\ShipmentMethodDecisionRulePlugin;
@@ -53,6 +54,7 @@ protected function getDecisionRulePlugins(): array
             new ProductLabelListDecisionRulePlugin(),
             new ProductAttributeDecisionRulePlugin(),
             new CategoryDecisionRulePlugin(),
+            new CustomerOrderCountDecisionRulePlugin(),
         ]);
     }