diff --git a/composer.json b/composer.json index 6b0350efbb..ec27e0ba46 100644 --- a/composer.json +++ b/composer.json @@ -155,6 +155,7 @@ "spryker-shop/sales-product-configuration-widget-extension": "^1.0.0", "spryker-shop/sales-return-page": "^1.0.0", "spryker-shop/sales-return-page-extension": "^1.0.0", + "spryker-shop/sales-service-point-widget": "^0.1.0", "spryker-shop/security-blocker-page": "^1.0.0", "spryker-shop/service-point-widget": "^0.2.0", "spryker-shop/session-agent-validation": "^1.0.0", @@ -987,6 +988,8 @@ "spryker/sales-return-gui-extension": "^1.0.0", "spryker/sales-return-search": "^1.0.0", "spryker/sales-returns-rest-api": "^1.0.0", + "spryker/sales-service-point": "^0.1.0", + "spryker/sales-service-point-gui": "^0.1.0", "spryker/sales-split": "^5.0.0", "spryker/sales-statistics": "^1.0.0", "spryker/scheduler": "^1.2.0", diff --git a/composer.lock b/composer.lock index 1176d52ffe..d6e6d20fcf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "367f309f347b99a33dcf6f101a701ba5", + "content-hash": "055dae2e415868aacd4baad835c62da8", "packages": [ { "name": "async-aws/core", @@ -9862,16 +9862,16 @@ }, { "name": "spryker-shop/customer-page", - "version": "2.44.0", + "version": "2.45.0", "source": { "type": "git", "url": "https://github.com/spryker-shop/customer-page.git", - "reference": "f716e892372d69e3bf9b88b483db4c4bceef5d76" + "reference": "290d665b2164e2aa1a33e4f278792fe878cbb968" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker-shop/customer-page/zipball/f716e892372d69e3bf9b88b483db4c4bceef5d76", - "reference": "f716e892372d69e3bf9b88b483db4c4bceef5d76", + "url": "https://api.github.com/repos/spryker-shop/customer-page/zipball/290d665b2164e2aa1a33e4f278792fe878cbb968", + "reference": "290d665b2164e2aa1a33e4f278792fe878cbb968", "shasum": "" }, "require": { @@ -9928,6 +9928,7 @@ "spryker-shop/sales-configurable-bundle-widget": "Add the module if you want to use OrderItemsConfiguredBundleWidget.", "spryker-shop/sales-product-configuration-widget": "Add the module if you want to use ProductConfigurationOrderItemDisplayWidget.", "spryker-shop/sales-return-page": "Add the module if you want to use return-create-link molecule.", + "spryker-shop/sales-service-point-widget": "Add the module if you want to display the service point related information.", "spryker/config": "Use this module when using plugins that need Config dependencies.", "spryker/container": "If you want to use twig plugins.", "spryker/messenger": "Use this module when using plugins that need Messenger dependencies.", @@ -9952,9 +9953,9 @@ ], "description": "CustomerPage module", "support": { - "source": "https://github.com/spryker-shop/customer-page/tree/2.44.0" + "source": "https://github.com/spryker-shop/customer-page/tree/2.45.0" }, - "time": "2023-07-28T12:49:00+00:00" + "time": "2023-08-01T16:36:48+00:00" }, { "name": "spryker-shop/customer-page-extension", @@ -14680,6 +14681,55 @@ }, "time": "2020-05-29T15:35:39+00:00" }, + { + "name": "spryker-shop/sales-service-point-widget", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker-shop/sales-service-point-widget.git", + "reference": "32bb5eeecacc0c09dc2517750586cfc9bc7dfae7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-shop/sales-service-point-widget/zipball/32bb5eeecacc0c09dc2517750586cfc9bc7dfae7", + "reference": "32bb5eeecacc0c09dc2517750586cfc9bc7dfae7", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "spryker-shop/shop-ui": "^1.72.0", + "spryker/kernel": "^3.52.0", + "spryker/sales-service-point": "^0.1.0", + "spryker/transfer": "^3.27.0" + }, + "require-dev": { + "spryker/code-sniffer": "*" + }, + "suggest": { + "spryker/router": "Use this module if you need use the RouterProviderPlugin.", + "spryker/silex": "Use this module when using plugins that need Silex dependencies." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerShop\\": "src/SprykerShop/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "SalesServicePointWidget module", + "support": { + "source": "https://github.com/spryker-shop/sales-service-point-widget/tree/0.1.0" + }, + "time": "2023-08-01T16:36:48+00:00" + }, { "name": "spryker-shop/security-blocker-page", "version": "1.1.0", @@ -58200,6 +58250,100 @@ }, "time": "2021-04-02T09:54:31+00:00" }, + { + "name": "spryker/sales-service-point", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/sales-service-point.git", + "reference": "858927d986caaeab345422421267603676eee499" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/sales-service-point/zipball/858927d986caaeab345422421267603676eee499", + "reference": "858927d986caaeab345422421267603676eee499", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "spryker/kernel": "^3.30.0", + "spryker/propel-orm": "^1.0.0", + "spryker/sales": "^11.0.0", + "spryker/sales-extension": "^1.9.0", + "spryker/service-point": "^0.4.0", + "spryker/transfer": "^3.27.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/oms": "*", + "spryker/propel": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "SalesServicePoint module", + "support": { + "source": "https://github.com/spryker/sales-service-point/tree/0.1.0" + }, + "time": "2023-08-01T16:36:46+00:00" + }, + { + "name": "spryker/sales-service-point-gui", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/sales-service-point-gui.git", + "reference": "50ef7d603464149b2b72d3ec8225fe23ede588ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/sales-service-point-gui/zipball/50ef7d603464149b2b72d3ec8225fe23ede588ec", + "reference": "50ef7d603464149b2b72d3ec8225fe23ede588ec", + "shasum": "" + }, + "require": { + "php": ">=8.0", + "spryker/gui": "^3.49.0", + "spryker/sales-service-point": "^0.1.0", + "spryker/transfer": "^3.27.0" + }, + "require-dev": { + "spryker/code-sniffer": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "SalesServicePointGui module", + "support": { + "source": "https://github.com/spryker/sales-service-point-gui/tree/0.1.0" + }, + "time": "2023-08-01T16:36:46+00:00" + }, { "name": "spryker/sales-split", "version": "5.1.1", @@ -61188,16 +61332,16 @@ }, { "name": "spryker/shipment-gui", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/spryker/shipment-gui.git", - "reference": "65754a79a30a19c8a11bd6a82e3d2874486a2dce" + "reference": "c6c9a56fffe7ec32e038e002c60bfbd02c75eb90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/shipment-gui/zipball/65754a79a30a19c8a11bd6a82e3d2874486a2dce", - "reference": "65754a79a30a19c8a11bd6a82e3d2874486a2dce", + "url": "https://api.github.com/repos/spryker/shipment-gui/zipball/c6c9a56fffe7ec32e038e002c60bfbd02c75eb90", + "reference": "c6c9a56fffe7ec32e038e002c60bfbd02c75eb90", "shasum": "" }, "require": { @@ -61230,6 +61374,9 @@ "spryker/validator": "*", "spryker/zed-navigation": "*" }, + "suggest": { + "spryker/sales-service-point-gui": "Add the module if you want to display the service point related information." + }, "type": "library", "extra": { "branch-alias": { @@ -61247,9 +61394,9 @@ ], "description": "ShipmentGui module", "support": { - "source": "https://github.com/spryker/shipment-gui/tree/2.8.0" + "source": "https://github.com/spryker/shipment-gui/tree/2.9.0" }, - "time": "2023-04-17T15:49:27+00:00" + "time": "2023-08-01T16:36:46+00:00" }, { "name": "spryker/shipment-gui-extension", diff --git a/data/import/common/common/cms_block.csv b/data/import/common/common/cms_block.csv index ddd6a126ee..47a3679b9f 100644 --- a/data/import/common/common/cms_block.csv +++ b/data/import/common/common/cms_block.csv @@ -26,8 +26,8 @@ cms-block-email--gift-card-delivery--html,gift-card-delivery--html,HTML Email Te cms-block-email--gift-card-usage--html,gift-card-usage--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.twig,1,,,,,,,"

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.customer.firstName }} {{ mail.customer.lastName }},

{{ 'mail.trans.gift_card_usage.title' | trans }}

{{ 'mail.trans.gift_card_usage.subtitle' | trans }} {{ giftCard.code }} ({{ giftCard.actualValue / 100 | number_format(2) }} {{ giftCard.currencyIsoCode }})
","

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.customer.firstName }} {{ mail.customer.lastName }},

