Merge branch 'master' into hakathon/feature/cc-34976-discount-improve…

…ments-product-offer-reference

_archive/release-notes/release-notes-202212.0/security-release-notes-202212.0.md

@@ -60,7 +60,7 @@ spryker/twig (3.17.0 or earlier)
 
 ## Missing validation of the wishlist name on adding an item
 
-Due to the way the characters are handled, it was possible to abuse the name in a way that the constructed URL linked to another resource of the shop instead of the wishlist.
+Because of the way the characters are handled, it was possible to abuse the name in a way that the constructed URL linked to another resource of the shop instead of the wishlist.
 
 **Changes:**
 Wishlist module:
@@ -330,7 +330,7 @@ composer update codeception/codeception
 Make sure that for the codeception/codeception module, the current version is equal to or later than 4.1.22.
 
 ## Known vulnerabilities in frontend dependencies
-- The datatables.net package is vulnerable to Prototype Pollution due to an incomplete fix.
+- The datatables.net package is vulnerable to Prototype Pollution because of an incomplete fix.
 - Known Regular Expression Denial of Service (ReDoS) vulnerabilities in the hosted-git-info package.
 - Known vulnerabilities in the lodash package (Command Injection, ReDoS, Prototype Pollution).
 - Known vulnerabilities in the ssri package (ReDoS).

_data/sidebars/about_all_sidebar.yml

@@ -7,6 +7,8 @@ entries:
     - title: Releases
       url: /docs/about/all/releases/product-and-code-releases.html
       nested:
+      - title: Security release notes 202412.0
+        url: /docs/about/all/releases/security-release-notes-202412.0.html        
       - title: Release notes 202410.0
         url: /docs/about/all/releases/release-notes-202410.0.html
       - title: Security release notes 202409.0

_data/sidebars/ca_dev_sidebar.yml

@@ -135,7 +135,7 @@ entries:
             nested:
               - title: Assets, logs, or pipelines are not visible in AWS Management Console
                 url: /docs/ca/dev/troubleshooting/troubleshooting-deployment-issues/assets-logs-or-pipelines-are-not-visible-in-aws-management-console.html
-              - title: Deployment fails due to a failed docker authentication
+              - title: Deployment fails because of a failed docker authentication
                 url: /docs/ca/dev/troubleshooting/troubleshooting-deployment-issues/deployment-fails-due-to-a-failed-docker-authentication.html
               - title: Jenkins does not restart
                 url: /docs/ca/dev/troubleshooting/troubleshooting-deployment-issues/jenkins-does-not-restart.html

_data/sidebars/dg_dev_sidebar.yml

@@ -1620,8 +1620,23 @@ entries:
         url: /docs/dg/dev/acp/integrate-acp-payment-apps-with-spryker-oms-configuration.html
       - title: Retaining ACP apps when running destructive deployments
         url: /docs/dg/dev/acp/retaining-acp-apps-when-running-destructive-deployments.html
-      - title: APIs and overview diagrams for payment service providers
-        url: /docs/dg/dev/acp/apis-and-overview-diagrams-for-payment-service-providers.html
+      - title: APIs and flows for payment service providers
+        url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/apis-and-flows-for-payment-service-providers.html
+        nested:
+          - title: Asynchronous API for payment service providers
+            url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/asynchronous-api-for-payment-service-providers.html
+          - title: Configure and disconnect flows for payment service providers
+            url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/configure-and-disconnect-flows-for-payment-service-providers.html
+          - title: Headless express checkout payment flow for payment service providers
+            url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/headless-express-checkout-payment-flow-for-payment-service-providers.html
+          - title: Headless payment flow for payment service providers
+            url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/headless-payment-flow-for-payment-service-providers.html
+          - title: Hosted payment page flow for payment service providers
+            url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/hosted-payment-page-flow-for-payment-service-providers.html
+          - title: OMS payment flow for payment service providers
+            url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/oms-payment-flow-for-payment-service-providers.html
+          - title: Synchronous API for payment service providers
+            url: /docs/dg/dev/acp/apis-and-flows-for-payment-service-providers/synchronous-api-for-payment-service-providers.html
 #      - title: Develop an app
 #        url: /docs/dg/dev/acp/develop-an-app/develop-an-app.html
 #        nested:

