diff --git a/.gitattributes b/.gitattributes index 43302b9..58bd84c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -192,12 +192,28 @@ changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text changed_full/450/out/basic/tpl/inc/popup_basket.tpl -text changed_full/450/out/basic/tpl/page/checkout/basket.tpl -text changed_full/450/out/basic/tpl/page/checkout/user.tpl -text +changed_full/451/out/admin/de/d3_googleanalytics_lang.php -text +changed_full/451/out/admin/en/d3_googleanalytics_lang.php -text +changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text +changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text +changed_full/451/out/azure/tpl/form/user_checkout_change.tpl -text +changed_full/451/out/azure/tpl/form/user_checkout_noregistration.tpl -text +changed_full/451/out/azure/tpl/form/user_checkout_registration.tpl -text +changed_full/451/out/azure/tpl/layout/footer.tpl -text +changed_full/451/out/azure/tpl/page/checkout/basket.tpl -text +changed_full/451/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl -text +changed_full/451/out/basic/tpl/_footer.tpl -text +changed_full/451/out/basic/tpl/dyn/mini_basket.tpl -text +changed_full/451/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text +changed_full/451/out/basic/tpl/inc/popup_basket.tpl -text +changed_full/451/out/basic/tpl/page/checkout/basket.tpl -text +changed_full/451/out/basic/tpl/page/checkout/user.tpl -text copy_this/admin/d3_cfg_googleanalytics.php -text copy_this/admin/d3_cfg_googleanalytics_campaigns.php -text copy_this/admin/d3_cfg_googleanalytics_licence.php -text copy_this/admin/d3_cfg_googleanalytics_list.php -text copy_this/admin/d3_cfg_googleanalytics_main.php -text -copy_this/core/smarty/plugin/function.d3getArticleFromOrderArticle.php -text +copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text copy_this/modules/d3GoogleAnalytics/menu.xml -text copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleAnalytics.php -text setup+doku/Google[!!-~]Analytics-Installation.pdf -text diff --git a/changed_full/420/out/admin/de/d3_googleanalytics_lang.php b/changed_full/420/out/admin/de/d3_googleanalytics_lang.php index 1a6bfdb..f12cebf 100644 --- a/changed_full/420/out/admin/de/d3_googleanalytics_lang.php +++ b/changed_full/420/out/admin/de/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/420/out/admin/en/d3_googleanalytics_lang.php b/changed_full/420/out/admin/en/d3_googleanalytics_lang.php index 4ba9f3b..0206931 100644 --- a/changed_full/420/out/admin/en/d3_googleanalytics_lang.php +++ b/changed_full/420/out/admin/en/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl index 6a6a9b5..5f62505 100644 --- a/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ b/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl @@ -99,17 +99,21 @@ [{/if}] [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}] + + [{assign var="currate" value=$order->oxorder__oxcurrate->value}] + _gaq.push(['_addTrans', '[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}] '[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] - [{*'[{ $order->getOrderNetSum() }]', // total - required - has to be gross sum *}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]', // total - required - has to be gross sum *}] + + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{else}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{/if}] '', [{* // tax *}] - '[{ $order->oxorder__oxdelcost->value }]', [{* // shipping *}] + '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]', [{* // shipping *}] '[{ $order->oxorder__oxbillcity->value }]', [{* // city *}] '[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}] '[{ $order->oxorder__oxbillcountry->value }]' [{* // country *}] @@ -123,9 +127,9 @@ '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]', [{* // category or variation *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] [{assign var="oPrice" value=$oOrderArticle->getPrice()}] - '[{ $oPrice->getNettoPrice() }]', [{* // unit price - required *}] + '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]', [{* // unit price - required *}] [{else}] - '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required *}] + '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required - is not currency depended *}] [{/if}] '[{ $oOrderArticle->oxorderarticles__oxamount->value }]' [{* // quantity - required *}] ]); diff --git a/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php b/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php index 1a6bfdb..f12cebf 100644 --- a/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php +++ b/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php b/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php index 4ba9f3b..0206931 100644 --- a/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php +++ b/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl index 6a6a9b5..5f62505 100644 --- a/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ b/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl @@ -99,17 +99,21 @@ [{/if}] [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}] + + [{assign var="currate" value=$order->oxorder__oxcurrate->value}] + _gaq.push(['_addTrans', '[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}] '[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] - [{*'[{ $order->getOrderNetSum() }]', // total - required - has to be gross sum *}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]', // total - required - has to be gross sum *}] + + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{else}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{/if}] '', [{* // tax *}] - '[{ $order->oxorder__oxdelcost->value }]', [{* // shipping *}] + '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]', [{* // shipping *}] '[{ $order->oxorder__oxbillcity->value }]', [{* // city *}] '[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}] '[{ $order->oxorder__oxbillcountry->value }]' [{* // country *}] @@ -123,9 +127,9 @@ '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]', [{* // category or variation *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] [{assign var="oPrice" value=$oOrderArticle->getPrice()}] - '[{ $oPrice->getNettoPrice() }]', [{* // unit price - required *}] + '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]', [{* // unit price - required *}] [{else}] - '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required *}] + '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required - is not currency depended *}] [{/if}] '[{ $oOrderArticle->oxorderarticles__oxamount->value }]' [{* // quantity - required *}] ]); diff --git a/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php b/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php index 1a6bfdb..f12cebf 100644 --- a/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php +++ b/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php b/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php index 4ba9f3b..0206931 100644 --- a/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php +++ b/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl index 6a6a9b5..5f62505 100644 --- a/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ b/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl @@ -99,17 +99,21 @@ [{/if}] [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}] + + [{assign var="currate" value=$order->oxorder__oxcurrate->value}] + _gaq.push(['_addTrans', '[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}] '[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] - [{*'[{ $order->getOrderNetSum() }]', // total - required - has to be gross sum *}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]', // total - required - has to be gross sum *}] + + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{else}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{/if}] '', [{* // tax *}] - '[{ $order->oxorder__oxdelcost->value }]', [{* // shipping *}] + '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]', [{* // shipping *}] '[{ $order->oxorder__oxbillcity->value }]', [{* // city *}] '[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}] '[{ $order->oxorder__oxbillcountry->value }]' [{* // country *}] @@ -123,9 +127,9 @@ '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]', [{* // category or variation *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] [{assign var="oPrice" value=$oOrderArticle->getPrice()}] - '[{ $oPrice->getNettoPrice() }]', [{* // unit price - required *}] + '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]', [{* // unit price - required *}] [{else}] - '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required *}] + '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required - is not currency depended *}] [{/if}] '[{ $oOrderArticle->oxorderarticles__oxamount->value }]' [{* // quantity - required *}] ]); diff --git a/changed_full/450/out/admin/de/d3_googleanalytics_lang.php b/changed_full/450/out/admin/de/d3_googleanalytics_lang.php index 1a6bfdb..f12cebf 100644 --- a/changed_full/450/out/admin/de/d3_googleanalytics_lang.php +++ b/changed_full/450/out/admin/de/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/450/out/admin/en/d3_googleanalytics_lang.php b/changed_full/450/out/admin/en/d3_googleanalytics_lang.php index 4ba9f3b..0206931 100644 --- a/changed_full/450/out/admin/en/d3_googleanalytics_lang.php +++ b/changed_full/450/out/admin/en/d3_googleanalytics_lang.php @@ -43,7 +43,7 @@ $aLang = array( 'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', 'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', -'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', 'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', diff --git a/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl b/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl index 6a6a9b5..5f62505 100644 --- a/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl +++ b/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl @@ -99,17 +99,21 @@ [{/if}] [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}] + + [{assign var="currate" value=$order->oxorder__oxcurrate->value}] + _gaq.push(['_addTrans', '[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}] '[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] - [{*'[{ $order->getOrderNetSum() }]', // total - required - has to be gross sum *}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]', // total - required - has to be gross sum *}] + + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{else}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{/if}] '', [{* // tax *}] - '[{ $order->oxorder__oxdelcost->value }]', [{* // shipping *}] + '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]', [{* // shipping *}] '[{ $order->oxorder__oxbillcity->value }]', [{* // city *}] '[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}] '[{ $order->oxorder__oxbillcountry->value }]' [{* // country *}] @@ -123,9 +127,9 @@ '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]', [{* // category or variation *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] [{assign var="oPrice" value=$oOrderArticle->getPrice()}] - '[{ $oPrice->getNettoPrice() }]', [{* // unit price - required *}] + '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]', [{* // unit price - required *}] [{else}] - '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required *}] + '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required - is not currency depended *}] [{/if}] '[{ $oOrderArticle->oxorderarticles__oxamount->value }]' [{* // quantity - required *}] ]); diff --git a/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl index 6a6a9b5..5f62505 100644 --- a/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ b/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl @@ -99,17 +99,21 @@ [{/if}] [{if $oD3GASettings->getValue('blD3GASendECommerce') && $oViewConf->getActiveClassName() == 'thankyou'}] + + [{assign var="currate" value=$order->oxorder__oxcurrate->value}] + _gaq.push(['_addTrans', '[{ $order->oxorder__oxordernr->value }]', [{* // order ID - required *}] '[{ $oxcmp_shop->oxshops__oxname->value}]', [{* // affiliation or store name *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] - [{*'[{ $order->getOrderNetSum() }]', // total - required - has to be gross sum *}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + [{*'[{math equation="s / r" s=$order->getOrderNetSum() r=$currate format="%.2f"}]', // total - required - has to be gross sum *}] + + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{else}] - '[{ $order->getTotalOrderSum() }]', [{* // total - required *}] + '[{math equation="s / r" s=$order->getTotalOrderSum() r=$currate format="%.2f"}]', [{* // total - required *}] [{/if}] '', [{* // tax *}] - '[{ $order->oxorder__oxdelcost->value }]', [{* // shipping *}] + '[{math equation="s / r" s=$order->oxorder__oxdelcost->value r=$currate format="%.2f"}]', [{* // shipping *}] '[{ $order->oxorder__oxbillcity->value }]', [{* // city *}] '[{ $order->oxorder__oxbillstate->value }]', [{* // state or province *}] '[{ $order->oxorder__oxbillcountry->value }]' [{* // country *}] @@ -123,9 +127,9 @@ '[{ $oOrderArticle->oxorderarticles__oxselvariant->value }]', [{* // category or variation *}] [{if $oD3GASettings->getValue('blD3GAUseNetto') }] [{assign var="oPrice" value=$oOrderArticle->getPrice()}] - '[{ $oPrice->getNettoPrice() }]', [{* // unit price - required *}] + '[{math equation="s / r" s=$oPrice->getNettoPrice() r=$currate format="%.2f"}]', [{* // unit price - required *}] [{else}] - '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required *}] + '[{ $oOrderArticle->oxorderarticles__oxprice->value }]', [{* // unit price - required - is not currency depended *}] [{/if}] '[{ $oOrderArticle->oxorderarticles__oxamount->value }]' [{* // quantity - required *}] ]); diff --git a/changed_full/451/out/admin/de/d3_googleanalytics_lang.php b/changed_full/451/out/admin/de/d3_googleanalytics_lang.php new file mode 100644 index 0000000..f12cebf --- /dev/null +++ b/changed_full/451/out/admin/de/d3_googleanalytics_lang.php @@ -0,0 +1,93 @@ + 'ISO-8859-15', +'d3mxd3modules' => 'D³ Module', +'d3mxgoogleanalytics' => 'Google Analytics', +'d3mxgoogleanalytics_settings' => 'Einstellungen', +'d3tbclgoogleanalytics_main' => 'Analytics', +'d3tbclgoogleanalytics_adwords' => 'Kampagnen (z.B. AdWords)', + +'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Analytics Schnittstelle - Einstellungen', + +'D3_GOOGLEANALYTICS_MAIN' => 'Grundeinstellungen', +'D3_GOOGLEANALYTICS_MAIN_GAID' => 'Analyics-ID', +'D3_GOOGLEANALYTICS_MAIN_GAID_DESC' => 'Fügen Sie hier die Google Analytics Konto-ID ein. Diese finden Sie in Ihrem GA-Konto und beginnt im Normalfall mit "UA-".', +'D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP' => 'IP-Adressen anonymisiert übertragen (dringend empfohlen)', +'D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC' => 'Die IP-Adressen Ihrer Shopbesucher werden anonymisiert. Zwar werden dadurch die Gebietszuordnungen etwas ungenauer. Jedoch können Sie nur mit dieser Einstellung den Datenschutzvorschriften in Deutschland entsprechen.', +'D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME' => 'Seitenladezeit mit übertragen', +'D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME_DESC' => 'Die Ladezeit Ihrer Seite ist, speziell auch in Hinblick auf verschiedene Länder, durchaus ein Faktor, der in das Ranking Ihrer Page einfliesst.', + +'D3_GOOGLEANALYTICS_ECOMMERCE' => 'eCommerce-Einstellungen', +'D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA' => 'eCommerce-Daten übertragen', +'D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA_DESC' => 'Mit dieser Einstellung werden Warenkorbdaten Ihrer Kunden an Analytics übertragen. Damit können Sie z.B. die Produktleistung und Umsatzzahlen ermitteln.', +'D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO' => 'Netto-Preise übertragen, wenn verfügbar', +'D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO_DESC' => 'Betreiben Sie einen B2B-Shop, übertragen Sie Ihre Artikelpreise netto an Analytics, wenn diese auch im Shop ohne Steuer zur Verfügung stehen. ', + +'D3_GOOGLEANALYTICS_DOMAIN' => 'Multi-Domain-Einstellungen', +'D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER' => 'Trackingdaten von unterschiedlichen Domains verwenden', +'D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER_DESC' => 'Cross Domain Tracking erlaubt das Sammeln von Trackinginformationen auch über verschiedene Domains hinweg.

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME' => 'fixiert das Tracking-Cookie auf die angegebene Domain (optional)', +'D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME_DESC' => 'Lassen Sie dieses Feld leer, ist das Tacking-Cookie für unterschiedliche Seiten gültig. Wenn Sie statt dessen eine Domain angeben, ist das gesetzte Cookie nur für Seiten unter dieser Domain gültig. Andere zu trackende Seiten setzen dann ein neues Cookie.

Der Eintrag sollte hier so aussehen: .yourDomainName.com

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH' => 'Tracking nur auf ein Verzeichnis beschränken (optional)', +'D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH_DESC' => 'Ein Eintrag hier sollte so aussehen: /myStore/

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY' => 'Cookie Informationen werden in das Verzeichnis der selben Domain kopiert (optional)', +'D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY_DESC' => 'Ein Eintrag hier sollte so aussehen: /myCart/

Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE_DESC' => 'Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_CUSTOMVARS' => 'individuelle Daten', +'D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT' => 'individuelle Daten übertragen', +'D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT_DESC' => 'Mit individuellen Daten können Sie Parameter übermitteln, die sonst im Rahmen des Trackingcodes nicht gesammelt werden. Ergänzen Sie den entsprechenden Abschnitt im Template "inc/d3GoogleAnalytics.tpl" um die gewünschten Daten. Als Beispiel ist die Übertragung des Kundengeschlechts angelegt.

Individuelle Daten können nicht mit jedem Tracking-Typ übertragen werden. Lesen Sie auf den Analytics-Hilfe-Seiten nach, ob und wann dies möglich ist.

Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_SECURITYINFORMATIONS' => 'Im CMS-Baustein "Analytics_Security_Informations" ist ein Text hinterlegt, den Sie Ihren Kunden unter Ihrer Datenschutzerklärung verfügbar machen sollten. Klären Sie jedoch bitte vor Verwendung von Google Analytics Tracking und diesem Hinweistext ab, ob beides mit den Datenschutzbestimmung Ihres Landes konform geht. Ausschließlich der Shopbetreiber haftet für Verstöße. Beraten Sie sich im Zweifel mit Ihrem Rechtsanwalt.

Nach Aktivierung des Tracking-Codes dauert es in der Regel ca. 24 Stunden, bis die ersten Tracking-Daten in Analytics zur Verfügung stehen.', + // TODO: add content to package + +'D3_GOOGLEANALYTICS_ADWORDSGENERAL' => 'Kampagnen Grundeinstellungen', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK' => 'Kampagnendaten nicht übertragen', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC' => 'Das Kampagnentracking ist im Standard aktiviert. Setzen Sie diesen Haken, um die Kampagnenübertragung zu deaktivieren.', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY' => 'Kampagnendaten nur in Bestellabschlussseite verwenden', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY_DESC' => 'Ist dieser Haken nicht gesetzt, wird der Kampagnencode shopweit eingefügt. Das AdWords-Conversion Tracking erwartet die Daten jedoch nur bei Bestellabschluss. Ob diese Einstellung notwendig ist, erfahren Sie bei Ihrem Conversion Tracking Anbieter.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT' => 'Kampagnenlaufzeit (optional, sonst 6 Monate)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_DESC' => 'Geben Sie hier eine optionale Laufzeit dieser Kampagne in Millisekunden an.

30 Tage = 2592000000
365 Tage = 31536000000', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_MS' => 'Millisekunden', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY' => 'zwingend verwendete Kampagne (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY_DESC' => 'die hier festgelegte Kampagne wird zwingend verwendet, auch wenn die Cookie-Einstellungen schon eine andere Kampagne liefern.

Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_ADWORDSCODE' => 'Kampagnen-Code', +'D3_GOOGLEANALYTICS_ADWORDSCODE_CODE' => 'AdWords-Code', +'D3_GOOGLEANALYTICS_ADWORDSCODE_CODE_DESC' => 'Kopieren Sie hier den Kampagnen-Tracking-Code ein, den Sie auf Ihrer AdWords-Seite finden. Kopieren Sie auch das "script"-Tag mit.', + +'D3_GOOGLEANALYTICS_ADWORDSMAIN' => 'Individualisierung der Kampagnentrackings', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY' => 'Kampagnenname (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC' => 'Unter diesem Namen sehen Sie die Auswertung der Daten aus dieser Shopkampagne in Analytics.

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY' => 'Kampagnenmedium (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC' => 'Definieren Sie das Medium dieser Kampagne (z.B. Werbebanner, Mailkampagne oder auch Klickkampagne). Diese Einstellung finden Sie in der Kampagnenauswertung unter "Keywords".

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY' => 'Kampagnenquelle (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC' => 'Benennen Sie hier die Quelle der Shopkampagne, vergeben Sie zum Beispiel den Webseiten-Name oder den Firmenname.

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY' => 'Schlüsselwort(e) Ihrer Kampagne (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC' => 'Auch diese Keywords erscheinen in Analytics unter "Keywords".

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY' => 'Inhaltsbeschreibung der Kampagne (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC' => 'Den beschrieben Inhalt finden Sie in der Auswertung als "Ad Content".

Weitere Informationen finden Sie hier.', + +); + + +/* + +[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] + +*/ diff --git a/changed_full/451/out/admin/en/d3_googleanalytics_lang.php b/changed_full/451/out/admin/en/d3_googleanalytics_lang.php new file mode 100644 index 0000000..0206931 --- /dev/null +++ b/changed_full/451/out/admin/en/d3_googleanalytics_lang.php @@ -0,0 +1,93 @@ + 'ISO-8859-15', +'d3mxd3modules' => 'D³ Module', +'d3mxgoogleanalytics' => 'Google Analytics', +'d3mxgoogleanalytics_settings' => 'Einstellungen', +'d3tbclgoogleanalytics_main' => 'Analytics', +'d3tbclgoogleanalytics_adwords' => 'Kampagnen (z.B. AdWords)', + +'D3_GOOGLEANALYTICS_CFG_TITLE' => 'Google Analytics Schnittstelle - Einstellungen', + +'D3_GOOGLEANALYTICS_MAIN' => 'Grundeinstellungen', +'D3_GOOGLEANALYTICS_MAIN_GAID' => 'Analyics-ID', +'D3_GOOGLEANALYTICS_MAIN_GAID_DESC' => 'Fügen Sie hier die Google Analytics Konto-ID ein. Diese finden Sie in Ihrem GA-Konto und beginnt im Normalfall mit "UA-".', +'D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP' => 'IP-Adressen anonymisiert übertragen (dringend empfohlen)', +'D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC' => 'Die IP-Adressen Ihrer Shopbesucher werden anonymisiert. Zwar werden dadurch die Gebietszuordnungen etwas ungenauer. Jedoch können Sie nur mit dieser Einstellung den Datenschutzvorschriften in Deutschland entsprechen.', +'D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME' => 'Seitenladezeit mit übertragen', +'D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME_DESC' => 'Die Ladezeit Ihrer Seite ist, speziell auch in Hinblick auf verschiedene Länder, durchaus ein Faktor, der in das Ranking Ihrer Page einfliesst.', + +'D3_GOOGLEANALYTICS_ECOMMERCE' => 'eCommerce-Einstellungen', +'D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA' => 'eCommerce-Daten übertragen', +'D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA_DESC' => 'Mit dieser Einstellung werden Warenkorbdaten Ihrer Kunden an Analytics übertragen. Damit können Sie z.B. die Produktleistung und Umsatzzahlen ermitteln.', +'D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO' => 'Netto-Preise übertragen, wenn verfügbar', +'D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO_DESC' => 'Betreiben Sie einen B2B-Shop, übertragen Sie Ihre Artikelpreise netto an Analytics, wenn diese auch im Shop ohne Steuer zur Verfügung stehen. ', + +'D3_GOOGLEANALYTICS_DOMAIN' => 'Multi-Domain-Einstellungen', +'D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER' => 'Trackingdaten von unterschiedlichen Domains verwenden', +'D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER_DESC' => 'Cross Domain Tracking erlaubt das Sammeln von Trackinginformationen auch über verschiedene Domains hinweg.

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME' => 'fixiert das Tracking-Cookie auf die angegebene Domain (optional)', +'D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME_DESC' => 'Lassen Sie dieses Feld leer, ist das Tacking-Cookie für unterschiedliche Seiten gültig. Wenn Sie statt dessen eine Domain angeben, ist das gesetzte Cookie nur für Seiten unter dieser Domain gültig. Andere zu trackende Seiten setzen dann ein neues Cookie.

Der Eintrag sollte hier so aussehen: .yourDomainName.com

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH' => 'Tracking nur auf ein Verzeichnis beschränken (optional)', +'D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH_DESC' => 'Ein Eintrag hier sollte so aussehen: /myStore/

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY' => 'Cookie Informationen werden in das Verzeichnis der selben Domain kopiert (optional)', +'D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY_DESC' => 'Ein Eintrag hier sollte so aussehen: /myCart/

Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_BROWSER' => 'Browser-Daten', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO' => 'Deaktiviert die Erkennung von Browserdaten (z.B. Name und Version)', +'D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH' => 'Unterbindet die Erkennung, ob beim Kunden das Flash-Plugin installiert ist.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC' => 'Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE' => 'Verhindert die Erkennung des Seitentitels.', +'D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE_DESC' => 'Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_CUSTOMVARS' => 'individuelle Daten', +'D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT' => 'individuelle Daten übertragen', +'D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT_DESC' => 'Mit individuellen Daten können Sie Parameter übermitteln, die sonst im Rahmen des Trackingcodes nicht gesammelt werden. Ergänzen Sie den entsprechenden Abschnitt im Template "inc/d3GoogleAnalytics.tpl" um die gewünschten Daten. Als Beispiel ist die Übertragung des Kundengeschlechts angelegt.

Individuelle Daten können nicht mit jedem Tracking-Typ übertragen werden. Lesen Sie auf den Analytics-Hilfe-Seiten nach, ob und wann dies möglich ist.

Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_SECURITYINFORMATIONS' => 'Im CMS-Baustein "Analytics_Security_Informations" ist ein Text hinterlegt, den Sie Ihren Kunden unter Ihrer Datenschutzerklärung verfügbar machen sollten. Klären Sie jedoch bitte vor Verwendung von Google Analytics Tracking und diesem Hinweistext ab, ob beides mit den Datenschutzbestimmung Ihres Landes konform geht. Ausschließlich der Shopbetreiber haftet für Verstöße. Beraten Sie sich im Zweifel mit Ihrem Rechtsanwalt.

Nach Aktivierung des Tracking-Codes dauert es in der Regel ca. 24 Stunden, bis die ersten Tracking-Daten in Analytics zur Verfügung stehen.', + // TODO: add content to package + +'D3_GOOGLEANALYTICS_ADWORDSGENERAL' => 'Kampagnen Grundeinstellungen', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK' => 'Kampagnendaten nicht übertragen', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC' => 'Das Kampagnentracking ist im Standard aktiviert. Setzen Sie diesen Haken, um die Kampagnenübertragung zu deaktivieren.', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY' => 'Kampagnendaten nur in Bestellabschlussseite verwenden', +'D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY_DESC' => 'Ist dieser Haken nicht gesetzt, wird der Kampagnencode shopweit eingefügt. Das AdWords-Conversion Tracking erwartet die Daten jedoch nur bei Bestellabschluss. Ob diese Einstellung notwendig ist, erfahren Sie bei Ihrem Conversion Tracking Anbieter.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT' => 'Kampagnenlaufzeit (optional, sonst 6 Monate)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_DESC' => 'Geben Sie hier eine optionale Laufzeit dieser Kampagne in Millisekunden an.

30 Tage = 2592000000
365 Tage = 31536000000', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_MS' => 'Millisekunden', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY' => 'zwingend verwendete Kampagne (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY_DESC' => 'die hier festgelegte Kampagne wird zwingend verwendet, auch wenn die Cookie-Einstellungen schon eine andere Kampagne liefern.

Weitere Informationen finden Sie hier.', + +'D3_GOOGLEANALYTICS_ADWORDSCODE' => 'Kampagnen-Code', +'D3_GOOGLEANALYTICS_ADWORDSCODE_CODE' => 'AdWords-Code', +'D3_GOOGLEANALYTICS_ADWORDSCODE_CODE_DESC' => 'Kopieren Sie hier den Kampagnen-Tracking-Code ein, den Sie auf Ihrer AdWords-Seite finden. Kopieren Sie auch das "script"-Tag mit.', + +'D3_GOOGLEANALYTICS_ADWORDSMAIN' => 'Individualisierung der Kampagnentrackings', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY' => 'Kampagnenname (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC' => 'Unter diesem Namen sehen Sie die Auswertung der Daten aus dieser Shopkampagne in Analytics.

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY' => 'Kampagnenmedium (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC' => 'Definieren Sie das Medium dieser Kampagne (z.B. Werbebanner, Mailkampagne oder auch Klickkampagne). Diese Einstellung finden Sie in der Kampagnenauswertung unter "Keywords".

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY' => 'Kampagnenquelle (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC' => 'Benennen Sie hier die Quelle der Shopkampagne, vergeben Sie zum Beispiel den Webseiten-Name oder den Firmenname.

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY' => 'Schlüsselwort(e) Ihrer Kampagne (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC' => 'Auch diese Keywords erscheinen in Analytics unter "Keywords".

Weitere Informationen finden Sie hier.', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY' => 'Inhaltsbeschreibung der Kampagne (optional)', +'D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC' => 'Den beschrieben Inhalt finden Sie in der Auswertung als "Ad Content".

Weitere Informationen finden Sie hier.', + +); + + +/* + +[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] + +*/ diff --git a/changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl new file mode 100644 index 0000000..330968b --- /dev/null +++ b/changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl @@ -0,0 +1,296 @@ +[{include file="headitem.tpl" title="D3_GOOGLEANALYTICS_CFG_TITLE"|oxmultilangassign}] + + + + + + + +[{ if $readonly}] + [{assign var="readonly" value="readonly disabled"}] +[{else}] + [{assign var="readonly" value=""}] +[{/if}] + +
+ [{ $oViewConf->getHiddenSid() }] + + + + +
+ +
+ [{ $oViewConf->getHiddenSid() }] + + + + + + + +
+ + [{if $oView->getValueStatus() == 'error'}] +
+ [{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]
+ + + [{else}] + +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSGENERAL"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK"}] +[{* _gaq.push(['_setCampaignTrack', false]); *}] +
+
+ + d3_cfg_mod__blD3GASetCampaignTrack}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetCampaignTrack]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTRACK_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY"}] +
+
+ + d3_cfg_mod__blD3GASetCampaignOnThankyouOnly}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetCampaignOnThankyouOnly]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_SETCAMPAIGNTHANKYOUONLY_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT"}] +[{* _gaq.push(['_setCampaignCookieTimeout', 31536000000]); *}] +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_MS"}] + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPAIGNCOOKIETIMEOUT_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY"}] +[{* _gaq.push(['_setCampNOKey', 'ga_nooverride']); *}] +
+
+ + d3_cfg_mod__blD3GASetCampNoKey}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetCampNoKey]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNOKEY_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSCODE_CODE"}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSCODE_CODE_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY"}] +[{* _gaq.push(['_setCampNameKey', 'ga_campaign']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPNAMEKEY_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY"}] +[{* _gaq.push(['_setCampMediumKey', 'ga_medium']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPMEDIUMKEY_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY"}] +[{* _gaq.push(['_setCampSourceKey', 'ga_source']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPSOURCEKEY_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY"}] +[{* _gaq.push(['_setCampTermKey', 'ga_term']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPTERMKEY_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY"}] +[{* _gaq.push(['_setCampContentKey', 'ga_content']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ADWORDSMAIN_SETCAMPCONTENTKEY_DESC" }] +
+
+
+
+
+ + + + + +

+ + +
+ +
+ + [{/if}] + + +[{include file="bottomitem.tpl"}] + + \ No newline at end of file diff --git a/changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_main.tpl new file mode 100644 index 0000000..96358fc --- /dev/null +++ b/changed_full/451/out/admin/tpl/d3_cfg_googleanalytics_main.tpl @@ -0,0 +1,402 @@ +[{include file="headitem.tpl" title="D3_GOOGLEANALYTICS_CFG_TITLE"|oxmultilangassign}] + + + + + + + +[{ if $readonly}] + [{assign var="readonly" value="readonly disabled"}] +[{else}] + [{assign var="readonly" value=""}] +[{/if}] + +
+ [{ $oViewConf->getHiddenSid() }] + + + + +
+ +
+ [{ $oViewConf->getHiddenSid() }] + + + + + + + +
+ + + + + + +
+ + + + + +
+ [{oxmultilang ident="D3_CFG_MOD_GENERAL_MODULEACTIVE"}] + + + d3_cfg_mod__oxactive->value == 1}]checked[{/if}]> +
+ 		+ [{assign var="blD3HasLog" value=$oView->checkD3Log() }] + + + + + + + + + +
+ [{if $blD3HasLog}] + [{oxmultilang ident="D3_CFG_MOD_GENERAL_MODULELOGGING"}] + [{/if}] + + [{if $blD3HasLog}] + + [{/if}] +
+   + +   +
+
+ + [{if $oView->getValueStatus() == 'error'}] +
+ [{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]
+ + + [{else}] + +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_GAID"}] +[{* _gaq.push(['_setAccount', 'UA_XXX']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_GAID_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP"}] +[{* _gaq.push(['_gat._anonymizeIp']); *}] +
+
+ + d3_cfg_mod__blD3GAAnonymizeIP}]checked[{/if}] name="value[d3_cfg_mod__blD3GAAnonymizeIP]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_ANONYMIZEIP_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME"}] +[{* _gaq.push(['_gat._trackPageLoadTime']); *}] +
+
+ + d3_cfg_mod__blD3GATrackPageLoadTime}]checked[{/if}] name="value[d3_cfg_mod__blD3GATrackPageLoadTime]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_TRACKPAGELOADTIME_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA"}] +
+
+ + d3_cfg_mod__blD3GASendECommerce}]checked[{/if}] name="value[d3_cfg_mod__blD3GASendECommerce]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ECOMMERCE_SENDDATA_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO"}] +
+
+ + d3_cfg_mod__blD3GAUseNetto}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseNetto]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_ECOMMERCE_USENETTO_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER"}] +[{* _gaq.push(['_setAllowLinker', true]); *}] +
+
+ + d3_cfg_mod__blD3GAAllowDomainLinker}]checked[{/if}] name="value[d3_cfg_mod__blD3GAAllowDomainLinker]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_SETALLOWLINKER_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME"}] +[{* _gaq.push(['_setDomainName', '.example-petstore.com']); *}] +[{* if used _gaq.push(['_setAllowHash', false]); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_SETDOMAINNAME_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH"}] +[{* _gaq.push(['_setCookiePath', '/path/of/cookie/']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_SETCOOKIEPATH_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY"}] +[{* _gaq.push(['_cookiePathCopy', '/path/of/cookie/']); *}] +
+
+ + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_DOMAIN_COOKIEPATHCOPY_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO"}] +[{* _gaq.push(['_setClientInfo', false]); *}] +
+
+ + d3_cfg_mod__blD3GASetClientInfo}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetClientInfo]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_BROWSER_SETCLIENTINFO_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH"}] +[{* _gaq.push(['_setDetectFlash', false]); *}] +
+
+ + d3_cfg_mod__blD3GASetDetectFlash}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetDetectFlash]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTFLASH_DESC" }] +
+
+
+
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE"}] +[{* _gaq.push(['_setDetectTitle', false]); *}] +
+
+ + d3_cfg_mod__blD3GASetDetectTitle}]checked[{/if}] name="value[d3_cfg_mod__blD3GASetDetectTitle]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_BROWSER_SETDETECTTITLE_DESC" }] +
+
+
+
+
+ +
+
+ + + [{oxmultilang ident="D3_GOOGLEANALYTICS_CUSTOMVARS"}] + + +
+
+ [{oxmultilang ident="D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT"}] +[{* _gaq.push(['_setCustomVar', false]); *}] +
+
+ + d3_cfg_mod__blD3GAUseCustomVars}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseCustomVars]"> + [{ oxinputhelp ident="D3_GOOGLEANALYTICS_CUSTOMVARS_TRANSMIT_DESC" }] +
+
+
+
+
+ + + + + +