{{ 'mail.trans.gift_card_usage.title' | trans }}

{{ 'mail.trans.gift_card_usage.subtitle' | trans }} {{ giftCard.code }} ({{ giftCard.actualValue / 100 | number_format(2) }} {{ giftCard.currencyIsoCode }})
" cms-block-email--newsletter-subscribed--html,newsletter-subscribed--html,Empty Email Template,@CmsBlock/template/email-template-empty.twig,1,,,,,,,"

{{ 'mail.trans.newsletter_subscribed.title' | trans }}

{{ 'mail.trans.newsletter_subscribed.subtitle' | trans }}

{{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }}


{{ 'mail.trans.footer.shopping_experience' | trans }}

{{ 'mail.trans.footer.your_team' | trans }}
{{ 'mail.trans.footer.shop_name' | trans }}
{{ 'mail.trans.footer.shop_address' | trans }}
{{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }}

{{ 'mail.trans.footer.shop_phone' | trans }}
{{ 'mail.trans.footer.contact_email_address' | trans }}
","

{{ 'mail.trans.newsletter_subscribed.title' | trans }}

{{ 'mail.trans.newsletter_subscribed.subtitle' | trans }}

{{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }}


{{ 'mail.trans.footer.shopping_experience' | trans }}

{{ 'mail.trans.footer.your_team' | trans }}
{{ 'mail.trans.footer.shop_name' | trans }}
{{ 'mail.trans.footer.shop_address' | trans }}
{{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }}