_data/sidebars/pbc_all_sidebar.yml

@@ -2303,20 +2303,12 @@ entries:
                 url: /docs/pbc/all/payment-service-provider/base-shop/payments-feature-overview.html
               - title: Install and upgrade
                 nested:
-                  - title: Install features
-                    nested:
-                      - title: Payments
-                        url: /docs/pbc/all/payment-service-provider/base-shop/install-and-upgrade/install-the-payments-feature.html
-
-                  - title: Install Glue APIs
-                    nested:
-                      - title: Payments
-                        url: /docs/pbc/all/payment-service-provider/base-shop/install-and-upgrade/install-the-payments-glue-api.html
-
-                  - title: Upgrade modules
-                    nested:
-                      - title: Payment
-                        url: /docs/pbc/all/payment-service-provider/base-shop/install-and-upgrade/upgrade-the-payment-module.html
+                  - title: Install the Payments feature
+                    url: /docs/pbc/all/payment-service-provider/base-shop/install-and-upgrade/install-the-payments-feature.html
+                  - title: Install the Payments Glue API
+                    url: /docs/pbc/all/payment-service-provider/base-shop/install-and-upgrade/install-the-payments-glue-api.html
+                  - title: Upgrade the Payment module
+                    url: /docs/pbc/all/payment-service-provider/base-shop/install-and-upgrade/upgrade-the-payment-module.html
 
               - title: Import and export data
                 url: /docs/pbc/all/payment-service-provider/base-shop/import-and-export-data/payment-service-provider-data-import-and-export.html
@@ -2334,12 +2326,20 @@ entries:
                   - title: View payment methods
                     url: /docs/pbc/all/payment-service-provider/base-shop/manage-in-the-back-office/view-payment-methods.html
 
+              - title: Define return URLs for payments
+                url: /docs/pbc/all/payment-service-provider/base-shop/define-return-urls-for-payments.html
+                include_versions:
+                - "202410.0"
               - title: Debug payment integrations locally
                 url: /docs/pbc/all/payment-service-provider/base-shop/debug-payment-integrations-locally.html
               - title: Hydrate payment methods for an order
                 url: /docs/pbc/all/payment-service-provider/base-shop/hydrate-payment-methods-for-an-order.html
               - title: Interact with third party payment providers using Glue API
                 url: /docs/pbc/all/payment-service-provider/base-shop/interact-with-third-party-payment-providers-using-glue-api.html
+              - title: Payment method strategies
+                url: /docs/pbc/all/payment-service-provider/base-shop/payment-method-strategies.html
+                include_versions:
+                - "202410.0"
               - title: Retrieve and use payment details from third-party PSPs
                 url: /docs/pbc/all/payment-service-provider/base-shop/retrieve-and-use-payment-details-from-third-party-psps.html
               - title: "Payments feature: Domain model and relationships"
@@ -2426,6 +2426,14 @@ entries:
                             url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/app-composition-platform-integration/configure-payone.html
                           - title: Disconnect Payone
                             url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/app-composition-platform-integration/disconnect-payone.html
+                          - title: Payment method flows
+                            nested:
+                              - title: PayOne Credit Card payment flow
+                                url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/app-composition-platform-integration/payment-method-flows/payone-credit-card-payment-flow.html
+                              - title: PayOne PayPal Express payment flow in headless applications
+                                url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/app-composition-platform-integration/payment-method-flows/payone-paypal-express-payment-flow-in-headless-applications.html
+                              - title: Payone PayPal payment flow
+                                url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/app-composition-platform-integration/payment-method-flows/payone-paypal-payment-flow.html
 
                       - title: Manual integration
                         url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/manual-integration/payone-manual-integration.html
@@ -2596,10 +2604,25 @@ entries:
                         url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/install-and-configure-stripe-prerequisites.html
                       - title: Connect and configure
                         url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/connect-and-configure-stripe.html
-                      - title: Project guidelines
-                        url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe.html
                       - title: Disconnect
                         url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/disconnect-stripe.html
