From 18ded7cc8ec9feef2d028f6c5e78d26ac94ab4c8 Mon Sep 17 00:00:00 2001 From: Florian Eisenmenger Date: Tue, 8 Mar 2022 16:46:17 +0100 Subject: [PATCH] stand --- AtlDiscountExtension-main/README.md | 2 +- AtlDiscountExtension-main/composer.json | 2 +- .../src/Resources/config/services.xml | 2 +- .../StateMachineTransitionSubscriber.php | 55 +++---- .../js/zenit-platform-atmos-set1.js | 14 +- .../src/scss/component/_product-box.scss | 2 +- .../checkout/offcanvas-item.html.twig | 16 ++ .../component/product/description.html.twig | 5 + .../page/checkout/checkout-item.html.twig | 6 +- .../page/product-detail/description.html.twig | 4 +- .../storefront/src/scss/layout/_header.scss | 138 +++++++++--------- .../app/storefront/src/scss/overrides.scss | 12 +- .../block/cms-block-gallery-buybox.html.twig | 4 +- .../checkout/offcanvas-cart.html.twig | 8 +- .../checkout/offcanvas-item.html.twig | 20 ++- .../component/product/description.html.twig | 5 + .../page/checkout/checkout-item.html.twig | 6 +- .../summary/summary-shipping.html.twig | 2 +- .../page/product-detail/description.html.twig | 4 +- 19 files changed, 176 insertions(+), 131 deletions(-) create mode 100644 zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/description.html.twig create mode 100644 zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/description.html.twig diff --git a/AtlDiscountExtension-main/README.md b/AtlDiscountExtension-main/README.md index 5de8aeb..9d809e5 100644 --- a/AtlDiscountExtension-main/README.md +++ b/AtlDiscountExtension-main/README.md @@ -1,5 +1,5 @@ **Possible issues** -- The plugin only reacts to the state 'shipped', partially shipped and returned items are not influencing the customer tag +- The plugin only reacts to the order state 'completed' - Plugin only works with a boolean custom field, because it is looking for a truthy value - Delete limit set to 999 \ No newline at end of file diff --git a/AtlDiscountExtension-main/composer.json b/AtlDiscountExtension-main/composer.json index 15454b4..267052b 100644 --- a/AtlDiscountExtension-main/composer.json +++ b/AtlDiscountExtension-main/composer.json @@ -1,7 +1,7 @@ { "name": "atl/discount-extension", "description": "Discount Extension", - "version": "1.0.2", + "version": "1.0.3", "type": "shopware-platform-plugin", "license": "proprietary", "authors": [ diff --git a/AtlDiscountExtension-main/src/Resources/config/services.xml b/AtlDiscountExtension-main/src/Resources/config/services.xml index fb4b2f1..28e3060 100644 --- a/AtlDiscountExtension-main/src/Resources/config/services.xml +++ b/AtlDiscountExtension-main/src/Resources/config/services.xml @@ -15,7 +15,7 @@ - + diff --git a/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php b/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php index d1fcf16..7e51bb0 100644 --- a/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php +++ b/AtlDiscountExtension-main/src/Subscriber/StateMachineTransitionSubscriber.php @@ -6,9 +6,9 @@ namespace Atl\DiscountExtension\Subscriber; use Atl\DiscountExtension\Core\System\RepeatDiscount\RepeatDiscountEntity; use Shopware\Core\Checkout\Customer\CustomerEntity; -use Shopware\Core\Checkout\Order\Aggregate\OrderDelivery\OrderDeliveryEntity; -use Shopware\Core\Checkout\Order\Aggregate\OrderDelivery\OrderDeliveryStates; -use Shopware\Core\Checkout\Order\Aggregate\OrderDeliveryPosition\OrderDeliveryPositionCollection; +use Shopware\Core\Checkout\Order\Aggregate\OrderLineItem\OrderLineItemCollection; +use Shopware\Core\Checkout\Order\OrderEntity; +use Shopware\Core\Checkout\Order\OrderStates; use Shopware\Core\Framework\DataAbstractionLayer\EntityRepositoryInterface; use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria; use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter; @@ -27,7 +27,7 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface /** * @var EntityRepositoryInterface */ - private $orderDeliveryRepository; + private $orderRepository; /** * @var EntityRepositoryInterface @@ -42,13 +42,13 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface public function __construct ( SystemConfigService $systemConfigService, - EntityRepositoryInterface $orderDeliveryRepository, + EntityRepositoryInterface $orderRepository, EntityRepositoryInterface $customFieldRepository, EntityRepositoryInterface $customerRepository ) { $this->systemConfigService = $systemConfigService; - $this->orderDeliveryRepository = $orderDeliveryRepository; + $this->orderRepository = $orderRepository; $this->customFieldRepository = $customFieldRepository; $this->customerRepository = $customerRepository; } @@ -69,50 +69,51 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface */ public function onStateTransition(StateMachineTransitionEvent $event): void { - // Early return if transition state is not 'shipped' - if ($event->getToPlace()->getTechnicalName() !== OrderDeliveryStates::STATE_SHIPPED) { + // Early return if order state is not 'completed' + if ($event->getToPlace()->getTechnicalName() !== OrderStates::STATE_COMPLETED) { return; } - $orderDeliveryId = $event->getEntityId(); - $orderDelivery = $this->getOrderDelivery($orderDeliveryId, $event); - $salesChannelId = $orderDelivery->getOrder()->getSalesChannelId(); + $orderId = $event->getEntityId(); + $order = $this->getOrder($orderId, $event); + $salesChannelId = $order->getSalesChannelId(); - // In case no order delivery could be found - return - if (empty($orderDelivery)) { + // In case no order could be found - return + if (empty($order)) { return; } $minAmountDiscountableLineItems = $this->systemConfigService->get('AtlDiscountExtension.config.minAmountDiscountableLineItems', $salesChannelId); - $amountDiscountableLineItems = $this->getAmountDiscountableLineItems($orderDelivery->getPositions(), $minAmountDiscountableLineItems, $salesChannelId, $event); + $amountDiscountableLineItems = $this->getAmountDiscountableLineItems($order->getLineItems(), $minAmountDiscountableLineItems, $salesChannelId, $event); + // In case it is not enough - return if ($amountDiscountableLineItems < $minAmountDiscountableLineItems) { return; } - $customer = $orderDelivery->getOrder()->getOrderCustomer()->getCustomer(); + $customer = $order->getOrderCustomer()->getCustomer(); // Tag the customer and trace last order date in 'spwn_repeat_discount' table $this->tagCustomer($customer, $salesChannelId, $event); } /** - * @param string $orderDeliveryId + * @param string $orderId * @param StateMachineTransitionEvent $event - * @return OrderDeliveryEntity + * @return OrderEntity */ - private function getOrderDelivery(string $orderDeliveryId, StateMachineTransitionEvent $event): OrderDeliveryEntity + private function getOrder(string $orderId, StateMachineTransitionEvent $event): OrderEntity { $criteria = new Criteria(); - $criteria->addFilter(new EqualsFilter('id', $orderDeliveryId)); - $criteria->addAssociation('positions.orderLineItem'); - $criteria->addAssociation('order.orderCustomer.customer'); + $criteria->addFilter(new EqualsFilter('id', $orderId)); + $criteria->addAssociation('lineItems'); + $criteria->addAssociation('orderCustomer.customer'); - return $this->orderDeliveryRepository->search($criteria, $event->getContext())->first(); + return $this->orderRepository->search($criteria, $event->getContext())->first(); } /** - * @param OrderDeliveryPositionCollection $positions + * @param OrderLineItemCollection $lineItems * @param int $minAmountDiscountableLineItems * @param string $salesChannelId * @param StateMachineTransitionEvent $event @@ -120,7 +121,7 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface */ private function getAmountDiscountableLineItems ( - OrderDeliveryPositionCollection $positions, + OrderLineItemCollection $lineItems, int $minAmountDiscountableLineItems, string $salesChannelId, StateMachineTransitionEvent $event @@ -134,12 +135,12 @@ class StateMachineTransitionSubscriber implements EventSubscriberInterface } $amountDiscountableLineItems = 0; - foreach($positions as $position) { - $customFields = $position->getOrderLineItem()->getPayload()['customFields']; + foreach($lineItems as $lineItem) { + $customFields = $lineItem->getPayload()['customFields']; // Checks if the custom field exists and is set to true if (!empty($customFields[$customFieldName]) && $customFields[$customFieldName] === true) { - $amountDiscountableLineItems += $position->getQuantity(); + $amountDiscountableLineItems += $lineItem->getQuantity(); } // Break if min amount is already reached diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js b/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js index 6d251a7..b6fa04a 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/dist/storefront/js/zenit-platform-atmos-set1.js @@ -35,13 +35,15 @@ $(document).ready(function() { changeDelivery(fp); } - var sticky = $(".thumbnail-container"), - parentContainer = sticky.parents(".aku-cms-factory-element"), - stickyTop = sticky.offset().top; - tagBar(sticky, parentContainer, stickyTop); - $(window).on('resize scroll', function() { + var sticky = $(".thumbnail-container"); + if (sticky.length) { + var parentContainer = sticky.parents(".aku-cms-factory-element"), + stickyTop = sticky.offset().top; tagBar(sticky, parentContainer, stickyTop); - }); + $(window).on('resize scroll', function() { + tagBar(sticky, parentContainer, stickyTop); + }); + } }); function manipulateDateInputValue() { diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss index fe006e7..37ccc6b 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_product-box.scss @@ -34,7 +34,7 @@ } .product-price-unit, .product-cheapest-price { - display: none; + //display: none; } } diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig index 57fece3..8f4bb21 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig @@ -56,6 +56,22 @@ {% endif %} {% endblock %} +{% block component_offcanvas_product_label %} +
+ {% if type == PRODUCT_LINE_ITEM_TYPE %} + + {{ quantity }}{{ "checkout.quantityTimes"|trans|sw_sanitize }} {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }} + + {% else %} +
+ {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }} +
+ {% endif %} +
+{% endblock %} + {# coming from AtlProductConfigurator #} {% block cart_item_variant_characteristics %}
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/description.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/description.html.twig new file mode 100644 index 0000000..5b9b438 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/product/description.html.twig @@ -0,0 +1,5 @@ +{% sw_extends '@Storefront/storefront/component/product/description.html.twig' %} + +{% block component_product_description_title %} + +{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig index 4171b5b..3a91cee 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/checkout-item.html.twig @@ -14,18 +14,18 @@ {% if lineItem.type == PRODUCT_LINE_ITEM_TYPE %} - {{ label|u.truncate(60, '...', false) }} + {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }} {% else %}
- {{ label|u.truncate(60, '...', false) }} + {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }}
{% endif %} {% endblock %} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/description.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/description.html.twig index 772f9b6..6dde31b 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/description.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/description.html.twig @@ -1,7 +1,5 @@ {% sw_extends '@Storefront/storefront/page/product-detail/description.html.twig' %} {% block page_product_detail_description_title %} -
- {{ "detail.descriptionTitle"|trans|sw_sanitize }} {{ page.product.translated.name }} -
+ {% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss index c39d9a0..d9221a1 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss @@ -1,107 +1,103 @@ .top-bar-country { - transform: translateY(4px); - .top-bar-nav-btn.btn { - color: #222; - &:hover { - background: transparent; - color: $sw-color-brand-primary; + transform: translateY(4px); + .top-bar-nav-btn.btn { + color: #222; + &:hover { + background: transparent; + color: $sw-color-brand-primary; + } + } +} + +@media (min-width: 992px) { + .header-main .header-inner { + padding-top: 15px; + padding-bottom: 25px; } - } } .header-row { - padding-top: 10px; - border-bottom: 1px solid #B1C3D9; + padding-top: 10px; + padding-bottom: 15px; } .header-main { - .header-actions-btn { - &:hover { - background: transparent; + .header-actions-btn { + &:hover { + background: transparent; + } } - } - .header-cart-btn { - .header-cart-total { - margin-right: 0; + .header-cart-btn { + .header-cart-total { + margin-right: 0; + } + &:hover { + background: transparent; + } } - &:hover { - background: transparent; - } - } -} - -.header-actions-col { - @media (min-width: 992px) { - position: absolute; - top: 0; - right: 0; - z-index: 10; - } } .header-nav-col { - max-width: 950px; - margin-top: 45px; - margin-left: auto; + max-width: 950px; + margin-top: 45px; + margin-left: auto; } .header-single-line { - .navigation-flyout { - top: 36px; - &.is-open { - @media (min-width: 992px) { - padding-top: 0; - } + .navigation-flyout { + top: 36px; + &.is-open { + @media (min-width: 992px) { + padding-top: 0; + } + } } - } } -.nav-header > .container { - padding-left: 0; - padding-right: 0; +.nav-header>.container { + padding-left: 0; + padding-right: 0; } .main-navigation-menu { - justify-content: space-between; + justify-content: space-around; } .main-navigation-divider { - display: none; + display: none; } .main-navigation-link { - font-size: 16px; - font-weight: 500; - letter-spacing: 1.6px; - line-height: 18px; - text-transform: uppercase; - padding: 0; - .main-navigation-link-text { - &:after { - height: 3px; - left: 0; - right: 0; - bottom: -18px; - } - } - &.active { + font-size: 18px; + font-weight: 500; + letter-spacing: 0.5px; + line-height: 18px; + padding: 0; .main-navigation-link-text { - color: $sw-color-brand-primary; + &:after { + height: 3px; + left: 0; + right: 0; + bottom: -18px; + } + } + &.active { + .main-navigation-link-text { + color: $sw-color-brand-primary; + } } - } } .navigation-offcanvas-actions { - .top-bar-country { - z-index: 10; - } + .top-bar-country { + z-index: 10; + } } .navigation-offcanvas-link { - &.is-home-link, - &.is-current-category { - background: #f3f4f5; - color: #222; - } -} - + &.is-home-link, + &.is-current-category { + background: #f3f4f5; + color: #222; + } +} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss index fe16211..06419ee 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss @@ -8,11 +8,12 @@ https://getbootstrap.com/docs/4.0/getting-started/theming/#variable-defaults */ html { - scroll-behavior: smooth; + scroll-behavior: smooth; } body { background: #fff; + border-top: 5px solid $sw-color-brand-primary !important; } h1 { @@ -40,7 +41,7 @@ h1 { } .btn-outline-primary { - border: 2px solid #33548C !important; + border: 2px solid #86B04B !important; border-radius: 3px; font-size: 16px; font-weight: 600; @@ -49,6 +50,13 @@ h1 { padding: 5px 32px !important; } +.aku-cms-factory-element { + .btn-outline-primary { + background-color: $sw-color-brand-primary; + color: #fff; + } +} + input.custom-number[type=number] { border-bottom: 2px solid $sw-color-brand-primary; } diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig index d8d8882..be10a7e 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/block/cms-block-gallery-buybox.html.twig @@ -26,9 +26,9 @@ {# ... add short description #} {% block zen_page_product_detail_short_description %} - {% if page.product.translated.metaDescription and theme_config('zen-product-details-short-description') %} + {% if page.product.customFields.custom_description_small_description and theme_config('zen-product-details-short-description') %}
- {{ page.product.translated.metaDescription|raw }} + {{ page.product.customFields.custom_description_small_description|trans|sw_sanitize }}
{% endif %} {% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig index 3c57829..2f86555 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig @@ -22,11 +22,11 @@ {% sw_icon 'checkmark-circle' %}
{% if customizedProductsCount == 1 %} -

Ihr Abnehmplan wurde erfolgreich zum Warenkorb hinzugefügt – ein guter Start!

-

Wählen Sie bis zu 2 weitere Pläne für Ihr optimales Abnehmprogramm und sparen Sie ab 150 € Bestellsumme die Versandkosten.

+

Ihr Paket wurde erfolgreich zum Warenkorb hinzugefügt – ein guter Start!

+

Wählen Sie bis zu 2 weitere Pläne für Ihr optimales Abnehmprogramm und sparen Sie ab 100 € Bestellsumme die Versandkosten.

{% elseif customizedProductsCount == 2 %} -

Ihr zweiter Abnehmplan wurde zum Warenkorb hinzugefügt - Sie sparen die Versandkosten!

-

Wählen Sie einen weiteren Plan für Ihr optimales, mehrwöchiges Abnehmprogramm.

+

Ihr zweites Paket wurde zum Warenkorb hinzugefügt - Sie sparen die Versandkosten!

+

Wählen Sie ein weiteres Paket für Ihr optimales, mehrwöchiges Abnehmprogramm.

{% endif %}
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig index 57fece3..e757fd6 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/checkout/offcanvas-item.html.twig @@ -48,14 +48,30 @@ {% if lineItem.payload is defined and lineItem.payload.customFields is defined and lineItem.payload.customFields.spwn_discountable_box is defined and addCustomizedProducts !== 0 %}
- Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + Fügen Sie ein weiteres Paket hinzu für ihr optimales Abnehmprogramm {% if addCustomizedProducts == 1 %} - Fügen Sie einen weiteren Plan hinzu für ihr optimales Abnehmprogramm + Fügen Sie einen weiteres Paket hinzu für ihr optimales Abnehmprogramm {% endif %}
{% endif %} {% endblock %} +{% block component_offcanvas_product_label %} +
+ {% if type == PRODUCT_LINE_ITEM_TYPE %} + + {{ quantity }}{{ "checkout.quantityTimes"|trans|sw_sanitize }} {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }} + + {% else %} +
+ {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }} +
+ {% endif %} +
+{% endblock %} + {# coming from AtlProductConfigurator #} {% block cart_item_variant_characteristics %}
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/description.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/description.html.twig new file mode 100644 index 0000000..5b9b438 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/product/description.html.twig @@ -0,0 +1,5 @@ +{% sw_extends '@Storefront/storefront/component/product/description.html.twig' %} + +{% block component_product_description_title %} + +{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig index 4171b5b..3a91cee 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/checkout-item.html.twig @@ -14,18 +14,18 @@ {% if lineItem.type == PRODUCT_LINE_ITEM_TYPE %} - {{ label|u.truncate(60, '...', false) }} + {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }} {% else %}
- {{ label|u.truncate(60, '...', false) }} + {{ label|replace({'&':'&'})|u.truncate(60, '...', false) }}
{% endif %} {% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig index abe7cb1..01740bd 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/summary/summary-shipping.html.twig @@ -12,7 +12,7 @@ data-url="{{ path('frontend.cms.page',{ id: config('core.basicInformation.shippingPaymentInfoPage') }) }}"> {{ "checkout.summaryShipping"|trans|sw_sanitize }} - {{ "checkout.freeShipping"|trans|sw_sanitize }} + {{ "checkout.freeShippingEasyfit"|trans|sw_sanitize }} {% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig index 772f9b6..6dde31b 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/description.html.twig @@ -1,7 +1,5 @@ {% sw_extends '@Storefront/storefront/page/product-detail/description.html.twig' %} {% block page_product_detail_description_title %} -
- {{ "detail.descriptionTitle"|trans|sw_sanitize }} {{ page.product.translated.name }} -
+ {% endblock %} \ No newline at end of file