{{ 'mail.trans.footer.shop_phone' | trans }}
{{ 'mail.trans.footer.contact_email_address' | trans }}
" cms-block-email--newsletter-unsubscribed--html,newsletter-unsubscribed--html,Empty Email Template,@CmsBlock/template/email-template-empty.twig,1,,,,,,,"

{{ 'mail.trans.newsletter_unsubscribed.title' | trans }}

{{ 'mail.trans.newsletter_unsubscribed.subtitle' | trans }}

{{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }}


{{ 'mail.trans.footer.shopping_experience' | trans }}

{{ 'mail.trans.footer.your_team' | trans }}
{{ 'mail.trans.footer.shop_name' | trans }}
{{ 'mail.trans.footer.shop_address' | trans }}
{{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }}

{{ 'mail.trans.footer.shop_phone' | trans }}
{{ 'mail.trans.footer.contact_email_address' | trans }}
","

{{ 'mail.trans.newsletter_unsubscribed.title' | trans }}

{{ 'mail.trans.newsletter_unsubscribed.subtitle' | trans }}

{{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }}


{{ 'mail.trans.footer.shopping_experience' | trans }}

{{ 'mail.trans.footer.your_team' | trans }}
{{ 'mail.trans.footer.shop_name' | trans }}
{{ 'mail.trans.footer.shop_address' | trans }}
{{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }}

{{ 'mail.trans.footer.shop_phone' | trans }}
{{ 'mail.trans.footer.contact_email_address' | trans }}
" -cms-block-email--order-confirmation--html,order-confirmation--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.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.trans.order.shipment_costs_total' | trans }}

{{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }}

{{ 'mail.trans.order.discounts_total' | trans }}

{{ discount.displayName }}

{{ 'mail.trans.order.taxes' | trans }}

{{ 'mail.trans.order.grand_total' | trans }}

{{ mail.order.totals.subtotal | money }}

{{ mail.order.totals.expenseTotal | money }}

{{ shipment.sumPriceToPayAggregation | money }}

‎‏‏‎ ‎

- {{ discount.sumAmount | money }}

{{ mail.order.totals.taxTotal.amount | money }}

{{ 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 }}: {{ 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) }}

{{ 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.trans.order.shipment_costs_total' | trans }}

{{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }}

{{ 'mail.trans.order.discounts_total' | trans }}

{{ discount.displayName }}

{{ 'mail.trans.order.taxes' | trans }}

{{ 'mail.trans.order.grand_total' | trans }}

{{ mail.order.totals.subtotal | money }}

{{ mail.order.totals.expenseTotal | money }}

{{ shipment.sumPriceToPayAggregation | money }}

‎‏‏‎ ‎

- {{ discount.sumAmount | money }}

{{ mail.order.totals.taxTotal.amount | money }}

{{ 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 }}: {{ 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) }}

{{ item.sumPrice | money }}

+ {{ option.groupName }}: {{ option.sumPrice | money }}
" -cms-block-email--order-shipped--html,order-shipped--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.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 }}: {{ 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) }}

{{ 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 }}: {{ 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) }}

{{ item.sumPrice | money }}

+ {{ option.groupName }}: {{ option.sumPrice | money }}
" +cms-block-email--order-confirmation--html,order-confirmation--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.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.trans.order.shipment_costs_total' | trans }}

{{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }}

{{ 'mail.trans.order.discounts_total' | trans }}

