Merge branch 'master' into stripe-docs-update

.github/workflows/build-changelog.yml

@@ -2,7 +2,7 @@ name: Build changelog
 on:
   push:
     tags:
-      - "12.2023"
+      - "01.2024"
 
 jobs:
   release:
@@ -31,8 +31,8 @@ jobs:
                 }
               ]
             }'
-          fromTag: "11.2023"
-          toTag: "12.2023"
+          fromTag: "12.2023"
+          toTag: "01.2024"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

_data/sidebars/pbc_all_sidebar.yml

@@ -86,7 +86,7 @@ entries:
                   - title: Install the Shipment Glue API
                     url: /docs/pbc/all/carrier-management/base-shop/install-and-upgrade/install-the-shipment-glue-api.html
               - title: Manage in the Back Office
-                url: /docs/pbc/all/carrier-management/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+                url: /docs/pbc/all/carrier-management/base-shop/manage-in-the-back-office/manage-carrier-companies-and-delivery-methods-in-the-back-office.html
                 nested:
                   - title: Add carrier companies
                     url: /docs/pbc/all/carrier-management/base-shop/manage-in-the-back-office/add-carrier-companies.html
@@ -391,7 +391,7 @@ entries:
                   - title: File details - sales_order_threshold.csv
                     url: /docs/pbc/all/cart-and-checkout/base-shop/import-and-export-data/import-file-details-sales-order-threshold.csv.html
               - title: Manage in the Back Office
-                url: /docs/pbc/all/cart-and-checkout/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+                url: /docs/pbc/all/cart-and-checkout/base-shop/manage-in-the-back-office/manage-thresholds-the-back-office.html
                 nested:
                   - title: Define global thresholds
                     url: /docs/pbc/all/cart-and-checkout/base-shop/manage-in-the-back-office/define-global-thresholds.html
@@ -697,7 +697,7 @@ entries:
                   - title: Retrieve navigation trees
                     url: /docs/pbc/all/content-management-system/base-shop/manage-using-glue-api/glue-api-retrieve-navigation-trees.html
               - title: Manage in the Back Office
-                url: /docs/pbc/all/content-management-system/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+                url: /docs/pbc/all/content-management-system/base-shop/manage-in-the-back-office/manage-content-in-the-back-office.html
                 nested:
                   - title: "Best practices: Add content to the Storefront pages using templates and slots"
                     url: /docs/pbc/all/content-management-system/base-shop/manage-in-the-back-office/best-practices-add-content-to-the-storefront-pages-using-templates-and-slots.html
@@ -921,7 +921,7 @@ entries:
               - title: Customer Access feature overview
                 url: /docs/pbc/all/customer-relationship-management/base-shop/customer-access-feature-overview.html
               - title: Manage in the Back Office
-                url: /docs/pbc/all/customer-relationship-management/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+                url: /docs/pbc/all/customer-relationship-management/base-shop/manage-in-the-back-office/manage-companies-and-customers-in-the-back-office.html
                 nested:
                   - title: Manage customers
                     nested:
@@ -1105,7 +1105,7 @@ entries:
                   - title: Upgrade the DiscountSalesAggregatorConnector module
                     url: /docs/pbc/all/discount-management/base-shop/install-and-upgrade/upgrade-the-discountsalesaggregatorconnector-module.html
               - title: Manage in the Back Office
-                url: /docs/pbc/all/discount-management/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+                url: /docs/pbc/all/discount-management/base-shop/manage-in-the-back-office/manage-discounts-in-the-back-office.html
                 nested:
                   - title: "Best practices: Promote products with discounts"
                     url: /docs/pbc/all/discount-management/base-shop/manage-in-the-back-office/best-practices-promote-products-with-discounts.html
@@ -1351,7 +1351,7 @@ entries:
                         url: /docs/pbc/all/merchant-management/base-shop/install-and-upgrade/install-glue-api/install-the-merchant-relationship-product-lists-glue-api.html
 
               - title: Manage in the Back Office
-                url: /docs/pbc/all/merchant-management/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+                url: /docs/pbc/all/merchant-management/base-shop/manage-in-the-back-office/manage-merchants-in-the-back-office.html
                 nested:
                   - title: Create merchants
                     url: /docs/pbc/all/merchant-management/base-shop/manage-in-the-back-office/create-merchants.html
@@ -1606,6 +1606,7 @@ entries:
               - title: "Import file details: glossary.csv"
                 url: /docs/pbc/all/miscellaneous/import-and-export-data/import-file-details-glossary.csv.html
           - title: Manage in the Back Office
