Skip to content

Commit

Permalink
Merge branch 'master' into security-release-notes-202306
Browse files Browse the repository at this point in the history
  • Loading branch information
lenadoc committed Jun 26, 2023
2 parents e160eab + c9e434f commit 49ed3b3
Show file tree
Hide file tree
Showing 271 changed files with 3,211 additions and 3,995 deletions.
123 changes: 95 additions & 28 deletions _data/sidebars/pbc_all_sidebar.yml

Large diffs are not rendered by default.

109 changes: 61 additions & 48 deletions _data/sidebars/scos_dev_sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ entries:
include_versions:
- "202204.0"
- "202108.0"
- title: Spryker Core
- title: Spryker Core
url: /docs/scos/dev/feature-walkthroughs/spryker-core-feature-walkthrough/spryker-core-feature-walkthrough.html
include_versions:
- "201811.0"
Expand Down Expand Up @@ -1221,6 +1221,11 @@ entries:
- "202108.0"
- title: Retrieve related products
url: /docs/scos/dev/glue-api-guides/retrieve-related-products.html
include_versions:
- "202009.0"
- "201907.0"
- "202108.0"
- "202204.0"
- title: Searching the product catalog
url: /docs/scos/dev/glue-api-guides/searching-the-product-catalog.html
include_versions:
Expand Down Expand Up @@ -1354,7 +1359,6 @@ entries:
url: /docs/scos/dev/glue-api-guides/glue-api-tutorials/glue-api-tutorials.html
include_versions:
- "202204.0"
- "202212.0"
nested:
- title: B2C API React example
url: /docs/scos/dev/glue-api-guides/glue-api-tutorials/b2c-api-react-example/b2c-api-react-example.html
Expand Down Expand Up @@ -1670,6 +1674,9 @@ entries:
- "202108.0"
- title: Glue API - REST Schema Validation
url: /docs/scos/dev/feature-integration-guides/glue-api/glue-api-rest-schema-validation-feature-integration.html
include_versions:
- "202108.0"
- "202204.0"
- title: Glue API - Return Management
url: /docs/scos/dev/feature-integration-guides/glue-api/glue-api-return-management-feature-integration.html
include_versions:
Expand Down Expand Up @@ -1701,7 +1708,6 @@ entries:
- "202009.0"
- "202108.0"
- "202204.0"
- "202212.0"
- title: Glue API - Store
url: /docs/scos/dev/feature-integration-guides/glue-api/store-api-feature-integration.html
include_versions:
Expand Down Expand Up @@ -2122,7 +2128,6 @@ entries:
url: /docs/scos/dev/feature-integration-guides/mailing-and-notifications-feature-integration.html
include_versions:
- "202204.0"
- "202212.0"
- title: Measurement Units
url: /docs/scos/dev/feature-integration-guides/measurement-units-feature-integration.html
include_versions:
Expand Down Expand Up @@ -2155,8 +2160,14 @@ entries:
- "202108.0"
- title: Merchant Product Restrictions
url: /docs/scos/dev/feature-integration-guides/merchant-product-restrictions-feature-integration.html
include_versions:
- "202108.0"
- "202204.0"
- title: Merchants and Merchant Relations
url: /docs/scos/dev/feature-integration-guides/merchants-and-merchant-relations-feature-integration.html
include_versions:
- "202108.0"
- "202204.0"
- title: Microsoft Azure Active Directory
url: /docs/scos/dev/feature-integration-guides/microsoft-azure-active-directory.html
include_versions:
Expand All @@ -2173,14 +2184,15 @@ entries:
url: /docs/scos/dev/feature-integration-guides/multiple-abstract-products-as-promotional-products-and-discounts-feature-integration.html
include_versions:
- "202204.0"
- "202212.0"
- title: Multi-store CMS Block
url: /docs/scos/dev/feature-integration-guides/multi-store-cms-block-feature-integration.html
include_versions:
- "202009.0"
- "202108.0"
- title: Multi-store Products
url: /docs/scos/dev/feature-integration-guides/multi-store-products-feature-integration.html
include_versions:
- "202204.0"
- title: Multiple Carts
url: /docs/scos/dev/feature-integration-guides/multiple-carts-feature-integration.html
include_versions:
Expand Down Expand Up @@ -2243,6 +2255,9 @@ entries:
- "202204.0"
- title: Permissions
url: /docs/scos/dev/feature-integration-guides/permissions-feature-integration.html
include_versions:
- "202108.0"
- "202204.0"
- title: Persistent Cart Sharing
url: /docs/scos/dev/feature-integration-guides/persistent-cart-sharing-feature-integration.html
include_versions:
Expand Down Expand Up @@ -2270,6 +2285,8 @@ entries:
- "202108.0"
- title: Prices per Merchant Relation
url: /docs/scos/dev/feature-integration-guides/prices-per-merchant-relation-feature-integration.html
include_versions:
- "202204.0"
- title: Product
url: /docs/scos/dev/feature-integration-guides/product-feature-integration.html
include_versions:
Expand Down Expand Up @@ -2451,7 +2468,6 @@ entries:
- "202009.0"
- "202108.0"
- "202204.0"
- "202212.0"
- title: Quick Add to Cart
url: /docs/scos/dev/feature-integration-guides/quick-add-to-cart-feature-integration.html
include_versions:
Expand Down Expand Up @@ -2634,7 +2650,6 @@ entries:
- "201903.0"
- "201907.0"
- "202204.0"
- "202212.0"
- title: Spryker Core
url: /docs/scos/dev/feature-integration-guides/spryker-core-feature-integration.html
include_versions:
Expand All @@ -2645,8 +2660,6 @@ entries:
- "202009.0"
- "202108.0"
- "202204.0"
- "202212.0"
- "202304.0"
- title: Spryker Core Back Office
url: /docs/scos/dev/feature-integration-guides/spryker-core-back-office-feature-integration.html
include_versions:
Expand All @@ -2659,6 +2672,8 @@ entries:
- "202204.0"
- title: Uuid Generation Console
url: /docs/scos/dev/feature-integration-guides/uuid-generation-console-feature-integration.html
include_versions:
- "202204.0"
- title: Picker user login
url: /docs/scos/dev/feature-integration-guides/install-the-picker-user-login-feature.html
include_versions:
Expand Down Expand Up @@ -2753,24 +2768,12 @@ entries:
url: /docs/scos/dev/module-migration-guides/migration-guide-elastica.html
- title: Migration Guide - Environment Configuration
url: /docs/scos/dev/module-migration-guides/migration-guide-environment-configuration.html
- title: Migration Guide - ErrorHandler
url: /docs/scos/dev/module-migration-guides/migration-guide-errorhandler.html
- title: Migration Guide - EventDispatcher
url: /docs/scos/dev/module-migration-guides/migration-guide-eventdispatcher.html
- title: Migration Guide - Flysystem
url: /docs/scos/dev/module-migration-guides/migration-guide-flysystem.html
- title: Migration Guide - Form
url: /docs/scos/dev/module-migration-guides/migration-guide-form.html
- title: Migration Guide - HTTP
url: /docs/scos/dev/module-migration-guides/migration-guide-http.html
- title: Migration Guide - Locale
url: /docs/scos/dev/module-migration-guides/migration-guide-locale.html
- title: Migration Guide - Merchant
url: /docs/scos/dev/module-migration-guides/migration-guide-merchant.html
- title: Migration guide - MerchantGui
url: /docs/scos/dev/module-migration-guides/migration-guide-merchantgui.html
- title: Migration Guide - Messenger
url: /docs/scos/dev/module-migration-guides/migration-guide-messenger.html
- title: Migration Guide - Monitoring
url: /docs/scos/dev/module-migration-guides/migration-guide-monitoring.html
- title: Migration Guide - MultiCartPage
Expand All @@ -2791,12 +2794,8 @@ entries:
url: /docs/scos/dev/module-migration-guides/migration-guide-persistentcart.html
- title: Migration Guide - RabbitMQ
url: /docs/scos/dev/module-migration-guides/migration-guide-rabbitmq.html
- title: Migration Guide - Propel
url: /docs/scos/dev/module-migration-guides/migration-guide-propel.html
- title: Migration Guide - Publish and Synchronization
url: /docs/scos/dev/module-migration-guides/migration-guide-publish-and-synchronization.html
- title: Migration Guide - Router
url: /docs/scos/dev/module-migration-guides/migration-guide-router.html
- title: Migration Guide - Sales
url: /docs/scos/dev/module-migration-guides/migration-guide-sales.html
- title: Migration Guide - SalesAggregator
Expand All @@ -2807,10 +2806,6 @@ entries:
url: /docs/scos/dev/module-migration-guides/migration-guide-salesquantity.html
- title: Migration Guide - SalesSplit
url: /docs/scos/dev/module-migration-guides/migration-guide-salessplit.html
- title: Migration Guide - Security
url: /docs/scos/dev/module-migration-guides/migration-guide-security.html
- title: Migration Guide - Session
url: /docs/scos/dev/module-migration-guides/migration-guide-session.html
- title: Migration Guide - Setup
url: /docs/scos/dev/module-migration-guides/migration-guide-setup.html
- title: Migration Guide - SharedCartPage
Expand All @@ -2819,24 +2814,8 @@ entries:
url: /docs/scos/dev/module-migration-guides/migration-guide-step-engine.html
- title: Migration Guide - Stock
url: /docs/scos/dev/module-migration-guides/migration-guide-stock.html
- title: Migration Guide - StockGui
url: /docs/scos/dev/module-migration-guides/migration-guide-stockgui.html
- title: Migration Guide - StockSalesConnector
url: /docs/scos/dev/module-migration-guides/migration-guide-stocksalesconnector.html
- title: Migration Guide - Store
url: /docs/scos/dev/module-migration-guides/migration-guide-store.html
- title: Migration Guide - Touch
url: /docs/scos/dev/module-migration-guides/migration-guide-touch.html
- title: Migration Guide - Transfer
url: /docs/scos/dev/module-migration-guides/migration-guide-transfer.html
- title: Migration Guide - Translator
url: /docs/scos/dev/module-migration-guides/migration-guide-translator.html
- title: Migration Guide - Twig
url: /docs/scos/dev/module-migration-guides/migration-guide-twig.html
- title: Migration Guide - Validator
url: /docs/scos/dev/module-migration-guides/migration-guide-validator.html
- title: Migration Guide - WebProfiler
url: /docs/scos/dev/module-migration-guides/migration-guide-webprofiler.html
- title: DevOps migration guides
include_versions:
- "202001.0"
Expand Down Expand Up @@ -3469,6 +3448,10 @@ entries:
- "202108.0"
- "202204.0"
- "202212.0"
- title: "Tutorial: Replace a default data importer with the queue data importer"
url: /docs/scos/dev/data-import/tutorial-replace-a-default-data-importer-with-the-queue-data-importer.html
include_versions:
- "202212.0"
- title: Data importer speed optimization
url: /docs/scos/dev/data-import/data-importer-speed-optimization.html
include_versions:
Expand Down Expand Up @@ -3891,7 +3874,7 @@ entries:
- title: Reactive components
url: /docs/scos/dev/front-end-development/oryx/reactivity/reactive-components.html
- title: Integration of backend APIs
url: /docs/scos/dev/front-end-development/oryx/reactivity/oryx-integration-of-backend-apis.html
url: /docs/scos/dev/front-end-development/oryx/reactivity/oryx-integration-of-backend-apis.html
- title: Migration guide - Remove support of IE11
url: /docs/scos/dev/front-end-development/migration-guide-remove-support-of-ie11.html
- title: Migration guide - Switch from Yarn to NPM v8
Expand Down Expand Up @@ -3923,6 +3906,38 @@ entries:
url: /docs/scos/dev/migration-concepts/silex-replacement/router/router-yves.html
- title: Router Zed
url: /docs/scos/dev/migration-concepts/silex-replacement/router/router-zed.html
- title: Migrate modules
nested:
- title: ErrorHandler
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-errorhandler-module.html
- title: EventDispatcher
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-eventdispatcher-module.html
- title: Form
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-form-module.html
- title: HTTP
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-http-module.html
- title: Locale
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-locale-module.html
- title: Messenger
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-messenger-module.html
- title: Propel
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-propel-module.html
- title: Router
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-router-module.html
- title: Security
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-security-module.html
- title: Session
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-session-module.html
- title: Store
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-store-module.html
- title: Translator
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-translator-module.html
- title: Twig
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-twig-module.html
- title: Validator
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-validator-module.html
- title: WebProfiler
url: /docs/scos/dev/migration-concepts/silex-replacement/migrate-modules/migrate-the-webprofiler-module.html
- title: The Docker SDK
url: /docs/scos/dev/the-docker-sdk/the-docker-sdk.html
include_versions:
Expand Down Expand Up @@ -4263,8 +4278,6 @@ entries:
url: /docs/scos/dev/tutorials-and-howtos/advanced-tutorials/tutorial-implementing-widgets-and-widget-plugins.html
- title: "Tutorial: Managing glossary keys"
url: /docs/scos/dev/tutorials-and-howtos/advanced-tutorials/tutorial-managing-glossary-keys.html
- title: "Tutorial: Replacing a default data importer with the queue data importer"
url: /docs/scos/dev/tutorials-and-howtos/advanced-tutorials/tutorial-replacing-a-default-data-importer-with-the-queue-data-importer.html
- title: "Tutorial: Twig extensions"
url: /docs/scos/dev/tutorials-and-howtos/advanced-tutorials/tutorial-twig-extensions.html
- title: "Tutorial: New Relic monitoring"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ To start feature integration, integrate the required features and Glue APIs:
| Spryker Core API | {{page.version}} | [Glue API: Spryker Core feature integration](/docs/scos/dev/feature-integration-guides/{{page.version}}/glue-api/glue-api-spryker-core-feature-integration.html) |
| Product API |{{page.version}} |[Glue API: Products feature integration](/docs/pbc/all/product-information-management/{{page.version}}/base-shop/install-and-upgrade/install-glue-api/install-the-product-glue-api.html)|
| Cart API| {{page.version}}| [Install the Cart Glue API](/docs/scos/dev/feature-integration-guides/{{page.version}}/glue-api/glue-api-cart-feature-integration.html)|
| Wishlist API| {{page.version}}| [Glue API: Wishlist feature integration](/docs/pbc/all/shopping-list-and-wishlist/{{page.version}}/base-shop/install-and-upgrade/integrate-the-wishlist-glue-api.html)|
| Shopping List API| {{page.version}}| [Glue API: Shopping lists feature integration](/docs/scos/dev/feature-integration-guides/{{page.version}}/glue-api/glue-api-shopping-lists-feature-integration.html)|
| Wishlist API| {{page.version}}| [Glue API: Wishlist feature integration](/docs/pbc/all/shopping-list-and-wishlist/{{page.version}}/base-shop/install-and-upgrade/install-glue-api/install-the-wishlist-glue-api.html)|
| Shopping List API| {{page.version}}| [Glue API: Shopping lists feature integration](/docs/pbc/all/shopping-list-and-wishlist/{{page.version}}/base-shop/install-and-upgrade/install-glue-api/install-the-shopping-lists-glue-api.html)|
| Order Management API| {{page.version}} |[Glue API: Order Management feature integration](/docs/scos/dev/feature-integration-guides/{{page.version}}/glue-api/glue-api-order-management-feature-integration.html)|
|Product Configuration |{{page.version}} |[Product Configuration feature integration](/docs/pbc/all/product-information-management/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-product-feature.html)|

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To start feature integration, overview and install the necessary features:
| FEATURE | VERSION | INTEGRATION GUIDE |
| --- | --- |--- |
| Spryker Core | {{page.version}} |[Glue API: Spryker Core feature integration](/docs/scos/dev/feature-integration-guides/{{page.version}}/glue-api/glue-api-spryker-core-feature-integration.html) |
| Shopping Lists | {{page.version}} |[Shopping Lists feature integration](/docs/pbc/all/shopping-list-and-wishlist/{{page.version}}/base-shop/install-and-upgrade/integrate-the-shopping-lists-feature.html) |
| Shopping Lists | {{page.version}} |[Shopping Lists feature integration](/docs/pbc/all/shopping-list-and-wishlist/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-shopping-lists-feature.html) |