{{ discount.displayName }}

{{ 'mail.trans.order.taxes' | trans }}

{{ 'mail.trans.order.grand_total' | trans }}

{{ mail.order.totals.subtotal | money }}

{{ mail.order.totals.expenseTotal | money }}

{{ shipment.sumPriceToPayAggregation | money }}

‎‏‏‎ ‎

- {{ discount.sumAmount | money }}

{{ mail.order.totals.taxTotal.amount | money }}

{{ 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) }}

{{ 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.trans.order.shipment_costs_total' | trans }}

{{ shipmentGroup.shipment.carrier.name }} - {{ shipmentGroup.shipment.method.name }}

{{ 'mail.trans.order.discounts_total' | trans }}

{{ discount.displayName }}

{{ 'mail.trans.order.taxes' | trans }}

{{ 'mail.trans.order.grand_total' | trans }}

{{ mail.order.totals.subtotal | money }}

{{ mail.order.totals.expenseTotal | money }}

{{ shipment.sumPriceToPayAggregation | money }}

‎‏‏‎ ‎

- {{ discount.sumAmount | money }}

{{ mail.order.totals.taxTotal.amount | money }}

{{ 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) }}

{{ item.sumPrice | money }}

+ {{ option.groupName }}: {{ option.sumPrice | money }}
" +cms-block-email--order-shipped--html,order-shipped--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.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) }}

{{ 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) }}

{{ item.sumPrice | money }}

+ {{ option.groupName }}: {{ option.sumPrice | money }}
" cms-block-email--merchant_restore_password--html,merchant_restore_password--html,HTML Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.html.twig,1,,,,,,,"

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{ mail.user.lastName}},

{{ 'mail.trans.merchant.restore_password.title' | trans }}

{{ 'mail.trans.customer_restore_password.subtitle' | trans }}
{{ 'mail.trans.customer_restore_password.change_password' | trans }}
","

{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{ mail.user.lastName}},

{{ 'mail.trans.merchant.restore_password.title' | trans }}

