diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss index 357cb47..84b6d62 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/base.scss @@ -16,4 +16,5 @@ @import 'page/checkout/register'; @import 'page/checkout/cart'; @import 'page/product-detail/product-detail'; +@import 'page/product-detail/tabs'; @import 'page/product-detail/review'; \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss index 4659b0a..709d96a 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/layout/_footer.scss @@ -94,8 +94,14 @@ &.icon-instagram { padding: 5px; } - } - svg { - color: $sw-color-brand-primary; + svg { + color: $sw-color-brand-primary; + } + &:hover { + background-color: $sw-color-brand-primary; + svg { + color: #fff; + } + } } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss index 0ad94e0..b77348a 100644 --- a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss @@ -2,7 +2,7 @@ .product-detail-media { padding-right: 40px; .gallery-slider-image { - width: 100%; + width: 100%; } .aku-cms-factory-element { display: flex; @@ -20,7 +20,7 @@ padding: 9px 9px 6px 9px; transition: border 0.2s ease-in-out; &.active { - border-color: #b1c3d9; + border-color: #b1c3d9; } img { width: 55px; @@ -69,12 +69,12 @@ } } .modal-content { - .modal-title { - margin-bottom: 10px; - } - h2 { - margin-top: 25px; - } + .modal-title { + margin-bottom: 10px; + } + h2 { + margin-top: 25px; + } } } } @@ -84,15 +84,20 @@ background-color: #E9F4FC; padding-top: 40px; .product-detail-short-description { - border-bottom: 1px solid #B1C3D9; + border-bottom: 1px solid #B1C3D9; } .product-detail-name { font-size: 60px; line-height: 54px; color: $sw-color-brand-primary; } + .product-detail-price-container { + display: flex; + align-items: baseline; + } .product-detail-price { color: $sw-color-brand-primary; + margin-right: 15px; } .product-detail-tax-link { color: #222; @@ -101,6 +106,19 @@ text-decoration: none; } } + .product-detail-form-container { + padding: 35px 0; + margin-top: 25px; + border-top: 1px solid #B1C3D9; + border-bottom: 1px solid #B1C3D9; + } + .product-detail-delivery-information { + margin-bottom: 0; + } + .product-wishlist { + border-top: 1px solid #B1C3D9; + padding: 25px 0; + } .btn-primary { background: transparent; color: $sw-color-brand-primary; @@ -117,5 +135,11 @@ color: #fff; } } + .product-wishlist-btn-content { + text-decoration: none; + &:hover { + text-decoration: underline; + } + } } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss new file mode 100644 index 0000000..3ddf77a --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/app/storefront/src/scss/page/product-detail/_tabs.scss @@ -0,0 +1,26 @@ +.cms-block-product-description-reviews .cms-block-container { + background: #e9f4fc; + padding-top: 3rem; + padding-bottom: 3rem; + color: #222; + } +.card-tabs { + .nav-link { + text-transform: uppercase; + letter-spacing: 1.6px; + } + .tab-content { + h2 { + font-family: $sw-font-family-base; + font-size: 1.375rem; + font-weight: 500; + color: #222; + } + h3, h4, h5, h6 { + color: #222; + } + .product-detail-description-text { + max-width: 900px; + } + } +} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/buy-widget/buy-widget-price.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/buy-widget/buy-widget-price.html.twig new file mode 100644 index 0000000..edc10f2 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/component/buy-widget/buy-widget-price.html.twig @@ -0,0 +1,46 @@ +{% sw_extends '@Storefront/storefront/component/buy-widget/buy-widget-price.html.twig' %} + +{% block buy_widget_price_content %} + {% set listPrice = price.listPrice %} + +

+ {{ price.unitPrice|currency }}{{ "general.star"|trans|sw_sanitize }} +

+ + {% set weekProductCount = 0 %} + {% if (product.customFields.custom_weightlossplan_day1_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day2_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day3_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day4_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day5_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day6_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if weekProductCount >= 1 %} + {{ (price.unitPrice / weekProductCount) | json_encode() | round(2) | number_format(2, ',', '.') }} € pro Tag + {% endif %} + + {% if listPrice.percentage > 0 %} + {% block buy_widget_was_price %} + + {% block buy_widget_was_price_badge %} + % + {% endblock %} + + {% set afterListPriceSnippetExists = "listing.afterListPrice"|trans|length > 0 %} + {% set beforeListPriceSnippetExists = "listing.beforeListPrice"|trans|length > 0 %} + + {% block buy_widget_was_price_wrapper %} + + {% if beforeListPriceSnippetExists %}{{"listing.beforeListPrice"|trans|trim}}{% endif %} + + {{ listPrice.price|currency }}{{ "general.star"|trans|sw_sanitize }} + + {% if afterListPriceSnippetExists %} + {{"listing.afterListPrice"|trans|trim}} + {% endif %} + + {{ "detail.listPricePercentage"|trans({'%price%': listPrice.percentage })|sw_sanitize }} + + {% endblock %} + {% endblock %} + {% endif %} +{% endblock %} \ No newline at end of file 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 13900d3..cd8f233 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 @@ -1,21 +1,209 @@ {% sw_extends '@Storefront/storefront/component/buy-widget/buy-widget.html.twig' %} -{% block buy_widget_price %} -
- {% if page.product.translated.customFields.deposittype %} -
- {{ page.product.translated.customFields.deposittype }} -
+{% block buy_widget %} +
+ {% block buy_widget_rich_snippets %} + {% block buy_widget_rich_snippets_brand %} + {% if product.manufacturer %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_gtin13 %} + {% if product.ean %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_mpn %} + {% if product.manufacturerNumber %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_weight %} + {% if product.weight %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_height %} + {% if product.height %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_width %} + {% if product.width %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_depth %} + {% if product.length %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_release_date %} + + {% endblock %} + {% endblock %} + + {% if not feature('FEATURE_NEXT_16992') %} + {# @deprecated tag:v6.5.0 tag:)(FEATURE_NEXT_16992) - Block will be removed in v6.5.0 #} + {% block buy_widget_not_available %} + {% endblock %} {% endif %} - {{ parent() }} - {% if page.product.translated.customFields.deposit %} - {% set deposit = page.product.translated.customFields.deposit|currency %} - -
- {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ - '%deposit%': deposit - })|sw_sanitize }} + + {% block buy_widget_buy_container %} +
+ {% block buy_widget_data %} + {% block buy_widget_data_rich_snippet_url %} + + {% endblock %} + + {% block buy_widget_data_rich_snippet_price_range %} + {% if product.calculatedPrices|length > 1 %} + {% set lowestPrice = false %} + {% set highestPrice = false %} + + {% for price in product.calculatedPrices %} + {% if not lowestPrice or price.unitPrice < lowestPrice %} + {% set lowestPrice = price.unitPrice %} + {% endif %} + {% if not highestPrice or price.unitPrice > highestPrice %} + {% set highestPrice = price.unitPrice %} + {% endif %} + {% endfor %} + + + + + {% endif %} + {% endblock %} + + {% block buy_widget_data_rich_snippet_price_currency %} + + {% endblock %} + + {% block buy_widget_price %} +
+ {% sw_include '@Storefront/storefront/component/buy-widget/buy-widget-price.html.twig' %} +
+ {% endblock %} + + {% block buy_widget_tax %} +
+ {% if context.taxState == "gross" %} + {% set taxText = "general.grossTaxInformation"|trans|sw_sanitize %} + {% else %} + {% set taxText = "general.netTaxInformation"|trans|sw_sanitize %} + {% endif %} + +

+ {% block buy_widget_tax_link %} + + {{ taxText }} + + {% endblock %} +

+
+ {% endblock %} + + {% block buy_widget_deposit %} + {% if page.product.translated.customFields.deposit %} + {% set deposit = page.product.translated.customFields.deposit|currency %} + +
+ {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ + '%deposit%': deposit + })|sw_sanitize }} +
+ {% endif %} + {% endblock %} + + {% set remoteClickOptions = { + selector: "#review-tab-" ~ product.id, + scrollToElement: true + } %} + + {% set reviewTabHref = "#review-tab-" ~ product.id ~ "-pane" %} + + {% block buy_widget_reviews %} + {% if product.ratingAverage > 0 and totalReviews > 0 and config('core.listing.showReview') %} +
+ + {% sw_include '@Storefront/storefront/component/review/rating.html.twig' with { + points: product.ratingAverage, + style: 'text-primary' + } %} + + {{ totalReviews }} + {{ "detail.reviewLinkText"|trans({'%count%': totalReviews})|sw_sanitize }} + +
+ {% endif %} + {% endblock %} + {% endblock %} + + {% block buy_widget_configurator_include %} + {% if product.parentId and configuratorSettings|length > 0 %} +
+ {% sw_include '@Storefront/storefront/component/buy-widget/configurator.html.twig' %} +
+ {% endif %} + {% endblock %} + + {% block buy_widget_buy_form %} + {% if product.active %} +
+ {% sw_include '@Storefront/storefront/component/buy-widget/buy-widget-form.html.twig' %} +
+ {% endif %} + {% endblock %}
+ {% endblock %} + + {% block buy_widget_delivery_informations %} +
+ {% sw_include '@Storefront/storefront/component/delivery-information.html.twig' %} +
+ {% endblock %} + + {% if config('core.cart.wishlistEnabled') %} + {% block buy_widget_wishlist %} + {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { + showText: true, + size: 'md', + productId: product.id + } %} + {% endblock %} {% endif %} + + {% block buy_widget_ordernumber_container %} + {% endblock %}
{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/cart/index.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/cart/index.html.twig index 6dae3e7..24d3ba7 100644 --- a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/cart/index.html.twig +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/checkout/cart/index.html.twig @@ -61,3 +61,6 @@
{% endblock %} + +{% block page_checkout_cart_shipping_costs %} +{% endblock %} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig new file mode 100644 index 0000000..ab33f95 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig @@ -0,0 +1,35 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/buy-widget-price.html.twig' %} + +{% block page_product_detail_price_content %} + {% set listPrice = price.listPrice %} + +

+ {{ price.unitPrice|currency }}{{ "general.star"|trans|sw_sanitize }} +

+ + {% if listPrice.percentage > 0 %} + {% block page_product_detail_was_price %} + + {% block page_product_detail_was_price_badge %} + % + {% endblock %} + + {% set afterListPriceSnippetExists = "listing.afterListPrice"|trans|length > 0 %} + {% set beforeListPriceSnippetExists = "listing.beforeListPrice"|trans|length > 0 %} + + {% block page_product_detail_was_price_wrapper %} + + {% if beforeListPriceSnippetExists %}{{"listing.beforeListPrice"|trans|trim}}{% endif %} + + {{ listPrice.price|currency }}{{ "general.star"|trans|sw_sanitize }} + + {% if afterListPriceSnippetExists %} + {{"listing.afterListPrice"|trans|trim}} + {% endif %} + + {{ "detail.listPricePercentage"|trans({'%price%': listPrice.percentage })|sw_sanitize }} + + {% endblock %} + {% endblock %} + {% endif %} +{% 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 new file mode 100644 index 0000000..9084ecb --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig @@ -0,0 +1,207 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/buy-widget.html.twig' %} + +{% block page_product_detail_buy_inner %} +
+ {% block page_product_detail_rich_snippets %} + {% block page_product_detail_rich_snippets_brand %} + {% if page.product.manufacturer %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_gtin13 %} + {% if page.product.ean %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_mpn %} + {% if page.product.manufacturerNumber %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_weight %} + {% if page.product.weight %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_height %} + {% if page.product.height %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_width %} + {% if page.product.width %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_depth %} + {% if page.product.length %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_release_date %} + + {% endblock %} + {% endblock %} + + {% if not feature('FEATURE_NEXT_16992') %} + {# @deprecated tag:v6.5.0 tag:)(FEATURE_NEXT_16992) - Block will be removed in v6.5.0 #} + {% block page_product_detail_not_available %} + {% endblock %} + {% endif %} + + {% block page_product_detail_buy_container %} +
+ {% block page_product_detail_data %} + {% block page_product_detail_data_rich_snippet_url %} + + {% endblock %} + + {% block page_product_detail_data_rich_snippet_price_range %} + {% if page.product.calculatedPrices|length > 1 %} + {% set lowestPrice = false %} + {% set highestPrice = false %} + + {% for price in page.product.calculatedPrices %} + {% if not lowestPrice or price.unitPrice < lowestPrice %} + {% set lowestPrice = price.unitPrice %} + {% endif %} + {% if not highestPrice or price.unitPrice > highestPrice %} + {% set highestPrice = price.unitPrice %} + {% endif %} + {% endfor %} + + + + + {% endif %} + {% endblock %} + + {% block page_product_detail_data_rich_snippet_price_currency %} + + {% endblock %} + + {% block page_product_detail_price %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/buy-widget-price.html.twig' %} +
+ {% endblock %} + + {% block page_product_detail_tax %} +
+ {% if context.taxState == "gross" %} + {% set taxText = "general.grossTaxInformation"|trans|sw_sanitize %} + {% else %} + {% set taxText = "general.netTaxInformation"|trans|sw_sanitize %} + {% endif %} + +

+ {% block page_product_detail_tax_link %} + + {{ taxText }} + + {% endblock %} +

+
+ {% endblock %} + + {% block page_product_detail_deposit %} + {% if page.product.translated.customFields.deposit %} + {% set deposit = page.product.translated.customFields.deposit|currency %} + +
+ {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ + '%deposit%': deposit + })|sw_sanitize }} +
+ {% endif %} + {% endblock %} + + {% set remoteClickOptions = { + selector: "#review-tab", + scrollToElement: true + } %} + + {% block page_product_detail_reviews %} + {% if page.product.ratingAverage > 0 and page.reviews.totalReviews > 0 and config('core.listing.showReview') %} +
+ + {% sw_include '@Storefront/storefront/component/review/rating.html.twig' with { + points: page.product.ratingAverage, + style: 'text-primary' + } %} + + {{ page.reviews.totalReviews }} + {{ "detail.reviewLinkText"|trans({'%count%': page.reviews.totalReviews})|sw_sanitize }} + +
+ {% endif %} + {% endblock %} + {% endblock %} + + {% block page_product_detail_configurator_include %} + {% if page.product.parentId and page.configuratorSettings|length > 0 %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/configurator.html.twig' %} +
+ {% endif %} + {% endblock %} + + {% block page_product_detail_buy_form %} + {% if page.product.active %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/buy-widget-form.html.twig' %} +
+ {% endif %} + {% endblock %} +
+ {% endblock %} + + {% block page_product_detail_delivery_informations %} +
+ {% sw_include '@Storefront/storefront/component/delivery-information.html.twig' %} +
+ {% endblock %} + + {% if config('core.cart.wishlistEnabled') %} + {% block page_product_detail_wishlist %} + {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { + showText: true, + size: 'md', + productId: page.product.id + } %} + {% endblock %} + {% endif %} + + {% block page_product_detail_ordernumber_container %} + {% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/tabs.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/tabs.html.twig new file mode 100644 index 0000000..825a39e --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/tabs.html.twig @@ -0,0 +1,39 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/tabs.html.twig' %} + +{% block zen_page_product_detail_tabs_navigation_custom_tab_global %} + {% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %} + {% set customTab = { + 'translated': { + title: "zentheme.atmos.content.customTabTitle"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabTitle')}), + text: "zentheme.atmos.content.customTabText"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabText')}) + } + } %} + + + {% endif %} +{% endblock %} + +{% block zen_page_product_detail_tabs_content_custom_tab_global %} + {% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/zen-custom-global-tab.html.twig' %} +
+ {% endif %} +{% endblock %} diff --git a/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig new file mode 100644 index 0000000..c2abca5 --- /dev/null +++ b/zenitPlatformAtmosSet1/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig @@ -0,0 +1,89 @@ +{% sw_extends '@Storefront/storefront/utilities/offcanvas.html.twig' %} + +{% block utilities_offcanvas_content %} + {% block zen_page_product_detail_custom_field_global_container %} +
+ {% set customTab = { + 'translated': { + title: "zentheme.atmos.content.customTabTitle"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabTitle')}), + text: "zentheme.atmos.content.customTabText"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabText')}) + } + } %} + + {% block zen_page_product_detail_custom_field_global_content %} + {% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %} +

