diff --git a/.DS_Store b/.DS_Store index fed8052..cd143d7 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/testsystem/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig b/testsystem/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig index 30b5db4..4bc4462 100644 --- a/testsystem/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig +++ b/testsystem/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig @@ -1,9 +1,5 @@ {% sw_extends '@Storefront/storefront/layout/meta.html.twig' %} -{% block layout_head_title %} - {% apply spaceless %} - {% block layout_head_title_inner %} - {{ metaTitle }} | diaeko.de - {% endblock %} - {% endapply %} +{% block layout_head_title_inner %} + {{ metaTitle }} | diaeko.de {% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_card.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_card.scss index 8d46aa8..46f377a 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_card.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/component/_card.scss @@ -48,6 +48,12 @@ } .cart-offcanvas { + .row { + justify-content: space-between; + } + .js-toggle-shipping-selection { + display: block; + } .offcanvas-close { min-height: 54px; background: #E9F4FC; @@ -82,13 +88,13 @@ margin-bottom: 20px; display: flex; grid-gap: 15px; - padding: 14px 18px 1px; + padding: 14px 8px 1px; border-radius: 3px; background: rgba(#86B04B, 0.15); color: #86B04B; &.spwn-c-p-more { - background-color: #33548c; - color: #fff; + background-color: #33548c; + color: #fff; } .icon { min-width: 22px; @@ -97,7 +103,7 @@ } &.spwn-c-p-more { .icon { - color: #fff; + color: #fff; } } } @@ -126,6 +132,24 @@ } } } + &.cart-item-FLOWSITEDepositLineItem { + .cart-item-row { + max-height: 20px; + .cart-item-img { + transform: translateY(-4px); + } + } + .cart-item-details { + margin-bottom: 0; + padding-top: 0; + .cart-item-details-container { + display: flex; + .cart-quantity-price { + min-height: auto; + } + } + } + } } .spwn-add-customized-products { .spwn-add-customized-products-detail { @@ -206,4 +230,8 @@ text-transform: uppercase; } } +} + +.offcanvas-cart .cart-item-details-container .cart-item-details { + margin-right: 48px; } \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss index 27c12f1..69fd052 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_header.scss @@ -29,11 +29,11 @@ } } .header-hotline-btn:hover { - svg { - path { - stroke: $sw-color-brand-primary; + svg { + path { + stroke: $sw-color-brand-primary; + } } - } } } @@ -46,10 +46,24 @@ } } +.header-logo-col { + @media (min-width: 992px) and (max-width: 1350px) { + width: 100%; + } +} + .header-nav-col { - max-width: 950px; + max-width: 1050px; margin-top: 45px; margin-left: auto; + @media (min-width: 992px) and (max-width: 1350px) { + max-width: 100%; + margin-top: 20px; + margin-left: 0; + .main-navigation { + margin-bottom: 18px; + } + } } .header-single-line { @@ -79,10 +93,13 @@ .main-navigation-link { font-size: 16px; font-weight: 500; - letter-spacing: 1.6px; + letter-spacing: 0.5px; line-height: 18px; text-transform: uppercase; padding: 0; + @media (min-width: 992px) and (max-width: 1149px) { + font-size: 14px; + } .main-navigation-link-text { &:after { height: 3px; @@ -98,6 +115,13 @@ } } +.navigation-flyout-category-link .nav-link, +.navigation-flyout-link { + @media (min-width: 992px) and (max-width: 1149px) { + font-size: 14px; + } +} + .navigation-offcanvas-actions { .top-bar-country { z-index: 10; @@ -129,9 +153,11 @@ z-index: 500; } } -.navigation-flyout-categories.is-level-0 > .navigation-flyout-col { + +.navigation-flyout-categories.is-level-0>.navigation-flyout-col { margin-bottom: 15px; } + .navigation-flyout .container>.navigation-flyout-content:first-child { padding-top: 30px; padding-bottom: 15px; diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig index cd8f233..22f9a7f 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig @@ -193,6 +193,26 @@ {% endblock %} + {# ordernumber #} + {% if theme_config('zen-product-details-ordernumber') and page.product.productNumber %} +
+ {% block buy_widget_ordernumber_label %} + + {{ "detail.ordernumberLabel"|trans|sw_sanitize }} + + {% endblock %} + + {% block buy_widget_ordernumber %} + + + {{ page.product.productNumber }} + + {% endblock %} +
+ {% endif %} + {% if config('core.cart.wishlistEnabled') %} {% block buy_widget_wishlist %} {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig index 550ed3b..d32e857 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/checkout/offcanvas-cart.html.twig @@ -5,6 +5,7 @@ {% set customizedProductsCount = 0 %} {% set customizedProductsCountTemp = 0 %} {% set addCustomizedProducts = 0 %} + {% set isProgram = 0 %} {# copy from SpnoSortBasket #} {% set sortBasketConfig = context.extensions.SpnoSortBasket %} @@ -13,21 +14,34 @@ {% if lineItem.payload is defined and lineItem.payload.customFields is defined and lineItem.payload.customFields.spwn_discountable_box is defined %} {% set customizedProductsCount = customizedProductsCount + lineItem.quantity %} + {% if lineItem.payload.customFields.custom_weightlossplan_day1_breakfast is defined %} + {% set isProgram = isProgram + lineItem.quantity %} + {% endif %} {% endif %} {% endfor %}
{# spawntree start #} - {% if customizedProductsCount == 1 || customizedProductsCount == 2 || customizedProductsCount > 3 %} -
+ {% if customizedProductsCount >= 1 and customizedProductsCount <= 4 %} +
+ {% sw_icon 'checkmark-circle' %} +
+ {% if customizedProductsCount == 1 %} + {{ "checkout.diaekoProgramNoticeFirst"|trans|sw_sanitize }} + {% elseif customizedProductsCount == 2 %} + {{ "checkout.diaekoProgramNoticeSecond"|trans|sw_sanitize }} + {% elseif customizedProductsCount == 3 %} + {{ "checkout.diaekoProgramNoticeThird"|trans|sw_sanitize }} + {% elseif customizedProductsCount == 4 %} + {{ "checkout.diaekoProgramNoticeFourth"|trans|sw_sanitize }} + {% endif %} +
+
+ {% endif %} + {% if isProgram > 3 %} +
{% sw_icon 'checkmark-circle' %}
- {% if customizedProductsCount == 1 %} - {{ "checkout.diaekoProgramNoticeFirst"|trans|sw_sanitize }} - {% elseif customizedProductsCount == 2 %} - {{ "checkout.diaekoProgramNoticeSecond"|trans|sw_sanitize }} - {% elseif customizedProductsCount > 3 %} {{ "checkout.diaekoProgramNoticeMore"|trans|sw_sanitize }} - {% endif %}
{% endif %} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/banner.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/banner.html.twig new file mode 100644 index 0000000..9b5e115 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/banner.html.twig @@ -0,0 +1,26 @@ +
+ + {% if config('SwagCustomNotification.config.bannerMarquee') %} + + {{ 'SwagCustomNotification.banner.text'|trans|raw }} + + {% else %} + + {{ 'SwagCustomNotification.banner.text'|trans|raw }} + + {% endif %} + + {% if config('SwagCustomNotification.config.bannerClosable') %} + + {{ source('@Storefront/../app/storefront/dist/assets/icon/default/x.svg', ignore_missing = true) }} + + {% endif %} +
+ diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig index 39a9c58..08c5cd2 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/header/header.html.twig @@ -29,6 +29,7 @@
{% endblock %} + {% block layout_header_hotline %}
diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig index 30b5db4..4bc4462 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/layout/meta.html.twig @@ -1,9 +1,5 @@ {% sw_extends '@Storefront/storefront/layout/meta.html.twig' %} -{% block layout_head_title %} - {% apply spaceless %} - {% block layout_head_title_inner %} - {{ metaTitle }} | diaeko.de - {% endblock %} - {% endapply %} +{% block layout_head_title_inner %} + {{ metaTitle }} | diaeko.de {% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig index 9084ecb..91ab513 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig @@ -191,6 +191,26 @@
{% endblock %} + {# ordernumber #} + {% if theme_config('zen-product-details-ordernumber') and page.product.productNumber %} +
+ {% block buy_widget_ordernumber_label %} + + {{ "detail.ordernumberLabel"|trans|sw_sanitize }} + + {% endblock %} + + {% block buy_widget_ordernumber %} + + + {{ page.product.productNumber }} + + {% endblock %} +
+ {% endif %} + {% if config('core.cart.wishlistEnabled') %} {% block page_product_detail_wishlist %} {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/meta.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/meta.html.twig new file mode 100644 index 0000000..234e232 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/meta.html.twig @@ -0,0 +1,5 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/meta.html.twig' %} + +{% block layout_head_title_inner %} + {% if page.metaInformation.metaTitle %}{{ page.metaInformation.metaTitle }} | diaeko.de{% else %}{{ page.product.translated.name }}{% if page.product.variation %} - {% for variation in page.product.variation %}{{ variation.group }}: {{ variation.option }}{% if page.product.variation|last != variation %}{{ " | " }}{% endif %}{% endfor %}{% endif %}{% endif %} +{% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss index 57da07c..18dee19 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/component/_card.scss @@ -7,9 +7,9 @@ } .card { - .product-rating { - display: none; - } + .product-rating { + display: none; + } } .cart-table-header { @@ -54,6 +54,12 @@ } .cart-offcanvas { + .row { + justify-content: space-between; + } + .js-toggle-shipping-selection { + display: block; + } .offcanvas-close { min-height: 54px; background: #E9F4FC; @@ -88,13 +94,13 @@ margin-bottom: 20px; display: flex; grid-gap: 15px; - padding: 14px 18px 1px; + padding: 14px 8px 1px; border-radius: 3px; background: rgba(#86B04B, 0.15); color: #86B04B; &.spwn-c-p-more { - background-color: #86b04b; - color: #272527; + background-color: #86b04b; + color: #272527; } .icon { min-width: 22px; @@ -102,9 +108,9 @@ color: #86B04B; } &.spwn-c-p-more { - .icon { - color: #272527; - } + .icon { + color: #272527; + } } } .cart-item { @@ -113,9 +119,9 @@ background-color: #E9F4FC; } &.is-discount { - .cart-item-remove { - display: none; - } + .cart-item-remove { + display: none; + } } .cart-item-img { border: none; @@ -132,6 +138,27 @@ } } } + &.cart-item-FLOWSITEDepositLineItem { + .cart-item-row { + max-height: 20px; + .cart-item-img { + transform: translateY(-4px); + } + } + .cart-item-details { + flex: 0 0 auto; + width: auto; + max-width: 100%; + margin-bottom: 0; + padding-top: 0; + .cart-item-details-container { + display: flex; + .cart-quantity-price { + min-height: auto; + } + } + } + } } .spwn-add-customized-products { .spwn-add-customized-products-detail { diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig index cd8f233..22f9a7f 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget.html.twig @@ -193,6 +193,26 @@ {% endblock %} + {# ordernumber #} + {% if theme_config('zen-product-details-ordernumber') and page.product.productNumber %} +
+ {% block buy_widget_ordernumber_label %} + + {{ "detail.ordernumberLabel"|trans|sw_sanitize }} + + {% endblock %} + + {% block buy_widget_ordernumber %} + + + {{ page.product.productNumber }} + + {% endblock %} +
+ {% endif %} + {% if config('core.cart.wishlistEnabled') %} {% block buy_widget_wishlist %} {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { 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 5e7e007..402cf74 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 @@ -17,7 +17,7 @@ {% endfor %}
{# spawntree start #} - {% if customizedProductsCount == 1 || customizedProductsCount == 2 %} + {% if customizedProductsCount >= 1 and customizedProductsCount <= 4 %}
{% sw_icon 'checkmark-circle' %}
@@ -25,6 +25,10 @@ {{ "checkout.easyfitProgramNoticeFirst"|trans|sw_sanitize }} {% elseif customizedProductsCount == 2 %} {{ "checkout.easyfitProgramNoticeSecond"|trans|sw_sanitize }} + {% elseif customizedProductsCount == 3 %} + {{ "checkout.easyfitProgramNoticeThird"|trans|sw_sanitize }} + {% elseif customizedProductsCount == 4 %} + {{ "checkout.easyfitProgramNoticeFourth"|trans|sw_sanitize }} {% endif %}
diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/meta.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/meta.html.twig index 8842b39..b11a574 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/meta.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/layout/meta.html.twig @@ -1,9 +1,5 @@ {% sw_extends '@Storefront/storefront/layout/meta.html.twig' %} -{% block layout_head_title %} - {% apply spaceless %} - {% block layout_head_title_inner %} - {{ metaTitle }} | easyfit.de - {% endblock %} - {% endapply %} -{% endblock %} \ No newline at end of file +{% block layout_head_title_inner %} + {{ metaTitle }} | easyfitfood.com +{% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig index 9084ecb..91ab513 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig @@ -191,6 +191,26 @@
{% endblock %} + {# ordernumber #} + {% if theme_config('zen-product-details-ordernumber') and page.product.productNumber %} +
+ {% block buy_widget_ordernumber_label %} + + {{ "detail.ordernumberLabel"|trans|sw_sanitize }} + + {% endblock %} + + {% block buy_widget_ordernumber %} + + + {{ page.product.productNumber }} + + {% endblock %} +
+ {% endif %} + {% if config('core.cart.wishlistEnabled') %} {% block page_product_detail_wishlist %} {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/meta.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/meta.html.twig new file mode 100644 index 0000000..638920d --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/meta.html.twig @@ -0,0 +1,5 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/meta.html.twig' %} + +{% block layout_head_title_inner %} + {% if page.metaInformation.metaTitle %}{{ page.metaInformation.metaTitle }} | easyfitfood.com{% else %}{{ page.product.translated.name }}{% if page.product.variation %} - {% for variation in page.product.variation %}{{ variation.group }}: {{ variation.option }}{% if page.product.variation|last != variation %}{{ " | " }}{% endif %}{% endfor %}{% endif %}{% endif %} +{% endblock %}