Skip to content

Commit

Permalink
Merge branch 'master' of github.com:spryker/spryker-docs into bugfix/…
Browse files Browse the repository at this point in the history
…cc-26235-fix-insecure-file-upload
  • Loading branch information
artem-png committed Aug 23, 2023
2 parents 2dd2a8e + 51c4041 commit e1816cb
Show file tree
Hide file tree
Showing 68 changed files with 128 additions and 126 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,10 @@ To add a carrier company in the Back Office, follow these steps:
| ATTRIBUTE |DESCRIPTION|
| --- | --- |
| NAME | You will use the name for creating delivery methods for the company. |
| ACTIVATE | Defines if you can [create delivery methods](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/delivery-methods/creating-carrier-companies.html) for the company. |
| ACTIVATE | Defines if you can [create delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) for the company. |

## Next steps

Add shipment methods for the added company. For instructions, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
Add shipment methods for the added company. For instructions, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).


Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ When you have a new shipment carrier, you can add a new shipment method to it.

{% info_block infoBox "Note" %}

For more detailed information about adding shipment methods, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
For more detailed information about adding shipment methods, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).

{% endinfo_block %}

Expand All @@ -93,7 +93,7 @@ To add a shipment method to a carrier, follow these steps:

{% info_block infoBox "Note" %}

For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/delivery-methods/creating-carrier-companies.html).
For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html).

{% endinfo_block %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ When you have a new shipment carrier, you can add a new shipment method to it.

{% info_block infoBox "Note" %}

For more detailed information about adding shipment methods, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
For more detailed information about adding shipment methods, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).

{% endinfo_block %}

Expand All @@ -98,7 +98,7 @@ To add a shipment method to a carrier, follow these steps:

{% info_block infoBox "Note" %}

For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/delivery-methods/creating-carrier-companies.html).
For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html).

{% endinfo_block %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ To add a carrier company in the Back Office, follow these steps:
| ATTRIBUTE |DESCRIPTION|
| --- | --- |
| NAME | You will use the name for creating delivery methods for the company. |
| ACTIVATE | Defines if you can [create delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-carrier-companies.html) for the company. |
| ACTIVATE | Defines if you can [create delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-carrier-companies.html) for the company. |

## Next steps

Add shipment methods for the added company. For instructions, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
Add shipment methods for the added company. For instructions, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ When you have a new shipment carrier, you can add a new shipment method to it.

{% info_block infoBox "Note" %}

For more detailed information about adding shipment methods, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
For more detailed information about adding shipment methods, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).

{% endinfo_block %}

Expand All @@ -93,7 +93,7 @@ To add a shipment method to a carrier, follow these steps:

{% info_block infoBox "Note" %}

For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-carrier-companies.html).
For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-carrier-companies.html).

{% endinfo_block %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ When you have a new shipment carrier, you can add a new shipment method to it.

{% info_block infoBox "Note" %}

For more detailed information about adding shipment methods, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
For more detailed information about adding shipment methods, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).

{% endinfo_block %}

Expand All @@ -98,7 +98,7 @@ To add a shipment method to a carrier, follow these steps:

{% info_block infoBox "Note" %}

For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-carrier-companies.html).
For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-carrier-companies.html).

{% endinfo_block %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ To add a carrier company in the Back Office, follow these steps:
| ATTRIBUTE |DESCRIPTION|
| --- | --- |
| NAME | You will use the name for creating delivery methods for the company. |
| ACTIVATE | Defines if you can [create delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-carrier-companies.html) for the company. |
| ACTIVATE | Defines if you can [create delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-carrier-companies.html) for the company. |

## Next steps

Add shipment methods for the added company. For instructions, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
Add shipment methods for the added company. For instructions, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ When you have a new shipment carrier, you can add a new shipment method to it.

{% info_block infoBox "Note" %}

For more detailed information about adding shipment methods, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
For more detailed information about adding shipment methods, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).

{% endinfo_block %}

Expand All @@ -93,7 +93,7 @@ To add a shipment method to a carrier, follow these steps:

{% info_block infoBox "Note" %}

For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-carrier-companies.html).
For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-carrier-companies.html).

{% endinfo_block %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ When you have a new shipment carrier, you can add a new shipment method to it.

{% info_block infoBox "Note" %}

For more detailed information about adding shipment methods, see [Creating and managing delivery methods](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-and-managing-delivery-methods.html).
For more detailed information about adding shipment methods, see [Add delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-delivery-methods.html) and [Edit delivery methods](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/edit-delivery-methods.html).

{% endinfo_block %}

Expand All @@ -98,7 +98,7 @@ To add a shipment method to a carrier, follow these steps:

{% info_block infoBox "Note" %}

For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/delivery-methods/creating-carrier-companies.html).
For more detailed information about adding carrier companies, see [Creating carrier companies](/docs/pbc/all/carrier-management/{{page.version}}/base-shop/manage-in-the-back-office/add-carrier-companies.html).