+ + +
+ +
+ +

[{oxmultilang ident="D3_GOOGLEANALYTICS_SECURITYINFORMATIONS"}] + [{/if}] + + +[{include file="bottomitem.tpl"}] + + \ No newline at end of file diff --git a/changed_full/451/out/azure/tpl/form/user_checkout_change.tpl b/changed_full/451/out/azure/tpl/form/user_checkout_change.tpl new file mode 100644 index 0000000..4cf5891 --- /dev/null +++ b/changed_full/451/out/azure/tpl/form/user_checkout_change.tpl @@ -0,0 +1,61 @@ +[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] +[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] +[{block name="user_checkout_change"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{block name="user_checkout_change_form"}] + [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] + [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + + + + +
+ [{ oxmultilang ident="FORM_USER_CHECKOUT_CHANGE_BACKSTEP" }] + +
+ +
+
+

[{ oxmultilang ident="FORM_REGISTER_BILLINGADDRESS" }]

+ +
    +
  • + [{include file="widget/address/billing_address.tpl" noFormSubmit=true blSubscribeNews=true blOrderRemark=true}] +
    • +
    • +
  • + +
    • +
+ [{oxscript add="$('#userChangeAddress').click( function() { $('#addressForm').show();$('#addressText').hide();return false;});"}] +
+
+

[{ oxmultilang ident="FORM_REGISTER_SHIPPINGADDRESS" }]

+

showShipAddress()}]checked[{/if}] value="0">