+                      - title: Project guidelines
+                        url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/project-guidelines-for-stripe.html
+                        include_versions:
+                        - "202410.0"
+                        nested:
+                          - title: Embed the Stripe payment page as an iframe
+                            url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/embed-the-stripe-payment-page-as-an-iframe.html
+                          - title: Implement Stripe checkout as a hosted payment page
+                            url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/project-prerequisites-for-implementing-Stripe-checkout-as-a-hosted-payment-page.html
+                          - title: OMS configuration for Stripe
+                            url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/oms-configuration-for-stripe.html
+                          - title: Processing refunds with Stripe
+                            url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/processing-refunds-with-stripe.html
+                          - title: Sending additional data to Stripe
+                            url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/sending-additional-data-to-stripe.html
+                          - title: Stripe checkout with third-party frontends
+                            url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/stripe-checkout-with-third-party-frontends.html
 
                   - title: Unzer
                     url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/unzer/unzer.html

_drafts/deprecated-devvm/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-installation-fails-or-project-folder-can-not-be-mounted-due-to-sip.md

@@ -1,6 +1,6 @@
 ---
-title: Mac OSX - Installation fails or project folder can not be mounted due to SIP
-description: Learn how to fix the issue when installation fails on MacOS or project folder can not be mounted due to SIP
+title: Mac OSX - Installation fails or project folder can not be mounted because of SIP
+description: Learn how to fix the issue when installation fails on MacOS or project folder can not be mounted because of SIP
 last_updated: Jun 16, 2021
 template: troubleshooting-guide-template
 originalLink: https://documentation.spryker.com/2021080/docs/mac-osx-installation-fails-or-project-folder-can-not-be-mounted-due-to-sip
@@ -21,7 +21,7 @@ related:
 
 ## Description
 
-Sometimes, installation fails or project folder can not be mounted due to SIP on MacOS.
+Sometimes, installation fails or project folder can not be mounted because of SIP on MacOS.
 
 ## Cause
 

_drafts/deprecated-devvm/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-iterm2-locale-error.md

@@ -13,7 +13,7 @@ redirect_from:
   - /v6/docs/mac-osx-iterm2-locale-error
   - /v6/docs/en/mac-osx-iterm2-locale-error
 related:
-  - title: Mac OSX - Installation fails or project folder can not be mounted due to SIP
+  - title: Mac OSX - Installation fails or project folder can not be mounted because of SIP
     link: docs/scos/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-installation-fails-or-project-folder-can-not-be-mounted-due-to-sip.html
   - title: Mac OSX - Wrong curl version error
     link: docs/scos/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-wrong-curl-version-error.html

_drafts/deprecated-devvm/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-wrong-curl-version-error.md

@@ -13,7 +13,7 @@ redirect_from:
   - /v6/docs/mac-osx-wrong-curl-version-error
   - /v6/docs/en/mac-osx-wrong-curl-version-error
 related:
-  - title: Mac OSX - Installation fails or project folder can not be mounted due to SIP
+  - title: Mac OSX - Installation fails or project folder can not be mounted because of SIP
     link: docs/scos/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-installation-fails-or-project-folder-can-not-be-mounted-due-to-sip.html
   - title: Mac OSX - iterm2 (locale error)
     link: docs/scos/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-iterm2-locale-error.html

_drafts/deprecated-devvm/troubleshooting-spryker-in-vagrant-issues/troubleshooting-spryker-in-vagrant-installation-issues.md

