diff --git a/views/twig/admin/d3ga4uimain.html.twig b/views/twig/admin/d3ga4uimain.html.twig index a47d6b3..f3abb4e 100644 --- a/views/twig/admin/d3ga4uimain.html.twig +++ b/views/twig/admin/d3ga4uimain.html.twig @@ -54,6 +54,23 @@ {{ translate({ ident: "D3USEGOOGLECONSENTMODE" }) }}{% include "inputhelp.html.twig" with {'sHelpId': help_id("D3USEGOOGLECONSENTMODE_HELP"), 'sHelpText': help_text("D3USEGOOGLECONSENTMODE_HELP")} %} +
+ + +
+
+
+ {{ translate({ ident: "D3REPLACECHARS" }) }} + +
+
{{ translate({ ident: "D3REPLACECHARS_HELP" }) }}
+
diff --git a/views/twig/event/add_payment_info.html.twig b/views/twig/event/add_payment_info.html.twig index 2c12243..dd790b7 100644 --- a/views/twig/event/add_payment_info.html.twig +++ b/views/twig/event/add_payment_info.html.twig @@ -25,14 +25,15 @@ {% set gtmBasketItem = basketitem.getArticle() %} {% set gtmBasketItemCategory = gtmBasketItem.getCategory() %} { + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_id': '{{ gtmCartArticles[basketindex].getFieldData('oxartnum') }}', - 'item_name': '{{ gtmCartArticles[basketindex].getFieldData('oxtitle')|raw }}', + 'item_name': '{{ gtmCartArticles[basketindex].getRawFieldData('oxtitle')|raw }}', 'item_variant': '{{ gtmCartArticles[basketindex].getFieldData('oxvarselect') }}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', - 'item_category_2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', - 'item_category_3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', - 'item_category_4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', + 'item_category2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', + 'item_category3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', + 'item_category4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', 'item_list_name': '{{ gtmBasketItemCategory.getSplitCategoryArray() }}', {% endif %} 'price': {{ gtmItemPriceObject.getPrice() }}, diff --git a/views/twig/event/add_to_cart.html.twig b/views/twig/event/add_to_cart.html.twig index 6016c97..2d8c46c 100644 --- a/views/twig/event/add_to_cart.html.twig +++ b/views/twig/event/add_to_cart.html.twig @@ -35,16 +35,17 @@ 'currency': "{{ currency.name }}", 'value': iArtQuantity*{{ d3PriceObject.getPrice() }}, 'items': [{ + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_id': '{{ oGtmProduct.getFieldData('oxartnum') }}', - 'item_name': '{{ oGtmProduct.getFieldData('oxtitle')|raw }}', + 'item_name': '{{ oGtmProduct.getRawFieldData('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_category2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', + 'item_category3':'{{ gtmCategory.getSplitCategoryArray(2, true) }}', + 'item_category4':'{{ gtmCategory.getSplitCategoryArray(3, true) }}', 'item_list_name':'{{ gtmCategory.getSplitCategoryArray() }}', {% endif %} 'quantity': iArtQuantity diff --git a/views/twig/event/begin_checkout.html.twig b/views/twig/event/begin_checkout.html.twig index b1c76bf..8df4c50 100644 --- a/views/twig/event/begin_checkout.html.twig +++ b/views/twig/event/begin_checkout.html.twig @@ -22,15 +22,18 @@ {% set d3oItemPrice = basketitem.getPrice() %} {% set gtmBasketItem = basketitem.getArticle() %} {% set gtmBasketItemCategory = gtmBasketItem.getCategory() %} + {% set gtmManufacturer = gtmBasketItem.getManufacturer() %} { + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_id': '{{ gtmCartArticles[basketindex].getFieldData('oxartnum') }}', - 'item_name': '{{ gtmCartArticles[basketindex].getFieldData('oxtitle')|raw }}', + 'item_name': '{{ gtmCartArticles[basketindex].getRawFieldData('oxtitle')|raw }}', 'item_variant': '{{ gtmCartArticles[basketindex].getFieldData('oxvarselect') }}', + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getRawFieldData('oxtitle') }}{% endif %}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', - 'item_category_2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', - 'item_category_3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', - 'item_category_4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', + 'item_category2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', + 'item_category3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', + 'item_category4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', 'item_list_name': '{{ gtmBasketItemCategory.getSplitCategoryArray() }}', {% endif %} 'price': {{ d3oItemPrice.getPrice() }}, diff --git a/views/twig/event/purchase.html.twig b/views/twig/event/purchase.html.twig index b61da5e..8d37173 100644 --- a/views/twig/event/purchase.html.twig +++ b/views/twig/event/purchase.html.twig @@ -28,18 +28,20 @@ {% set gtmPurchaseItemPriceObject = gtmBasketItem.getPrice() %} {% set gtmPurchaseItem = gtmBasketItem.getArticle() %} {% set gtmPurchaseItemCategory = gtmPurchaseItem.getCategory() %} - + {% set gtmManufacturer = gtmBasketItem.getManufacturer() %} { + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_id': '{{ gtmBasketItem.getFieldData("oxartnum") }}', '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") }}', + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getRawFieldData('oxtitle') }}{% endif %}', {% if gtmPurchaseItemCategory %} 'item_category': '{{ gtmPurchaseItemCategory.getSplitCategoryArray(0, true) }}', - 'item_category_2': '{{ gtmPurchaseItemCategory.getSplitCategoryArray(1, true) }}', - 'item_category_3': '{{ gtmPurchaseItemCategory.getSplitCategoryArray(2, true) }}', - 'item_category_4': '{{ gtmPurchaseItemCategory.getSplitCategoryArray(3, true) }}', + 'item_category2': '{{ gtmPurchaseItemCategory.getSplitCategoryArray(1, true) }}', + 'item_category3': '{{ gtmPurchaseItemCategory.getSplitCategoryArray(2, true) }}', + 'item_category4': '{{ gtmPurchaseItemCategory.getSplitCategoryArray(3, true) }}', 'item_list_name': '{{ gtmPurchaseItemCategory.getSplitCategoryArray() }}', {% endif %} 'price': {{ gtmPurchaseItemPriceObject.getPrice() }}, @@ -51,7 +53,7 @@ }{% if oViewConf.isDebugModeOn() %}, 'debug_mode': 'true' {% endif %} - }) + }); {% endapply %} {% endset %} {{ script({ add: d3_ga4_purchase.__toString(), dynamic: __oxid_include_dynamic }) }} diff --git a/views/twig/event/remove_from_cart.html.twig b/views/twig/event/remove_from_cart.html.twig index b251dac..fbcb14c 100644 --- a/views/twig/event/remove_from_cart.html.twig +++ b/views/twig/event/remove_from_cart.html.twig @@ -19,15 +19,18 @@ {% for rmItemindex, rmItem in toRemoveArticles.getArray() %} {% set d3oItemPrice = rmItem.getPrice() %} {% set gtmBasketItemCategory = rmItem.getCategory() %} + {% set gtmManufacturer = gtmBasketItem.getManufacturer() %} { + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_id': '{{ rmItem.getFieldData('oxartnum') }}', 'item_name': '{{ rmItem.getFieldData('oxtitle')|raw }}', 'item_variant': '{{ rmItem.getFieldData('oxvarselect') }}', + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getRawFieldData('oxtitle') }}{% endif %}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', - 'item_category_2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', - 'item_category_3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', - 'item_category_4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', + 'item_category2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', + 'item_category3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', + 'item_category4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', 'item_list_name': '{{ gtmBasketItemCategory.getSplitCategoryArray() }}', {% endif %} 'price': {{ d3oItemPrice.getPrice() }}, diff --git a/views/twig/event/view_cart.html.twig b/views/twig/event/view_cart.html.twig index 58b422b..4645bb9 100644 --- a/views/twig/event/view_cart.html.twig +++ b/views/twig/event/view_cart.html.twig @@ -22,15 +22,18 @@ {% set d3oItemPrice = basketitem.getPrice() %} {% set gtmBasketItem = basketitem.getArticle() %} {% set gtmBasketItemCategory = gtmBasketItem.getCategory() %} + {% set gtmManufacturer = gtmBasketItem.getManufacturer() %} { - 'item_id': '{{ gtmCartArticles[basketindex].getFieldData('oxartnum') }}', - 'item_name': '{{ gtmCartArticles[basketindex].getFieldData('oxtitle')|raw }}', + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', + 'item_id': '{{ gtmCartArticles[basketindex].getFieldData('oxartnum') }}', + 'item_name': '{{ gtmCartArticles[basketindex].getFieldData('oxtitle')|raw }}', 'item_variant': '{{ gtmCartArticles[basketindex].getFieldData('oxvarselect') }}', + 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getRawFieldData('oxtitle') }}{% endif %}', {% if gtmBasketItemCategory %} 'item_category': '{{ gtmBasketItemCategory.getSplitCategoryArray(0, true) }}', - 'item_category_2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', - 'item_category_3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', - 'item_category_4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', + 'item_category2': '{{ gtmBasketItemCategory.getSplitCategoryArray(1, true) }}', + 'item_category3': '{{ gtmBasketItemCategory.getSplitCategoryArray(2, true) }}', + 'item_category4': '{{ gtmBasketItemCategory.getSplitCategoryArray(3, true) }}', 'item_list_name': '{{ gtmBasketItemCategory.getSplitCategoryArray() }}', {% endif %} 'price': {{ d3oItemPrice.getPrice() }}, diff --git a/views/twig/event/view_item.html.twig b/views/twig/event/view_item.html.twig index 7445a4a..4f83026 100644 --- a/views/twig/event/view_item.html.twig +++ b/views/twig/event/view_item.html.twig @@ -14,15 +14,16 @@ 'ecommerce': { 'currency': '{{ currency.name }}', 'items': [{ + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_name': '{{ gtmProduct.getFieldData('oxtitle')|raw }}', 'item_id': '{{ gtmProduct.getFieldData("oxartnum") }}', '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) }}', - 'item_category_2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', - 'item_category_3':'{{ gtmCategory.getSplitCategoryArray(2, true) }}', - 'item_category_4':'{{ gtmCategory.getSplitCategoryArray(3, true) }}', + 'item_category2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', + 'item_category3':'{{ gtmCategory.getSplitCategoryArray(2, true) }}', + 'item_category4':'{{ gtmCategory.getSplitCategoryArray(3, true) }}', 'item_list_name':'{{ gtmCategory.getSplitCategoryArray() }}', {% endif %} {% set d3PriceObject = gtmProduct.getPrice() %} diff --git a/views/twig/event/view_item_list.html.twig b/views/twig/event/view_item_list.html.twig index aff0398..d66e8f9 100644 --- a/views/twig/event/view_item_list.html.twig +++ b/views/twig/event/view_item_list.html.twig @@ -21,15 +21,16 @@ {% set gtmManufacturer = gtmProduct.getManufacturer() %} {% if not gtmCategory %}{% set gtmCategory = gtmProduct.getCategory() %}{% endif %} { + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_id': '{{ gtmProduct.getFieldData("oxartnum") }}', - 'item_name': '{{ gtmProduct.getFieldData('oxtitle')|raw }}', + 'item_name': '{{ gtmProduct.getRawFieldData('oxtitle')|raw }}', 'price': {{ d3PriceObject.getPrice() }}, 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getFieldData('oxtitle')|raw }}{% 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_category2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', + 'item_category3':'{{ gtmCategory.getSplitCategoryArray(2, true) }}', + 'item_category4':'{{ gtmCategory.getSplitCategoryArray(3, true) }}', {% endif %} 'quantity': 1 }{% if not loop.last %},{% endif %} diff --git a/views/twig/event/view_search_result.html.twig b/views/twig/event/view_search_result.html.twig index b6a1191..25896c2 100644 --- a/views/twig/event/view_search_result.html.twig +++ b/views/twig/event/view_search_result.html.twig @@ -17,15 +17,16 @@ {% set gtmManufacturer = gtmProduct.getManufacturer() %} {% set gtmCategory = gtmProduct.getCategory() %} { + 'item_oxid': '{{ gtmProduct.getFieldData("oxid") }}', 'item_id': '{{ gtmProduct.getFieldData("oxartnum") }}', - 'item_name': '{{ gtmProduct.getFieldData('oxtitle')|raw }}', + 'item_name': '{{ gtmProduct.getRawFieldData('oxtitle')|raw }}', 'price': {{ d3PriceObject.getPrice() }}, 'item_brand': '{% if gtmManufacturer %}{{ gtmManufacturer.getFieldData('oxtitle')|raw }}{% 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_category2':'{{ gtmCategory.getSplitCategoryArray(1, true) }}', + 'item_category3':'{{ gtmCategory.getSplitCategoryArray(2, true) }}', + 'item_category4':'{{ gtmCategory.getSplitCategoryArray(3, true) }}', 'item_list_name':'{{ gtmCategory.getSplitCategoryArray() }}', {% endif %} 'quantity': 1