From 891d29798b51ddb9a6f743f68497fd1833ebaa31 Mon Sep 17 00:00:00 2001 From: MaxBUhe Date: Thu, 12 Jun 2025 14:33:56 +0200 Subject: [PATCH] [Fixed] smarty to twig converted templates --- views/twig/event/add_payment_info.html.twig | 16 +-- views/twig/event/add_to_cart.html.twig | 121 +++++++++--------- views/twig/event/begin_checkout.html.twig | 16 +-- views/twig/event/purchase.html.twig | 14 +- views/twig/event/remove_from_cart.html.twig | 12 +- views/twig/event/view_cart.html.twig | 16 +-- views/twig/event/view_item.html.twig | 12 +- views/twig/event/view_item_list.html.twig | 14 +- views/twig/event/view_search_result.html.twig | 14 +- .../themes/default/layout/_gtm_js.html.twig | 5 +- .../themes/default/layout/_gtm_nojs.html.twig | 6 +- .../page/account/d3gtmnoticelist.html.twig | 8 +- .../account/d3gtmrecommendationlist.html.twig | 8 +- .../page/account/d3gtmwishlist.html.twig | 8 +- 14 files changed, 135 insertions(+), 135 deletions(-) diff --git a/views/twig/event/add_payment_info.html.twig b/views/twig/event/add_payment_info.html.twig index 40446b6..f910416 100644 --- a/views/twig/event/add_payment_info.html.twig +++ b/views/twig/event/add_payment_info.html.twig @@ -6,8 +6,8 @@ {% set gtmPaymentObject = oView.getPayment() %} {% block gtm_ga4_add_payment_info_block %} - {% capture name = "gtm_ga4_add_payment_info" %} - {% spaceless %} + {% set gtm_ga4_add_payment_info %} + {% apply spaceless %} dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ dataLayer.push({ 'event': 'add_payment_info', @@ -26,9 +26,9 @@ {% set gtmBasketItem = basketitem.getArticle() %} {% set gtmBasketItemCategory = gtmBasketItem.getCategory() %} { - 'item_id': '{{ gtmCartArticles[$basketindex].getFieldData('oxartnum') }}', - 'item_name': '{{ gtmCartArticles[$basketindex].getFieldData('oxtitle') }}', - 'item_variant': '{{ gtmCartArticles[$basketindex].getFieldData('oxvarselect') }}', + 'item_id': '{{ gtmCartArticles[basketindex].getFieldData('oxartnum') }}', + 'item_name': '{{ gtmCartArticles[basketindex].getFieldData('oxtitle')|raw }}', + 'item_variant': '{{ gtmCartArticles[basketindex].getFieldData('oxvarselect') }}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', 'item_category_2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', @@ -47,7 +47,7 @@ 'debug_mode': 'true' {% endif %} }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.gtm_ga4_add_payment_info, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: gtm_ga4_add_payment_info.__toString(), dynamic: __oxid_include_dynamic }) }} {% endblock %} \ No newline at end of file diff --git a/views/twig/event/add_to_cart.html.twig b/views/twig/event/add_to_cart.html.twig index e9b31a3..84c1553 100644 --- a/views/twig/event/add_to_cart.html.twig +++ b/views/twig/event/add_to_cart.html.twig @@ -1,61 +1,62 @@ - -{% if d3CmpBasket and d3CmpBasket.getAddToBasketDecision() and d3CmpBasket.d3GtmRequestedArticleLoadedByAnid() != "null" %} - {% set oGtmProduct = d3CmpBasket.d3GtmRequestedArticleLoadedByAnid() %} - {% set oGtmAmountArticlesAdded = d3CmpBasket.getD3GtmAddToCartAmountArticles() %} - {# $smarty.block.parent #} - {# variable $oGtmProduct is passed from parent tempalte #} - {% set d3PriceObject = oGtmProduct.getPrice() %} - {% set gtmCurrency = oView.getActCurrency() %} - {% set gtmManufacturer = oGtmProduct.getManufacturer() %} - {% set gtmCategory = oGtmProduct.getCategory() %} - - {% block d3_ga4_add_to_cart_list_block %} - {% capture name = "d3_ga4_add_to_cart_listtpl" %} - {% spaceless %} - dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ - - {# ** Debug cases ** #} - {# event.preventDefault(); #} - - let iArtQuantity = $("{{ htmlIdAmountOfArticles }}").val(); - let iArtQuantityAdded = {{ oGtmAmountArticlesAdded }}; - - if(!iArtQuantity && (iArtQuantityAdded is same as(1)){ ) - iArtQuantity = 1; - }else{ - iArtQuantity = iArtQuantityAdded; - } - - dataLayer.push({ - 'isAddToBasket': true, - 'event':'add_to_cart', - 'eventLabel': 'add_to_cart', - 'ecommerce': { - 'currency': "{{ currency.name }}", - 'value': iArtQuantity*{{ d3PriceObject.getPrice() }}, - 'items': [ - { - 'item_id': '{{ oGtmProduct.getFieldData('oxartnum') }}', - 'item_name': '{{ oGtmProduct.getFieldData('oxtitle') }}', - 'price': {{ d3PriceObject.getPrice() }}, - 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.oxmanufacturers__oxtitle.value }}{% endif %}', - 'item_variant': '{% if oGtmProduct.getFieldData('oxvarselect') %}{{ oGtmProduct.getFieldData('oxvarselect') }}{% endif %}', - {% if gtmCategory %} - 'item_category': '{{ gtmCategory.getSplitCategoryArray(0, true) }}', - 'item_category_2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', - 'item_category_3':'{{ gtmCategory.getSplitCategoryArray(2, true) }}', - 'item_category_4':'{{ gtmCategory.getSplitCategoryArray(3, true) }}', - 'item_list_name':'{{ gtmCategory.getSplitCategoryArray() }}', - {% endif %} - 'quantity': iArtQuantity - } - ] - }{% if oViewConf.isDebugModeOn() %}, - 'debug_mode': 'true' - {% endif %} - }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_add_to_cart_listtpl, dynamic: __oxid_include_dynamic }) }} - {% endblock %} + +{% if d3CmpBasket and d3CmpBasket.getAddToBasketDecision() and d3CmpBasket.d3GtmRequestedArticleLoadedByAnid() != "null" %} + {% set oGtmProduct = d3CmpBasket.d3GtmRequestedArticleLoadedByAnid() %} + {% set oGtmAmountArticlesAdded = d3CmpBasket.getD3GtmAddToCartAmountArticles() %} + {# twig.block.parent #} + {# variable $oGtmProduct is passed from parent tempalte #} + {% set d3PriceObject = oGtmProduct.getPrice() %} + {% set gtmCurrency = oView.getActCurrency() %} + {% set gtmManufacturer = oGtmProduct.getManufacturer() %} + {% set gtmCategory = oGtmProduct.getCategory() %} + + {% block d3_ga4_add_to_cart_list_block %} + {% set d3_ga4_add_to_cart_listtpl %} + {% apply spaceless %} + dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ + + {# ** Debug cases ** #} + {# event.preventDefault(); #} + + let iArtQuantity = $("{{ htmlIdAmountOfArticles }}").val(); + let iArtQuantityAdded = {{ oGtmAmountArticlesAdded }}; + + if(!iArtQuantity && (iArtQuantityAdded is same as(1)){ +) + iArtQuantity = 1; + }else{ + iArtQuantity = iArtQuantityAdded; + } + + dataLayer.push({ + 'isAddToBasket': true, + 'event':'add_to_cart', + 'eventLabel': 'add_to_cart', + 'ecommerce': { + 'currency': "{{ currency.name }}", + 'value': iArtQuantity*{{ d3PriceObject.getPrice() }}, + 'items': [ + { + 'item_id': '{{ oGtmProduct.getFieldData('oxartnum') }}', + 'item_name': '{{ oGtmProduct.getFieldData('oxtitle')|raw }}', + 'price': {{ d3PriceObject.getPrice() }}, + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getFieldData('oxtitle')|raw }}{% endif %}', + 'item_variant': '{% if oGtmProduct.getFieldData('oxvarselect') %}{{ oGtmProduct.getFieldData('oxvarselect') }}{% endif %}', + {% if gtmCategory %} + 'item_category': '{{ gtmCategory.getSplitCategoryArray(0, true) }}', + 'item_category_2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', + 'item_category_3':'{{ gtmCategory.getSplitCategoryArray(2, true) }}', + 'item_category_4':'{{ gtmCategory.getSplitCategoryArray(3, true) }}', + 'item_list_name':'{{ gtmCategory.getSplitCategoryArray() }}', + {% endif %} + 'quantity': iArtQuantity + } + ] + }{% if oViewConf.isDebugModeOn() %}, + 'debug_mode': 'true' + {% endif %} + }); + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_add_to_cart_listtpl.__toString(), dynamic: __oxid_include_dynamic }) }} + {% endblock %} {% endif %} \ No newline at end of file diff --git a/views/twig/event/begin_checkout.html.twig b/views/twig/event/begin_checkout.html.twig index ca1ffa1..d84ab67 100644 --- a/views/twig/event/begin_checkout.html.twig +++ b/views/twig/event/begin_checkout.html.twig @@ -6,8 +6,8 @@ {% set gtmCurrency = oView.getActCurrency() %} {% block d3_ga4_begin_checkout_block %} - {% capture name = "d3_ga4_begin_checkout" %} - {% spaceless %} + {% set d3_ga4_begin_checkout %} + {% apply spaceless %} dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ dataLayer.push({ 'event': 'begin_checkout', @@ -25,9 +25,9 @@ {% set gtmBasketItem = basketitem.getArticle() %} {% set gtmBasketItemCategory = gtmBasketItem.getCategory() %} { - 'item_id': '{{ gtmCartArticles[$basketindex].getFieldData('oxartnum') }}', - 'item_name': '{{ gtmCartArticles[$basketindex].getFieldData('oxtitle') }}', - 'item_variant': '{{ gtmCartArticles[$basketindex].getFieldData('oxvarselect') }}', + 'item_id': '{{ gtmCartArticles[basketindex].getFieldData('oxartnum') }}', + 'item_name': '{{ gtmCartArticles[basketindex].getFieldData('oxtitle')|raw }}', + 'item_variant': '{{ gtmCartArticles[basketindex].getFieldData('oxvarselect') }}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', 'item_category_2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', @@ -46,7 +46,7 @@ 'debug_mode': 'true' {% endif %} }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_begin_checkout, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_begin_checkout.__toString(), dynamic: __oxid_include_dynamic }) }} {% endblock %} \ No newline at end of file diff --git a/views/twig/event/purchase.html.twig b/views/twig/event/purchase.html.twig index 5063f95..98fb1c6 100644 --- a/views/twig/event/purchase.html.twig +++ b/views/twig/event/purchase.html.twig @@ -1,6 +1,6 @@ {% block d3_ga4_purchase_block %} - {% capture name = "d3_ga4_purchase" %} - {% spaceless %} + {% set d3_ga4_purchase %} + {% apply spaceless %} dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ {% set gtmOrder = oView.getOrder() %} {% set gtmBasket = oView.getBasket() %} @@ -29,8 +29,8 @@ { 'item_id': '{{ gtmBasketItem.getFieldData("oxartnum") }}', - 'item_name': '{{ gtmBasketItem.getFieldData("oxtitle") }}', - 'affiliation': '{{ gtmBasketItem.getFieldData("oxtitle") }}', + 'item_name': '{{ gtmBasketItem.getFieldData('oxtitle')|raw }}', + 'affiliation': '{{ gtmBasketItem.getFieldData('oxtitle')|raw }}', 'coupon': '{% for gtmOrderVoucher in gtmOrderVouchers %}{{ gtmOrderVoucher }}{% if not loop.last %}, {% endif %}{% endfor %}', 'item_variant': '{{ gtmBasketItem.getFieldData("oxselvariant") }}', {% if gtmPurchaseItemCategory %} @@ -50,7 +50,7 @@ 'debug_mode': 'true' {% endif %} }) - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_purchase, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_purchase.__toString(), dynamic: __oxid_include_dynamic }) }} {% endblock %} \ No newline at end of file diff --git a/views/twig/event/remove_from_cart.html.twig b/views/twig/event/remove_from_cart.html.twig index ada03c3..a62eca3 100644 --- a/views/twig/event/remove_from_cart.html.twig +++ b/views/twig/event/remove_from_cart.html.twig @@ -1,8 +1,8 @@ {% block d3_ga4_remove_from_cart_block %} {% if hasBeenReloaded %} {% set d3BasketPrice = oxcmp_basket.getPrice() %} - {% capture name = "d3_ga4_remove_from_cart" %} - {% spaceless %} + {% set d3_ga4_remove_from_cart %} + {% apply spaceless %} dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ dataLayer.push({ 'isRemoveFromCart': true, @@ -19,7 +19,7 @@ {% set gtmBasketItemCategory = rmItem.getCategory() %} { 'item_id': '{{ rmItem.getFieldData('oxartnum') }}', - 'item_name': '{{ rmItem.getFieldData('oxtitle') }}', + 'item_name': '{{ rmItem.getFieldData('oxtitle')|raw }}', 'item_variant': '{{ rmItem.getFieldData('oxvarselect') }}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', @@ -39,8 +39,8 @@ 'debug_mode': 'true' {% endif %} }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_remove_from_cart, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_remove_from_cart.__toString(), dynamic: __oxid_include_dynamic }) }} {% endif %} {% endblock %} \ No newline at end of file diff --git a/views/twig/event/view_cart.html.twig b/views/twig/event/view_cart.html.twig index d4eca47..f37cc61 100644 --- a/views/twig/event/view_cart.html.twig +++ b/views/twig/event/view_cart.html.twig @@ -4,8 +4,8 @@ {% set gtmCartArticles = oView.getBasketArticles() %} {% block d3_ga4_view_cart_block %} - {% capture name = "d3_ga4_view_cart" %} - {% spaceless %} + {% set d3_ga4_view_cart %} + {% apply spaceless %} dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ dataLayer.push({ 'event': 'view_cart', @@ -23,9 +23,9 @@ {% set gtmBasketItem = basketitem.getArticle() %} {% set gtmBasketItemCategory = gtmBasketItem.getCategory() %} { - 'item_id': '{{ gtmCartArticles[$basketindex].getFieldData('oxartnum') }}', - 'item_name': '{{ gtmCartArticles[$basketindex].getFieldData('oxtitle') }}', - 'item_variant': '{{ gtmCartArticles[$basketindex].getFieldData('oxvarselect') }}', + 'item_id': '{{ gtmCartArticles[basketindex].getFieldData('oxartnum') }}', + 'item_name': '{{ gtmCartArticles[basketindex].getFieldData('oxtitle')|raw }}', + 'item_variant': '{{ gtmCartArticles[basketindex].getFieldData('oxvarselect') }}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', 'item_category_2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', @@ -44,7 +44,7 @@ 'debug_mode': 'true' {% endif %} }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_view_cart, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_view_cart.__toString(), dynamic: __oxid_include_dynamic }) }} {% endblock %} \ No newline at end of file diff --git a/views/twig/event/view_item.html.twig b/views/twig/event/view_item.html.twig index 3fa9d3f..4338bf8 100644 --- a/views/twig/event/view_item.html.twig +++ b/views/twig/event/view_item.html.twig @@ -3,7 +3,7 @@ {% set gtmManufacturer = gtmProduct.getManufacturer() %} {% block d3_ga4_view_item_block %} - {% capture name = "d3_ga4_view_item" %} + {% set d3_ga4_view_item %} {% spaceless %} dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ @@ -16,9 +16,9 @@ 'items': [ { - 'item_name': '{{ gtmProduct.getFieldData("oxtitle") }}', + 'item_name': '{{ gtmProduct.getFieldData('oxtitle')|raw }}', 'item_id': '{{ gtmProduct.getFieldData("oxartnum") }}', - 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.oxmanufacturers__oxtitle.value }}{% endif %}', + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getFieldData('oxtitle')|raw }}{% endif %}', 'item_variant': '{% if gtmProduct.getFieldData("oxvarselect") %}{{ gtmProduct.getFieldData("oxvarselect") }}{% endif %}', {% if gtmCategory %} 'item_category': '{{ gtmCategory.getSplitCategoryArray(0, true) }}', @@ -35,7 +35,7 @@ 'debug_mode': 'true' {% endif %} }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_view_item, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_view_item.__toString(), dynamic: __oxid_include_dynamic }) }} {% endblock %} \ No newline at end of file diff --git a/views/twig/event/view_item_list.html.twig b/views/twig/event/view_item_list.html.twig index 01e8806..685c002 100644 --- a/views/twig/event/view_item_list.html.twig +++ b/views/twig/event/view_item_list.html.twig @@ -5,8 +5,8 @@ {% block d3_ga4_view_item_list_block %} {% if gtmProducts|length %} - {% capture name = "d3_ga4_view_item_list" %} - {% spaceless %} + {% set d3_ga4_view_item_list %} + {% apply spaceless %} dataLayer.push({ecommerce: null}); dataLayer.push({ 'event':'view_item_list', @@ -21,9 +21,9 @@ {% if not gtmCategory %}{% set gtmCategory = gtmProduct.getCategory() %}{% endif %} { 'item_id': '{{ gtmProduct.getFieldData("oxartnum") }}', - 'item_name': '{{ gtmProduct.getFieldData("oxtitle") }}', + 'item_name': '{{ gtmProduct.getFieldData('oxtitle')|raw }}', 'price': {{ d3PriceObject.getPrice() }}, - 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.oxmanufacturers__oxtitle.value }}{% endif %}', + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getFieldData('oxtitle')|raw }}{% endif %}', {% if gtmCategory %} 'item_category': '{{ gtmCategory.getSplitCategoryArray(0, true) }}', 'item_category_2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', @@ -38,8 +38,8 @@ 'debug_mode': 'true' {% endif %} }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_view_item_list, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_view_item_list.__toString(), dynamic: __oxid_include_dynamic }) }} {% endif %} {% endblock %} \ No newline at end of file diff --git a/views/twig/event/view_search_result.html.twig b/views/twig/event/view_search_result.html.twig index d98d2a3..f4140cb 100644 --- a/views/twig/event/view_search_result.html.twig +++ b/views/twig/event/view_search_result.html.twig @@ -2,8 +2,8 @@ {% block d3_ga4_view_search_result_block %} {% if gtmProducts %} - {% capture name = "d3_ga4_view_search_result" %} - {% spaceless %} + {% set d3_ga4_view_search_result %} + {% apply spaceless %} dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null}); /* Clear the previous ecommerce object. */ dataLayer.push({ 'event': 'view_search_result', @@ -17,9 +17,9 @@ {% set gtmCategory = gtmProduct.getCategory() %} { 'item_id': '{{ gtmProduct.getFieldData("oxartnum") }}', - 'item_name': '{{ gtmProduct.getFieldData("oxtitle") }}', + 'item_name': '{{ gtmProduct.getFieldData('oxtitle')|raw }}', 'price': {{ d3PriceObject.getPrice() }}, - 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.oxmanufacturers__oxtitle.value }}{% endif %}', + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getFieldData('oxtitle')|raw }}{% endif %}', {% if gtmCategory %} 'item_category': '{{ gtmCategory.getSplitCategoryArray(0, true) }}', 'item_category_2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', @@ -35,9 +35,9 @@ 'debug_mode': 'true' {% endif %} }); - {% endspaceless %} - {% endcapture %} - {{ script({ add: smarty.capture.d3_ga4_view_search_result, dynamic: __oxid_include_dynamic }) }} + {% endapply %} + {% endset %} + {{ script({ add: d3_ga4_view_search_result.__toString(), dynamic: __oxid_include_dynamic }) }} {% endif %} {% endblock %} diff --git a/views/twig/extensions/themes/default/layout/_gtm_js.html.twig b/views/twig/extensions/themes/default/layout/_gtm_js.html.twig index 695b999..660f731 100644 --- a/views/twig/extensions/themes/default/layout/_gtm_js.html.twig +++ b/views/twig/extensions/themes/default/layout/_gtm_js.html.twig @@ -8,8 +8,7 @@ {% if oViewConf.isGA4enabled() and oViewConf.D3blShowGtmScript() %} {% if d3GtmContainerIdString %} - {% spaceless %} - + {% apply spaceless %} {% if oViewConf.isGtmConsentModeSetActivated() %} - {% endspaceless %} + {% endapply %} {% endif %} {% endif %} diff --git a/views/twig/extensions/themes/default/layout/_gtm_nojs.html.twig b/views/twig/extensions/themes/default/layout/_gtm_nojs.html.twig index fc83b1a..efc2777 100644 --- a/views/twig/extensions/themes/default/layout/_gtm_nojs.html.twig +++ b/views/twig/extensions/themes/default/layout/_gtm_nojs.html.twig @@ -1,12 +1,12 @@ {% if oViewConf.D3blShowGtmScript() %} - {% if oViewConf.getGtmContainerId() %}{% spaceless %} + {% if oViewConf.getGtmContainerId() %}{% apply spaceless %} - {% endspaceless %}{% endif %} - {% endif %} + {% endapply %}{% endif %} +{% endif %} {{ parent() }} \ No newline at end of file diff --git a/views/twig/extensions/themes/default/page/account/d3gtmnoticelist.html.twig b/views/twig/extensions/themes/default/page/account/d3gtmnoticelist.html.twig index a4cd553..1bf1735 100644 --- a/views/twig/extensions/themes/default/page/account/d3gtmnoticelist.html.twig +++ b/views/twig/extensions/themes/default/page/account/d3gtmnoticelist.html.twig @@ -1,4 +1,4 @@ -{% capture append = "oxidBlock_content" %} +{% set oxidBlock_content %} {% set template_title = "MY_WISH_LIST"|translate %}

{{ translate({ ident: "MY_WISH_LIST" }) }}

@@ -11,8 +11,8 @@ {% include '@d3googleanalytics4/event/add_to_cart.html.twig' with {htmlIdAmountOfArticles: '#amountToBasket'} %} {{ insert_tracker({title: template_title}) }} - {% endcapture %} -{% capture append = "oxidBlock_sidebar" %} + {% endset %} +{% set oxidBlock_sidebar %} {% include "page/account/inc/account_menu.html.twig" with {active_link: "noticelist"} %} - {% endcapture %} + {% endset %} {% include "layout/page.html.twig" with {sidebar: "Left"} %} \ No newline at end of file diff --git a/views/twig/extensions/themes/default/page/account/d3gtmrecommendationlist.html.twig b/views/twig/extensions/themes/default/page/account/d3gtmrecommendationlist.html.twig index d1aed19..80c3124 100644 --- a/views/twig/extensions/themes/default/page/account/d3gtmrecommendationlist.html.twig +++ b/views/twig/extensions/themes/default/page/account/d3gtmrecommendationlist.html.twig @@ -1,4 +1,4 @@ -{% capture append = "oxidBlock_content" %} +{% set oxidBlock_content %} {% set template_title = "LISTMANIA"|translate %} {% set _actvrecommlist = oView.getActiveRecommList() %} @@ -24,9 +24,9 @@ {% include '@d3googleanalytics4/event/add_to_cart.html.twig' with {htmlIdAmountOfArticles: '#amountToBasket'} %} {{ insert_tracker({title: template_title}) }} -{% endcapture %} -{% capture append = "oxidBlock_sidebar" %} +{% endset %} +{% set oxidBlock_sidebar %} {% include "page/account/inc/account_menu.html.twig" with {active_link: "recommendationlist"} %} -{% endcapture %} +{% endset %} {% include "layout/page.html.twig" with {sidebar: "Left"} %} diff --git a/views/twig/extensions/themes/default/page/account/d3gtmwishlist.html.twig b/views/twig/extensions/themes/default/page/account/d3gtmwishlist.html.twig index 3e5f292..93394fd 100644 --- a/views/twig/extensions/themes/default/page/account/d3gtmwishlist.html.twig +++ b/views/twig/extensions/themes/default/page/account/d3gtmwishlist.html.twig @@ -1,4 +1,4 @@ -{% capture append = "oxidBlock_content" %} +{% set oxidBlock_content %} {% set template_title = "MY_GIFT_REGISTRY"|translate %} {% if not oView.getWishListUsers() and oView.getWishListSearchParam() %} {% set _statusMessage = "MESSAGE_SORRY_NO_GIFT_REGISTRY"|translate %} @@ -37,8 +37,8 @@ {% include '@d3googleanalytics4/event/add_to_cart.html.twig' with {htmlIdAmountOfArticles: '#amountToBasket'} %} {{ insert_tracker({title: template_title}) }} -{% endcapture %} -{% capture append = "oxidBlock_sidebar" %} +{% endset %} +{% set oxidBlock_sidebar %} {% include "page/account/inc/account_menu.html.twig" with {active_link: "wishlist"} %} -{% endcapture %} +{% endset %} {% include "layout/page.html.twig" with {sidebar: "Left"} %} \ No newline at end of file