{{ "customFields.custom_nutrition"|trans }} pro 100 {% if (page.product.unit.name == "kg") or (page.product.unit.name == "g") %}g{% elseif page.product.unit.name == "Liter" %}ml{% endif %}:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ "customFields.custom_nutrition_energy_kcal"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_energy_kcal|raw }} kcal / {{ page.product.translated.customFields.custom_nutrition_energy_kj|raw }} kJ +
+ {{ "customFields.custom_nutrition_fat"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_fat|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_fattyacids"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_fattyacids|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_carbohydrates"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_carbohydrates|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_sugar"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_sugar|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_protein"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_protein|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_salt"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_salt|raw|number_format(2, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_be"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_be|raw|number_format(1, ',', '.') }} BE +
+ {% endif %} + {% endblock %} + +
+ {% endblock %} +{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_container.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_container.scss index b0c079e..7e58f5d 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_container.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_container.scss @@ -1,37 +1,7 @@ -body.is-act-home { +body { @include media-breakpoint-down(xs) { .cms-section.bg-image { background-position: center left; } } - @include media-breakpoint-up(sm) { - .content-main { - margin-left: -20px; - margin-right: -20px; - .cms-section-default.full-width { - padding-left: 5px; - padding-right: 5px; - } - } - } - @include media-breakpoint-up(md) { - .content-main { - margin-left: -40px; - margin-right: -40px; - .cms-section-default.full-width { - padding-left: 10px; - padding-right: 10px; - } - } - } - @include media-breakpoint-up(xl) { - .content-main { - margin-left: -80px; - margin-right: -80px; - .cms-section-default.full-width { - padding-left: 20px; - padding-right: 20px; - } - } - } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss index 398d6fc..806c330 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_footer.scss @@ -62,7 +62,9 @@ a:not(.btn) { margin-top: 16px; margin-bottom: 0; - line-height: 15px; + font-size: 22px; + line-height: 24px; + font-weight: 500; } } .footer-contact-form { 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 d955723..a7c1e61 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/layout/_header.scss @@ -71,11 +71,9 @@ } } } - .is-lo-full-width .container { max-width: 1120px; } - .nav-header>.container { padding-left: 0; padding-right: 0; diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss index edb7c5a..ca03277 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/overrides.scss @@ -14,6 +14,7 @@ html { body { background: #fff; border-top: 5px solid $sw-color-brand-primary !important; + overflow-x:hidden; } h1 { @@ -75,6 +76,9 @@ h6 { font-weight: 600; letter-spacing: 1px; padding: 5px 32px !important; + &:hover { + color: #fff !important; + } } .aku-cms-factory-element, diff --git a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss index d68ce56..73b553c 100644 --- a/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss +++ b/zenitPlatformAtmosSet2/src/Resources/app/storefront/src/scss/page/product-detail/_product-detail.scss @@ -82,8 +82,13 @@ color: $sw-color-brand-secondary; line-height: 40px !important; } + .product-detail-price-container { + display: flex; + align-items: baseline; + } .product-detail-price { color: $sw-color-brand-primary; + margin-right: 15px; } .product-detail-tax-link { color: #222; @@ -92,6 +97,19 @@ text-decoration: none; } } + .product-detail-form-container { + padding: 35px 0; + margin-top: 25px; + border-top: 1px solid #86b04b; + border-bottom: 1px solid #86b04b; + } + .product-detail-delivery-information { + margin-bottom: 0; + } + .product-wishlist { + border-top: 1px solid #86b04b; + padding: 25px 0; + } .btn-primary { background: transparent; color: $sw-color-brand-primary; @@ -108,5 +126,11 @@ color: #fff; } } + .product-wishlist-btn-content { + text-decoration: none; + &:hover { + text-decoration: underline; + } + } } } \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget-price.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget-price.html.twig new file mode 100644 index 0000000..edc10f2 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/component/buy-widget/buy-widget-price.html.twig @@ -0,0 +1,46 @@ +{% sw_extends '@Storefront/storefront/component/buy-widget/buy-widget-price.html.twig' %} + +{% block buy_widget_price_content %} + {% set listPrice = price.listPrice %} + +

+ {{ price.unitPrice|currency }}{{ "general.star"|trans|sw_sanitize }} +

+ + {% set weekProductCount = 0 %} + {% if (product.customFields.custom_weightlossplan_day1_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day2_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day3_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day4_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day5_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if (product.customFields.custom_weightlossplan_day6_image != null) %}{% set weekProductCount = weekProductCount + 1 %}{% endif %} + {% if weekProductCount >= 1 %} + {{ (price.unitPrice / weekProductCount) | json_encode() | round(2) | number_format(2, ',', '.') }} € pro Tag + {% endif %} + + {% if listPrice.percentage > 0 %} + {% block buy_widget_was_price %} + + {% block buy_widget_was_price_badge %} + % + {% endblock %} + + {% set afterListPriceSnippetExists = "listing.afterListPrice"|trans|length > 0 %} + {% set beforeListPriceSnippetExists = "listing.beforeListPrice"|trans|length > 0 %} + + {% block buy_widget_was_price_wrapper %} + + {% if beforeListPriceSnippetExists %}{{"listing.beforeListPrice"|trans|trim}}{% endif %} + + {{ listPrice.price|currency }}{{ "general.star"|trans|sw_sanitize }} + + {% if afterListPriceSnippetExists %} + {{"listing.afterListPrice"|trans|trim}} + {% endif %} + + {{ "detail.listPricePercentage"|trans({'%price%': listPrice.percentage })|sw_sanitize }} + + {% endblock %} + {% endblock %} + {% endif %} +{% endblock %} \ No newline at end of file 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 13900d3..cd8f233 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 @@ -1,21 +1,209 @@ {% sw_extends '@Storefront/storefront/component/buy-widget/buy-widget.html.twig' %} -{% block buy_widget_price %} -
- {% if page.product.translated.customFields.deposittype %} -
- {{ page.product.translated.customFields.deposittype }} -
+{% block buy_widget %} +
+ {% block buy_widget_rich_snippets %} + {% block buy_widget_rich_snippets_brand %} + {% if product.manufacturer %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_gtin13 %} + {% if product.ean %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_mpn %} + {% if product.manufacturerNumber %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_weight %} + {% if product.weight %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_height %} + {% if product.height %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_width %} + {% if product.width %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_depth %} + {% if product.length %} + + {% endif %} + {% endblock %} + + {% block buy_widget_rich_snippets_release_date %} + + {% endblock %} + {% endblock %} + + {% if not feature('FEATURE_NEXT_16992') %} + {# @deprecated tag:v6.5.0 tag:)(FEATURE_NEXT_16992) - Block will be removed in v6.5.0 #} + {% block buy_widget_not_available %} + {% endblock %} {% endif %} - {{ parent() }} - {% if page.product.translated.customFields.deposit %} - {% set deposit = page.product.translated.customFields.deposit|currency %} - -
- {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ - '%deposit%': deposit - })|sw_sanitize }} + + {% block buy_widget_buy_container %} +
+ {% block buy_widget_data %} + {% block buy_widget_data_rich_snippet_url %} + + {% endblock %} + + {% block buy_widget_data_rich_snippet_price_range %} + {% if product.calculatedPrices|length > 1 %} + {% set lowestPrice = false %} + {% set highestPrice = false %} + + {% for price in product.calculatedPrices %} + {% if not lowestPrice or price.unitPrice < lowestPrice %} + {% set lowestPrice = price.unitPrice %} + {% endif %} + {% if not highestPrice or price.unitPrice > highestPrice %} + {% set highestPrice = price.unitPrice %} + {% endif %} + {% endfor %} + + + + + {% endif %} + {% endblock %} + + {% block buy_widget_data_rich_snippet_price_currency %} + + {% endblock %} + + {% block buy_widget_price %} +
+ {% sw_include '@Storefront/storefront/component/buy-widget/buy-widget-price.html.twig' %} +
+ {% endblock %} + + {% block buy_widget_tax %} +
+ {% if context.taxState == "gross" %} + {% set taxText = "general.grossTaxInformation"|trans|sw_sanitize %} + {% else %} + {% set taxText = "general.netTaxInformation"|trans|sw_sanitize %} + {% endif %} + +

+ {% block buy_widget_tax_link %} + + {{ taxText }} + + {% endblock %} +

+
+ {% endblock %} + + {% block buy_widget_deposit %} + {% if page.product.translated.customFields.deposit %} + {% set deposit = page.product.translated.customFields.deposit|currency %} + +
+ {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ + '%deposit%': deposit + })|sw_sanitize }} +
+ {% endif %} + {% endblock %} + + {% set remoteClickOptions = { + selector: "#review-tab-" ~ product.id, + scrollToElement: true + } %} + + {% set reviewTabHref = "#review-tab-" ~ product.id ~ "-pane" %} + + {% block buy_widget_reviews %} + {% if product.ratingAverage > 0 and totalReviews > 0 and config('core.listing.showReview') %} +
+ + {% sw_include '@Storefront/storefront/component/review/rating.html.twig' with { + points: product.ratingAverage, + style: 'text-primary' + } %} + + {{ totalReviews }} + {{ "detail.reviewLinkText"|trans({'%count%': totalReviews})|sw_sanitize }} + +
+ {% endif %} + {% endblock %} + {% endblock %} + + {% block buy_widget_configurator_include %} + {% if product.parentId and configuratorSettings|length > 0 %} +
+ {% sw_include '@Storefront/storefront/component/buy-widget/configurator.html.twig' %} +
+ {% endif %} + {% endblock %} + + {% block buy_widget_buy_form %} + {% if product.active %} +
+ {% sw_include '@Storefront/storefront/component/buy-widget/buy-widget-form.html.twig' %} +
+ {% endif %} + {% endblock %}
+ {% endblock %} + + {% block buy_widget_delivery_informations %} +
+ {% sw_include '@Storefront/storefront/component/delivery-information.html.twig' %} +
+ {% endblock %} + + {% if config('core.cart.wishlistEnabled') %} + {% block buy_widget_wishlist %} + {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { + showText: true, + size: 'md', + productId: product.id + } %} + {% endblock %} {% endif %} + + {% block buy_widget_ordernumber_container %} + {% endblock %}
{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig index 6dae3e7..24d3ba7 100644 --- a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/checkout/cart/index.html.twig @@ -61,3 +61,6 @@
{% endblock %} + +{% block page_checkout_cart_shipping_costs %} +{% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig new file mode 100644 index 0000000..ab33f95 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget-price.html.twig @@ -0,0 +1,35 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/buy-widget-price.html.twig' %} + +{% block page_product_detail_price_content %} + {% set listPrice = price.listPrice %} + +

+ {{ price.unitPrice|currency }}{{ "general.star"|trans|sw_sanitize }} +

+ + {% if listPrice.percentage > 0 %} + {% block page_product_detail_was_price %} + + {% block page_product_detail_was_price_badge %} + % + {% endblock %} + + {% set afterListPriceSnippetExists = "listing.afterListPrice"|trans|length > 0 %} + {% set beforeListPriceSnippetExists = "listing.beforeListPrice"|trans|length > 0 %} + + {% block page_product_detail_was_price_wrapper %} + + {% if beforeListPriceSnippetExists %}{{"listing.beforeListPrice"|trans|trim}}{% endif %} + + {{ listPrice.price|currency }}{{ "general.star"|trans|sw_sanitize }} + + {% if afterListPriceSnippetExists %} + {{"listing.afterListPrice"|trans|trim}} + {% endif %} + + {{ "detail.listPricePercentage"|trans({'%price%': listPrice.percentage })|sw_sanitize }} + + {% endblock %} + {% endblock %} + {% endif %} +{% endblock %} \ No newline at end of file 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 new file mode 100644 index 0000000..9084ecb --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/buy-widget.html.twig @@ -0,0 +1,207 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/buy-widget.html.twig' %} + +{% block page_product_detail_buy_inner %} +
+ {% block page_product_detail_rich_snippets %} + {% block page_product_detail_rich_snippets_brand %} + {% if page.product.manufacturer %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_gtin13 %} + {% if page.product.ean %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_mpn %} + {% if page.product.manufacturerNumber %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_weight %} + {% if page.product.weight %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_height %} + {% if page.product.height %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_width %} + {% if page.product.width %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_depth %} + {% if page.product.length %} + + {% endif %} + {% endblock %} + + {% block page_product_detail_rich_snippets_release_date %} + + {% endblock %} + {% endblock %} + + {% if not feature('FEATURE_NEXT_16992') %} + {# @deprecated tag:v6.5.0 tag:)(FEATURE_NEXT_16992) - Block will be removed in v6.5.0 #} + {% block page_product_detail_not_available %} + {% endblock %} + {% endif %} + + {% block page_product_detail_buy_container %} +
+ {% block page_product_detail_data %} + {% block page_product_detail_data_rich_snippet_url %} + + {% endblock %} + + {% block page_product_detail_data_rich_snippet_price_range %} + {% if page.product.calculatedPrices|length > 1 %} + {% set lowestPrice = false %} + {% set highestPrice = false %} + + {% for price in page.product.calculatedPrices %} + {% if not lowestPrice or price.unitPrice < lowestPrice %} + {% set lowestPrice = price.unitPrice %} + {% endif %} + {% if not highestPrice or price.unitPrice > highestPrice %} + {% set highestPrice = price.unitPrice %} + {% endif %} + {% endfor %} + + + + + {% endif %} + {% endblock %} + + {% block page_product_detail_data_rich_snippet_price_currency %} + + {% endblock %} + + {% block page_product_detail_price %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/buy-widget-price.html.twig' %} +
+ {% endblock %} + + {% block page_product_detail_tax %} +
+ {% if context.taxState == "gross" %} + {% set taxText = "general.grossTaxInformation"|trans|sw_sanitize %} + {% else %} + {% set taxText = "general.netTaxInformation"|trans|sw_sanitize %} + {% endif %} + +

+ {% block page_product_detail_tax_link %} + + {{ taxText }} + + {% endblock %} +

+
+ {% endblock %} + + {% block page_product_detail_deposit %} + {% if page.product.translated.customFields.deposit %} + {% set deposit = page.product.translated.customFields.deposit|currency %} + +
+ {{ "FlowsiteDepositSystemBasic.plusDeposit"|trans({ + '%deposit%': deposit + })|sw_sanitize }} +
+ {% endif %} + {% endblock %} + + {% set remoteClickOptions = { + selector: "#review-tab", + scrollToElement: true + } %} + + {% block page_product_detail_reviews %} + {% if page.product.ratingAverage > 0 and page.reviews.totalReviews > 0 and config('core.listing.showReview') %} +
+ + {% sw_include '@Storefront/storefront/component/review/rating.html.twig' with { + points: page.product.ratingAverage, + style: 'text-primary' + } %} + + {{ page.reviews.totalReviews }} + {{ "detail.reviewLinkText"|trans({'%count%': page.reviews.totalReviews})|sw_sanitize }} + +
+ {% endif %} + {% endblock %} + {% endblock %} + + {% block page_product_detail_configurator_include %} + {% if page.product.parentId and page.configuratorSettings|length > 0 %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/configurator.html.twig' %} +
+ {% endif %} + {% endblock %} + + {% block page_product_detail_buy_form %} + {% if page.product.active %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/buy-widget-form.html.twig' %} +
+ {% endif %} + {% endblock %} +
+ {% endblock %} + + {% block page_product_detail_delivery_informations %} +
+ {% sw_include '@Storefront/storefront/component/delivery-information.html.twig' %} +
+ {% endblock %} + + {% if config('core.cart.wishlistEnabled') %} + {% block page_product_detail_wishlist %} + {% sw_include '@Storefront/storefront/component/product/card/wishlist.html.twig' with { + showText: true, + size: 'md', + productId: page.product.id + } %} + {% endblock %} + {% endif %} + + {% block page_product_detail_ordernumber_container %} + {% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/tabs.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/tabs.html.twig new file mode 100644 index 0000000..825a39e --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/tabs.html.twig @@ -0,0 +1,39 @@ +{% sw_extends '@Storefront/storefront/page/product-detail/tabs.html.twig' %} + +{% block zen_page_product_detail_tabs_navigation_custom_tab_global %} + {% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %} + {% set customTab = { + 'translated': { + title: "zentheme.atmos.content.customTabTitle"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabTitle')}), + text: "zentheme.atmos.content.customTabText"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabText')}) + } + } %} + + + {% endif %} +{% endblock %} + +{% block zen_page_product_detail_tabs_content_custom_tab_global %} + {% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %} +
+ {% sw_include '@Storefront/storefront/page/product-detail/zen-custom-global-tab.html.twig' %} +
+ {% endif %} +{% endblock %} diff --git a/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig new file mode 100644 index 0000000..c2abca5 --- /dev/null +++ b/zenitPlatformAtmosSet2/src/Resources/views/storefront/page/product-detail/zen-custom-global-tab.html.twig @@ -0,0 +1,89 @@ +{% sw_extends '@Storefront/storefront/utilities/offcanvas.html.twig' %} + +{% block utilities_offcanvas_content %} + {% block zen_page_product_detail_custom_field_global_container %} +
+ {% set customTab = { + 'translated': { + title: "zentheme.atmos.content.customTabTitle"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabTitle')}), + text: "zentheme.atmos.content.customTabText"|trans({"%placeholder%": config('zenitPlatformAtmos.config.customTabText')}) + } + } %} + + {% block zen_page_product_detail_custom_field_global_content %} + {% if page.product.translated.customFields.custom_nutrition_energy_kcal|length > 0 %} +

{{ "customFields.custom_nutrition"|trans }} pro 100 {% if (page.product.unit.name == "kg") or (page.product.unit.name == "g") %}g{% elseif page.product.unit.name == "Liter" %}ml{% endif %}:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ "customFields.custom_nutrition_energy_kcal"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_energy_kcal|raw }} kcal / {{ page.product.translated.customFields.custom_nutrition_energy_kj|raw }} kJ +
+ {{ "customFields.custom_nutrition_fat"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_fat|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_fattyacids"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_fattyacids|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_carbohydrates"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_carbohydrates|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_sugar"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_sugar|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_protein"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_protein|raw|number_format(1, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_salt"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_salt|raw|number_format(2, ',', '.') }} g +
+ {{ "customFields.custom_nutrition_be"|trans }} + + {{ page.product.translated.customFields.custom_nutrition_be|raw|number_format(1, ',', '.') }} BE +
+ {% endif %} + {% endblock %} + +
+ {% endblock %} +{% endblock %} \ No newline at end of file