+
    showShipAddress()}]style="display: none;"[{/if}]> + [{ include file="form/fieldset/user_shipping.tpl" noFormSubmit=true onChangeClass='user'}] +
+
    +
  • + [{include file="form/fieldset/order_newsletter.tpl" blSubscribeNews=true}] + [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] +
    • +
+
+
+ + [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] + +
+ [{ oxmultilang ident="FORM_USER_CHECKOUT_CHANGE_BACKSTEP" }] + +
+ [{/block}] +
+[{/block}] \ No newline at end of file diff --git a/changed_full/451/out/azure/tpl/form/user_checkout_noregistration.tpl b/changed_full/451/out/azure/tpl/form/user_checkout_noregistration.tpl new file mode 100644 index 0000000..539cf4c --- /dev/null +++ b/changed_full/451/out/azure/tpl/form/user_checkout_noregistration.tpl @@ -0,0 +1,61 @@ +[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] +[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] +[{block name="user_checkout_noregistration"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{block name="user_checkout_noregistration_form"}] + [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] + [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + [{if !$oxcmp_user->oxuser__oxpassword->value }] + + [{else}] + + + [{/if}] + + + +
+ [{ oxmultilang ident="FORM_USER_CHECKOUT_NOREGISTRATION_BACKSTEP" }] + +
+ +
+
+

[{ oxmultilang ident="FORM_REGISTER_ACCOUNTINFO" }]

+
    + [{ include file="form/fieldset/user_noaccount.tpl" }] +
+
+
+

[{ oxmultilang ident="FORM_REGISTER_BILLINGADDRESS" }]

+
    + [{ include file="form/fieldset/user_billing.tpl" noFormSubmit=true blOrderRemark=true}] +
+
+
+

[{ oxmultilang ident="FORM_REGISTER_SHIPPINGADDRESS" }]

+

showShipAddress()}]checked[{/if}] value="0">