+            url: /docs/pbc/all/miscellaneous/manage-in-the-back-office/manage-translations-in-the-back-office.html
             nested:
               - title: Add translations
                 url: /docs/pbc/all/miscellaneous/manage-in-the-back-office/add-translations.html
@@ -1974,7 +1975,7 @@ entries:
                   - title: Split delivery migration concept
                     url: /docs/pbc/all/order-management-system/base-shop/install-and-upgrade/split-delivery-migration-concept.html
               - title: Manage in the Back Office
-                url: /docs/pbc/all/order-management-system/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+                url: /docs/pbc/all/order-management-system/base-shop/manage-in-the-back-office/manage-orders-in-the-back-office.html
                 nested:
                   - title: Orders
                     nested:
@@ -2869,10 +2870,6 @@ entries:
                         url: /docs/pbc/all/product-information-management/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-productvalidity-module.html
                       - title: Stock
                         url: /docs/pbc/all/product-information-management/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-stock-module.html
-                      - title: StockSalesConnector
-                        url: /docs/pbc/all/product-information-management/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-stocksalesconnector-module.html
-                        include_versions:
-                        - "202204.0"
                       - title: Touch
                         url: /docs/pbc/all/product-information-management/base-shop/install-and-upgrade/upgrade-modules/upgrade-the-touch-module.html
 

_includes/pbc/all/install-features/202403.0/marketplace/install-the-merchant-portal-agent-assist-feature.md

@@ -118,6 +118,7 @@ class AclConfig extends SprykerAclConfig
     }
 }
 ```
+
 </details>
 
 **src/Pyz/Zed/AclMerchantAgent/AclMerchantAgentConfig.php**

_includes/pbc/all/install-features/202403.0/unified-commerce/install-the-warehouse-user-management-feature.md

@@ -164,14 +164,22 @@ class OauthWarehouseUserConfig extends SprykerOauthWarehouseUserConfig
      *
      * @return array<string, mixed>
      */
-    public function getAllowedForWarehouseUserPaths(): array
+       public function getAllowedForWarehouseUserPaths(): array
     {
         return [
-            '/\/picking-lists.*/' => [
+            '/\/warehouse-user-assignments(?:\/[^\/]+)?\/?$/' => [
                 'isRegularExpression' => true,
+                'methods' => [
+                    'get',
+                    'getCollection',
+                    'patch',
+                ],
             ],
-            '/\/warehouse-user-assignments(?:\/[^\/]+)?\/?$/' => [
+            '/\/picking-lists.*/' => [
                 'isRegularExpression' => true,
+                'methods' => [
+                    'patch',
+                ],
             ],
             '/push-notification-subscriptions' => [
                 'isRegularExpression' => false,
@@ -186,9 +194,47 @@ class OauthWarehouseUserConfig extends SprykerOauthWarehouseUserConfig
     }
 }
 ```
-
 </details>
 
+3. Optional: To give any type of users access to the backend API endpoints that are protected by the  `WarehouseTokenAuthorizationStrategy` strategy, set the following module configuration:
+
+**src/Pyz/Zed/OauthWarehouse/OauthWarehouseConfig.php**
+```php
+<?php
+
+namespace Pyz\Zed\OauthWarehouse;
+
+use Spryker\Zed\OauthWarehouse\OauthWarehouseConfig as SprykerOauthWarehouseConfig;
+
+class OauthWarehouseConfig extends SprykerOauthWarehouseConfig
+{
+    /**
+     * @uses \Spryker\Zed\OauthUserConnector\OauthUserConnectorConfig::SCOPE_BACK_OFFICE_USER
+     *
+     * @var string
+     */
+    protected const SCOPE_BACK_OFFICE_USER = 'back-office-user';
+
+    /**
+     * @uses \Spryker\Zed\OauthWarehouseUser\OauthWarehouseUserConfig::SCOPE_WAREHOUSE_USER
+     *
+     * @var string
+     */
+    protected const SCOPE_WAREHOUSE_USER = 'warehouse-user';
+
+    /**
+     * @return list<string>
+     */
+    public function getAllowedUserScopes(): array
+    {
+        return [
+            static::SCOPE_BACK_OFFICE_USER,
+            static::SCOPE_WAREHOUSE_USER,
+        ];
+    }
+}
+```
+
 ## 4) Add translations
 
 1. Append glossary according to your configuration:

docs/dg/dev/developer-getting-started-guide.md

@@ -10,11 +10,11 @@ redirect_from:
   - /docs/pbc/all/punchout/202307.0/punchout-catalogs-overview.html
 ---
 