## 1) Install the required modules using Composer

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ To start the feature integration, overview and install the necessary features:
| ------------- | ------- | ------------------------------------------------------------ |
| Spryker Core | master | [Spryker Core feature integration](/docs/scos/dev/feature-integration-guides/{{page.version}}/spryker-core-feature-integration.html) |
| Agent Assist | master | [Agent Assist feature integration](/docs/pbc/all/user-management/{{page.version}}/install-and-upgrade/install-the-agent-assist-feature.html) |
| Shopping List | master | [Integrate the Shopping Lists feature](/docs/pbc/all/shopping-list-and-wishlist/{{page.version}}/base-shop/install-and-upgrade/integrate-the-shopping-lists-feature.html) |
| Shopping List | master | [Integrate the Shopping Lists feature](/docs/pbc/all/shopping-list-and-wishlist/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-shopping-lists-feature.html) |


## 1) Set up behavior
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ By default abstract products are available in all stores. This feature provides
To prepare your project to work with multi-store abstract products:

1. Update/install `spryker/collector` to at least 6.0.0 version. You can find additional help for feature migration in [Migration Guide - Collector](/docs/scos/dev/module-migration-guides/migration-guide-collector.html).
2. Update/install `spryker/touch` to at least 4.0.0 version. You can find additional help for feature migration in [_Migration Guide - Touch_](/docs/scos/dev/module-migration-guides/migration-guide-touch.html).
2. Update/install `spryker/touch` to at least 4.0.0 version. You can find additional help for feature migration in [_Migration Guide - Touch_](/docs/pbc/all/product-information-management/{{site.version}}/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-touch-module.html).
3. Update/install `spryker/store` to at least 1.3.0 version.
4. Update/install `spryker/product` to at least 6.0.0 version. You can find additional help for feature migration in [Migration Guide - Product](/docs/pbc/all/product-information-management/{{page.version}}/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-product-module.html).
5. If you want to have Zed Admin UI support for the multi-store abstract product management:
Expand Down
Loading

0 comments on commit 49ed3b3

Please sign in to comment.