Merge branch 'master' into feature/cc-32215/dev-agent-assist-in-merch…

…ant-portal
spryker · Jan 31, 2024 · 3c08d23 · 3c08d23
2 parents 9f0bdc1 + 3d41546
commit 3c08d23
Show file tree

Hide file tree

Showing 2,476 changed files with 2,376 additions and 190,797 deletions.
diff --git a/_config.yml b/_config.yml
@@ -155,32 +155,19 @@ defaults:
       role: "all"
 
 versions:
-  '202204.0': '202204.0'
   '202212.0': '202212.0'
   '202307.0': '202307.0'
   '202311.0': '202311.0'
 
 # versioned categories - these must match corresponding directories
 versioned_categories:
   scos:
-    user:
-      - features
-      - back-office-user-guides
-      - technology-partners
-      - shop-user-guides
-      - overview-of-features
     dev:
-      - feature-walkthroughs
       - feature-integration-guides
       - data-import
       - data-export
       - glue-api-guides
-      - technology-partner-integration-guides
       - the-docker-sdk
-      - migration-and-integration
-      - legacy-demoshop
-      - technology-partner-guides
-      - devops-migration-guides
       - system-requirements
       - front-end-development
   pbc:

diff --git a/_data/sidebars/acp_user_sidebar.yml b/_data/sidebars/acp_user_sidebar.yml
@@ -41,4 +41,6 @@ entries:
         url: /docs/acp/user/sync-api.html
       - title: Async API
         url: /docs/acp/user/async-api.html
+      - title: Receive ACP messages
+        url: /docs/acp/user/receive-acp-messages.html
 
diff --git a/_data/sidebars/pbc_all_sidebar.yml b/_data/sidebars/pbc_all_sidebar.yml
@@ -637,8 +637,6 @@ entries:
                         url: /docs/pbc/all/content-management-system/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-navigationsrestapi-module.html
                       - title: ProductSetGui
                         url: /docs/pbc/all/content-management-system/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-productsetgui-module.html
-                        include_versions:
-                        - "202204.0"
                   - title: Category CMS blocks
                     url: /docs/pbc/all/content-management-system/base-shop/install-and-upgrade/install-category-cms-blocks.html
                   - title: Product CMS blocks
@@ -2248,9 +2246,11 @@ entries:
                       - title: Integration in the Back Office
                         url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/integration-in-the-back-office/payone-integration-in-the-back-office.html
                         nested:
-                          - title: Integrate
+                          - title: Integrate Payone
                             url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/integration-in-the-back-office/integrate-payone.html
-                          - title: Disconnect
+                          - title: Configure Payone
+                            url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/integration-in-the-back-office/configure-payone.html
+                          - title: Disconnect Payone
                             url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/integration-in-the-back-office/disconnect-payone.html
                       - title: Manual integration
                         url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/payone/manual-integration/payone-manual-integration.html
@@ -2407,8 +2407,8 @@ entries:
                   - title: Stripe
                     url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/stripe.html
                     nested:
-                      - title: Install Stripe
-                        url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/install-stripe.html
+                      - title: Integrate Stripe
+                        url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/integrate-stripe.html
                       - title: Configure Stripe
                         url: /docs/pbc/all/payment-service-provider/base-shop/third-party-integrations/stripe/configure-stripe.html
                       - title: Disconnect Stripe

diff --git a/_data/sidebars/scos_dev_sidebar.yml b/_data/sidebars/scos_dev_sidebar.yml
@@ -1,4 +1,3 @@
----
 title: SCOS Developer Guides
 entries:
 - product: SCOS
@@ -3190,5 +3189,4 @@ entries:
   - title: Example modules
     url: /docs/scos/dev/example-modules.html
   - title: Code contribution guide
-    url: /docs/scos/dev/code-contribution-guide.html
-...
+    url: /docs/scos/dev/code-contribution-guide.html
diff --git a/_data/sidebars/scos_user_sidebar.yml b/_data/sidebars/scos_user_sidebar.yml
@@ -40,10 +40,6 @@ entries:
             url: /docs/scos/user/intro-to-spryker/releases/release-notes/release-notes-202212.0/patch-releases-202212.0.html
           - title: Security release notes 202212.0
             url: /docs/scos/user/intro-to-spryker/releases/release-notes/release-notes-202212.0/security-release-notes-202212.0.html
-        - title: Release notes 202211.0
-          url: /docs/scos/user/intro-to-spryker/releases/release-notes/release-notes-202211.0/release-notes-202211.0.html
-        - title: Release notes 202204.0
-          url: /docs/scos/user/intro-to-spryker/releases/release-notes/release-notes-202204.0/release-notes-202204.0.html
     - title: Docs updates
       url: /docs/scos/user/intro-to-spryker/docs-release-notes.html
     - title: What's new

diff --git a/...items-to-a-cart-of-registered-user-response-attributes-of-included-resources.md b/...items-to-a-cart-of-registered-user-response-attributes-of-included-resources.md
diff --git a/...202204.0/add-items-to-a-guest-cart-response-attributes-of-included-resources.md b/...202204.0/add-items-to-a-guest-cart-response-attributes-of-included-resources.md
diff --git a/...api-guides/202204.0/add-items-to-a-registered-users-cart-response-attributes.md b/...api-guides/202204.0/add-items-to-a-registered-users-cart-response-attributes.md
diff --git a/...guides/202204.0/check-out-puchases-response-attributes-of-included-resources.md b/...guides/202204.0/check-out-puchases-response-attributes-of-included-resources.md