+
    showShipAddress()}]style="display: none;"[{/if}]> + [{ include file="form/fieldset/user_shipping.tpl" noFormSubmit=true}] +
+
    +
  • + [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] +
    • +
+
+
+ + [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] + +
+ [{ oxmultilang ident="FORM_USER_CHECKOUT_NOREGISTRATION_BACKSTEP" }] + +
+ [{/block}] +
+[{/block}] \ No newline at end of file diff --git a/changed_full/451/out/azure/tpl/form/user_checkout_registration.tpl b/changed_full/451/out/azure/tpl/form/user_checkout_registration.tpl new file mode 100644 index 0000000..8859827 --- /dev/null +++ b/changed_full/451/out/azure/tpl/form/user_checkout_registration.tpl @@ -0,0 +1,61 @@ +[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] +[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] +[{block name="user_checkout_registration"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{block name="user_checkout_registration_form"}] + [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] + [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + [{if !$oxcmp_user->oxuser__oxpassword->value }] + + [{else}] + + + [{/if}] + + + +
+ [{ oxmultilang ident="FORM_USER_CHECKOUT_REGISTRATION_BACKSTEP" }] + +
+ +
+
+

[{ oxmultilang ident="FORM_REGISTER_ACCOUNTINFO" }]

+
    + [{ include file="form/fieldset/user_account.tpl" }] +
+
+
+

[{ oxmultilang ident="FORM_REGISTER_BILLINGADDRESS" }]

+
    + [{ include file="form/fieldset/user_billing.tpl" noFormSubmit=true blSubscribeNews=false blOrderRemark=true}] +
+
+
+

[{ oxmultilang ident="FORM_REGISTER_SHIPPINGADDRESS" }]

+

showShipAddress()}]checked[{/if}] value="0">

