diff --git a/.gitattributes b/.gitattributes
index 7b4adc6..fd1abc1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -164,6 +164,7 @@ changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_univer
changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl -text
changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl -text
changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl -text
+changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl -text
copy_this/.noencode -text
copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php -text
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php -text
@@ -172,6 +173,7 @@ copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php -text
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php -text
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php -text
+copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php -text
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php -text
copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php -text
copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text
@@ -194,6 +196,7 @@ copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.p
copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl -text
copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text
copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl -text
+copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl -text
setup+doku/Google[!!-~]AdWords-Einrichtung.pdf -text svneol=unset#unset
setup+doku/Google[!!-~]Analytics-Einrichtung.pdf -text svneol=unset#unset
setup+doku/Google[!!-~]Analytics-Installation.pdf -text
diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl
index 04b529e..143b43c 100644
--- a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl
+++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl
@@ -99,4 +99,8 @@
[{/if}]
[{$smarty.capture.d3GATrackCode}]
+[{/if}]
+
+[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GATSActive') && $oD3GASettings->getValue('sD3GATSId')}]
+ [{include file="d3ga_universal_trustedstore.tpl"}]
[{/if}]
\ No newline at end of file
diff --git a/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl
new file mode 100644
index 0000000..a5bc056
--- /dev/null
+++ b/changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl
@@ -0,0 +1,64 @@
+[{* https://support.google.com/trustedstoresmerchant/answer/6063080?hl=de&ref_topic=6063044 *}]
+
+
+
+
+[{if $oViewConf->getActiveClassName() == 'thankyou'}]
+ [{* https://support.google.com/trustedstoresmerchant/answer/6063087?hl=de&ref_topic=6063044 *}]
+
+
+
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+ MERCHANT_ORDER_ID
+
+
+
+
+
+ ITEM_NAME
+ ITEM_NAME
+ ITEM_NAME
+[{*
+ ITEM_NAME
+ ITEM_NAME
+ ITEM_NAME
+ ITEM_NAME
+*}]
+
+
+
+
+
+[{/if}]
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
new file mode 100644
index 0000000..d1282bf
--- /dev/null
+++ b/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
@@ -0,0 +1,25 @@
+.
+ *
+ * @link http://www.oxidmodule.com
+ * @link http://www.shopmodule.com
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ */
+
+class d3_cfg_googleanalytics_trustedstore extends d3_cfg_mod_main
+{
+ protected $_sThisTemplate = 'd3_cfg_googleanalytics_trustedstore.tpl';
+ protected $_sModId = 'd3_googleanalytics';
+}
diff --git a/copy_this/modules/d3/d3_googleanalytics/menu.xml b/copy_this/modules/d3/d3_googleanalytics/menu.xml
index 63beba9..fee3f55 100644
--- a/copy_this/modules/d3/d3_googleanalytics/menu.xml
+++ b/copy_this/modules/d3/d3_googleanalytics/menu.xml
@@ -6,6 +6,7 @@
+
diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/copy_this/modules/d3/d3_googleanalytics/metadata.php
index d5b4378..625a023 100644
--- a/copy_this/modules/d3/d3_googleanalytics/metadata.php
+++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php
@@ -61,6 +61,8 @@ $aModule = array(
'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php',
'd3_cfg_googleanalytics_list' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php',
'd3_cfg_googleanalytics_main' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php',
+ 'd3_cfg_googleanalytics_trustedstore' =>
+ 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php',
'd3_cfg_googleanalyticslog' => 'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php',
'd3_cfg_googleanalyticslog_list' =>
'd3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php',
@@ -81,6 +83,8 @@ $aModule = array(
'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl',
'd3ga_universal_campaigncode.tpl' =>
'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl',
+ 'd3ga_universal_trustedstore.tpl' =>
+ 'd3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl',
'd3_cfg_googleanalytics_main.tpl' =>
'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl',
@@ -88,6 +92,8 @@ $aModule = array(
'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl',
'd3_cfg_googleanalytics_campaigns.tpl' =>
'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl',
+ 'd3_cfg_googleanalytics_trustedstore.tpl' =>
+ 'd3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl',
),
'events' => array(
'onActivate' => 'd3install::checkUpdateStart',
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php b/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
index 1ca3d5d..b6ee478 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
@@ -31,6 +31,7 @@ $aLang = array(
'd3mxgoogleanalytics_settings' => 'Einstellungen',
'd3tbclgoogleanalytics_main' => 'Analytics',
'd3tbclgoogleanalytics_adwords' => 'AdWords',
+ 'd3tbclgoogleanalytics_trustedstore' => 'Google zertifizierter Shop',
'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Analytics Schnittstelle - Einstellungen',
@@ -275,6 +276,9 @@ $aLang = array(
'ein, den Sie vom Anbieter erhalten haben. Kopieren Sie auch ein eventuell vorhandenes "script"-Tag mit. '.
'Dieser Code wird 1:1 in den Seitenquelltext eingefügt und nicht geparst.',
+ 'D3_GOOGLEANALYTICS_TS_ACTIVE' => 'Trusted Store aktivieren',
+ 'D3_GOOGLEANALYTICS_TS_ID' => 'Trusted Store-ID',
+
'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle',
'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und '.
'unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden '.
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php b/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
index 251bf44..b81e59c 100644
--- a/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
@@ -31,6 +31,7 @@ $aLang = array(
'd3mxgoogleanalytics_settings' => 'Settings',
'd3tbclgoogleanalytics_main' => 'Analytics',
'd3tbclgoogleanalytics_adwords' => 'AdWords',
+ 'd3tbclgoogleanalytics_trustedstore' => 'Google Trusted Shop',
'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Analytics Connector - Settings',
@@ -274,6 +275,9 @@ $aLang = array(
'ein, den Sie vom Anbieter erhalten haben. Kopieren Sie auch ein eventuell vorhandenes "script"-Tag mit. '.
'Dieser Code wird 1:1 in den Seitenquelltext eingefügt und nicht geparst.',
+ 'D3_GOOGLEANALYTICS_TS_ACTIVE' => 'activate Trusted Store',
+ 'D3_GOOGLEANALYTICS_TS_ID' => 'Trusted Store-ID',
+
'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle',
'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und '.
'unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden '.
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
new file mode 100644
index 0000000..3f1ec3d
--- /dev/null
+++ b/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
@@ -0,0 +1,210 @@
+[{include file="headitem.tpl" title="D3_GOOGLEANALYTICS_CFG_TITLE"|oxmultilangassign}]
+
+
+
+
+
+[{if $readonly}]
+ [{assign var="readonly" value="readonly disabled"}]
+[{else}]
+ [{assign var="readonly" value=""}]
+[{/if}]
+
+
+
+
+
+[{assign var="incpath" value=$oViewConf->getModulePath('d3modcfg_lib')|cat:"views/admin/tpl/d3_cfg_mod_inc.tpl"}]
+[{include file="d3_cfg_mod_inc.tpl"}]
+
+
\ No newline at end of file