diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl b/copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl b/copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl b/copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl similarity index 94% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl index 295e44c..3a8c028 100644 --- a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl +++ b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl @@ -1,8 +1,8 @@ -[{strip}] - [{if $oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode') && - (false == $oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou')}] - - [{$oD3GASettings->getValue('sD3GACampaignCode')}] - - [{/if}] +[{strip}] + [{if $oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode') && + (false == $oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou')}] + + [{$oD3GASettings->getValue('sD3GACampaignCode')}] + + [{/if}] [{/strip}] \ No newline at end of file diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl similarity index 100% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl diff --git a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl similarity index 98% rename from changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl rename to copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl index 41392f8..7d41baa 100644 --- a/changed_full/490-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl +++ b/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl @@ -1,87 +1,87 @@ -[{block name="UniversalTrustedStoreBadge"}] - [{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}] - - - -[{/block}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{block name="UniversalTrustedStoreOrderInfo"}] - [{* https://support.google.com/trustedstoresmerchant/answer/6063087?hl=de&ref_topic=6063044 *}] - - [{assign var="oOrder" value=$oView->getOrder()}] - [{assign var="oOrderCurrency" value=$oOrder->getOrderCurrency()}] - [{assign var="oUser" value=$oOrder->getOrderUser()}] - [{assign var="oUserCountry" value=$oView->d3GAGetUserCountry()}] - [{if $oD3GASettings->getValue('blD3GAUseNetto')}] - [{assign var="sTotal" value=$oOrder->getOrderNetSum()}] [{* // total - required - has to be gross sum *}] - [{else}] - [{assign var="sTotal" value=$oOrder->getTotalOrderSum()}] [{* // total - required *}] - [{/if}] - - -
- - [{/block}] +[{block name="UniversalTrustedStoreBadge"}] + [{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}] + + + +[{/block}] + +[{if $oViewConf->getActiveClassName() == 'thankyou'}] + [{block name="UniversalTrustedStoreOrderInfo"}] + [{* https://support.google.com/trustedstoresmerchant/answer/6063087?hl=de&ref_topic=6063044 *}] + + [{assign var="oOrder" value=$oView->getOrder()}] + [{assign var="oOrderCurrency" value=$oOrder->getOrderCurrency()}] + [{assign var="oUser" value=$oOrder->getOrderUser()}] + [{assign var="oUserCountry" value=$oView->d3GAGetUserCountry()}] + [{if $oD3GASettings->getValue('blD3GAUseNetto')}] + [{assign var="sTotal" value=$oOrder->getOrderNetSum()}] [{* // total - required - has to be gross sum *}] + [{else}] + [{assign var="sTotal" value=$oOrder->getTotalOrderSum()}] [{* // total - required *}] + [{/if}] + + + + + [{/block}] [{/if}] \ No newline at end of file diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt index a49e867..b5ff03b 100644 --- a/setup+doku/changelog.txt +++ b/setup+doku/changelog.txt @@ -1,6 +1,7 @@ => 3.4.0.1 - #5078: ecomm_totalvalue darf nicht in Apostrophen stehen - #4814: Remarketing: Werte für ecomm_pagetype anpassen +- #4509: changed_full entfernen => 3.4.0.0 - Remarketing (via Analytics) eingefügt