From b45475b62fc62409eb9d67e51de19b26a9c4cc19 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Wed, 2 Aug 2023 14:17:52 +0200 Subject: [PATCH 01/13] CC-30055: Saving Service Point name in OMS & emails --- .../install-the-service-points-feature.md | 285 +++++++++++------- .../install-the-service-points-feature.md | 2 +- 2 files changed, 181 insertions(+), 106 deletions(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md index 81269b70377..ad5ac0df6d7 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md @@ -10,9 +10,11 @@ Follow the steps below to install the Service Points feature core. To start feature integration, integrate the required features: -| NAME | VERSION | INTEGRATION GUIDE | -|--------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | +| NAME | VERSION | INTEGRATION GUIDE | +|-----------------------------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | +| Shipment | {{page.version}} | [Shipment feature integration](/docs/pbc/all/carrier-management/{{page.version}}/unified-commerce/enhanced-click-and-collect/install-and-upgrade/install-the-shipment-feature.html) | +| Customer Account Management | {{page.version}} | [Customer account management feature integration](/docs/pbc/all/customer-relationship-management/{{page.version}}/install-and-upgrade/install-features/install-the-customer-account-management-feature.html) | ### 1) Install the required modules using Composer @@ -24,14 +26,18 @@ composer require spryker-feature/service-points: "{{page.version}}" --update-wit Make sure that the following modules have been installed: -| MODULE | EXPECTED DIRECTORY | -|-------------------------|-------------------------------------------| -| ServicePoint | vendor/spryker/service-point | -| ServicePointDataImport | vendor/spryker/service-point-data-import | -| ServicePointsBackendApi | vendor/spryker/service-points-backend-api | -| ServicePointSearch | vendor/spryker/service-point-search | -| ServicePointStorage | vendor/spryker/service-point-storage | -| ServicePointWidget | vendor/spryker-shop/service-point-widget | +| MODULE | EXPECTED DIRECTORY | +|-------------------------|------------------------------------------------| +| ServicePoint | vendor/spryker/service-point | +| ServicePointDataImport | vendor/spryker/service-point-data-import | +| ServicePointsBackendApi | vendor/spryker/service-points-backend-api | +| ServicePointSearch | vendor/spryker/service-point-search | +| ServicePointStorage | vendor/spryker/service-point-storage | +| ServicePointWidget | vendor/spryker/service-point-widget | +| SalesServicePoint | vendor/spryker/sales-service-point | +| SalesServicePointGui | vendor/spryker/sales-service-point-gui | +| SalesServicePointWidget | vendor/spryker-shop/sales-service-point-widget | + {% endinfo_block %} @@ -39,11 +45,11 @@ Make sure that the following modules have been installed: 1. Adjust the schema definition so entity changes trigger events. -| AFFECTED ENTITY | TRIGGERED EVENTS | -|-------------------------------|-------------------------------------------------------------------------------------------------------------------------------| -| spy_service_point | Entity.spy_service_point.create
Entity.spy_service_point.update
Entity.spy_service_point.delete | -| spy_service_point_address | Entity.spy_service_point_address.create
Entity.spy_service_point_address.update
Entity.spy_service_point_address.delete | -| spy_service_point_store | Entity.spy_service_point_store.create
Entity.spy_service_point_store.update
Entity.spy_service_point_store.delete | +| AFFECTED ENTITY | TRIGGERED EVENTS | +|-------------------------------------|-------------------------------------------------------------------------------------------------------------------------------| +| spy_service_point | Entity.spy_service_point.create
Entity.spy_service_point.update
Entity.spy_service_point.delete | +| spy_service_point_address | Entity.spy_service_point_address.create
Entity.spy_service_point_address.update
Entity.spy_service_point_address.delete | +| spy_service_point_store | Entity.spy_service_point_store.create
Entity.spy_service_point_store.update
Entity.spy_service_point_store.delete | | **src/Pyz/Zed/ServicePoint/Persistence/Propel/Schema/spy_service_point.schema.xml** @@ -91,97 +97,108 @@ console frontend:zed:build Make sure that the following changes have been applied in the database: -| DATABASE ENTITY | TYPE | EVENT | -|-----------------------------------|--------|---------| -| spy_service_point | table | created | -| spy_service_point_address | table | created | -| spy_service | table | created | -| spy_service_point_store | table | created | -| spy_service_point_search | table | created | -| spy_service_point_storage | table | created | -| spy_service_type | table | created | -| spy_region.uuid | column | created | +| DATABASE ENTITY | TYPE | EVENT | +|-------------------------------------|--------|---------| +| spy_service_point | table | created | +| spy_service_point_address | table | created | +| spy_service | table | created | +| spy_service_point_store | table | created | +| spy_service_point_search | table | created | +| spy_service_point_storage | table | created | +| spy_service_type | table | created | +| spy_region.uuid | column | created | +| spy_sales_order_item_service_point | table | created | Make sure that propel entities have been generated successfully by checking their existence. Also, make generated entity classes extending respective Spryker core classes. -| CLASS NAMESPACE | EXTENDS | -|-----------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------| -| \Orm\Zed\ServicePoint\Persistence\SpyServicePoint | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePoint | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddress | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddress | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyService | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyService | -| \Orm\Zed\ServicePoint\Persistence\SpyServiceQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStore | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStore | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStoreQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStoreQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServiceType | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceType | -| \Orm\Zed\ServicePoint\Persistence\SpyServiceTypeQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceTypeQuery | -| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearch | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearch | -| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearchQuery | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearchQuery | -| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorage | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorage | -| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorageQuery | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorageQuery | +| CLASS NAMESPACE | EXTENDS | +|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------| +| \Orm\Zed\ServicePoint\Persistence\SpyServicePoint | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePoint | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddress | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddress | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyService | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyService | +| \Orm\Zed\ServicePoint\Persistence\SpyServiceQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStore | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStore | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStoreQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStoreQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServiceType | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceType | +| \Orm\Zed\ServicePoint\Persistence\SpyServiceTypeQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceTypeQuery | +| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearch | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearch | +| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearchQuery | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearchQuery | +| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorage | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorage | +| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorageQuery | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorageQuery | +| \Orm\Zed\ServicePointStorage\Persistence\SpySalesOrderItemServicePoint | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePoint | +| \Orm\Zed\ServicePointStorage\Persistence\SpySalesOrderItemServicePointQuery | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePointQuery | Make sure that the following changes have been applied in transfer objects: -| TRANSFER | TYPE | EVENT | PATH | -|----------------------------------------|-------|---------|------------------------------------------------------------------------------| -| ServicePoint | class | created | src/Generated/Shared/Transfer/ServicePointTransfer | -| ServicePointCollection | class | created | src/Generated/Shared/Transfer/ServicePointCollectionTransfer | -| ServicePointCollectionRequest | class | created | src/Generated/Shared/Transfer/ServicePointCollectionRequestTransfer | -| ServicePointCollectionResponse | class | created | src/Generated/Shared/Transfer/ServicePointCollectionResponseTransfer | -| ServicePointCriteria | class | created | src/Generated/Shared/Transfer/ServicePointCriteriaTransfer | -| ServicePointConditions | class | created | src/Generated/Shared/Transfer/ServicePointConditionsTransfer | -| ApiServicePointsAttributes | class | created | src/Generated/Shared/Transfer/ApiServicePointsAttributesTransfer | -| ApiServiceTypesAttributes | class | created | src/Generated/Shared/Transfer/ApiServiceTypesAttributesTransfer | -| ApiServicesAttributes | class | created | src/Generated/Shared/Transfer/ApiServicesAttributesTransfer | -| ApiServicesRequestAttributes | class | created | src/Generated/Shared/Transfer/ApiServicesRequestAttributesTransfer | -| ApiServicePointAddressesAttributes | class | created | src/Generated/Shared/Transfer/ApiServicePointAddressesAttributesTransfer | -| StoreRelation | class | created | src/Generated/Shared/Transfer/StoreRelationTransfer | -| Store | class | created | src/Generated/Shared/Transfer/StoreTransfer | -| Error | class | created | src/Generated/Shared/Transfer/ErrorTransfer | -| Sort | class | created | src/Generated/Shared/Transfer/SortTransfer | -| Pagination | class | created | src/Generated/Shared/Transfer/PaginationTransfer | -| ErrorCollection | class | created | src/Generated/Shared/Transfer/ErrorCollectionTransfer | -| DataImporterConfiguration | class | created | src/Generated/Shared/Transfer/DataImporterConfigurationTransfer | -| DataImporterReport | class | created | src/Generated/Shared/Transfer/DataImporterReportTransfer | -| CountryCriteria | class | created | src/Generated/Shared/Transfer/CountryCriteriaTransfer | -| CountryConditions | class | created | src/Generated/Shared/Transfer/CountryConditionsTransfer | -| Country | class | created | src/Generated/Shared/Transfer/CountryTransfer | -| CountryCollection | class | created | src/Generated/Shared/Transfer/CountryCollectionTransfer | -| Region | class | created | src/Generated/Shared/Transfer/RegionTransfer | -| ServicePointAddressCollection | class | created | src/Generated/Shared/Transfer/ServicePointAddressCollectionTransfer | -| ServicePointAddressCollectionRequest | class | created | src/Generated/Shared/Transfer/ServicePointAddressCollectionRequestTransfer | -| ServicePointAddressCollectionResponse | class | created | src/Generated/Shared/Transfer/ServicePointAddressCollectionResponseTransfer | -| ServicePointAddressCriteria | class | created | src/Generated/Shared/Transfer/ServicePointAddressCriteriaTransfer | -| ServicePointAddressConditions | class | created | src/Generated/Shared/Transfer/ServicePointAddressConditionsTransfer | -| ServicePointAddress | class | created | src/Generated/Shared/Transfer/ServicePointAddressTransfer | -| GlueRelationship | class | created | src/Generated/Shared/Transfer/GlueRelationshipTransfer | -| ServicePointSearchCollection | class | created | src/Generated/Shared/Transfer/ServicePointSearchCollectionTransfer | -| ServicePointSearch | class | created | src/Generated/Shared/Transfer/ServicePointSearchTransfer | -| ServicePointSearchRequest | class | created | src/Generated/Shared/Transfer/ServicePointSearchRequestTransfer | -| ServiceCollectionRequest | class | created | src/Generated/Shared/Transfer/ServiceCollectionRequestTransfer | -| ServiceCollectionResponse | class | created | src/Generated/Shared/Transfer/ServiceCollectionResponseTransfer | -| ServiceCollection | class | created | src/Generated/Shared/Transfer/ServiceCollectionTransfer | -| ServiceConditions | class | created | src/Generated/Shared/Transfer/ServiceConditionsTransfer | -| ServiceCriteria | class | created | src/Generated/Shared/Transfer/ServiceCriteriaTransfer | -| Service | class | created | src/Generated/Shared/Transfer/ServiceTransfer | -| ServiceTypeCollectionRequest | class | created | src/Generated/Shared/Transfer/ServiceTypeCollectionRequestTransfer | -| ServiceTypeCollectionResponse | class | created | src/Generated/Shared/Transfer/ServiceTypeCollectionResponseTransfer | -| ServiceTypeCollection | class | created | src/Generated/Shared/Transfer/ServiceTypeCollectionTransfer | -| ServiceTypeConditions | class | created | src/Generated/Shared/Transfer/ServiceTypeConditionsTransfer | -| ServiceTypeCriteria | class | created | src/Generated/Shared/Transfer/ServiceTypeCriteriaTransfer | -| ServiceType | class | created | src/Generated/Shared/Transfer/ServiceTypeTransfer | -| ServicePointStorage | class | created | src/Generated/Shared/Transfer/ServicePointStorageTransfer | -| ServicePointAddressStorage | class | created | src/Generated/Shared/Transfer/ServicePointAddressStorageTransfer | -| ServiceStorage | class | created | src/Generated/Shared/Transfer/ServiceStorageTransfer | -| CountryStorage | class | created | src/Generated/Shared/Transfer/CountryStorageTransfer | -| RegionStorage | class | created | src/Generated/Shared/Transfer/RegionStorageTransfer | -| ServicePointStorageCollection | class | created | src/Generated/Shared/Transfer/ServicePointStorageCollectionTransfer | -| ServicePointStorageCriteria | class | created | src/Generated/Shared/Transfer/ServicePointStorageCriteriaTransfer | -| ServicePointStorageConditions | class | created | src/Generated/Shared/Transfer/ServicePointStorageConditionsTransfer | -| SynchronizationData | class | created | src/Generated/Shared/Transfer/SynchronizationDataTransfer | -| Filter | class | created | src/Generated/Shared/Transfer/FilterTransfer | +| TRANSFER | TYPE | EVENT | PATH | +|---------------------------------------|-------|---------|-----------------------------------------------------------------------------| +| ServicePoint | class | created | src/Generated/Shared/Transfer/ServicePointTransfer | +| ServicePointCollection | class | created | src/Generated/Shared/Transfer/ServicePointCollectionTransfer | +| ServicePointCollectionRequest | class | created | src/Generated/Shared/Transfer/ServicePointCollectionRequestTransfer | +| ServicePointCollectionResponse | class | created | src/Generated/Shared/Transfer/ServicePointCollectionResponseTransfer | +| ServicePointCriteria | class | created | src/Generated/Shared/Transfer/ServicePointCriteriaTransfer | +| ServicePointConditions | class | created | src/Generated/Shared/Transfer/ServicePointConditionsTransfer | +| ApiServicePointsAttributes | class | created | src/Generated/Shared/Transfer/ApiServicePointsAttributesTransfer | +| ApiServiceTypesAttributes | class | created | src/Generated/Shared/Transfer/ApiServiceTypesAttributesTransfer | +| ApiServicesAttributes | class | created | src/Generated/Shared/Transfer/ApiServicesAttributesTransfer | +| ApiServicesRequestAttributes | class | created | src/Generated/Shared/Transfer/ApiServicesRequestAttributesTransfer | +| ApiServicePointAddressesAttributes | class | created | src/Generated/Shared/Transfer/ApiServicePointAddressesAttributesTransfer | +| StoreRelation | class | created | src/Generated/Shared/Transfer/StoreRelationTransfer | +| Store | class | created | src/Generated/Shared/Transfer/StoreTransfer | +| Error | class | created | src/Generated/Shared/Transfer/ErrorTransfer | +| Sort | class | created | src/Generated/Shared/Transfer/SortTransfer | +| Pagination | class | created | src/Generated/Shared/Transfer/PaginationTransfer | +| ErrorCollection | class | created | src/Generated/Shared/Transfer/ErrorCollectionTransfer | +| DataImporterConfiguration | class | created | src/Generated/Shared/Transfer/DataImporterConfigurationTransfer | +| DataImporterReport | class | created | src/Generated/Shared/Transfer/DataImporterReportTransfer | +| CountryCriteria | class | created | src/Generated/Shared/Transfer/CountryCriteriaTransfer | +| CountryConditions | class | created | src/Generated/Shared/Transfer/CountryConditionsTransfer | +| Country | class | created | src/Generated/Shared/Transfer/CountryTransfer | +| CountryCollection | class | created | src/Generated/Shared/Transfer/CountryCollectionTransfer | +| Region | class | created | src/Generated/Shared/Transfer/RegionTransfer | +| ServicePointAddressCollection | class | created | src/Generated/Shared/Transfer/ServicePointAddressCollectionTransfer | +| ServicePointAddressCollectionRequest | class | created | src/Generated/Shared/Transfer/ServicePointAddressCollectionRequestTransfer | +| ServicePointAddressCollectionResponse | class | created | src/Generated/Shared/Transfer/ServicePointAddressCollectionResponseTransfer | +| ServicePointAddressCriteria | class | created | src/Generated/Shared/Transfer/ServicePointAddressCriteriaTransfer | +| ServicePointAddressConditions | class | created | src/Generated/Shared/Transfer/ServicePointAddressConditionsTransfer | +| ServicePointAddress | class | created | src/Generated/Shared/Transfer/ServicePointAddressTransfer | +| GlueRelationship | class | created | src/Generated/Shared/Transfer/GlueRelationshipTransfer | +| ServicePointSearchCollection | class | created | src/Generated/Shared/Transfer/ServicePointSearchCollectionTransfer | +| ServicePointSearch | class | created | src/Generated/Shared/Transfer/ServicePointSearchTransfer | +| ServicePointSearchRequest | class | created | src/Generated/Shared/Transfer/ServicePointSearchRequestTransfer | +| ServiceCollectionRequest | class | created | src/Generated/Shared/Transfer/ServiceCollectionRequestTransfer | +| ServiceCollectionResponse | class | created | src/Generated/Shared/Transfer/ServiceCollectionResponseTransfer | +| ServiceCollection | class | created | src/Generated/Shared/Transfer/ServiceCollectionTransfer | +| ServiceConditions | class | created | src/Generated/Shared/Transfer/ServiceConditionsTransfer | +| ServiceCriteria | class | created | src/Generated/Shared/Transfer/ServiceCriteriaTransfer | +| Service | class | created | src/Generated/Shared/Transfer/ServiceTransfer | +| ServiceTypeCollectionRequest | class | created | src/Generated/Shared/Transfer/ServiceTypeCollectionRequestTransfer | +| ServiceTypeCollectionResponse | class | created | src/Generated/Shared/Transfer/ServiceTypeCollectionResponseTransfer | +| ServiceTypeCollection | class | created | src/Generated/Shared/Transfer/ServiceTypeCollectionTransfer | +| ServiceTypeConditions | class | created | src/Generated/Shared/Transfer/ServiceTypeConditionsTransfer | +| ServiceTypeCriteria | class | created | src/Generated/Shared/Transfer/ServiceTypeCriteriaTransfer | +| ServiceType | class | created | src/Generated/Shared/Transfer/ServiceTypeTransfer | +| ServicePointStorage | class | created | src/Generated/Shared/Transfer/ServicePointStorageTransfer | +| ServicePointAddressStorage | class | created | src/Generated/Shared/Transfer/ServicePointAddressStorageTransfer | +| ServiceStorage | class | created | src/Generated/Shared/Transfer/ServiceStorageTransfer | +| CountryStorage | class | created | src/Generated/Shared/Transfer/CountryStorageTransfer | +| RegionStorage | class | created | src/Generated/Shared/Transfer/RegionStorageTransfer | +| ServicePointStorageCollection | class | created | src/Generated/Shared/Transfer/ServicePointStorageCollectionTransfer | +| ServicePointStorageCriteria | class | created | src/Generated/Shared/Transfer/ServicePointStorageCriteriaTransfer | +| ServicePointStorageConditions | class | created | src/Generated/Shared/Transfer/ServicePointStorageConditionsTransfer | +| SynchronizationData | class | created | src/Generated/Shared/Transfer/SynchronizationDataTransfer | +| Filter | class | created | src/Generated/Shared/Transfer/FilterTransfer | +| SalesOrderItemServicePoint | class | created | src/Generated/Shared/Transfer/FilterTransfer | +| Item | class | created | src/Generated/Shared/Transfer/FilterTransfer | +| SalesOrderItemServicePointCriteria | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointCriteria | +| SalesOrderItemServicePointConditions | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointConditions | +| SalesOrderItemServicePointCollection | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointCollection | +| Quote | class | created | src/Generated/Shared/Transfer/QuoteTransfer | +| SaveOrder | class | created | src/Generated/Shared/Transfer/SaveOrderTransfer | +| ShipmentGroup | class | created | src/Generated/Shared/Transfer/ShipmentGroupTransfer | {% endinfo_block %} @@ -656,6 +673,53 @@ class PublisherDependencyProvider extends SprykerPublisherDependencyProvider } ``` +#### Register sales plugins + +| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | +|---------------------------------------|------------------------------------------------------------|---------------|-----------------------------------------------------------------------------------------------| +| ServicePointOrderItemExpanderPlugin | Expands sales order items with with related service point. | None | Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemExpanderPlugin | +| ServicePointOrderItemsPostSavePlugin | Persists service point information for sales order items. | None | Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemsPostSavePlugin | + +**src/Pyz/Zed/Sales/SalesDependencyProvider.php** + +```php + + */ + protected function getOrderItemExpanderPlugins(): array + { + return [ + new ServicePointOrderItemExpanderPlugin(), + ]; + } + + /** + * @return array<\Spryker\Zed\SalesExtension\Dependency\Plugin\OrderItemsPostSavePluginInterface> + */ + protected function getOrderItemsPostSavePlugins(): array + { + return [ + new ServicePointOrderItemsPostSavePlugin(), + ]; + } +} +``` + #### Register publisher plugins | PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | @@ -1295,7 +1359,15 @@ service_point_widget.no_results,"Nothing found...",en_US service_point_widget.no_results,"Nichts gefunden...",de_DE ``` -2. Import data: +2. Updated email templates to show service point information + +** data/import/common/common/cms_block.csv ** +```csv +cms-block-email--order-confirmation--text,order-confirmation--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " +cms-block-email--order-shipped--text,order-shipped--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " +``` + +4. Import data: ```bash console data:import glossary @@ -1350,6 +1422,7 @@ class RouterDependencyProvider extends SprykerRouterDependencyProvider namespace Pyz\Yves\ShopApplication; +use SprykerShop\Yves\SalesServicePointWidget\Widget\SalesServicePointNameForShipmentGroupWidget; use SprykerShop\Yves\ServicePointWidget\Widget\ServicePointSearchWidget; use SprykerShop\Yves\ShopApplication\ShopApplicationDependencyProvider as SprykerShopApplicationDependencyProvider; @@ -1362,6 +1435,7 @@ class ShopApplicationDependencyProvider extends SprykerShopApplicationDependency { return [ ServicePointSearchWidget::class, + SalesServicePointNameForShipmentGroupWidget::class, ]; } } @@ -1371,9 +1445,10 @@ class ShopApplicationDependencyProvider extends SprykerShopApplicationDependency Make sure that the following widgets have been registered by adding the respective code snippets to a Twig template: -| WIDGET | VERIFICATION | -|--------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------| -| ServicePointSearchWidget | `{% raw %}{%{% endraw %} widget 'ServicePointSearchWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | +| WIDGET | VERIFICATION | +|---------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ServicePointSearchWidget | `{% raw %}{%{% endraw %} widget 'ServicePointSearchWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | +| SalesServicePointNameForShipmentGroupWidget | `{% raw %}{%{% endraw %} widget 'SalesServicePointNameForShipmentGroupWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | {% endinfo_block %} diff --git a/docs/pbc/all/service-points/202400.0/unified-commerce/install-the-service-points-feature.md b/docs/pbc/all/service-points/202400.0/unified-commerce/install-the-service-points-feature.md index 9c89ce8d201..0e2b13ab200 100644 --- a/docs/pbc/all/service-points/202400.0/unified-commerce/install-the-service-points-feature.md +++ b/docs/pbc/all/service-points/202400.0/unified-commerce/install-the-service-points-feature.md @@ -1,7 +1,7 @@ --- title: Install the Service Points feature description: Learn how to integrate the Service Points feature into your project -last_updated: Jul 31, 2023 +last_updated: Aug 02, 2023 template: feature-integration-guide-template redirect_from: - /docs/uc/all/enhanced-click-collect/202307.0/install-and-upgrade/install-features/install-the-service-points-feature.html From 4d7672ef1bda641080cb28a7ca01a825bb14c3f4 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Wed, 2 Aug 2023 16:39:27 +0200 Subject: [PATCH 02/13] CC-30055: Saving Service Point name in OMS & emails --- .../202400.0/install-the-service-points-feature.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md index ad5ac0df6d7..0c7a44fe943 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md @@ -1363,8 +1363,10 @@ service_point_widget.no_results,"Nichts gefunden...",de_DE ** data/import/common/common/cms_block.csv ** ```csv +{% raw %} cms-block-email--order-confirmation--text,order-confirmation--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " cms-block-email--order-shipped--text,order-shipped--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " +{% endraw %} ``` 4. Import data: From f9060fc08fad9871f97349485a8ebd87938b55e1 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Wed, 2 Aug 2023 17:21:39 +0200 Subject: [PATCH 03/13] CC-30055: Saving Service Point name in OMS & emails --- .../install-the-service-points-feature.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md index 0c7a44fe943..88f0ddbf14f 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md @@ -1349,7 +1349,7 @@ Follow the steps below to install the Service Points feature frontend. ### 1) Add translations 1. Append glossary for the feature: - + ```csv service_point_widget.search,"Search for Store, zip code or city...",en_US service_point_widget.search,"Suche nach Store, PLZ oder Stadt...",de_DE @@ -1362,11 +1362,17 @@ service_point_widget.no_results,"Nichts gefunden...",de_DE 2. Updated email templates to show service point information ** data/import/common/common/cms_block.csv ** + ```csv -{% raw %} -cms-block-email--order-confirmation--text,order-confirmation--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " -cms-block-email--order-shipped--text,order-shipped--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " -{% endraw %} +cms-block-email--order-confirmation--text,order-confirmation--text,TEXT Email Template With Header And Footer, +@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order. +firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans } +} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ +'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order. +billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode } +} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order. +totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " +cms-block-email--order-shipped--text,order-shipped--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " ``` 4. Import data: From a256746710bcaa81975f70554db2453e48ecd03e Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Thu, 3 Aug 2023 11:49:22 +0200 Subject: [PATCH 04/13] CC-30055: Saving Service Point name in OMS & emails --- .../install-the-service-points-feature.md | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md index 88f0ddbf14f..73d1864de96 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md @@ -15,6 +15,7 @@ To start feature integration, integrate the required features: | Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | | Shipment | {{page.version}} | [Shipment feature integration](/docs/pbc/all/carrier-management/{{page.version}}/unified-commerce/enhanced-click-and-collect/install-and-upgrade/install-the-shipment-feature.html) | | Customer Account Management | {{page.version}} | [Customer account management feature integration](/docs/pbc/all/customer-relationship-management/{{page.version}}/install-and-upgrade/install-features/install-the-customer-account-management-feature.html) | +| File details CMS block | {{page.version}} | [File details - cms_block.csv](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/import-and-export-data/file-details-cms-block.csv.html#import-file-command) | ### 1) Install the required modules using Composer @@ -1359,23 +1360,7 @@ service_point_widget.no_results,"Nothing found...",en_US service_point_widget.no_results,"Nichts gefunden...",de_DE ``` -2. Updated email templates to show service point information - -** data/import/common/common/cms_block.csv ** - -```csv -cms-block-email--order-confirmation--text,order-confirmation--text,TEXT Email Template With Header And Footer, -@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order. -firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans } -} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ -'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order. -billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode } -} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order. -totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_confirmation.title' | trans }} {{ 'mail.trans.order_confirmation.subtitle' | trans }} ----- {{ 'mail.trans.order.order_details' | trans }} {{ 'mail.trans.order.order_reference' | trans }}: {{ mail.order.orderReference }} {{ 'mail.trans.order.order_date' | trans }}: {{ mail.order.createdAt | date }} {{ 'mail.trans.order.billing_address' | trans }}: {{ mail.order.billingAddress.address1 }} {{ mail.order.billingAddress.address2 }} {{ mail.order.billingAddress.address3 }} {{ mail.order.billingAddress.zipCode }} {{ mail.order.billingAddress.city }} {{ mail.order.billingAddress.region }} ----- {{ 'mail.trans.order.subtotal' | trans }}: {{ mail.order.totals.subtotal | money }} {{ 'mail.trans.order.shipment_costs_total' | trans }}: {{ mail.order.totals.expenseTotal | money }} {{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.discounts_total' | trans }} {{ discount.displayName }}: - {{ discount.sumAmount | money }} {{ 'mail.trans.order.taxes' | trans }}: {{ mail.order.totals.taxTotal.amount | money }} {{ 'mail.trans.order.grand_total' | trans }}: {{ mail.order.totals.grandTotal | money }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " -cms-block-email--order-shipped--text,order-shipped--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.order.firstName }} {{ mail.order.lastName }}, {{ 'mail.trans.order_shipped.title' | trans }} ----- {{ 'mail.trans.order.shipment_for_number.part1' | trans }} {{ loop.index }} {{ 'mail.trans.order.shipment_for_number.part2' | trans }} {{ mail.shipmentGroups | length }} {{ 'mail.trans.order.delivery_address' | trans }}: {{ servicePoint.name }}, {{ shipmentGroup.shipment.shippingAddress.firstName }} {{ shipmentGroup.shipment.shippingAddress.lastName }}, {{ shipmentGroup.shipment.shippingAddress.address1 }} {{ shipmentGroup.shipment.shippingAddress.address2 }} {{ shipmentGroup.shipment.shippingAddress.address3 }} {{ shipmentGroup.shipment.shippingAddress.zipCode }} {{ shipmentGroup.shipment.shippingAddress.city }} {{ shipmentGroup.shipment.shippingAddress.region }} {{ 'mail.trans.order.delivery_method' | trans }}: {{ shipmentGroup.shipment.method.name }} {{ 'mail.trans.order.requested_delivery_date' | trans }}: {{ shipmentGroup.shipment.requestedDeliveryDate }} * {{ item.name }} - {{ 'customer.order.item_sku' | trans }}: {{ item.sku }} {{ 'mail.trans.order.quantity' | trans }}: {{ item.quantity | executeFilterIfExists('formatInt', app.locale) }} {{ 'mail.trans.order.item_price' | trans }}: {{ item.sumPrice | money }} + {{ option.groupName }} - {{ option.sumPrice | money }} " -``` - -4. Import data: +2. Import data: ```bash console data:import glossary From cfd30976b23b0cd39dcac6347fcea4d33532a1ad Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Fri, 4 Aug 2023 11:24:17 +0200 Subject: [PATCH 05/13] CC-30055: Saving Service Point name in OMS & emails --- ...service-points-order-management-feature.md | 180 ++++++++++++++++++ ...service-points-order-management-feature.md | 8 + .../intro-to-spryker/docs-release-notes.md | 9 + 3 files changed, 197 insertions(+) create mode 100644 _includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md create mode 100644 docs/pbc/all/carrier-management/202400.0/unified-commerce/install-and-upgrade/install-the-service-points-order-management-feature.md diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md new file mode 100644 index 00000000000..39938c8bae1 --- /dev/null +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md @@ -0,0 +1,180 @@ + + +This document describes how to integrate the Service Points + Order Management feature into a Spryker project. + +## Install feature core + +Follow the steps below to install the Service Points + Order Management feature. + +### Prerequisites + +To start feature integration, integrate the required features: + +| NAME | VERSION | INTEGRATION GUIDE | +|------------------|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Service Points | {{page.version}} | [Install the Service Points feature](/docs/pbc/all/service-points/{{page.version}}/install-and-upgrade/install-the-service-points-feature.html) | +| Order Management | {{page.version}} | [Order Management feature integration](/docs/pbc/all/order-management-system/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-order-management-feature.html) | + +## 1) Install the required modules using Composer + +```bash +composer require spryker/sales-service-point:"^0.1.0" spryker/sales-service-point-gui:"^0.1.0" spryker/sales-service-point-gui:"^0.1.0" --update-with-dependencies +``` + +{% info_block warningBox "Verification" %} + +Make sure that the following module has been installed: + +| MODULE | EXPECTED DIRECTORY | +|-------------------------|------------------------------------------------| +| SalesServicePoint | vendor/spryker/sales-service-point | +| SalesServicePointGui | vendor/spryker/sales-service-point-gui | +| SalesServicePointWidget | vendor/spryker-shop/sales-service-point-widget | + +{% endinfo_block %} + +## 2) Set up database schema and transfer objects + +1. Apply database changes and generate transfer changes: + +```bash +console transfer:generate +console propel:install +console transfer:generate +``` + +{% info_block warningBox "Verification" %} + +Make sure that the following changes have been applied in the database: + +| DATABASE ENTITY | TYPE | EVENT | +|-------------------------------------|--------|---------| +| spy_sales_order_item_service_point | table | created | + +Make sure that propel entities have been generated successfully by checking their existence. Also, make generated entity classes extending respective Spryker core classes. + +| CLASS NAMESPACE | EXTENDS | +|---------------------------------------------------------------------------|----------------------------------------------------------------------------------------------| +| \Orm\Zed\SalesServicePoint\Persistence\SpySalesOrderItemServicePoint | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePoint | +| \Orm\Zed\SalesServicePoint\Persistence\SpySalesOrderItemServicePointQuery | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePointQuery | + +Make sure that the following changes have been applied in transfer objects: + +| TRANSFER | TYPE | EVENT | PATH | +|--------------------------------------|----------|---------|--------------------------------------------------------------------| +| SalesOrderItemServicePoint | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointTransfer | +| SalesOrderItemServicePointCriteria | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointCriteria | +| SalesOrderItemServicePointConditions | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointConditions | +| SalesOrderItemServicePointCollection | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointCollection | +| ServicePoint | class | created | src/Generated/Shared/Transfer/ServicePoint | +| Quote | class | created | src/Generated/Shared/Transfer/QuoteTransfer | +| SaveOrder | class | created | src/Generated/Shared/Transfer/SaveOrderTransfer | +| Item | class | created | src/Generated/Shared/Transfer/ItemTransfer | +| ShipmentGroup.items | property | created | src/Generated/Shared/Transfer/ShipmentGroupTransfer | + +{% endinfo_block %} + +## 3) Set up behavior + +1. Register sales plugins: + +| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | +|---------------------------------------|------------------------------------------------------------|---------------|-----------------------------------------------------------------------------------------------| +| ServicePointOrderItemExpanderPlugin | Expands sales order items with with related service point. | None | Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemExpanderPlugin | +| ServicePointOrderItemsPostSavePlugin | Persists service point information for sales order items. | None | Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemsPostSavePlugin | + +**src/Pyz/Zed/Sales/SalesDependencyProvider.php** + +```php + + */ + protected function getOrderItemExpanderPlugins(): array + { + return [ + new ServicePointOrderItemExpanderPlugin(), + ]; + } + + /** + * @return array<\Spryker\Zed\SalesExtension\Dependency\Plugin\OrderItemsPostSavePluginInterface> + */ + protected function getOrderItemsPostSavePlugins(): array + { + return [ + new ServicePointOrderItemsPostSavePlugin(), + ]; + } +} +``` + +{% info_block warningBox "Verification" %} + +Make sure that sales plugins work correctly: + +1. Add product offer with service point shipment type to cart. + +2. Place an order with the added product. + +3. Check that the `spy_sales_order_item_service_point` database table contains a record with the product and selected service point. + +{% endinfo_block %} + +## Install feature frontend + +## 1) Set up widgets + +1. Register the following plugins to enable widgets: + +| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | +|---------------------------------------------|-----------------------------------------------------------|---------------|-------------------------------------------------| +| SalesServicePointNameForShipmentGroupWidget | Allow customers to display orders related service points. | | SprykerShop\Yves\SalesServicePointWidget\Widget | + +**src/Pyz/Yves/ShopApplication/ShopApplicationDependencyProvider.php** + +```php + + */ + protected function getGlobalWidgets(): array + { + return [ + SalesServicePointNameForShipmentGroupWidget::class, + ]; + } +} +``` + +{% info_block warningBox "Verification" %} + +Make sure that the following widgets have been registered by adding the respective code snippets to a Twig template: + +| WIDGET | VERIFICATION | +|---------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| SalesServicePointNameForShipmentGroupWidget | `{% raw %}{%{% endraw %} widget 'SalesServicePointNameForShipmentGroupWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | + +{% endinfo_block %} diff --git a/docs/pbc/all/carrier-management/202400.0/unified-commerce/install-and-upgrade/install-the-service-points-order-management-feature.md b/docs/pbc/all/carrier-management/202400.0/unified-commerce/install-and-upgrade/install-the-service-points-order-management-feature.md new file mode 100644 index 00000000000..7682a285f16 --- /dev/null +++ b/docs/pbc/all/carrier-management/202400.0/unified-commerce/install-and-upgrade/install-the-service-points-order-management-feature.md @@ -0,0 +1,8 @@ +--- +title: Install the Service Points + Order Management feature +description: Learn how to integrate the Service Points + Order Management feature into your project +last_updated: Aug 04, 2023 +template: feature-integration-guide-template +--- + +{% include pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md %} diff --git a/docs/scos/user/intro-to-spryker/docs-release-notes.md b/docs/scos/user/intro-to-spryker/docs-release-notes.md index 1b61fec0c3c..8624cd05ec8 100644 --- a/docs/scos/user/intro-to-spryker/docs-release-notes.md +++ b/docs/scos/user/intro-to-spryker/docs-release-notes.md @@ -3,6 +3,15 @@ title: Docs release notes description: Spryker docs release notes template: concept-topic-template --- +## August 2023 + +In June 2023, we have added and updated the following pages: + +### New pages_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md +- [Service Points + Order Management feature integration guide](/docs/pbc/all/carrier-management/202400.0/unified-commerce/install-and-upgrade/install-the-service-points-order-management-feature.html). + +For more details on these and other updates to the Spryker docs in August 2023, refer to the [docs release notes page on GitHub](https://github.com/spryker/spryker-docs/releases). + ## June 2023 In June 2023, we have added and updated the following pages: From 8260acb6cc934cddd0f3d0d1d1cb57a7372a1c3b Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Fri, 4 Aug 2023 11:54:56 +0200 Subject: [PATCH 06/13] CC-30055: Saving Service Point name in OMS & emails --- .../install-the-service-points-feature.md | 56 +------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md index 73d1864de96..db701c4582d 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md @@ -13,9 +13,6 @@ To start feature integration, integrate the required features: | NAME | VERSION | INTEGRATION GUIDE | |-----------------------------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | -| Shipment | {{page.version}} | [Shipment feature integration](/docs/pbc/all/carrier-management/{{page.version}}/unified-commerce/enhanced-click-and-collect/install-and-upgrade/install-the-shipment-feature.html) | -| Customer Account Management | {{page.version}} | [Customer account management feature integration](/docs/pbc/all/customer-relationship-management/{{page.version}}/install-and-upgrade/install-features/install-the-customer-account-management-feature.html) | -| File details CMS block | {{page.version}} | [File details - cms_block.csv](/docs/pbc/all/content-management-system/{{page.version}}/base-shop/import-and-export-data/file-details-cms-block.csv.html#import-file-command) | ### 1) Install the required modules using Composer @@ -39,7 +36,6 @@ Make sure that the following modules have been installed: | SalesServicePointGui | vendor/spryker/sales-service-point-gui | | SalesServicePointWidget | vendor/spryker-shop/sales-service-point-widget | - {% endinfo_block %} ## 2) Set up database schema and transfer objects @@ -674,53 +670,6 @@ class PublisherDependencyProvider extends SprykerPublisherDependencyProvider } ``` -#### Register sales plugins - -| PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | -|---------------------------------------|------------------------------------------------------------|---------------|-----------------------------------------------------------------------------------------------| -| ServicePointOrderItemExpanderPlugin | Expands sales order items with with related service point. | None | Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemExpanderPlugin | -| ServicePointOrderItemsPostSavePlugin | Persists service point information for sales order items. | None | Spryker\Zed\SalesServicePoint\Communication\Plugin\Sales\ServicePointOrderItemsPostSavePlugin | - -**src/Pyz/Zed/Sales/SalesDependencyProvider.php** - -```php - - */ - protected function getOrderItemExpanderPlugins(): array - { - return [ - new ServicePointOrderItemExpanderPlugin(), - ]; - } - - /** - * @return array<\Spryker\Zed\SalesExtension\Dependency\Plugin\OrderItemsPostSavePluginInterface> - */ - protected function getOrderItemsPostSavePlugins(): array - { - return [ - new ServicePointOrderItemsPostSavePlugin(), - ]; - } -} -``` - #### Register publisher plugins | PLUGIN | SPECIFICATION | PREREQUISITES | NAMESPACE | @@ -1350,7 +1299,7 @@ Follow the steps below to install the Service Points feature frontend. ### 1) Add translations 1. Append glossary for the feature: - + ```csv service_point_widget.search,"Search for Store, zip code or city...",en_US service_point_widget.search,"Suche nach Store, PLZ oder Stadt...",de_DE @@ -1415,7 +1364,6 @@ class RouterDependencyProvider extends SprykerRouterDependencyProvider namespace Pyz\Yves\ShopApplication; -use SprykerShop\Yves\SalesServicePointWidget\Widget\SalesServicePointNameForShipmentGroupWidget; use SprykerShop\Yves\ServicePointWidget\Widget\ServicePointSearchWidget; use SprykerShop\Yves\ShopApplication\ShopApplicationDependencyProvider as SprykerShopApplicationDependencyProvider; @@ -1428,7 +1376,6 @@ class ShopApplicationDependencyProvider extends SprykerShopApplicationDependency { return [ ServicePointSearchWidget::class, - SalesServicePointNameForShipmentGroupWidget::class, ]; } } @@ -1441,7 +1388,6 @@ Make sure that the following widgets have been registered by adding the respecti | WIDGET | VERIFICATION | |---------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | ServicePointSearchWidget | `{% raw %}{%{% endraw %} widget 'ServicePointSearchWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | -| SalesServicePointNameForShipmentGroupWidget | `{% raw %}{%{% endraw %} widget 'SalesServicePointNameForShipmentGroupWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | {% endinfo_block %} From d12a1a1b92269da021ebd690388df19e86752833 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Fri, 4 Aug 2023 12:07:47 +0200 Subject: [PATCH 07/13] CC-30055: Saving Service Point name in OMS & emails --- ...service-points-order-management-feature.md | 72 ++----------------- .../install-the-service-points-feature.md | 2 +- ...service-points-order-management-feature.md | 0 .../intro-to-spryker/docs-release-notes.md | 7 +- 4 files changed, 10 insertions(+), 71 deletions(-) rename docs/pbc/all/{carrier-management/202400.0/unified-commerce/install-and-upgrade => service-points/202400.0/unified-commerce}/install-the-service-points-order-management-feature.md (100%) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md index 39938c8bae1..cdd0e5e8c4c 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md @@ -15,66 +15,7 @@ To start feature integration, integrate the required features: | Service Points | {{page.version}} | [Install the Service Points feature](/docs/pbc/all/service-points/{{page.version}}/install-and-upgrade/install-the-service-points-feature.html) | | Order Management | {{page.version}} | [Order Management feature integration](/docs/pbc/all/order-management-system/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-order-management-feature.html) | -## 1) Install the required modules using Composer - -```bash -composer require spryker/sales-service-point:"^0.1.0" spryker/sales-service-point-gui:"^0.1.0" spryker/sales-service-point-gui:"^0.1.0" --update-with-dependencies -``` - -{% info_block warningBox "Verification" %} - -Make sure that the following module has been installed: - -| MODULE | EXPECTED DIRECTORY | -|-------------------------|------------------------------------------------| -| SalesServicePoint | vendor/spryker/sales-service-point | -| SalesServicePointGui | vendor/spryker/sales-service-point-gui | -| SalesServicePointWidget | vendor/spryker-shop/sales-service-point-widget | - -{% endinfo_block %} - -## 2) Set up database schema and transfer objects - -1. Apply database changes and generate transfer changes: - -```bash -console transfer:generate -console propel:install -console transfer:generate -``` - -{% info_block warningBox "Verification" %} - -Make sure that the following changes have been applied in the database: - -| DATABASE ENTITY | TYPE | EVENT | -|-------------------------------------|--------|---------| -| spy_sales_order_item_service_point | table | created | - -Make sure that propel entities have been generated successfully by checking their existence. Also, make generated entity classes extending respective Spryker core classes. - -| CLASS NAMESPACE | EXTENDS | -|---------------------------------------------------------------------------|----------------------------------------------------------------------------------------------| -| \Orm\Zed\SalesServicePoint\Persistence\SpySalesOrderItemServicePoint | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePoint | -| \Orm\Zed\SalesServicePoint\Persistence\SpySalesOrderItemServicePointQuery | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePointQuery | - -Make sure that the following changes have been applied in transfer objects: - -| TRANSFER | TYPE | EVENT | PATH | -|--------------------------------------|----------|---------|--------------------------------------------------------------------| -| SalesOrderItemServicePoint | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointTransfer | -| SalesOrderItemServicePointCriteria | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointCriteria | -| SalesOrderItemServicePointConditions | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointConditions | -| SalesOrderItemServicePointCollection | class | created | src/Generated/Shared/Transfer/SalesOrderItemServicePointCollection | -| ServicePoint | class | created | src/Generated/Shared/Transfer/ServicePoint | -| Quote | class | created | src/Generated/Shared/Transfer/QuoteTransfer | -| SaveOrder | class | created | src/Generated/Shared/Transfer/SaveOrderTransfer | -| Item | class | created | src/Generated/Shared/Transfer/ItemTransfer | -| ShipmentGroup.items | property | created | src/Generated/Shared/Transfer/ShipmentGroupTransfer | - -{% endinfo_block %} - -## 3) Set up behavior +## 1) Set up behavior 1. Register sales plugins: @@ -88,11 +29,6 @@ Make sure that the following changes have been applied in transfer objects: ```php Date: Fri, 4 Aug 2023 12:19:03 +0200 Subject: [PATCH 08/13] CC-30055: Saving Service Point name in OMS & emails --- .../install-the-service-points-feature.md | 54 +++++++++---------- ...service-points-order-management-feature.md | 1 - 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md index db701c4582d..cdd990a18e0 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md @@ -10,9 +10,9 @@ Follow the steps below to install the Service Points feature core. To start feature integration, integrate the required features: -| NAME | VERSION | INTEGRATION GUIDE | -|-----------------------------|------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | +| NAME | VERSION | INTEGRATION GUIDE | +|-----------------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | ### 1) Install the required modules using Composer @@ -42,11 +42,11 @@ Make sure that the following modules have been installed: 1. Adjust the schema definition so entity changes trigger events. -| AFFECTED ENTITY | TRIGGERED EVENTS | -|-------------------------------------|-------------------------------------------------------------------------------------------------------------------------------| -| spy_service_point | Entity.spy_service_point.create
Entity.spy_service_point.update
Entity.spy_service_point.delete | -| spy_service_point_address | Entity.spy_service_point_address.create
Entity.spy_service_point_address.update
Entity.spy_service_point_address.delete | -| spy_service_point_store | Entity.spy_service_point_store.create
Entity.spy_service_point_store.update
Entity.spy_service_point_store.delete | | +| AFFECTED ENTITY | TRIGGERED EVENTS | +|---------------------------|-------------------------------------------------------------------------------------------------------------------------------| +| spy_service_point | Entity.spy_service_point.create
Entity.spy_service_point.update
Entity.spy_service_point.delete | +| spy_service_point_address | Entity.spy_service_point_address.create
Entity.spy_service_point_address.update
Entity.spy_service_point_address.delete | +| spy_service_point_store | Entity.spy_service_point_store.create
Entity.spy_service_point_store.update
Entity.spy_service_point_store.delete | | **src/Pyz/Zed/ServicePoint/Persistence/Propel/Schema/spy_service_point.schema.xml** @@ -108,25 +108,25 @@ Make sure that the following changes have been applied in the database: Make sure that propel entities have been generated successfully by checking their existence. Also, make generated entity classes extending respective Spryker core classes. -| CLASS NAMESPACE | EXTENDS | -|-----------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------| -| \Orm\Zed\ServicePoint\Persistence\SpyServicePoint | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePoint | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddress | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddress | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyService | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyService | -| \Orm\Zed\ServicePoint\Persistence\SpyServiceQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStore | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStore | -| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStoreQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStoreQuery | -| \Orm\Zed\ServicePoint\Persistence\SpyServiceType | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceType | -| \Orm\Zed\ServicePoint\Persistence\SpyServiceTypeQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceTypeQuery | -| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearch | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearch | -| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearchQuery | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearchQuery | -| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorage | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorage | -| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorageQuery | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorageQuery | -| \Orm\Zed\ServicePointStorage\Persistence\SpySalesOrderItemServicePoint | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePoint | -| \Orm\Zed\ServicePointStorage\Persistence\SpySalesOrderItemServicePointQuery | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePointQuery | +| CLASS NAMESPACE | EXTENDS | +|-----------------------------------------------------------------------------|----------------------------------------------------------------------------------------------| +| \Orm\Zed\ServicePoint\Persistence\SpyServicePoint | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePoint | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddress | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddress | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyService | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyService | +| \Orm\Zed\ServicePoint\Persistence\SpyServiceQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointAddressQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointAddressQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStore | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStore | +| \Orm\Zed\ServicePoint\Persistence\SpyServicePointStoreQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServicePointStoreQuery | +| \Orm\Zed\ServicePoint\Persistence\SpyServiceType | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceType | +| \Orm\Zed\ServicePoint\Persistence\SpyServiceTypeQuery | \Spryker\Zed\ServicePoint\Persistence\Propel\AbstractSpyServiceTypeQuery | +| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearch | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearch | +| \Orm\Zed\ServicePointSearch\Persistence\SpyServicePointSearchQuery | \Spryker\Zed\ServicePointSearch\Persistence\Propel\AbstractSpyServicePointSearchQuery | +| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorage | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorage | +| \Orm\Zed\ServicePointStorage\Persistence\SpyServicePointStorageQuery | \Spryker\Zed\ServicePointStorage\Persistence\Propel\AbstractSpyServicePointStorageQuery | +| \Orm\Zed\ServicePointStorage\Persistence\SpySalesOrderItemServicePoint | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePoint | +| \Orm\Zed\ServicePointStorage\Persistence\SpySalesOrderItemServicePointQuery | \Spryker\Zed\SalesServicePoint\Persistence\Propel\AbstractSpySalesOrderItemServicePointQuery | Make sure that the following changes have been applied in transfer objects: diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md index cdd0e5e8c4c..74b5e61a99b 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md @@ -13,7 +13,6 @@ To start feature integration, integrate the required features: | NAME | VERSION | INTEGRATION GUIDE | |------------------|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Service Points | {{page.version}} | [Install the Service Points feature](/docs/pbc/all/service-points/{{page.version}}/install-and-upgrade/install-the-service-points-feature.html) | -| Order Management | {{page.version}} | [Order Management feature integration](/docs/pbc/all/order-management-system/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-order-management-feature.html) | ## 1) Set up behavior From 0427fecb36eb1f686b3152ab94ddd108e0516419 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Fri, 4 Aug 2023 14:08:43 +0200 Subject: [PATCH 09/13] CC-30055: Saving Service Point name in OMS & emails --- .../install-the-service-points-feature.md | 22 +++++++++---------- ...service-points-order-management-feature.md | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md index cdd990a18e0..c757ea66eea 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-feature.md @@ -10,9 +10,9 @@ Follow the steps below to install the Service Points feature core. To start feature integration, integrate the required features: -| NAME | VERSION | INTEGRATION GUIDE | -|-----------------------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------| -| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | +| NAME | VERSION | INTEGRATION GUIDE | +|--------------|------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------| +| Spryker Core | {{page.version}} | [Install the Spryker Core feature](/docs/pbc/all/miscellaneous/{{page.version}}/install-and-upgrade/install-features/install-the-spryker-core-feature.html) | ### 1) Install the required modules using Composer @@ -42,11 +42,11 @@ Make sure that the following modules have been installed: 1. Adjust the schema definition so entity changes trigger events. -| AFFECTED ENTITY | TRIGGERED EVENTS | -|---------------------------|-------------------------------------------------------------------------------------------------------------------------------| -| spy_service_point | Entity.spy_service_point.create
Entity.spy_service_point.update
Entity.spy_service_point.delete | -| spy_service_point_address | Entity.spy_service_point_address.create
Entity.spy_service_point_address.update
Entity.spy_service_point_address.delete | -| spy_service_point_store | Entity.spy_service_point_store.create
Entity.spy_service_point_store.update
Entity.spy_service_point_store.delete | | +| AFFECTED ENTITY | TRIGGERED EVENTS | +|-------------------------------|-------------------------------------------------------------------------------------------------------------------------------| +| spy_service_point | Entity.spy_service_point.create
Entity.spy_service_point.update
Entity.spy_service_point.delete | +| spy_service_point_address | Entity.spy_service_point_address.create
Entity.spy_service_point_address.update
Entity.spy_service_point_address.delete | +| spy_service_point_store | Entity.spy_service_point_store.create
Entity.spy_service_point_store.update
Entity.spy_service_point_store.delete | **src/Pyz/Zed/ServicePoint/Persistence/Propel/Schema/spy_service_point.schema.xml** @@ -1385,9 +1385,9 @@ class ShopApplicationDependencyProvider extends SprykerShopApplicationDependency Make sure that the following widgets have been registered by adding the respective code snippets to a Twig template: -| WIDGET | VERIFICATION | -|---------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| ServicePointSearchWidget | `{% raw %}{%{% endraw %} widget 'ServicePointSearchWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | +| WIDGET | VERIFICATION | +|--------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------| +| ServicePointSearchWidget | `{% raw %}{%{% endraw %} widget 'ServicePointSearchWidget' args [...] only {% raw %}%}{% endraw %}{% raw %}{%{% endraw %} endwidget {% raw %}%}{% endraw %}` | {% endinfo_block %} diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md index 74b5e61a99b..cdd0e5e8c4c 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md @@ -13,6 +13,7 @@ To start feature integration, integrate the required features: | NAME | VERSION | INTEGRATION GUIDE | |------------------|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | Service Points | {{page.version}} | [Install the Service Points feature](/docs/pbc/all/service-points/{{page.version}}/install-and-upgrade/install-the-service-points-feature.html) | +| Order Management | {{page.version}} | [Order Management feature integration](/docs/pbc/all/order-management-system/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-order-management-feature.html) | ## 1) Set up behavior From c1325f20586aa73f393f8639638d0baec3240e42 Mon Sep 17 00:00:00 2001 From: AlexSlawinski Date: Fri, 4 Aug 2023 14:50:52 +0200 Subject: [PATCH 10/13] Apply suggestions from code review --- .../install-the-service-points-order-management-feature.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md index cdd0e5e8c4c..626bdd1fcc0 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md @@ -15,7 +15,7 @@ To start feature integration, integrate the required features: | Service Points | {{page.version}} | [Install the Service Points feature](/docs/pbc/all/service-points/{{page.version}}/install-and-upgrade/install-the-service-points-feature.html) | | Order Management | {{page.version}} | [Order Management feature integration](/docs/pbc/all/order-management-system/{{page.version}}/base-shop/install-and-upgrade/install-features/install-the-order-management-feature.html) | -## 1) Set up behavior +## Set up behavior 1. Register sales plugins: @@ -63,7 +63,7 @@ class SalesDependencyProvider extends SprykerSalesDependencyProvider Make sure that sales plugins work correctly: -1. Add product offer with service point shipment type to cart. +1. Add a product offer with the service point shipment type to your cart. 2. Place an order with the added product. @@ -73,7 +73,7 @@ Make sure that sales plugins work correctly: ## Install feature frontend -## 1) Set up widgets +## Set up widgets 1. Register the following plugins to enable widgets: From 7cbebc12de6f4a9b607221515fcaeaee5b5886a0 Mon Sep 17 00:00:00 2001 From: Michael Knappe Date: Fri, 4 Aug 2023 15:04:03 +0200 Subject: [PATCH 11/13] CC-30055: Saving Service Point name in OMS & emails --- .../scos/user/intro-to-spryker/docs-release-notes.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docs/scos/user/intro-to-spryker/docs-release-notes.md b/docs/scos/user/intro-to-spryker/docs-release-notes.md index ff85286498f..f06e644340d 100644 --- a/docs/scos/user/intro-to-spryker/docs-release-notes.md +++ b/docs/scos/user/intro-to-spryker/docs-release-notes.md @@ -4,18 +4,6 @@ description: Spryker docs release notes template: concept-topic-template last_updated: Aug 2, 2023 --- -## August 2023 - -In June 2023, we have added and updated the following pages: - -### New pages -- [Service Points + Order Management feature integration guide](/docs/pbc/all/service-points/202400.0/unified-commerce/install-the-service-points-order-management-feature.html). - -## Updated pages -- [Service Points feature integration guide](/docs/pbc/all/service-points/202400.0/unified-commerce/install-the-service-points-feature.html). - -For more details on these and other updates to the Spryker docs in August 2023, refer to the [docs release notes page on GitHub](https://github.com/spryker/spryker-docs/releases). - ## July 2023 In July 2023, we have added and updated the following pages: From 4bd1204b74b239e47d1a5e279f526a6f9c8b0869 Mon Sep 17 00:00:00 2001 From: Vadym Sachenko Date: Mon, 7 Aug 2023 10:02:18 +0300 Subject: [PATCH 12/13] Apply suggestions from code review --- .../install-the-service-points-order-management-feature.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md index 626bdd1fcc0..cb57e1fca86 100644 --- a/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md +++ b/_includes/pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md @@ -1,6 +1,6 @@ -This document describes how to integrate the Service Points + Order Management feature into a Spryker project. +This document describes how to integrate the Service Points + [Order Management](/docs/pbc/all/order-management-system/{{page.version}}/base-shop/order-management-feature-overview/order-management-feature-overview.html) feature into a Spryker project. ## Install feature core @@ -73,6 +73,8 @@ Make sure that sales plugins work correctly: ## Install feature frontend +Follow the steps below to install the {Feature Name} feature frontend. + ## Set up widgets 1. Register the following plugins to enable widgets: From 061b2930e85ffe73d773cfc136c191a483635893 Mon Sep 17 00:00:00 2001 From: Vadym Sachenko Date: Mon, 7 Aug 2023 10:51:01 +0300 Subject: [PATCH 13/13] Create install-the-order-management-service-points-feature.md add the IG to another related PBC --- ...install-the-order-management-service-points-feature.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docs/pbc/all/order-management-system/202400.0/unified-commerce/install-and-update/install-features/install-the-order-management-service-points-feature.md diff --git a/docs/pbc/all/order-management-system/202400.0/unified-commerce/install-and-update/install-features/install-the-order-management-service-points-feature.md b/docs/pbc/all/order-management-system/202400.0/unified-commerce/install-and-update/install-features/install-the-order-management-service-points-feature.md new file mode 100644 index 00000000000..a9ff553def5 --- /dev/null +++ b/docs/pbc/all/order-management-system/202400.0/unified-commerce/install-and-update/install-features/install-the-order-management-service-points-feature.md @@ -0,0 +1,8 @@ +--- +title: Install the Order Management + Service Points feature +description: Learn how to integrate the Order Management + Service Points feature into your project +last_updated: Aug 04, 2023 +template: feature-integration-guide-template +--- + +{% include pbc/all/install-features/202400.0/install-the-service-points-order-management-feature.md %}