Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/cc-26235-fix-insecure-file-upload
Browse files Browse the repository at this point in the history
  • Loading branch information
Vadym Sachenko committed Aug 23, 2023
2 parents 8daabf5 + aca6fbb commit 6949dbf
Show file tree
Hide file tree
Showing 487 changed files with 558 additions and 547 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@


This document describes how to integrate the Marketplace Shipment feature into a Spryker project.

## Install feature core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ You can always define what exactly is going to be needed for your specific proje

|BACK OFFICE USER GUIDES|
|---|
| [Get a general idea of the Back Office Translations](/docs/scos/user/features/{{page.version}}/spryker-core-back-office-feature-overview/back-office-translations-overview.html) |
| [Get a general idea of the Back Office Translations](/docs/pbc/all/back-office/{{page.version}}/back-office-translations-overview.html) |
| [Log in to the Back Office](/docs/pbc/all/identity-access-management/{{page.version}}/log-into-the-back-office.html) |

## Related Developer articles
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ You can always define what exactly is going to be needed for your specific proje

|BACK OFFICE USER GUIDES|
|---|
| [Get a general idea of the Back Office Translations](/docs/scos/user/features/{{page.version}}/spryker-core-back-office-feature-overview/back-office-translations-overview.html) |
| [Get a general idea of the Back Office Translations](/docs/pbc/all/back-office/{{page.version}}/back-office-translations-overview.html) |
| [Log in to the Back Office](/docs/pbc/all/identity-access-management/{{page.version}}/log-into-the-back-office.html) |

## Related Developer articles

|INSTALLATION GUIDES | REFERENCES|
|---------|---------|
| [Install the Spryker Core Back Office feature](/docs/pbc/all/identity-access-management/{{page.version}}/install-and-upgrade/install-the-spryker-core-back-office-feature.html) | [Back Office Translations overview](/docs/scos/user/features/{{page.version}}/spryker-core-back-office-feature-overview/back-office-translations-overview.html) |
| [Install the Spryker Core Back Office feature](/docs/pbc/all/identity-access-management/{{page.version}}/install-and-upgrade/install-the-spryker-core-back-office-feature.html) | [Back Office Translations overview](/docs/pbc/all/back-office/{{page.version}}/back-office-translations-overview.html) |
| [Microsoft Azure Active Directory](/docs/pbc/all/identity-access-management/{{page.version}}/install-and-upgrade/install-microsoft-azure-active-directory.html) | [Users and rights overview](/docs/pbc/all/user-management/{{page.version}}/user-and-rights-overview.html) |
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ related:
link: docs/scos/dev/feature-walkthroughs/page.version/approval-process-feature-walkthrough.html
---

{% include pbc/all/install-features/202204.0/install-the-shipment-approval-process-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-the-shipment-approval-process-feature.md -->
{% include pbc/all/install-features/{{page.version}}/install-the-shipment-approval-process-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-the-shipment-approval-process-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ related:
link: docs/pbc/all/carrier-management/page.version/base-shop/install-and-upgrade/install-features/install-the-shipment-feature.html
---

{% include pbc/all/install-features/202204.0/install-the-shipment-cart-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-the-shipment-cart-feature.md -->
{% include pbc/all/install-features/{{page.version}}/install-the-shipment-cart-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-the-shipment-cart-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ related:
link: docs/pbc/all/carrier-management/page.version/base-shop/install-and-upgrade/install-features/install-the-shipment-approval-process-feature.html
---

{% include pbc/all/install-features/202204.0/install-the-shipment-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-the-shipment-feature.md -->
{% include pbc/all/install-features/{{page.version}}/install-the-shipment-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-the-shipment-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ related:
link: docs/scos/dev/glue-api-guides/page.version/retrieving-orders.html
---

{% include pbc/all/install-features/202204.0/install-glue-api/install-the-shipment-glue-api.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-glue-api/install-the-shipment-glue-api.md -->
{% include pbc/all/install-features/{{page.version}}/install-glue-api/install-the-shipment-glue-api.md %} <!-- To edit, see /_includes/pbc/all/install-features/202204.0/install-glue-api/install-the-shipment-glue-api.md -->
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 @@ -22,4 +22,4 @@ related:
link: docs/scos/dev/feature-walkthroughs/page.version/approval-process-feature-walkthrough.html
---

{% include pbc/all/install-features/202212.0/install-the-shipment-approval-process-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-the-shipment-approval-process-feature.md -->
{% include pbc/all/install-features/{{page.version}}/install-the-shipment-approval-process-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-the-shipment-approval-process-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ related:
link: docs/pbc/all/carrier-management/page.version/base-shop/install-and-upgrade/install-features/install-the-shipment-feature.html
---

{% include pbc/all/install-features/202212.0/install-the-shipment-cart-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-the-shipment-cart-feature.md -->
{% include pbc/all/install-features/{{page.version}}/install-the-shipment-cart-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-the-shipment-cart-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ related:
link: docs/pbc/all/carrier-management/page.version/base-shop/install-and-upgrade/install-features/install-the-shipment-approval-process-feature.html
---

{% include pbc/all/install-features/202212.0/install-the-shipment-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-the-shipment-feature.md -->
{% include pbc/all/install-features/{{page.version}}/install-the-shipment-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-the-shipment-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ related:
link: docs/pbc/all/order-management-system/page.version/base-shop/glue-api-retrieve-orders.html
---

{% include pbc/all/install-features/202212.0/install-glue-api/install-the-shipment-glue-api.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-glue-api/install-the-shipment-glue-api.md -->
{% include pbc/all/install-features/{{page.version}}/install-glue-api/install-the-shipment-glue-api.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/install-glue-api/install-the-shipment-glue-api.md -->
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 @@ -7,4 +7,4 @@ redirect_from:
template: feature-integration-guide-template
---

{% include pbc/all/install-features/202212.0/marketplace/install-marketplace-shipment-customer-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-marketplace-shipment-customer-feature.md -->
{% include pbc/all/install-features/{{page.version}}/marketplace/install-marketplace-shipment-customer-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-marketplace-shipment-customer-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ related:
link: docs/pbc/all/carrier-management/page.version/marketplace/marketplace-shipment-feature-overview.html
---

{% include pbc/all/install-features/202212.0/marketplace/install-marketplace-shipment-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-marketplace-shipment-feature.md -->
{% include pbc/all/install-features/{{page.version}}/marketplace/install-marketplace-shipment-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-marketplace-shipment-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ redirect_from:
- /docs/marketplace/dev/feature-integration-guides/202212.0/marketplace-shipment-cart-feature-integration.html
---

{% include pbc/all/install-features/202212.0/marketplace/install-the-marketplace-shipment-cart-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-the-marketplace-shipment-cart-feature.md -->
{% include pbc/all/install-features/{{page.version}}/marketplace/install-the-marketplace-shipment-cart-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-the-marketplace-shipment-cart-feature.md -->
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ redirect_from:
- /docs/marketplace/dev/feature-integration-guides/202212.0/marketplace-shipment-checkout-feature-integration.html
---

{% include pbc/all/install-features/202212.0/marketplace/install-the-marketplace-shipment-checkout-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-the-marketplace-shipment-checkout-feature.md -->
{% include pbc/all/install-features/{{page.version}}/marketplace/install-the-marketplace-shipment-checkout-feature.md %} <!-- To edit, see /_includes/pbc/all/install-features/202212.0/marketplace/install-the-marketplace-shipment-checkout-feature.md -->
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
Loading

0 comments on commit 6949dbf

Please sign in to comment.