+
    showShipAddress()}]style="display: none;"[{/if}]> + [{ include file="form/fieldset/user_shipping.tpl" noFormSubmit=true}] +
+
    +
  • + [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] +
    • +
+
+
+ + [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] + +
+ [{ oxmultilang ident="FORM_USER_CHECKOUT_REGISTRATION_BACKSTEP" }] + +
+ [{/block}] +
+[{/block}] diff --git a/changed_full/451/out/azure/tpl/layout/footer.tpl b/changed_full/451/out/azure/tpl/layout/footer.tpl new file mode 100644 index 0000000..0671abf --- /dev/null +++ b/changed_full/451/out/azure/tpl/layout/footer.tpl @@ -0,0 +1,85 @@ +[{block name="footer_main"}] + [{oxscript include="js/widgets/oxequalizer.js" priority=10 }] + [{oxscript add="$(function(){oxEqualizer.equalHeight($( '#panel dl' ));});"}] + +[{/block}] +[{if $oView->isRootCatChanged()}] + [{oxscript include="js/widgets/oxmodalpopup.js" priority=10 }] + [{oxscript add="$( '#scRootCatChanged' ).oxModalPopup({ target: '#scRootCatChanged', openDialog: true});"}] + +[{/if}] + +[{*** D3 MOD START * GoogleAnalytics ***}] + [{include file="widget/d3googleanalytics/d3GoogleAnalytics.tpl"}] +[{*** D3 MOD END * GoogleAnalytics ***}] diff --git a/changed_full/451/out/azure/tpl/page/checkout/basket.tpl b/changed_full/451/out/azure/tpl/page/checkout/basket.tpl new file mode 100644 index 0000000..3283354 --- /dev/null +++ b/changed_full/451/out/azure/tpl/page/checkout/basket.tpl @@ -0,0 +1,114 @@ +[{capture append="oxidBlock_content"}] + + [{* ordering steps *}] + [{include file="page/checkout/inc/steps.tpl" active=1 }] + + [{block name="checkout_basket_main"}] + [{assign var="currency" value=$oView->getActCurrency() }] + [{if !$oxcmp_basket->getProductsCount() }] + [{block name="checkout_basket_emptyshippingcart"}] +
[{ oxmultilang ident="PAGE_CHECKOUT_BASKET_EMPTYSHIPPINGCART" }]
+ [{/block}] + [{else }] +
+ [{if $oView->showBackToShop()}] + [{block name="checkout_basket_backtoshop_top"}] +
+[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{ $oViewConf->getHiddenSid() }] + + + +
+
+ [{/block}] + [{/if}] + + [{if $oView->isLowOrderPrice() }] + [{block name="checkout_basket_loworderprice_top"}] +
[{ oxmultilang ident="PAGE_CHECKOUT_BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+ [{/block}] + [{else}] + [{block name="basket_btn_next_top"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{ $oViewConf->getHiddenSid() }] + + +
+ [{/block}] + [{/if}] +
+ + [{include file="page/checkout/inc/basketcontents.tpl" editable=true}] + + [{if $oViewConf->getShowVouchers()}] + [{block name="checkout_basket_vouchers"}] + [{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] + [{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{foreach from=$Errors.basket item=oEr key=key}] + [{if $oEr->getErrorClassType() == 'oxVoucherException'}] +
+ [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_COUPONNOTACCEPTED1" }] “[{ $oEr->getValue('voucherNr') }]” [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_COUPONNOTACCEPTED2" }]
+ [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_REASON" }] + [{ $oEr->getOxMessage() }] +
+ [{/if}] + [{/foreach}] + + [{ $oViewConf->getHiddenSid() }] + + + + +

+ [{ oxmultilang ident="EXCEPTION_INPUT_NOTALLFIELDS" }] +

+ +
+
+ [{/block}] + [{/if}] +
+ [{if $oView->showBackToShop()}] + [{block name="checkout_basket_backtoshop_bottom"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + + + +
+
+ [{/block}] + [{/if}] + + [{if $oView->isLowOrderPrice() }] + [{block name="checkout_basket_loworderprice_bottom"}] +
[{ oxmultilang ident="PAGE_CHECKOUT_BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+ [{/block}] + [{else}] + [{block name="basket_btn_next_bottom"}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+ [{ $oViewConf->getHiddenSid() }] + + +
+ [{/block}] + [{/if}] +
+ [{/if }] + [{if $oView->isWrapping() }] + [{include file="page/checkout/inc/wrapping.tpl"}] + [{/if}] + [{/block}] + [{insert name="oxid_tracker" title=$template_title }] +[{/capture}] + +[{include file="layout/page.tpl"}] \ No newline at end of file diff --git a/changed_full/451/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl b/changed_full/451/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl new file mode 100644 index 0000000..5f62505 --- /dev/null +++ b/changed_full/451/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl @@ -0,0 +1,154 @@ +[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] + [{strip}] + + + [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') && + !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}] + [{$oD3GASettings->getValue('sD3GACampaignCode')}] + [{/if}] + [{/strip}] +[{/if}] \ No newline at end of file diff --git a/changed_full/451/out/basic/tpl/_footer.tpl b/changed_full/451/out/basic/tpl/_footer.tpl new file mode 100644 index 0000000..89fbb15 --- /dev/null +++ b/changed_full/451/out/basic/tpl/_footer.tpl @@ -0,0 +1,79 @@ +
+ + + + + +
+ +[{if $popup}][{include file=$popup}][{/if}] +[{oxid_include_dynamic file="dyn/newbasketitem_popup.tpl"}] + +[{if $oView->showFbConnectToAccountMsg()}] +[{ insert name="oxid_fblogin"}] +[{/if}] + +[{oxid_include_dynamic file="dyn/popup_scbasketexcl.tpl"}] +[{oxscript include="oxid.js"}] + +[{ include file="inc/facebook/fb_init.tpl" }] + +[{oxscript}][{oxid_include_dynamic file="dyn/oxscript.tpl" }] + + +[{*** D3 MOD START * GoogleAnalytics ***}] + [{include file="inc/d3GoogleAnalytics.tpl"}] +[{*** D3 MOD END * GoogleAnalytics ***}] + + + diff --git a/changed_full/451/out/basic/tpl/dyn/mini_basket.tpl b/changed_full/451/out/basic/tpl/dyn/mini_basket.tpl new file mode 100644 index 0000000..99c952d --- /dev/null +++ b/changed_full/451/out/basic/tpl/dyn/mini_basket.tpl @@ -0,0 +1,84 @@ +[{ if $oxcmp_basket->getProductsCount()}] + [{oxhasrights ident="TOBASKET"}] + [{assign var="currency" value=$oView->getActCurrency() }] +
+ + [{ oxmultilang ident="INC_RIGHTITEM_BASKET" }] + + +
+ [{if $_basket_extended }] + [{foreach from=$oxcmp_basket->getContents() name=rightlist item=_product}] +
+ [{ assign var="sRightListArtTitle" value=$_product->getTitle() }] + + [{ $sRightListArtTitle|strip_tags }] + + [{ $sRightListArtTitle|strip_tags }] +
+ ( [{$_product->getAmount()}] [{ oxmultilang ident="INC_CMP_BASKET_QTY" }] ) +
+ [{/foreach}] + +
+ [{/if}] + + + + + + + + + + + [{ if $oxcmp_basket->getDeliveryCosts() }] + + + + + [{ /if}] + + + + + [{if $oViewConf->getShowBasketTimeout()}] + + + [{counter name="mini_basket_countdown_nr" assign="countdown_nr"}] + + [{oxscript include="jquery.min.js"}] + [{oxscript include="countdown.jquery.js"}] + [{capture name="countdown"}] + $(document).ready( + function(){ + $(".minibasket_container #countdown_[{$countdown_nr}]").countdown( + function(count, element, container) { + if (count <= 1) { + $(element).parents(".minibasket_container").hide(); + return container.not(element); + } + } + ); + } + ); + [{/capture}] + [{oxscript add=$smarty.capture.countdown}] + + [{/if}] +
[{ oxmultilang ident="INC_CMP_BASKET_PRODUCT" }][{ $oxcmp_basket->getProductsCount()}]
[{ oxmultilang ident="INC_CMP_BASKET_QUANTITY" }][{ $oxcmp_basket->getItemsCount()}]
[{ oxmultilang ident="INC_CMP_BASKET_SHIPPING" }][{ $oxcmp_basket->getFDeliveryCosts() }] [{ $currency->sign}]
[{ oxmultilang ident="INC_CMP_BASKET_TOTALPRODUCTS" }][{ $oxcmp_basket->getFProductsPrice()}] [{ $currency->sign}]
[{ oxmultilang ident="INC_CMP_BASKET_TIMEOUT" }][{$oViewConf->getBasketTimeLeft()|oxformattime}]
+ +
+ +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + +
+
+
+
+
+ [{/oxhasrights}] +[{/if}] diff --git a/changed_full/451/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/changed_full/451/out/basic/tpl/inc/d3GoogleAnalytics.tpl new file mode 100644 index 0000000..5f62505 --- /dev/null +++ b/changed_full/451/out/basic/tpl/inc/d3GoogleAnalytics.tpl @@ -0,0 +1,154 @@ +[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] + [{strip}] + + + [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') && + !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}] + [{$oD3GASettings->getValue('sD3GACampaignCode')}] + [{/if}] + [{/strip}] +[{/if}] \ No newline at end of file diff --git a/changed_full/451/out/basic/tpl/inc/popup_basket.tpl b/changed_full/451/out/basic/tpl/inc/popup_basket.tpl new file mode 100644 index 0000000..d5c6090 --- /dev/null +++ b/changed_full/451/out/basic/tpl/inc/popup_basket.tpl @@ -0,0 +1,65 @@ + + +[{ if $oxcmp_basket->getProductsCount() && ( $_newitem || $Errors.popup )}] +[{assign var="currency" value=$oView->getActCurrency() }] + +[{oxscript add="oxid.popup.show();" }] +[{/if }] diff --git a/changed_full/451/out/basic/tpl/page/checkout/basket.tpl b/changed_full/451/out/basic/tpl/page/checkout/basket.tpl new file mode 100644 index 0000000..9b42f15 --- /dev/null +++ b/changed_full/451/out/basic/tpl/page/checkout/basket.tpl @@ -0,0 +1,466 @@ +[{assign var="template_title" value="BASKET_BASKET"|oxmultilangassign }] +[{include file="_header.tpl" title=$template_title location=$template_title}] + + +[{include file="inc/steps_item.tpl" highlight=1 }] +[{assign var="currency" value=$oView->getActCurrency() }] +[{if !$oxcmp_basket->getProductsCount() }] +
[{ oxmultilang ident="BASKET_EMPTYSHIPPINGCART" }]
+[{else }] +
+ [{if $oView->showBackToShop()}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + + +
+ +
+
+
+ [{/if}] + + [{if $oView->isLowOrderPrice() }] +
[{ oxmultilang ident="BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+ [{else}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + +
+ +
+
+
+ [{/if}] +
+ + +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [{assign var="basketitemlist" value=$oView->getBasketArticles() }] + [{foreach key=basketindex from=$oxcmp_basket->getContents() item=basketitem name=test_Contents}] + [{assign var="basketproduct" value=$basketitemlist.$basketindex }] + + + + + + + + + + + + + + + + + + + + + + + + [{foreach from=$Errors.basket item=oEr key=key }] + [{if $oEr->getErrorClassType() == 'oxOutOfStockException'}] + + [{if $basketproduct->oxarticles__oxid->value == $oEr->getValue('productId') }] + + + + + + [{/if}] + [{/if}] + [{if $oEr->getErrorClassType() == 'oxArticleInputException'}] + [{if $basketproduct->oxarticles__oxid->value == $oEr->getValue('productId') }] + + + + + + [{/if}] + [{/if}] + [{/foreach}] + + + + + + + + [{/foreach }] + + + + + + + + + + + [{if !$oxcmp_basket->getDiscounts() }] + + + + + + + [{foreach from=$oxcmp_basket->getProductVats() item=VATitem key=key }] + + + + + + + [{/foreach }] + [{/if }] + + + + + + + + + [{if $oxcmp_basket->getDiscounts() }] + + [{foreach from=$oxcmp_basket->getDiscounts() item=oDiscount name=test_Discounts}] + + + + + + + [{/foreach }] + + + + + + + [{foreach from=$oxcmp_basket->getProductVats() item=VATitem key=key }] + + + + + + + [{/foreach }] + [{/if }] + + [{if $oViewConf->getShowVouchers() && $oxcmp_basket->getVoucherDiscValue() }] + + [{foreach from=$oxcmp_basket->getVouchers() item=oVoucher key=key name=Voucher}] + + + + + + + + [{/foreach }] + [{/if }] + + [{if $oxcmp_basket->getDelCostNet() || $oxcmp_basket->getDelCostVat()}] + + [{/if}] + + [{if $oxcmp_basket->getDelCostNet() }] + + + + + + + [{if $oxcmp_basket->getDelCostVat() }] + + + + + + + [{/if }] + [{/if }] + + [{if $oxcmp_basket->getPaymentCosts() }] + + + + + + + [{if $oxcmp_basket->getPayCostVat() }] + + + + + + + [{/if }] + [{/if }] + + [{ if $oxcmp_basket->getTsProtectionCosts() }] + + + + + + + [{ if $oxcmp_basket->getTsProtectionVat() }] + + + + + + + [{/if}] + [{/if}] + + [{ if $oViewConf->getShowGiftWrapping() && $oxcmp_basket->getWrappCostNet() }] + + + + + + + [{if $oxcmp_basket->getWrappCostVat() }] + + + + + + + [{/if}] + [{/if}] + + + + + + + + + + + + + + + + [{if $oxcmp_basket->hasSkipedDiscount() }] + + + + + + [{/if}] + + + + + +
 
[{ oxmultilang ident="BASKET_ARTICEL" }][{ oxmultilang ident="BASKET_QUANTITY" }][{ oxmultilang ident="BASKET_UNITPRICE" }][{ oxmultilang ident="BASKET_TAX" }]  [{ oxmultilang ident="BASKET_TOTAL" }]
+ + + + [{ $basketproduct->oxarticles__oxtitle->value|strip_tags }] + + +
[{ $basketproduct->oxarticles__oxtitle->value }][{if $basketproduct->oxarticles__oxvarselect->value }], [{ $basketproduct->oxarticles__oxvarselect->value }][{/if }][{if $basketitem->isSkipDiscount() }] **[{/if}]
+
[{ oxmultilang ident="BASKET_ARTNOMBER" }] [{ $basketproduct->oxarticles__oxartnum->value }]
+ [{if !$basketitem->isBundle() || !$basketitem->isDiscountArticle()}] + + [{if $basketproduct->getDispSelList() }] +
+ [{foreach key=iSel from=$basketproduct->getDispSelList() item=oList }] + + [{/foreach }] +
+ [{/if}] + + [{/if }] + 		+ + + + + [{if $basketitem->isBundle() }] + + [{/if}] + [{if $basketitem->getdBundledAmount() > 0 && ($basketitem->isBundle() || $basketitem->isDiscountArticle()) }] +
+[{ $basketitem->getdBundledAmount() }]
+ [{/if}] + + [{if !$basketitem->isBundle() || !$basketitem->isDiscountArticle()}] + [{foreach key=sVar from=$basketitem->getPersParams() item=aParam }] + [{ oxmultilang ident="BASKET_DETAILS" }]: 
+ [{/foreach }] + + [{/if}] + 		+ [{if !$basketitem->isBundle() || !$basketitem->isDiscountArticle()}] + [{if $basketitem->getFUnitPrice() }][{ $basketitem->getFUnitPrice() }] [{ $currency->sign}][{/if}] + [{/if}] + + [{if !$basketitem->isBundle() || !$basketitem->isDiscountArticle()}] + [{ $basketitem->getVatPercent() }]% + [{/if}] + + [{if !$basketitem->isBundle() || !$basketitem->isDiscountArticle()}] + [{ $basketitem->getFTotalPrice() }] [{ $currency->sign }] + [{/if}] +
+ [{ $oEr->getOxMessage() }] [{ $oEr->getValue('remainingAmount') }] +
+ [{ $oEr->getOxMessage() }] +
+ + + +
+ +
+     + + + +
[{ oxmultilang ident="BASKET_TOTALNET" }][{ $oxcmp_basket->getProductsNetPrice() }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_TAX1" }] [{ $key }][{ oxmultilang ident="BASKET_TAX2" }][{ $VATitem }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_TOTALGROSS" }][{ $oxcmp_basket->getFProductsPrice() }] [{ $currency->sign }]
+ [{if $oDiscount->dDiscount < 0 }][{ oxmultilang ident="BASKET_CHARGE" }][{else}][{ oxmultilang ident="BASKET_DISCOUNT2" }][{/if}]  + [{ $oDiscount->sDiscount }]: + + [{if $oDiscount->dDiscount < 0 }][{ $oDiscount->fDiscount|replace:"-":"" }][{else}]-[{ $oDiscount->fDiscount }][{/if}] [{ $currency->sign }] +
[{ oxmultilang ident="BASKET_TOTALNET" }][{ $oxcmp_basket->getProductsNetPrice() }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_TAX1" }] [{ $key }][{ oxmultilang ident="BASKET_TAX2" }][{ $VATitem }] [{ $currency->sign }]
+   [{ oxmultilang ident="BASKET_COUPON" }]  + ([{ oxmultilang ident="BASKET_NOMBER" }] [{ $oVoucher->sVoucherNr }]): + +
+ [{ oxmultilang ident="BASKET_REMOVE2" }] +
+ 		+ - + [{ $oVoucher->fVoucherdiscount }]  + [{ $currency->sign }] +
[{if $oxcmp_basket->getDelCostVat() }][{ oxmultilang ident="BASKET_SHIPPINGNET" }][{else}][{ oxmultilang ident="BASKET_SHIPPING" }][{/if }][{ $oxcmp_basket->getDelCostNet() }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_PLUSTAX1" }] [{ $oxcmp_basket->getDelCostVatPercent() }][{ oxmultilang ident="BASKET_PLUSTAX2" }][{ $oxcmp_basket->getDelCostVat() }] [{ $currency->sign }]
[{if $oxcmp_basket->getPaymentCosts() >= 0}][{ oxmultilang ident="BASKET_PAYMENT" }][{else}][{ oxmultilang ident="BASKET_CHARGE2" }][{/if}] [{ oxmultilang ident="BASKET_DISCOUNT3" }][{ $oxcmp_basket->getPayCostNet() }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_PAYMENTTAX1" }] [{ $oxcmp_basket->getPayCostVatPercent() }] [{ oxmultilang ident="BASKET_PAYMENTTAX2" }][{ $oxcmp_basket->getPayCostVat() }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_TSPROTECTION" }][{ $oxcmp_basket->getTsProtectionNet() }] [{ $currency->sign}]
[{ oxmultilang ident="BASKET_TSPROTECTIONCHARGETAX1" }] [{ $oxcmp_basket->getTsProtectionVatPercent()}][{ oxmultilang ident="BASKET_TSPROTECTIONCHARGETAX2" }][{ $oxcmp_basket->getTsProtectionVat() }] [{ $currency->sign}]
[{if $oxcmp_basket->getWrappCostVat() }][{ oxmultilang ident="ORDER_WRAPPINGNET" }][{else}][{ oxmultilang ident="ORDER_WRAPPINGGROSS1" }][{/if}][{ $oxcmp_basket->getWrappCostNet() }] [{ $currency->sign}]
[{ oxmultilang ident="ORDER_WRAPPINGTAX1" }] [{ $oxcmp_basket->getWrappCostVatPercent() }][{ oxmultilang ident="ORDER_WRAPPINGTAX2" }][{ $oxcmp_basket->getWrappCostVat() }] [{ $currency->sign}]
[{ oxmultilang ident="BASKET_GRANDTOTAL" }][{ $oxcmp_basket->getFPrice() }] [{ $currency->sign }]
** [{ oxmultilang ident="BASKET_DISCOUNTS_NOT_APPLIED_FOR_ARTICLES" }]
+
+ + [{if $oViewConf->getShowVouchers()}] + [{ oxmultilang ident="BASKET_REDEEMCOUPON" }] +
+ [{foreach from=$Errors.basket item=oEr key=key }] + [{if $oEr->getErrorClassType() == 'oxVoucherException'}] + [{ oxmultilang ident="BASKET_COUPONNOTACCEPTED1" }] [{ $oEr->getValue('voucherNr') }] [{ oxmultilang ident="BASKET_COUPONNOTACCEPTED2" }]
+ [{ oxmultilang ident="BASKET_REASON" }] + [{ $oEr->getOxMessage() }]
+ [{/if}] + [{/foreach}] + +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ + [{ $oViewConf->getHiddenSid() }] + + + + + +
+
+
+ [{/if}] + +
+ [{if $oView->showBackToShop()}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + + +
+ +
+
+
+ [{/if}] + + [{if $oView->isLowOrderPrice() }] +
[{ oxmultilang ident="BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+ [{else}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + +
+ +
+
+
+ [{/if}] + +
+ + [{if $oView->getBasketSimilarList() }] + [{ oxmultilang ident="ORDER_OTHERINTRESTINGARTICLES"}] + [{foreach from=$oView->getBasketSimilarList() item=simproduct }] + [{include file="inc/product.tpl" size="small" product=$simproduct testid="similar_"|cat:$simproduct->oxarticles__oxid->value }] + [{/foreach }] + [{/if }] + +   + +[{/if }] + + +[{insert name="oxid_tracker" title=$template_title }] +[{include file="_footer.tpl" }] diff --git a/changed_full/451/out/basic/tpl/page/checkout/user.tpl b/changed_full/451/out/basic/tpl/page/checkout/user.tpl new file mode 100644 index 0000000..97aec3e --- /dev/null +++ b/changed_full/451/out/basic/tpl/page/checkout/user.tpl @@ -0,0 +1,475 @@ +[{assign var="template_title" value="USER_LOGINTITLE"|oxmultilangassign}] +[{include file="_header.tpl" title=$template_title location=$template_title}] + + +[{include file="inc/steps_item.tpl" highlight=2 }] +[{assign var="_blshownoregopt" value=$oView->getShowNoRegOption()}] + + [{ if !$oxcmp_user && !$oView->getLoginOption() && !$oView->isConnectedWithFb() }] + [{if $_blshownoregopt }] +
+ [{ oxmultilang ident="USER_OPTION1" }] +
+ [{ oxmultilang ident="USER_ORDERWITHOUTREGISTER1" }]

+ [{ oxmultilang ident="USER_ORDERWITHOUTREGISTER2" }]

+[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + + +
+
+
+
+ [{/if}] +
+ [{if !$_blshownoregopt }][{ oxmultilang ident="USER_OPTION1" }][{else}][{ oxmultilang ident="USER_OPTION2" }][{/if}] +
+ [{ oxmultilang ident="USER_ALREADYCUSTOMER" }]

+ [{ oxmultilang ident="USER_PLEASELOGIN" }]

+ [{foreach from=$Errors.user item=oEr key=key }] +
[{ $oEr->getOxMessage()}]
+ [{/foreach}] +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + + + + [{ oxmultilang ident="USER_EMAIL" }]
+

+ [{ oxmultilang ident="USER_PWD" }]
+

+

+ [{ oxmultilang ident="USER_FORGOTPWD" }]

+
+
+
+
+ +
+ [{if !$_blshownoregopt }][{ oxmultilang ident="USER_OPTION2" }][{else}][{ oxmultilang ident="USER_OPTION3" }][{/if}] +
+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT1" }]

+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT2" }] [{ oxmultilang ident="USER_OPENPERSONALACCOUNT3" }]

+ + [{ oxmultilang ident="USER_OPENPERSONALACCOUNT4" }]
+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT5" }]
+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT6" }]
+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT7" }]
+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT8" }]
+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT9" }]
+ [{ oxmultilang ident="USER_OPENPERSONALACCOUNT10" }] + +

+[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + + +
+
+
+
+ + [{else}] + [{assign var="invadr" value=$oView->getInvoiceAddress()}] + [{assign var="currency" value=$oView->getActCurrency() }] + + [{if !$oxcmp_user && $oView->isConnectedWithFb()}] + [{ oxmultilang ident="USER_LOGIN3" }] +
+ [{ oxmultilang ident="USER_FB_UPDATEACCOUNTMSG" }] +
+
+ +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + + + + +

+
+
+
+ [{/if}] + +[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] +
+
+ [{ $oViewConf->getHiddenSid() }] + [{ $oViewConf->getNavFormParams() }] + + + + + [{if !$oxcmp_user->oxuser__oxpassword->value }] + + [{else}] + + + [{/if}] +
+ + [{if $oView->isLowOrderPrice()}] +
+
[{ oxmultilang ident="BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+
+ [{else}] +
+
+ +
+
+ [{/if}] + + [{include file="inc/error.tpl" Errorlist=$Errors.user}] + + [{if $oView->getLoginOption() == 3 || (!$oxcmp_user && $oView->isConnectedWithFb()) }] + [{ oxmultilang ident="USER_LOGIN3" }] +
+ + [{ oxmultilang ident="USER_ENTEREMAILANDPWD" }]
+ [{ oxmultilang ident="USER_RECEIVECONFIRMATION" }] +
+ + + + + + + + + + + + + + + + +
 *
 *
 *
+
+ [{/if}] + + [{ oxmultilang ident="USER_SEND" }] +
+ [{ oxmultilang ident="USER_BILLINDADDRESS" }] [{ oxmultilang ident="USER_COMPLETEALLMARKEDFIELDS" }] +
+ + + + + + [{ if !$oxcmp_user->oxuser__oxpassword->value && $oView->getLoginOption() != 3 && !$oView->isConnectedWithFb() }] + + + + + [{/if}] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [{if $oViewConf->showBirthdayFields() }] + + + + + [{/if}] + + + + + + + + + +
+ + *
+ [{include file="inc/salutation.tpl" name="invadr[oxuser__oxsal]" value=$oxcmp_user->oxuser__oxsal->value value2=$invadr.oxuser__oxsal}] + [{if $oView->isFieldRequired(oxuser__oxsal) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxfname) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxlname) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxcompany) }]*[{/if}] +
+ + + [{if $oView->isFieldRequired(oxuser__oxstreet) || $oView->isFieldRequired(oxuser__oxstreetnr) }]*[{/if}] +
+ + + [{if $oView->isFieldRequired(oxuser__oxzip) || $oView->isFieldRequired(oxuser__oxcity) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxustid) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxaddinfo) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxcountryid) }]*[{/if}] +
+ [{include file="inc/state_selector.snippet.tpl" + countrySelectId="invCountrySelect" + stateSelectName="invadr[oxuser__oxstateid]" + selectedStateIdPrim=$invadr.oxuser__oxstateid + selectedStateId=$oxcmp_user->oxuser__oxstateid + }] +
+ + [{if $oView->isFieldRequired(oxuser__oxfon) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxfax) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxmobfon) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxuser__oxprivfon) }]*[{/if}] +
+ + +
+ oxuser__oxbirthdate->value|regex_replace:"/^([0-9]{4})[-]([0-9]{1,2})[-]/":"" }][{/if}]">   + oxuser__oxbirthdate->value|regex_replace:"/^([0-9]{4})[-]/":""|regex_replace:"/[-]([0-9]{1,2})$/":"" }][{/if}]">   + oxuser__oxbirthdate->value|regex_replace:"/[-]([0-9]{1,2})[-]([0-9]{1,2})$/":"" }][{/if}]"> + [{if $oView->isFieldRequired(oxuser__oxbirthdate) }]*[{/if}] [{ oxmultilang ident="USER_BIRTHDAYMESSAGE" }]
+
+ + isNewsSubscribed()}]checked[{/if}]> + [{ oxmultilang ident="USER_SUBSCRIBENEWSLETTER_MESSAGE" }] +
+ [{ if !$oView->getOrderRemark()}] + [{assign var="order_remark" value="USER_MESSAGEHERE"|oxmultilangassign}] + [{else}] + [{assign var="order_remark" value=$oView->getOrderRemark()}] + [{/if}] + +
+ +
+ +
+ [{ oxmultilang ident="USER_SHIPPINGADDRESS" }] +
+ + [{if !$oView->showShipAddress()}] +

+ [{else}] +

+ [{/if}] + +
[{ oxmultilang ident="USER_NOTE" }] [{ oxmultilang ident="USER_DIFFERENTDELIVERYADDRESS" }]
+ [{if $oView->showShipAddress()}] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ [{include file="inc/salutation.tpl" name="deladr[oxaddress__oxsal]" value=$delivadr->oxaddress__oxsal->value}] + [{if $oView->isFieldRequired(oxaddress__oxsal) }]*[{/if}] +
+ + + [{if $oView->isFieldRequired(oxaddress__oxfname) || $oView->isFieldRequired(oxaddress__oxlname) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxaddress__oxcompany) }]*[{/if}] +
+ + + [{if $oView->isFieldRequired(oxaddress__oxstreet) || $oView->isFieldRequired(oxaddress__oxstreetnr) }]*[{/if}] +
+ + + [{if $oView->isFieldRequired(oxaddress__oxzip) || $oView->isFieldRequired(oxaddress__oxcity) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxaddress__oxaddinfo) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxaddress__oxcountryid) }]*[{/if}] +
+ [{include file="inc/state_selector.snippet.tpl" + countrySelectId="delCountrySelect" + stateSelectName="deladr[oxaddress__oxstateid]" + selectedStateIdPrim=$deladr.oxaddress__oxstateid + selectedStateId=$delivadr->oxaddress__oxstateid->value + }] +
+ + [{if $oView->isFieldRequired(oxaddress__oxfon) }]*[{/if}] +
+ + [{if $oView->isFieldRequired(oxaddress__oxfax) }]*[{/if}] +
+ [{/if}] +
+ + [{if $oView->isLowOrderPrice()}] +
+
[{ oxmultilang ident="BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+
+ [{else}] +
+
+ +
+
+ [{/if}] + +
+   + + [{/if}] + + +[{ insert name="oxid_tracker" title=$template_title }] +[{include file="_footer.tpl"}] diff --git a/copy_this/core/smarty/plugin/function.d3getArticleFromOrderArticle.php b/copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php similarity index 100% rename from copy_this/core/smarty/plugin/function.d3getArticleFromOrderArticle.php rename to copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php diff --git a/setup+doku/install_ee.sql b/setup+doku/install_ee.sql index 86cea6d..0a3b77d 100644 --- a/setup+doku/install_ee.sql +++ b/setup+doku/install_ee.sql @@ -1,22 +1,22 @@ REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -('504bcce44c2539d8905980e80630ddf5', '1', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.1.7', 'EE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' -, '', '', 26, 26); +('504bcce44c2539d8905980e80630ddf5', '1', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.2.0', 'EE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' +, '', '', 30, 30); REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -('504bcce44c2539d8905980e71630ddf5', '2', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.1.7', 'EE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' -, '', '', 26, 26); +('504bcce44c2539d8905980e71630ddf5', '2', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.2.0', 'EE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' +, '', '', 30, 30); REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -('504bcce44c2539d8905980e60330ddf5', '3', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.1.7', 'EE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' -, '', '', 26, 26); +('504bcce44c2539d8905980e60330ddf5', '3', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.2.0', 'EE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' +, '', '', 30, 30); diff --git a/setup+doku/install_pe_ce.sql b/setup+doku/install_pe_ce.sql index 727c71e..eb85579 100644 --- a/setup+doku/install_pe_ce.sql +++ b/setup+doku/install_pe_ce.sql @@ -1,5 +1,5 @@ REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXREVISION`, `OXNEWREVISION`) VALUES -('504bcce44c2539d8905980e80630ddf5', 'oxbaseshop', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.1.7', 'PE4 / CE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' -, '', '', 26, 26); +('504bcce44c2539d8905980e80630ddf5', 'oxbaseshop', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.2.0', 'PE4 / CE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' +, '', '', 30, 30); REPLACE INTO `oxcontents` (`OXID`, `OXLOADID`, `OXSHOPID`, `OXSNIPPET`, `OXTYPE`, `OXACTIVE`, `OXACTIVE_1`, `OXTITLE`, `OXCONTENT`, `OXTITLE_1`, `OXCONTENT_1`, `OXACTIVE_2`, `OXTITLE_2`, `OXCONTENT_2`, `OXACTIVE_3`, `OXTITLE_3`, `OXCONTENT_3`, `OXCATID`, `OXFOLDER`) VALUES ('a0b38ccf5da0f8a1d1d6718f91e9e9e7', 'Analytics_Security_Informations', 'oxbaseshop', 1, 0, 1, 1, 'Analytics Datenschutz Information', '

Diese Website benutzt Google Analytics, einen Webanalysedienst der Google\r\n\r\nInc. ("Google"). Google Analytics verwendet sog. "Cookies", Textdateien, die auf\r\n\r\nIhrem Computer gespeichert werden und die eine Analyse der Benutzung der Website\r\n\r\ndurch Sie ermöglichen. Die durch den Cookie erzeugten Informationen über Ihre\r\n\r\nBenutzung dieser Website (einschließlich Ihrer IP-Adresse, die jedoch mit der Methode _anonymizeIp() anonymisiert wird, so dass Sie nicht mehr einem Anschluss\r\n\r\nzugeordnet werden kann) wird an einen Server von Google in den USA\r\n\r\nübertragen und dort gespeichert. Google wird diese Informationen benutzen, um\r\n\r\nIhre Nutzung der Website auszuwerten, um Reports über die Websiteaktivitäten für\r\n\r\ndie Websitebetreiber zusammenzustellen und um weitere mit der Websitenutzung und\r\n\r\nder Internetnutzung verbundene Dienstleistungen zu erbringen. Auch wird Google\r\n\r\ndiese Informationen gegebenenfalls an Dritte übertragen, sofern dies gesetzlich\r\n\r\nvorgeschrieben oder soweit Dritte diese Daten im Auftrag von Google verarbeiten.\r\n\r\nGoogle wird in keinem Fall Ihre IP-Adresse mit anderen Daten von Google in\r\n\r\nVerbindung bringen. Sie können die Installation der Cookies durch eine\r\n\r\nentsprechende Einstellung Ihrer Browser Software verhindern; wir weisen Sie\r\n\r\njedoch darauf hin, dass Sie in diesem Fall gegebenenfalls nicht sämtliche\r\n\r\nFunktionen dieser Website vollumfänglich nutzen können. Durch die Nutzung dieser\r\n\r\nWebsite erklären Sie sich mit der Bearbeitung der über Sie erhobenen Daten durch\r\n\r\nGoogle in der zuvor beschriebenen Art und Weise und zu dem zuvor benannten Zweck\r\n\r\neinverstanden.

\r\n

Sie können der Erhebung der\r\n\r\nDaten durch Google-Analytics mit Wirkung für die Zukunft widersprechen, indem\r\n\r\nsie ein Deaktivierungs-Add-on (http://tools.google.com/dlpage/gaoptout?hl=de)\r\n\r\nfür Ihren Browser installieren.

', '', '', 1, '', '', 1, '', '', '943a9ba3050e78b443c16e043ae60ef3', 'CMSFOLDER_USERINFO'); \ No newline at end of file diff --git a/setup+doku/update.sql b/setup+doku/update.sql index c42dd41..a145461 100644 --- a/setup+doku/update.sql +++ b/setup+doku/update.sql @@ -20,4 +20,7 @@ UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.5', `OXINSTALLDATE` = NOW(), `OXREVIS UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.6', `OXINSTALLDATE` = NOW(), `OXREVISION` = '25', `OXNEWREVISION` = '25' WHERE `OXMODID` = 'd3_googleanalytics'; # ==== 2.1.6 PE4 => 2.1.7 PE4 / EE4 / CE4 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.7', `OXINSTALLDATE` = NOW(), `OXREVISION` = '26', `OXNEWREVISION` = '26' WHERE `OXMODID` = 'd3_googleanalytics'; \ No newline at end of file +UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.7', `OXINSTALLDATE` = NOW(), `OXREVISION` = '26', `OXNEWREVISION` = '26' WHERE `OXMODID` = 'd3_googleanalytics'; + +# ==== 2.1.7 PE4 => 2.2.0 PE4 / EE4 / CE4 ==== +UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.2.0', `OXINSTALLDATE` = NOW(), `OXREVISION` = '30', `OXNEWREVISION` = '30' WHERE `OXMODID` = 'd3_googleanalytics'; \ No newline at end of file