-This document guides you into getting started with the Spryker Cloud Commerce OS. It has been structured as a step-by-step checklist to help get you through all of the stages involved in working with Spryker. After following these instructions, if you still have any questions, you can access the Spryker community at [CommerceQuest](https://commercequest.space/).
+This document helps you get started with the Spryker Cloud Commerce OS. It has been structured as a step-by-step checklist to help get you through all of the stages involved in working with Spryker. If you have any questions after following these instructions, you can connect with the Spryker community at [CommerceQuest](https://commercequest.space/).
 
 ## 1. Install Spryker
 
-For the starting point of any project, it is good to start from one of the Spryker Demo Shops that are available. They act as a typical Spryker installation and help to establish different types of the Spryker Commerce OS. A Demo Shop includes different sets of components that have been selected for a different type of business or project. Each of these options is fully functional and can be used for both demonstrative purposes as well as working as a boilerplate for your new project. Though each shop comes with its own pre-selected components, Spryker also offers hundreds of additional modules which can be chosen later.
+Spryker Demo Shops are a good starting point for any project. A Demo Shop includes different sets of components that have been selected for a different type of business or project. Each of these options is fully functional and can be used for both demonstrative purposes as well as working as a boilerplate for your new project. Though each shop comes with its own pre-selected components, Spryker also offers hundreds of additional modules which can be chosen later.
 
 You can choose from the following options:
 
@@ -25,17 +25,17 @@ Both Demo Shops can also be expanded with separate features and modules.
 
 To install Spryker, see [Set up Spryker locally](/docs/scos/dev/set-up-spryker-locally/set-up-spryker-locally.html). Spryker can be run on MacOS, Linux, and Windows with WSL1 or WSL2.
 
-### The deploy file
+### Configure the local environment
 
-When working with a local environment, you should use the [deploy.dev.yml](/docs/scos/dev/the-docker-sdk/{{site.version}}/deploy-file/deploy-file.html) file.
+To configure the local environment, change the following attributes in `deploy.dev.yml`:
 
-In the default deploy file, change the following attributes:
+* Namespace: this helps to avoid issues when you have two or more projects with the same names.
+* Regions.
+* Stores.
+* Domains for the local environment.
+* Domains for the services like RabbitMQ and Jenkins: this helps to keep all project links together.
 
-* Namespace: We recommend specifying the name for your project, as this helps to avoid issues when you have two or more projects with the same names
-* Regions
-* Stores
-* Domains for the local environment
-* Domains for the services (RabbitMQ, Jenkins): Optional, but this can help to keep all project links together
+For more information about deploy files, see [Deploy file](/docs/scos/dev/the-docker-sdk/{{site.version}}/deploy-file/deploy-file.html).
 
 ### Vagrant clean-up
 

docs/pbc/all/carrier-management/202311.0/base-shop/manage-in-the-back-office/log-into-the-back-office.md → docs/pbc/all/carrier-management/202311.0/base-shop/manage-in-the-back-office/manage-carrier-companies-and-delivery-methods-in-the-back-office.md

@@ -1,10 +1,11 @@
 ---
-title: Log into the Back Office
+title: Manage carrier companies and delivery methods Back Office
 description: Learn how to log into the Back Office.
 last_updated: Apr 13, 2023
 template: back-office-user-guide-template
 redirect_from:
 - /docs/pbc/all/carrier-management/202204.0/base-shop/manage-in-the-back-office/log-into-the-back-office.html
+- /docs/pbc/all/carrier-management/202311.0/base-shop/manage-in-the-back-office/log-into-the-back-office.html
 ---
 
 {% include pbc/all/manage-in-the-back-office/log-into-the-back-office.md %} <!-- To edit, see /_includes/pbc/all/manage-in-the-back-office/log-into-the-back-office.md -->

docs/pbc/all/cart-and-checkout/202311.0/base-shop/manage-in-the-back-office/log-into-the-back-office.md → docs/pbc/all/cart-and-checkout/202311.0/base-shop/manage-in-the-back-office/manage-thresholds-the-back-office.md

@@ -1,5 +1,5 @@
 ---
-title: Log into the Back Office
+title: Manage thresholds the Back Office
 description: Learn how to log into the Back Office.
 last_updated: Apr 13, 2023
 template: back-office-user-guide-template
@@ -12,4 +12,5 @@ redirect_from:
 ## Next steps
 
 * [Define global thresholds](/docs/pbc/all/cart-and-checkout/{{page.version}}/base-shop/manage-in-the-back-office/define-global-thresholds.html)
+* [Define merchant order thresholds](/docs/pbc/all/cart-and-checkout/{{page.version}}/base-shop/manage-in-the-back-office/define-merchant-order-thresholds.html)
 * [Manage threshold settings](/docs/pbc/all/cart-and-checkout/{{page.version}}/base-shop/manage-in-the-back-office/manage-threshold-settings.html)