@@ -36,7 +36,7 @@ When you [install Spryker with Vagrant](/docs/dg/dev/set-up-spryker-locally/inst
 MacOS issues:
 
   * [Mac OSX: iterm2 (locale error)](/docs/dg/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-iterm2-locale-error.html)
-  * [Mac OSX: Installation fails or project folder can not be mounted due to SIP](/docs/dg/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-installation-fails-or-project-folder-can-not-be-mounted-due-to-sip.html)
+  * [Mac OSX: Installation fails or project folder can not be mounted because of SIP](/docs/dg/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-installation-fails-or-project-folder-can-not-be-mounted-due-to-sip.html)
   * [Mac OSX: Wrong curl version error](/docs/dg/dev/troubleshooting/troubleshooting-spryker-in-vagrant-issues/macos-issues/mac-osx-wrong-curl-version-error.html)
 
 Windows issues:

_drafts/docs-updates.md

@@ -66,7 +66,7 @@ In February 2024, we have added and updated the following pages:
 - [Merchant Portal Agent Assist feature overview](/docs/pbc/all/user-management/202404.0/marketplace/merchant-portal-agent-assist-feature-overview.html).
 - [Finilizing upgrades](/docs/ca/devscu/finilizing-upgrades.html): Learn how you can make sure everything works correctly after upgrading a module.
 - [Manage Stripe configurations in the ACP catalog](/docs/pbc/all/payment-service-provider/202311.0/base-shop/third-party-integrations/stripe/connect-and-configure-stripe.html).
-- [Project guidelines for the Stripe app](/docs/pbc/all/payment-service-provider/202311.0/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe.html).
+- [Project guidelines for the Stripe app](/docs/pbc/all/payment-service-provider/202311.0/base-shop/third-party-integrations/stripe/project-guidelines-for-stripe/project-guidelines-for-stripe.html).
 
 ### Updated pages
 

_drafts/drafts-dev/multistore-infrastructure-options.md

@@ -12,7 +12,7 @@ Multi-store setup 1: Database, search engine, and key-value storage are shared b
 
 ![multi-store setup 1](https://spryker.s3.eu-central-1.amazonaws.com/docs/scos/dev/tutorials-and-howtos/howtos/how-to-set-up-multiple-stores.md/multi-store-setup-configuration-option-1.png)
 
-Due to the resources being shared, the infrastructure costs are low. This setup is most suitable for B2C projects with low traffic and a small amount of data like products and prices.
+Because of the resources being shared, the infrastructure costs are low. This setup is most suitable for B2C projects with low traffic and a small amount of data like products and prices.
 
 Multi-store setup 2: Each store has a dedicated search engine and key-value storage while the database is shared.
 

_drafts/for-commerce-quest/faq.md

@@ -43,7 +43,7 @@ Capabilities are groups of features that are composed of modules, such as a cart
 
 ## How expensive is an average Spryker project?
 
-The price depends on the number of apps and on the type of app you are going to build. As a rule of thumb, it is possible to build and deploy a single slimline app for most standard use cases within a few weeks—for example, a voice app for Alexa or a simple chatbot. The aim is to keep each app simple and relevant and to lock away as much of it in the OS as possible. This means that building a standard, run-of-the-mill webshop with Spryker does not take longer than with other systems. Spryker's real strength, however, is the variety of apps. So, building a B2C case with 4-5 apps (for example, a shop, a web app, a chatbot, voice, and POS) using a standard system would be complex, very expensive, and frustratingly slow undertaking. Unlike standard systems, such a use case is part of Spryker's DNA. Besides, in IoT scenarios, Spryker is actually better than most of the other solutions due to the absence of dedicated technology.
+The price depends on the number of apps and on the type of app you are going to build. As a rule of thumb, it is possible to build and deploy a single slimline app for most standard use cases within a few weeks—for example, a voice app for Alexa or a simple chatbot. The aim is to keep each app simple and relevant and to lock away as much of it in the OS as possible. This means that building a standard, run-of-the-mill webshop with Spryker does not take longer than with other systems. Spryker's real strength, however, is the variety of apps. So, building a B2C case with 4-5 apps (for example, a shop, a web app, a chatbot, voice, and POS) using a standard system would be complex, very expensive, and frustratingly slow undertaking. Unlike standard systems, such a use case is part of Spryker's DNA. Besides, in IoT scenarios, Spryker is actually better than most of the other solutions because of the absence of dedicated technology.
 
 ## How might an MVP look like?
 

_includes/dg/overriding-webpack-js-scss-for-zed-on-project-level.md

@@ -44,7 +44,7 @@ oryxForZed.getConfiguration(myCustomZedSettings)
 ```
 
 The `oryx-for-zed` building settings must be expanded with a path to ZED modules on the project level (`entry.dirs`). 
-Due to `mergeWithStrategy`, the default config with core paths is expanded with a path to the project level.
+Because of `mergeWithStrategy`, the default config with core paths is expanded with a path to the project level.
 
 {% info_block infoBox %}