From 17c0f2231ee711bcc10fe73c15e03ec6092cbb0d Mon Sep 17 00:00:00 2001
From: RayEhrhardt <re@shopmodule.com>
Date: Thu, 18 May 2017 13:39:38 +0200
Subject: [PATCH] #4509: changed_full entfernen

---
 .../layout/d3_base_googleadwordscode.tpl      |   0
 .../blocks/layout/d3_base_googleanalytics.tpl |   0
 .../views/blocks/layout/d3_base_optout.tpl    |   0
 .../views/tpl/widget/d3_googleanalytics.tpl   |   0
 .../views/tpl/widget/d3ga_universal.tpl       |   0
 .../tpl/widget/inc/d3ga_universal_adwords.tpl |   0
 .../widget/inc/d3ga_universal_adwordscode.tpl |   0
 .../inc/d3ga_universal_campaigncode.tpl       |  14 +-
 .../tpl/widget/inc/d3ga_universal_custom.tpl  |   0
 .../widget/inc/d3ga_universal_ecommerce.tpl   |   0
 .../widget/inc/d3ga_universal_remarketing.tpl |   0
 .../inc/d3ga_universal_trustedstore.tpl       | 172 +++++++++---------
 setup+doku/changelog.txt                      |   1 +
 13 files changed, 94 insertions(+), 93 deletions(-)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl (94%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl (100%)
 rename {changed_full/490- => copy_this}/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl (98%)

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 *}]
-    <!-- BEGIN: Google Certified Shops -->
-    <script type="text/javascript">
-        var gts = gts || [];
-
-        [{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
-            gts.push(["id", "[{$oD3GASettings->getValue('sD3GATSId')}]"]);
-            gts.push(["badge_position", "BOTTOM_RIGHT"]);
-            gts.push(["locale", "[{$sD3CurrentGTSLang}]"]);
-            [{if $sD3GATSProdId}]
-                gts.push(["google_base_offer_id", "[{$sD3GATSProdId}]"]);
-            [{/if}]
-            gts.push(["google_base_subaccount_id", "[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]"]);
-            gts.push(["google_base_country", "[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]"]);
-            gts.push(["google_base_language", "[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]"]);
-        [{/if}]
-
-        (function() {
-            var gts = document.createElement("script");
-            gts.type = "text/javascript";
-            gts.async = true;
-            gts.src = "https://www.googlecommerce.com/trustedstores/api/js";
-            var s = document.getElementsByTagName("script")[0];
-            s.parentNode.insertBefore(gts, s);
-        })();
-    </script>
-    <!-- END: Google Certified Shops -->
-[{/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}]
-
-        <!-- START Google Trusted Stores Order -->
-            <div id="gts-order" style="display:none;" translate="no">
-                <!-- start order and merchant information -->
-                    <span id="gts-o-id">[{$oOrder->getFieldData('oxordernr')}]</span>
-                    <span id="gts-o-domain">[{$oxcmp_shop->oxshops__oxurl->value}]</span>
-                    <span id="gts-o-email">[{$oUser->getFieldData('oxusername')}]</span>
-                    <span id="gts-o-country">[{$oUserCountry->getFieldData('oxisoalpha2')}]</span>
-                    <span id="gts-o-currency">[{$oOrderCurrency->name}]</span>
-                    <span id="gts-o-total">[{$sTotal|string_format:"%.2f"}]</span>
-                    <span id="gts-o-discounts">-[{$oOrder->getFieldData('oxdiscount')|string_format:"%.2f"}]</span>
-                    <span id="gts-o-shipping-total">[{$oOrder->getFieldData('oxdelcost')|string_format:"%.2f"}]</span>
-                    <span id="gts-o-tax-total">[{$oOrder->d3GetTaxTotal()}]</span>
-                    <span id="gts-o-est-delivery-date">[{$oView->d3GAgetEstimatedDeliveryDate()|date_format:"%Y-%m-%d"}]</span>
-                    <span id="gts-o-est-ship-date">[{$oView->d3GAgetEstimatedShippingDate()|date_format:"%Y-%m-%d"}]</span>
-                    <span id="gts-o-has-preorder">[{$oView->d3GAhasBackorderPreorder()}]</span>
-                    <span id="gts-o-has-digital">[{$oView->d3GAhasDigitalGoods()}]</span>
-                <!-- end order and merchant information -->
-
-                <!-- start repeated item specific information -->
-                [{foreach from=$order->getOrderArticles() item=oOrderArticle}]
-                    [{if $oD3GASettings->getValue('blD3GAUseNetto')}]
-                        [{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxnprice->value}]
-                    [{else}]
-                        [{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxprice->value}]
-                    [{/if}]
-
-                    <span class="gts-item">
-                        <span class="gts-i-name">[{$oOrderArticle->oxorderarticles__oxtitle->value|escape:"quotes"}]</span>
-                        <span class="gts-i-price">[{$sPrice|string_format:"%.2f"}]</span>
-                        <span class="gts-i-quantity">[{$oOrderArticle->getFieldData('oxamount')}]</span>
-                        [{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
-                            <span class="gts-i-prodsearch-id">[{$oView->d3GAgetProductId($oOrderArticle)}]</span>
-                            <span class="gts-i-prodsearch-store-id">[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]</span>
-                            <span class="gts-i-prodsearch-country">[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]</span>
-                            <span class="gts-i-prodsearch-language">[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]</span>
-                        [{/if}]
-                    </span>
-                [{/foreach}]
-                <!-- end repeated item specific informations -->
-            </div>
-        <!-- END Google Trusted Stores Order -->
-    [{/block}]
+[{block name="UniversalTrustedStoreBadge"}]
+    [{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}]
+    <!-- BEGIN: Google Certified Shops -->
+    <script type="text/javascript">
+        var gts = gts || [];
+
+        [{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
+            gts.push(["id", "[{$oD3GASettings->getValue('sD3GATSId')}]"]);
+            gts.push(["badge_position", "BOTTOM_RIGHT"]);
+            gts.push(["locale", "[{$sD3CurrentGTSLang}]"]);
+            [{if $sD3GATSProdId}]
+                gts.push(["google_base_offer_id", "[{$sD3GATSProdId}]"]);
+            [{/if}]
+            gts.push(["google_base_subaccount_id", "[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]"]);
+            gts.push(["google_base_country", "[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]"]);
+            gts.push(["google_base_language", "[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]"]);
+        [{/if}]
+
+        (function() {
+            var gts = document.createElement("script");
+            gts.type = "text/javascript";
+            gts.async = true;
+            gts.src = "https://www.googlecommerce.com/trustedstores/api/js";
+            var s = document.getElementsByTagName("script")[0];
+            s.parentNode.insertBefore(gts, s);
+        })();
+    </script>
+    <!-- END: Google Certified Shops -->
+[{/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}]
+
+        <!-- START Google Trusted Stores Order -->
+            <div id="gts-order" style="display:none;" translate="no">
+                <!-- start order and merchant information -->
+                    <span id="gts-o-id">[{$oOrder->getFieldData('oxordernr')}]</span>
+                    <span id="gts-o-domain">[{$oxcmp_shop->oxshops__oxurl->value}]</span>
+                    <span id="gts-o-email">[{$oUser->getFieldData('oxusername')}]</span>
+                    <span id="gts-o-country">[{$oUserCountry->getFieldData('oxisoalpha2')}]</span>
+                    <span id="gts-o-currency">[{$oOrderCurrency->name}]</span>
+                    <span id="gts-o-total">[{$sTotal|string_format:"%.2f"}]</span>
+                    <span id="gts-o-discounts">-[{$oOrder->getFieldData('oxdiscount')|string_format:"%.2f"}]</span>
+                    <span id="gts-o-shipping-total">[{$oOrder->getFieldData('oxdelcost')|string_format:"%.2f"}]</span>
+                    <span id="gts-o-tax-total">[{$oOrder->d3GetTaxTotal()}]</span>
+                    <span id="gts-o-est-delivery-date">[{$oView->d3GAgetEstimatedDeliveryDate()|date_format:"%Y-%m-%d"}]</span>
+                    <span id="gts-o-est-ship-date">[{$oView->d3GAgetEstimatedShippingDate()|date_format:"%Y-%m-%d"}]</span>
+                    <span id="gts-o-has-preorder">[{$oView->d3GAhasBackorderPreorder()}]</span>
+                    <span id="gts-o-has-digital">[{$oView->d3GAhasDigitalGoods()}]</span>
+                <!-- end order and merchant information -->
+
+                <!-- start repeated item specific information -->
+                [{foreach from=$order->getOrderArticles() item=oOrderArticle}]
+                    [{if $oD3GASettings->getValue('blD3GAUseNetto')}]
+                        [{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxnprice->value}]
+                    [{else}]
+                        [{assign var="sPrice" value=$oOrderArticle->oxorderarticles__oxprice->value}]
+                    [{/if}]
+
+                    <span class="gts-item">
+                        <span class="gts-i-name">[{$oOrderArticle->oxorderarticles__oxtitle->value|escape:"quotes"}]</span>
+                        <span class="gts-i-price">[{$sPrice|string_format:"%.2f"}]</span>
+                        <span class="gts-i-quantity">[{$oOrderArticle->getFieldData('oxamount')}]</span>
+                        [{if $oD3GASettings->getValue('sD3GATSShoppingActive')}]
+                            <span class="gts-i-prodsearch-id">[{$oView->d3GAgetProductId($oOrderArticle)}]</span>
+                            <span class="gts-i-prodsearch-store-id">[{$oD3GASettings->getValue('sD3GATSShoppingAccountId')}]</span>
+                            <span class="gts-i-prodsearch-country">[{$oD3GASettings->getValue('sD3GATSShoppingCountry')|upper}]</span>
+                            <span class="gts-i-prodsearch-language">[{$oD3GASettings->getValue('sD3GATSShoppingLanguage')|lower}]</span>
+                        [{/if}]
+                    </span>
+                [{/foreach}]
+                <!-- end repeated item specific informations -->
+            </div>
+        <!-- END Google Trusted Stores Order -->
+    [{/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