{{ 'mail.trans.customer_restore_password.subtitle' | trans }}
{{ 'mail.trans.customer_restore_password.change_password' | trans }}
" cms-block-email--company-status--text,company-status--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.customer.firstName }} {{ mail.customer.lastName }}, {{ 'mail.trans.company_status.title' | trans }} {{ ('mail.company.status.' ~ mail.company.status) | trans }}","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.customer.firstName }} {{ mail.customer.lastName }}, {{ 'mail.trans.company_status.title' | trans }} {{ ('mail.company.status.' ~ mail.company.status) | trans }}" cms-block-email--company-user-invitation--text,company-user-invitation--text,TEXT Email Template With Header And Footer,@CmsBlock/template/email-template-with-header-and-footer.text.twig,1,,,,,,,"{{ 'mail.trans.customer_registration.title' | trans }} {{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.getCompanyUserInvitation.getFirstName }} {{ mail.getCompanyUserInvitation.getLastName }}, {{ 'mail.trans.customer_registration.registration_success' | trans }} {{ 'mail.trans.customer_registration.change_info' | trans }}. {{ 'mail.trans.customer_registration.confirmation_link' | trans }} ({{ mail.getInvitationLink }})","{{ 'mail.trans.customer_registration.title' | trans }} {{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.getCompanyUserInvitation.getFirstName }} {{ mail.getCompanyUserInvitation.getLastName }}, {{ 'mail.trans.customer_registration.registration_success' | trans }} {{ 'mail.trans.customer_registration.change_info' | trans }}. {{ 'mail.trans.customer_registration.confirmation_link' | trans }} ({{ mail.getInvitationLink }})" @@ -43,6 +43,6 @@ cms-block-email--gift-card-delivery--text,gift-card-delivery--text,TEXT Email Te cms-block-email--gift-card-usage--text,gift-card-usage--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.customer.firstName }} {{ mail.customer.lastName }}, {{ 'mail.trans.gift_card_usage.title' | trans }} {{ 'mail.trans.gift_card_usage.subtitle' | trans }} {{ giftCard.code }} ({{ giftCard.actualValue / 100 | number_format(2) }} {{ giftCard.currencyIsoCode }}) ","{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.customer.firstName }} {{ mail.customer.lastName }}, {{ 'mail.trans.gift_card_usage.title' | trans }} {{ 'mail.trans.gift_card_usage.subtitle' | trans }} {{ giftCard.code }} ({{ giftCard.actualValue / 100 | number_format(2) }} {{ giftCard.currencyIsoCode }}) " cms-block-email--newsletter-subscribed--text,newsletter-subscribed--text,Empty Email Template,@CmsBlock/template/email-template-empty.twig,1,,,,,,,///////////////////////////////////////// // {{ 'mail.trans.header.shop_name' | trans }} // ///////////////////////////////////////// {{ 'mail.trans.newsletter_subscribed.title' | trans }} {{ 'mail.trans.newsletter_subscribed.subtitle' | trans }} =========================================== =========================================== {{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }} (mailto:{{ 'mail.trans.footer.contact_email_address' | trans }}) {{ 'mail.trans.footer.shopping_experience' | trans }} {{ 'mail.trans.footer.your_team' | trans }} ------------------------------------------- {{ 'mail.trans.footer.shop_name' | trans }} {{ 'mail.trans.footer.shop_address' | trans }} {{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }} {{ 'mail.trans.footer.shop_phone' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }},///////////////////////////////////////// // {{ 'mail.trans.header.shop_name' | trans }} // ///////////////////////////////////////// {{ 'mail.trans.newsletter_subscribed.title' | trans }} {{ 'mail.trans.newsletter_subscribed.subtitle' | trans }} =========================================== =========================================== {{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }} (mailto:{{ 'mail.trans.footer.contact_email_address' | trans }}) {{ 'mail.trans.footer.shopping_experience' | trans }} {{ 'mail.trans.footer.your_team' | trans }} ------------------------------------------- {{ 'mail.trans.footer.shop_name' | trans }} {{ 'mail.trans.footer.shop_address' | trans }} {{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }} {{ 'mail.trans.footer.shop_phone' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }} cms-block-email--newsletter-unsubscribed--text,newsletter-unsubscribed--text,Empty Email Template,@CmsBlock/template/email-template-empty.twig,1,,,,,,,///////////////////////////////////////// // {{ 'mail.trans.header.shop_name' | trans }} // ///////////////////////////////////////// {{ 'mail.trans.newsletter_unsubscribed.title' | trans }} {{ 'mail.trans.newsletter_unsubscribed.subtitle' | trans }} =========================================== =========================================== {{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }} (mailto:{{ 'mail.trans.footer.contact_email_address' | trans }}) {{ 'mail.trans.footer.shopping_experience' | trans }} {{ 'mail.trans.footer.your_team' | trans }} ------------------------------------------- {{ 'mail.trans.footer.shop_name' | trans }} {{ 'mail.trans.footer.shop_address' | trans }} {{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }} {{ 'mail.trans.footer.shop_phone' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }},///////////////////////////////////////// // {{ 'mail.trans.header.shop_name' | trans }} // ///////////////////////////////////////// {{ 'mail.trans.newsletter_unsubscribed.title' | trans }} {{ 'mail.trans.newsletter_unsubscribed.subtitle' | trans }} =========================================== =========================================== {{ 'mail.trans.footer.if_you_have_further_questions' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }} (mailto:{{ 'mail.trans.footer.contact_email_address' | trans }}) {{ 'mail.trans.footer.shopping_experience' | trans }} {{ 'mail.trans.footer.your_team' | trans }} ------------------------------------------- {{ 'mail.trans.footer.shop_name' | trans }} {{ 'mail.trans.footer.shop_address' | trans }} {{ 'mail.trans.footer.shop_zip_code' | trans }} {{ 'mail.trans.footer.shop_city' | trans }} {{ 'mail.trans.footer.shop_phone' | trans }} {{ 'mail.trans.footer.contact_email_address' | trans }} -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 }}: {{ 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 }}: {{ 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 }}: {{ 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 }}: {{ 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-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 }} " cms-block-email--merchant_restore_password--text,merchant_restore_password--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.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) ,{{ 'mail.trans.common.hello_for_first_name' | trans }} {{ mail.user.firstName }} {{mail.user.lastName}} {{ 'mail.trans.merchant.restore_password.title' | trans }} {{ 'mail.trans.restore_password.subtitle' | trans }} {{ 'mail.trans.restore_password.change_password' | trans }} ({{ mail.resetPasswordLink }}) diff --git a/src/Orm/Zed/SalesServicePoint/Persistence/SpySalesOrderItemServicePoint.php b/src/Orm/Zed/SalesServicePoint/Persistence/SpySalesOrderItemServicePoint.php new file mode 100644 index 0000000000..7f7aa6877b --- /dev/null +++ b/src/Orm/Zed/SalesServicePoint/Persistence/SpySalesOrderItemServicePoint.php @@ -0,0 +1,23 @@ +