{% endinfo_block %}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,5 @@ If the global minimum threshold is €400, and the minimum threshold per merchan
|BACK OFFICE USER GUIDES|
|---|
| [Define global thresholds](/docs/pbc/all/cart-and-checkout/{{site.version}}/base-shop/manage-in-the-back-office/define-global-thresholds.html) |
| [Define merchant order thresholds](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/define-merchant-order-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/{{site.version}}/base-shop/manage-in-the-back-office/manage-threshold-settings.html) |
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,5 @@ If the global minimum threshold is €400, and the minimum threshold per merchan
|BACK OFFICE USER GUIDES|
|---|
| [Define global thresholds](/docs/pbc/all/cart-and-checkout/{{site.version}}/base-shop/manage-in-the-back-office/define-global-thresholds.html) |
| [Define merchant order thresholds](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/define-merchant-order-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/{{site.version}}/base-shop/manage-in-the-back-office/manage-threshold-settings.html) |
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,5 @@ If the global minimum threshold is €400, and the minimum threshold per merchan
|BACK OFFICE USER GUIDES|
|---|
| [Define global thresholds](/docs/pbc/all/cart-and-checkout/{{site.version}}/base-shop/manage-in-the-back-office/define-global-thresholds.html) |
| [Define merchant order thresholds](/docs/scos/user/back-office-user-guides/{{site.version}}/administration/define-merchant-order-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/{{site.version}}/base-shop/manage-in-the-back-office/manage-threshold-settings.html) |
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ You can use the functionalities described in this section, regardless of the ema

### Glossary keys in email templates

You can add [glossary keys](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/glossary/add-translations.html) directly to email templates, and the respective translations are fetched automatically. When an email with a glossary key is sent, the key is replaced with the translation you defined for the locale selected by the customer. For example, you add the `cart.price.grand.total` glossary key to an email template. When the email is sent to the customer with the `de_DE` locale, the key is replaced with Summe.
You can add [glossary keys](/docs/pbc/all/miscellaneous/{{page.version}}/manage-in-the-back-office/add-translations.html) directly to email templates, and the respective translations are fetched automatically. When an email with a glossary key is sent, the key is replaced with the translation you defined for the locale selected by the customer. For example, you add the `cart.price.grand.total` glossary key to an email template. When the email is sent to the customer with the `de_DE` locale, the key is replaced with Summe.

To learn how a Back Office User creates translations, see [Managing Glossary](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/glossary/add-translations.html).
To learn how a Back Office User creates translations, see [Managing Glossary](/docs/pbc/all/miscellaneous/{{page.version}}/manage-in-the-back-office/add-translations.html).

### Variables in Email Templates

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Structure:
| [Create product set content items](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/content-items/create-product-set-content-items.html) |
| [Edit content items](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/content-items/edit-content-items.html) |
| [Add content items to CMS blocks](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/blocks/add-content-items-to-cms-blocks.html) |
| [Add content items to CMS pages](/docs/scos/user/back-office-user-guides/{{page.version}}/content/content-items/editing-content-items-in-cms-pages-and-blocks.html) |
| [Add content items to CMS pages](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/pages/add-content-items-to-cms-pages.html) |

## Related Developer documents

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ You don’t need to activate the email CMS block, as the deactivated status of t

**Tips and tricks**

* Add a [glossary key](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/glossary/add-translations.html) to the email block. When the email is sent, the key is replaced with the translation you defined for the locale selected by the customer. To learn how to add translations, see [Managing glossary](/docs/scos/user/back-office-user-guides/{{page.version}}/administration/glossary/add-translations.html).
* Add a [glossary key](/docs/pbc/all/miscellaneous/{{page.version}}/manage-in-the-back-office/add-translations.html) to the email block. When the email is sent, the key is replaced with the translation you defined for the locale selected by the customer. To learn how to add translations, see [Managing glossary](/docs/pbc/all/miscellaneous/{{page.version}}/manage-in-the-back-office/add-translations.html).

* Add variables to the email CMS block to replace them with customer and order specific details. When the email is sent, the variables are replaced with the actual details. For example, add *firstName*, and it is replaced with the name of the customer the email is sent to. A developer can provide a full list of variables and create new ones.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ The feature has the following functional constraints which are going to be resol
|BACK OFFICE USER GUIDES|
|---|
| [Get a general idea of the Product Sets feature](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/product-sets-feature-overview.html) |
| [Create product sets](/docs/scos/user/back-office-user-guides/{{page.version}}/merchandising/product-sets/creating-product-sets.html) |
| [Manage product sets](/docs/scos/user/back-office-user-guides/{{page.version}}/merchandising/product-sets/managing-product-sets.html) |
| [Create product sets](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/product-sets/create-product-sets.html) |
| [Manage product sets](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/product-sets/edit-product-sets.html) |


## Related Developer documents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Structure:
| [Create product set content items](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/content-items/create-product-set-content-items.html) |
| [Edit content items](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/content-items/edit-content-items.html) |
| [Add content items to CMS blocks](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/blocks/add-content-items-to-cms-blocks.html) |
| [Add content items to CMS pages](/docs/scos/user/back-office-user-guides/{{page.version}}/content/content-items/editing-content-items-in-cms-pages-and-blocks.html) |
| [Add content items to CMS pages](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/pages/add-content-items-to-cms-pages.html) |

## Related Developer documents

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ The feature has the following functional constraints which are going to be resol
|BACK OFFICE USER GUIDES|
|---|
| [Get a general idea of the Product Sets feature](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/product-sets-feature-overview.html) |
| [Create product sets](/docs/scos/user/back-office-user-guides/{{page.version}}/merchandising/product-sets/creating-product-sets.html) |
| [Manage product sets](/docs/scos/user/back-office-user-guides/{{page.version}}/merchandising/product-sets/managing-product-sets.html) |
| [Create product sets](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/product-sets/create-product-sets.html) |
| [Manage product sets](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/manage-in-the-back-office/product-sets/edit-product-sets.html) |

## Related Developer documents

Expand Down
Loading

0 comments on commit e1816cb

Please sign in to comment.