diff --git a/.gitattributes b/.gitattributes index edb9166..4613813 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,105 +1,6 @@ * text=auto !eol Sources/Google[!!-~]Analytics-Installation.docx -text Sources/changelog.txt -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/admin/de/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/admin/en/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/basic/tpl/_footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/basic/tpl/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/basic/tpl/dyn/mini_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/basic/tpl/inc/popup_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/420/out/basic/tpl/user.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/basic/tpl/_footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/basic/tpl/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/basic/tpl/dyn/mini_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/basic/tpl/inc/popup_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/430-432/out/basic/tpl/user.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/basic/tpl/_footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/basic/tpl/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/basic/tpl/dyn/mini_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/basic/tpl/inc/popup_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/440-448/out/basic/tpl/user.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/admin/de/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/admin/en/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_change.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_noregistration.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_registration.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/azure/tpl/layout/footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/azure/tpl/page/checkout/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/basic/tpl/_footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/basic/tpl/dyn/mini_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/basic/tpl/inc/popup_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/basic/tpl/page/checkout/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/450/out/basic/tpl/page/checkout/user.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/admin/de/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/admin/en/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_change.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_noregistration.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_registration.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/azure/tpl/layout/footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/azure/tpl/page/checkout/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/basic/tpl/_footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/basic/tpl/dyn/mini_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/basic/tpl/inc/popup_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/user.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/admin/de/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/admin/en/d3_googleanalytics_lang.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_change.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_noregistration.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_registration.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/azure/tpl/layout/footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/azure/tpl/page/checkout/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/basic/tpl/_footer.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/basic/tpl/dyn/mini_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/user.tpl -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/admin/d3_cfg_googleanalytics.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/admin/d3_cfg_googleanalytics_campaigns.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/admin/d3_cfg_googleanalytics_licence.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/admin/d3_cfg_googleanalytics_list.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/admin/d3_cfg_googleanalytics_main.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/modules/d3GoogleAnalytics/core/d3_oxorder_googleanalytics.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/modules/d3GoogleAnalytics/menu.xml -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/modules/d3GoogleAnalytics/metadata.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/modules/d3GoogleAnalytics/picture.png -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_order_googleanalytics.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleanalytics.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_thankyou_googleanalytics.php -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/Google[!!-~]Analytics-Installation.pdf -text svneol=unset#unset -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/adwords_1.png -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/adwords_2.png -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/analytics_1.png -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/analytics_2.png -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/install_ee.sql -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/install_pe_ce.sql -text -Sources/d3GoogleAnalytic_Kundenversion[!!-~]indivParams[!!-~]Thankyou/setup+doku/update.sql -text Sources/doku/01_asyncTracking-Dateien/cleardot.gif -text Sources/doku/01_asyncTracking-Dateien/code_logo.gif -text Sources/doku/01_asyncTracking-Dateien/codesite.css -text @@ -257,31 +158,23 @@ changed_full/470-/application/views/azure/tpl/page/checkout/payment.tpl -text changed_full/470-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text changed_full/470-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text changed_full/480-/application/views/azure/tpl/form/login.tpl -text -changed_full/480-/application/views/azure/tpl/form/login.tpl.bak -text changed_full/480-/application/views/azure/tpl/form/user_checkout_change.tpl -text -changed_full/480-/application/views/azure/tpl/form/user_checkout_change.tpl.bak -text changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl -text -changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl.bak -text changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl -text -changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl.bak -text changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl -text -changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl.bak -text changed_full/480-/application/views/azure/tpl/page/checkout/inc/options.tpl -text -changed_full/480-/application/views/azure/tpl/page/checkout/inc/options.tpl.bak -text changed_full/480-/application/views/azure/tpl/page/checkout/order.tpl -text -changed_full/480-/application/views/azure/tpl/page/checkout/order.tpl.bak -text changed_full/480-/application/views/azure/tpl/page/checkout/payment.tpl -text -changed_full/480-/application/views/azure/tpl/page/checkout/payment.tpl.bak -text changed_full/480-/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl -text changed_full/480-/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl -text copy_this/.noencode -text +copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php -text copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php -text copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php -text copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php -text copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php -text copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php -text copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text -copy_this/modules/d3/d3_googleanalytics/d3_googleanalytics_stub.php -text copy_this/modules/d3/d3_googleanalytics/menu.xml -text copy_this/modules/d3/d3_googleanalytics/metadata.php -text copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php -text diff --git a/Sources/Google Analytics-Installation.docx b/Sources/Google Analytics-Installation.docx index 74a0b4b..eaba174 100644 Binary files a/Sources/Google Analytics-Installation.docx and b/Sources/Google Analytics-Installation.docx differ diff --git a/Sources/changelog.txt b/Sources/changelog.txt index e6b47b4..38d949b 100644 --- a/Sources/changelog.txt +++ b/Sources/changelog.txt @@ -1,4 +1,7 @@ +3.0.0.3 +- Update der precheck.php + -- 2012-12-19 -- SK -- - anpassen der Verzeichnisse + Dateien an PE/CE 4.7.x bzw. EE 5.0.x - "alten" Trunk auslagern unter branches/trunk_bis_4.6.x -- "alte" Versionen unter Tags verschieben in neuse Verzeichnis unter tags/versionen_bis_4.6.x \ No newline at end of file +- "alte" Versionen unter Tags verschieben in neuse Verzeichnis unter tags/versionen_bis_4.6.x diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/de/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/de/d3_googleanalytics_lang.php deleted file mode 100644 index d15a3e2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/de/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.
Auf Anregung durch Commodule-Blog haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank für diese Unterstützung!', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/en/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/en/d3_googleanalytics_lang.php deleted file mode 100644 index 6d7bac2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/en/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl deleted file mode 100644 index 330968b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl +++ /dev/null @@ -1,296 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_main.tpl deleted file mode 100644 index e2017d0..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ /dev/null @@ -1,413 +0,0 @@ -[{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_MAIN_USEREMARKETING"}] -
-
- - d3_cfg_mod__blD3GAUseRemarketing}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseRemarketing]"> - [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/_footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/_footer.tpl deleted file mode 100644 index c120471..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/_footer.tpl +++ /dev/null @@ -1,69 +0,0 @@ -
- - - - - - -
-[{if $popup}][{include file=$popup}][{/if}] - - - - -[{oxid_include_dynamic file="dyn/newbasketitem_popup.tpl"}] - - - -[{*** D3 MOD START * GoogleAnalytics ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="inc/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] - - - \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/basket.tpl deleted file mode 100644 index 9d4f912..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/basket.tpl +++ /dev/null @@ -1,457 +0,0 @@ -[{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 $oxcmp_basket->getVoucherDiscValue() }] - - - - - - [{foreach from=$oxcmp_basket->getVouchers() item=sVoucher 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->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()}] - - [{foreach key=iSel from=$basketproduct->selectlist item=oList }] - - [{/foreach }] - - [{/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 }] - [{ $sVar }]: 
- [{/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" }] [{ $sVoucher->sVoucherNr }]): - -
- [{ oxmultilang ident="BASKET_REMOVE2" }] -
- 		- - - [{ $sVoucher->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 }]
[{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" }]
-
- - - [{ 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 $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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/dyn/mini_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/dyn/mini_basket.tpl deleted file mode 100644 index bbbfc07..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/dyn/mini_basket.tpl +++ /dev/null @@ -1,59 +0,0 @@ -[{ 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->getFDeliveryCosts() }] - - - - - [{ /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}]
- -
- -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-
- [{ $oViewConf->getHiddenSid() }] - -
-
-
- -
- [{/oxhasrights}] -[{/if}] \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/inc/popup_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/inc/popup_basket.tpl deleted file mode 100644 index 022ed37..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/inc/popup_basket.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -[{ if $oxcmp_basket->getProductsCount() && ( $_newitem || $Errors.popup )}] -[{assign var="currency" value=$oView->getActCurrency() }] - -[{oxscript add="oxid.popup.show();" }] -[{/if }] diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/user.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/user.tpl deleted file mode 100644 index a41e15b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/420/out/basic/tpl/user.tpl +++ /dev/null @@ -1,436 +0,0 @@ -[{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() }] - [{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" }]

- [{ oxmultilang ident="USER_OPENID" }]
-

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

- [{ oxmultilang ident="USER_OPENPERSONALACCOUNT2" }] [{ $oxcmp_shop->oxshops__oxname->value }] [{ 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="currency" value=$oView->getActCurrency() }] - [{assign var="aMustFillFields" value=$oView->getMustFillFields() }] -[{*** 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}] - [{ 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}] - - - - - [{/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 isset($aMustFillFields.oxuser__oxsal) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxfname) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxlname) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxcompany) }]*[{/if}] -
- - - [{if isset($aMustFillFields.oxuser__oxstreet) || isset($aMustFillFields.oxuser__oxstreetnr) }]*[{/if}] -
- - - [{if isset($aMustFillFields.oxuser__oxzip) || isset($aMustFillFields.oxuser__oxcity) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxustid) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxaddinfo) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxcountryid) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxfon) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxfax) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxuser__oxmobfon) }]*[{/if}] -
- - [{if isset($aMustFillFields.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 isset($aMustFillFields.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()}] - [{assign var="delivadr" value=$oView->getDelAddress()}] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- [{include file="inc/salutation.tpl" name="deladr[oxaddress__oxsal]" value=$delivadr->oxaddress__oxsal->value}] - [{if isset($aMustFillFields.oxaddress__oxsal) }]*[{/if}] -
- - - [{if isset($aMustFillFields.oxaddress__oxfname) || isset($aMustFillFields.oxaddress__oxlname) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxaddress__oxcompany) }]*[{/if}] -
- - - [{if isset($aMustFillFields.oxaddress__oxstreet) || isset($aMustFillFields.oxaddress__oxstreetnr) }]*[{/if}] -
- - - [{if isset($aMustFillFields.oxaddress__oxzip) || isset($aMustFillFields.oxaddress__oxcity) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxaddress__oxaddinfo) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxaddress__oxcountryid) }]*[{/if}] -
- - [{if isset($aMustFillFields.oxaddress__oxfon) }]*[{/if}] -
- - [{if isset($aMustFillFields.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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php deleted file mode 100644 index d15a3e2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/de/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.
Auf Anregung durch Commodule-Blog haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank für diese Unterstützung!', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php deleted file mode 100644 index 6d7bac2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/en/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl deleted file mode 100644 index 330968b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl +++ /dev/null @@ -1,296 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_main.tpl deleted file mode 100644 index e2017d0..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ /dev/null @@ -1,413 +0,0 @@ -[{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_MAIN_USEREMARKETING"}] -
-
- - d3_cfg_mod__blD3GAUseRemarketing}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseRemarketing]"> - [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/_footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/_footer.tpl deleted file mode 100644 index c8dafde..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/_footer.tpl +++ /dev/null @@ -1,73 +0,0 @@ -
- - - - - -
-[{if $popup}][{include file=$popup}][{/if}] - - - -[{oxid_include_dynamic file="dyn/newbasketitem_popup.tpl"}] - - - -[{*** D3 MOD START * GoogleAnalytics ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="inc/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] - - - diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/basket.tpl deleted file mode 100644 index 3183e27..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/basket.tpl +++ /dev/null @@ -1,464 +0,0 @@ -[{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=sVoucher 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 $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->selectlist }] -
- [{foreach key=iSel from=$basketproduct->selectlist 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 }] - [{ $sVar }]: 
- [{/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" }] [{ $sVoucher->sVoucherNr }]): - -
- [{ oxmultilang ident="BASKET_REMOVE2" }] -
- 		- - - [{ $sVoucher->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 }]
[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/dyn/mini_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/dyn/mini_basket.tpl deleted file mode 100644 index d1949a3..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/dyn/mini_basket.tpl +++ /dev/null @@ -1,59 +0,0 @@ -[{ 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->getFDeliveryCosts() }] - - - - - [{ /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}]
- -
- -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-
- [{ $oViewConf->getHiddenSid() }] - -
-
-
- -
- [{/oxhasrights}] -[{/if}] diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/inc/popup_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/inc/popup_basket.tpl deleted file mode 100644 index 022ed37..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/inc/popup_basket.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -[{ if $oxcmp_basket->getProductsCount() && ( $_newitem || $Errors.popup )}] -[{assign var="currency" value=$oView->getActCurrency() }] - -[{oxscript add="oxid.popup.show();" }] -[{/if }] diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/user.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/user.tpl deleted file mode 100644 index cf50d06..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/430-432/out/basic/tpl/user.tpl +++ /dev/null @@ -1,459 +0,0 @@ -[{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() }] - [{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 $oViewConf->getShowOpenIdLogin() }] - [{ oxmultilang ident="USER_OPENID" }]
-

-
- [{/if}] -
-
-
-
- -
- [{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="currency" value=$oView->getActCurrency() }] -[{*** 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}] - [{ 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}] - - - - - [{/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="inv_country_select" - 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()}] - [{assign var="delivadr" value=$oView->getDelAddress()}] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- [{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="del_country_select" - 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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php deleted file mode 100644 index d15a3e2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/de/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.
Auf Anregung durch Commodule-Blog haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank für diese Unterstützung!', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php deleted file mode 100644 index 6d7bac2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/en/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl deleted file mode 100644 index 330968b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl +++ /dev/null @@ -1,296 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_main.tpl deleted file mode 100644 index e2017d0..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ /dev/null @@ -1,413 +0,0 @@ -[{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_MAIN_USEREMARKETING"}] -
-
- - d3_cfg_mod__blD3GAUseRemarketing}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseRemarketing]"> - [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/_footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/_footer.tpl deleted file mode 100644 index 4b1ba8c..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/_footer.tpl +++ /dev/null @@ -1,81 +0,0 @@ -
- - - - - -
- -[{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 ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="inc/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] - - - diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/basket.tpl deleted file mode 100644 index 73d9efd..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/basket.tpl +++ /dev/null @@ -1,466 +0,0 @@ -[{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=sVoucher 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->selectlist }] -
- [{foreach key=iSel from=$basketproduct->selectlist 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 }] - [{ $sVar }]: 
- [{/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" }] [{ $sVoucher->sVoucherNr }]): - -
- [{ oxmultilang ident="BASKET_REMOVE2" }] -
- 		- - - [{ $sVoucher->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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/dyn/mini_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/dyn/mini_basket.tpl deleted file mode 100644 index bb68b09..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/dyn/mini_basket.tpl +++ /dev/null @@ -1,84 +0,0 @@ -[{ 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->getFDeliveryCosts() }] - - - - - [{ /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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/inc/popup_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/inc/popup_basket.tpl deleted file mode 100644 index ba5fbbb..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/inc/popup_basket.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -[{ if $oxcmp_basket->getProductsCount() && ( $_newitem || $Errors.popup )}] -[{assign var="currency" value=$oView->getActCurrency() }] - -[{oxscript add="oxid.popup.show();" }] -[{/if }] diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/user.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/user.tpl deleted file mode 100644 index 473188d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/440-448/out/basic/tpl/user.tpl +++ /dev/null @@ -1,485 +0,0 @@ -[{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 $oViewConf->getShowOpenIdLogin() }] - [{ oxmultilang ident="USER_OPENID" }]
-

-
- [{/if}] -
-
-
-
- -
- [{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="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="inv_country_select" - 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()}] - [{assign var="delivadr" value=$oView->getDelAddress()}] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- [{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="del_country_select" - 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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/de/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/de/d3_googleanalytics_lang.php deleted file mode 100644 index d15a3e2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/de/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.
Auf Anregung durch Commodule-Blog haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank für diese Unterstützung!', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/en/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/en/d3_googleanalytics_lang.php deleted file mode 100644 index 6d7bac2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/en/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl deleted file mode 100644 index 330968b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl +++ /dev/null @@ -1,296 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_main.tpl deleted file mode 100644 index e2017d0..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ /dev/null @@ -1,413 +0,0 @@ -[{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_MAIN_USEREMARKETING"}] -
-
- - d3_cfg_mod__blD3GAUseRemarketing}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseRemarketing]"> - [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_change.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_change.tpl deleted file mode 100644 index bbcd46c..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_change.tpl +++ /dev/null @@ -1,45 +0,0 @@ -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-[{assign var="aErrors" value=$oView->getFieldValidationErrors()}] -[{ $oViewConf->getHiddenSid() }] -[{ $oViewConf->getNavFormParams() }] - - - - - - -
- [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_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'}] -
-
-
- -[{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] - -
- [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_BACKSTEP" }] - -
- -
\ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_noregistration.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_noregistration.tpl deleted file mode 100644 index a60192b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_noregistration.tpl +++ /dev/null @@ -1,50 +0,0 @@ -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-[{assign var="aErrors" value=$oView->getFieldValidationErrors()}] -[{ $oViewConf->getHiddenSid() }] -[{ $oViewConf->getNavFormParams() }] - - -[{if !$oxcmp_user->oxuser__oxpassword->value }] - -[{else}] - - -[{/if}] - - - -
- [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_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}] -
-
-
- -[{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] - -
- [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_BACKSTEP" }] - -
-
diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_registration.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_registration.tpl deleted file mode 100644 index 042166a..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/form/user_checkout_registration.tpl +++ /dev/null @@ -1,50 +0,0 @@ -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-[{assign var="aErrors" value=$oView->getFieldValidationErrors()}] -[{ $oViewConf->getHiddenSid() }] -[{ $oViewConf->getNavFormParams() }] - - -[{if !$oxcmp_user->oxuser__oxpassword->value }] - -[{else}] - - -[{/if}] - - - -
- [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_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=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}] -
-
-
- -[{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] - -
- [{ oxmultilang ident="PAGE_CHECKOUT_BASKET_BACKSTEP" }] - -
-
diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/layout/footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/layout/footer.tpl deleted file mode 100644 index 6b1c3eb..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/layout/footer.tpl +++ /dev/null @@ -1,84 +0,0 @@ - -[{if $oView->isRootCatChanged()}] - [{oxscript add="$( '#scRootCatChanged' ).oxModalPopup({ target: '#scRootCatChanged', openDialog: true});"}] - -[{/if}] - -[{*** D3 MOD START * GoogleAnalytics ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="widget/d3googleanalytics/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/page/checkout/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/page/checkout/basket.tpl deleted file mode 100644 index fae62f1..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/page/checkout/basket.tpl +++ /dev/null @@ -1,99 +0,0 @@ -[{oxstyle include="css/checkout.css"}] -[{capture append="oxidBlock_content"}] - -[{* ordering steps *}] -[{include file="page/checkout/inc/steps.tpl" active=1 }] - -[{assign var="currency" value=$oView->getActCurrency() }] -[{if !$oxcmp_basket->getProductsCount() }] -
[{ oxmultilang ident="PAGE_CHECKOUT_BASKET_EMPTYSHIPPINGCART" }]
-[{else }] -
- [{if $oView->showBackToShop()}] -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{ $oViewConf->getHiddenSid() }] - - - -
-
- [{/if}] - - [{if $oView->isLowOrderPrice() }] -
[{ oxmultilang ident="PAGE_CHECKOUT_BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
- [{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()}] -[{*** 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" }] -

- -
-
- [{/if}] -
- [{if $oView->showBackToShop()}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-
- [{ $oViewConf->getHiddenSid() }] - - - -
-
- [{/if}] - - [{if $oView->isLowOrderPrice() }] -
[{ oxmultilang ident="PAGE_CHECKOUT_BASKET_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
- [{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}] -[{oxscript add="$(function(){oxid.initBasket();});"}] -[{insert name="oxid_tracker" title=$template_title }] -[{/capture}] -[{include file="layout/page.tpl"}] \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/_footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/_footer.tpl deleted file mode 100644 index 66e44f8..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/_footer.tpl +++ /dev/null @@ -1,81 +0,0 @@ -
- - - - - -
- -[{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 ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="inc/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] - - - diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/dyn/mini_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/dyn/mini_basket.tpl deleted file mode 100644 index 2da8bd5..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/dyn/mini_basket.tpl +++ /dev/null @@ -1,84 +0,0 @@ -[{ 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->getFDeliveryCosts() }] - - - - - [{ /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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/inc/popup_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/inc/popup_basket.tpl deleted file mode 100644 index 022ed37..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/inc/popup_basket.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -[{ if $oxcmp_basket->getProductsCount() && ( $_newitem || $Errors.popup )}] -[{assign var="currency" value=$oView->getActCurrency() }] - -[{oxscript add="oxid.popup.show();" }] -[{/if }] diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/page/checkout/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/page/checkout/basket.tpl deleted file mode 100644 index 9b42f15..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/page/checkout/basket.tpl +++ /dev/null @@ -1,466 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/page/checkout/user.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/page/checkout/user.tpl deleted file mode 100644 index 97aec3e..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/450/out/basic/tpl/page/checkout/user.tpl +++ /dev/null @@ -1,475 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/de/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/de/d3_googleanalytics_lang.php deleted file mode 100644 index d15a3e2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/de/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.
Auf Anregung durch Commodule-Blog haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank für diese Unterstützung!', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/en/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/en/d3_googleanalytics_lang.php deleted file mode 100644 index 6d7bac2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/en/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl deleted file mode 100644 index 330968b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl +++ /dev/null @@ -1,296 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_main.tpl deleted file mode 100644 index e2017d0..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ /dev/null @@ -1,413 +0,0 @@ -[{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_MAIN_USEREMARKETING"}] -
-
- - d3_cfg_mod__blD3GAUseRemarketing}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseRemarketing]"> - [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_change.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_change.tpl deleted file mode 100644 index 4cf5891..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_change.tpl +++ /dev/null @@ -1,61 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_noregistration.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_noregistration.tpl deleted file mode 100644 index 539cf4c..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_noregistration.tpl +++ /dev/null @@ -1,61 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_registration.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_registration.tpl deleted file mode 100644 index 8859827..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/form/user_checkout_registration.tpl +++ /dev/null @@ -1,61 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/layout/footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/layout/footer.tpl deleted file mode 100644 index d705cc1..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/layout/footer.tpl +++ /dev/null @@ -1,87 +0,0 @@ -[{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 ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="widget/d3googleanalytics/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/page/checkout/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/page/checkout/basket.tpl deleted file mode 100644 index 3283354..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/page/checkout/basket.tpl +++ /dev/null @@ -1,114 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/_footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/_footer.tpl deleted file mode 100644 index 66e44f8..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/_footer.tpl +++ /dev/null @@ -1,81 +0,0 @@ -
- - - - - -
- -[{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 ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="inc/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] - - - diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/dyn/mini_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/dyn/mini_basket.tpl deleted file mode 100644 index 99c952d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/dyn/mini_basket.tpl +++ /dev/null @@ -1,84 +0,0 @@ -[{ 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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/inc/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/inc/popup_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/inc/popup_basket.tpl deleted file mode 100644 index d5c6090..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/inc/popup_basket.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -[{ if $oxcmp_basket->getProductsCount() && ( $_newitem || $Errors.popup )}] -[{assign var="currency" value=$oView->getActCurrency() }] - -[{oxscript add="oxid.popup.show();" }] -[{/if }] diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/basket.tpl deleted file mode 100644 index 9b42f15..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/basket.tpl +++ /dev/null @@ -1,466 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/user.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/user.tpl deleted file mode 100644 index 97aec3e..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/451-4511/out/basic/tpl/page/checkout/user.tpl +++ /dev/null @@ -1,475 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/de/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/de/d3_googleanalytics_lang.php deleted file mode 100644 index d15a3e2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/de/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.
Auf Anregung durch Commodule-Blog haben wir nun noch weitere Beispiele hinterlegt. Vielen Dank für diese Unterstützung!', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/en/d3_googleanalytics_lang.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/en/d3_googleanalytics_lang.php deleted file mode 100644 index 6d7bac2..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/en/d3_googleanalytics_lang.php +++ /dev/null @@ -1,98 +0,0 @@ - '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_MAIN_USEREMARKETING' => 'Remarketing verwenden', -'D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_DESC' => 'Wenn Sie sich entschließen, Remarketing mit Google Analytics zu nutzen, setzen Sie diesen Haken. Nachdem Sie diese Änderung vorgenommen haben, erfasst und analysiert Google Analytics neben den üblichen Informationen auch das DoubleClick-Cookie, sofern vorhanden. Das DoubleClick-Cookie ermöglicht Remarketing im Google Display-Netzwerk für Produkte wie AdWords.', - -'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.', - -'D3_GOOGLEANALYTICS_METADATA_TITLE' => 'Google Analytics Schnittstelle', -'D3_GOOGLEANALYTICS_METADATA_DESC' => 'Dieses Modul stellt Ihnen die schnelle und unkomplizierte Einbindung Ihres Google-Analytics-Kontos in Ihren Shop zur Verfügung. Hierbei werden über standardisierte Schnittstellen die Besucherdaten und eCommerce-Daten zu Google übertragen.Ebenfalls übermittelt werden Daten der Website-Suche. Dem Modul liegen angepaßte Templates bei, mit denen auch die Trichter ordentlich protokolliert werden.', - -); - - -/* - -[{ oxmultilang ident="GENERAL_YOUWANTTODELETE" }] - -*/ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl deleted file mode 100644 index 330968b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl +++ /dev/null @@ -1,296 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl deleted file mode 100644 index e2017d0..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ /dev/null @@ -1,413 +0,0 @@ -[{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_MAIN_USEREMARKETING"}] -
-
- - d3_cfg_mod__blD3GAUseRemarketing}]checked[{/if}] name="value[d3_cfg_mod__blD3GAUseRemarketing]"> - [{ oxinputhelp ident="D3_GOOGLEANALYTICS_MAIN_USEREMARKETING_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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_change.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_change.tpl deleted file mode 100644 index 4da671a..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_change.tpl +++ /dev/null @@ -1,82 +0,0 @@ -[{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" }] - -
- -
-
- [{block name="user_checkout_billing"}] - [{block name="user_checkout_billing_head"}] -

- [{oxmultilang ident="FORM_REGISTER_BILLINGADDRESS" }] - -

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

[{ oxmultilang ident="FORM_REGISTER_SHIPPINGADDRESS" }] - [{if $oView->showShipAddress() and $oxcmp_user->getSelectedAddress()}] - - [{/if}] -

- [{oxscript add="$('#userChangeShippingAddress').toggle($(this).is(':not(:checked)'));"}] - [{/block}] - [{block name="user_checkout_shipping_change"}] -

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

- [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] - [{/block}] - [{block name="user_checkout_shipping_form"}] -
    showShipAddress()}]style="display: none;"[{/if}]> - [{include file="form/fieldset/user_shipping.tpl" noFormSubmit=true onChangeClass='user'}] -
- [{/block}] - [{block name="user_checkout_shipping_feedback"}] -
    -
  • - [{include file="form/fieldset/order_newsletter.tpl" blSubscribeNews=true}] - [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] -
    • -
- [{/block}] - [{/block}] -
-
- -
- [{ oxmultilang ident="FORM_USER_CHECKOUT_CHANGE_BACKSTEP" }] - -
- [{/block}] -
-[{/block}] \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_noregistration.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_noregistration.tpl deleted file mode 100644 index 2a4dbcb..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_noregistration.tpl +++ /dev/null @@ -1,61 +0,0 @@ -[{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="NOTREGISTERED_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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_registration.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_registration.tpl deleted file mode 100644 index 8859827..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/form/user_checkout_registration.tpl +++ /dev/null @@ -1,61 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/layout/footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/layout/footer.tpl deleted file mode 100644 index 2f309c1..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/layout/footer.tpl +++ /dev/null @@ -1,93 +0,0 @@ -[{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 ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="widget/d3googleanalytics/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/page/checkout/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/page/checkout/basket.tpl deleted file mode 100644 index 3283354..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/page/checkout/basket.tpl +++ /dev/null @@ -1,114 +0,0 @@ -[{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl deleted file mode 100644 index d40d80f..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,187 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oView->getClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] - [{assign var="oUser" value=$oView->getUser()}] -[{/if}] - -[{strip}] - - - - [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oView->getClassName() == 'thankyou') && - !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}] - [{$oD3GASettings->getValue('sD3GACampaignCode')}] - [{/if}] - -[{/strip}] - -[{/if}] \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/_footer.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/_footer.tpl deleted file mode 100644 index d2ccdfe..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/_footer.tpl +++ /dev/null @@ -1,90 +0,0 @@ -
- - - - - -
- -[{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 ***}] - [{d3modcfgcheck modid="d3_googleanalytics"}] - [{include file="inc/d3GoogleAnalytics.tpl"}] - [{/d3modcfgcheck}] -[{*** D3 MOD END * GoogleAnalytics ***}] - - - diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/dyn/mini_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/dyn/mini_basket.tpl deleted file mode 100644 index 99c952d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/dyn/mini_basket.tpl +++ /dev/null @@ -1,84 +0,0 @@ -[{ 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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/inc/d3GoogleAnalytics.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/inc/d3GoogleAnalytics.tpl deleted file mode 100644 index d8c935d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/inc/d3GoogleAnalytics.tpl +++ /dev/null @@ -1,182 +0,0 @@ -[{if $blD3GoogleAnalyticsActive && $oD3GASettings->getValue('sD3GAId')}] - -[{if $oViewConf->getActiveClassName() == 'thankyou'}] - [{assign var="order" value=$oView->getOrder()}] - [{assign var="oPayment" value=$order->getPayment()}] - [{assign var="oDelSet" value=$order->getDelSet()}] - [{assign var="aVoucherSerieList" value=$order->d3getVoucherSerieList()}] -[{/if}] - - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl deleted file mode 100644 index d5c6090..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl +++ /dev/null @@ -1,65 +0,0 @@ - - -[{ if $oxcmp_basket->getProductsCount() && ( $_newitem || $Errors.popup )}] -[{assign var="currency" value=$oView->getActCurrency() }] - -[{oxscript add="oxid.popup.show();" }] -[{/if }] diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl deleted file mode 100644 index d326e03..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl +++ /dev/null @@ -1,497 +0,0 @@ -[{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 $basketindex == $oEr->getValue('basketIndex') }] - - - - - - [{/if}] - [{/if}] - [{if $oEr->getErrorClassType() == 'oxArticleInputException'}] - [{if $basketitem->getProductId() == $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 }] - [{elseif $oxcmp_basket->getFDeliveryCosts() }] - - - - - - - [{/if }] - - [{if $oxcmp_basket->getPayCostNet() }] - - - - - - - [{if $oxcmp_basket->getPayCostVat() }] - - - - - - - [{/if }] - [{elseif $oxcmp_basket->getFPaymentCosts() }] - - - - - - - [{/if }] - - [{ if $oxcmp_basket->getTsProtectionCosts() }] - [{ if $oxcmp_basket->getTsProtectionNet() }] - - - - - - - [{ if $oxcmp_basket->getTsProtectionVat() }] - - - - - - - [{/if}] - [{elseif $oxcmp_basket->getFTsProtectionCosts()}] - - - - - - - [{/if}] - [{/if}] - - [{ if $oViewConf->getShowGiftWrapping() }] - [{if $oxcmp_basket->getWrappCostNet() }] - - - - - - - [{elseif $oxcmp_basket->getFWrappingCosts()}] - - - - - - - [{/if}] - [{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" }]
- - - - [{$basketitem->getTitle()|strip_tags}] - - -
[{$basketitem->getTitle()}][{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 }] -
[{ oxmultilang ident="BASKET_SHIPPINGNET" }][{ $oxcmp_basket->getDelCostNet() }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_PLUSTAX1" }] [{ $oxcmp_basket->getDelCostVatPercent() }][{ oxmultilang ident="BASKET_PLUSTAX2" }][{ $oxcmp_basket->getDelCostVat() }] [{ $currency->sign }]
[{ oxmultilang ident="BASKET_SHIPPING" }][{ $oxcmp_basket->getFDeliveryCosts() }] [{ $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 }]
[{if $oxcmp_basket->getPaymentCosts() >= 0}][{ oxmultilang ident="BASKET_PAYMENT" }][{else}][{ oxmultilang ident="BASKET_CHARGE2" }][{/if}] [{ oxmultilang ident="BASKET_DISCOUNT3" }][{ $oxcmp_basket->getFPaymentCosts() }] [{ $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}]
[{ oxmultilang ident="BASKET_TSPROTECTION" }][{ $oxcmp_basket->getFTsProtectionCosts() }] [{ $currency->sign}]
[{ oxmultilang ident="ORDER_WRAPPINGNET" }][{ $oxcmp_basket->getWrappCostNet() }] [{ $currency->sign}]
[{ oxmultilang ident="ORDER_WRAPPINGGROSS1" }][{ $oxcmp_basket->getFWrappingCosts() }] [{ $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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/user.tpl b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/user.tpl deleted file mode 100644 index 30dd437..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/changed_full/460-464/out/basic/tpl/page/checkout/user.tpl +++ /dev/null @@ -1,502 +0,0 @@ -[{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" }]

- [{if $oView->isDownloadableProductWarning() }] -

[{ oxmultilang ident="MESSAGE_DOWNLOADABLE_PRODUCT" }]

- [{/if}] -[{*** 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()}] - [{if $oxcmp_user}] - [{assign var="delivadr" value=$oxcmp_user->getSelectedAddress()}] - [{/if}] - [{assign var="deladr" value=$oView->getDeliveryAddress()}] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- [{include file="inc/salutation.tpl" name="deladr[oxaddress__oxsal]" value=$delivadr->oxaddress__oxsal->value value2=$deladr.oxaddress__oxsal}] - [{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/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics.php deleted file mode 100644 index 809912d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics.php +++ /dev/null @@ -1,30 +0,0 @@ -. - * - * @link http://www.oxidmodule.com - * @link http://www.shopmodule.com - * @copyright (C) D3 Data Development - */ - -class d3_cfg_googleanalytics extends d3_cfg_mod_ -{ - - public function render() - { - $this->_aViewData['sListClass'] = 'd3_cfg_googleanalytics_list'; - $this->_aViewData['sMainClass'] = 'd3_cfg_googleanalytics_main'; - return parent::render(); - } -} \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_campaigns.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_campaigns.php deleted file mode 100644 index c003d8b..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_campaigns.php +++ /dev/null @@ -1,39 +0,0 @@ -. - * - * @link http://www.oxidmodule.com - * @link http://www.shopmodule.com - * @copyright (C) D3 Data Development - */ - -class d3_cfg_googleanalytics_campaigns extends d3_cfg_mod_main -{ - protected $_sThisTemplate = 'd3_cfg_googleanalytics_campaigns.tpl'; - - protected $_sModId = 'd3_googleanalytics'; - - public function checkD3Log() - { - // there are no reasons to log anything - return false; - } -/* - public function render() - { -dumpvar($this->oSet); - return parent::render(); - } -*/ -} \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_licence.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_licence.php deleted file mode 100644 index 56b294d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_licence.php +++ /dev/null @@ -1,31 +0,0 @@ -. - * - * @link http://www.oxidmodule.com - * @link http://www.shopmodule.com - * @copyright (C) D3 Data Development - */ - - -class d3_cfg_googleanalytics_licence extends d3_cfg_mod_licence { - - protected $_sModId = 'd3_googleanalytics'; - - protected $_hasLicence = false; - - protected $_hasNewsletterForm = false; - - protected $_hasUpdate = true; -} diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_list.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_list.php deleted file mode 100644 index a2b233d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_list.php +++ /dev/null @@ -1,35 +0,0 @@ -. - * - * @link http://www.oxidmodule.com - * @link http://www.shopmodule.com - * @copyright (C) D3 Data Development - */ - -class d3_cfg_googleanalytics_list extends d3_cfg_mod_list -{ - - protected $_blD3ShowLangSwitch = true; - - public function render() - { - parent::render(); - - $this->_aViewData["default_edit"] = "d3_cfg_googleanalytics_main"; - - return $this->_sThisTemplate; - } - -} \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_main.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_main.php deleted file mode 100644 index 181a3f4..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/admin/d3_cfg_googleanalytics_main.php +++ /dev/null @@ -1,39 +0,0 @@ -. - * - * @link http://www.oxidmodule.com - * @link http://www.shopmodule.com - * @copyright (C) D3 Data Development - */ - -class d3_cfg_googleanalytics_main extends d3_cfg_mod_main -{ - protected $_sThisTemplate = 'd3_cfg_googleanalytics_main.tpl'; - - protected $_sModId = 'd3_googleanalytics'; - - public function checkD3Log() - { - // there are no reasons to log anything - return false; - } -/* - public function render() - { -dumpvar($this->oSet); - return parent::render(); - } -*/ -} \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php deleted file mode 100644 index 145fd4f..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php +++ /dev/null @@ -1,43 +0,0 @@ -Load($sArtId); - - if( isset( $params['assign']) && $params['assign']) - $smarty->assign($params['assign'], $oArticle); - else - return "use assign param"; - -} diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/core/d3_oxorder_googleanalytics.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/core/d3_oxorder_googleanalytics.php deleted file mode 100644 index d060fa8..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/core/d3_oxorder_googleanalytics.php +++ /dev/null @@ -1,31 +0,0 @@ -_oPayment) - { - $this->_oPayment = oxNew('oxpayment'); - $this->_oPayment->Load($this->getFieldData('oxpaymenttype')); - } - - return parent::getPayment(); - } - - public function d3getVoucherSerieList() - { - $sSelect = "SELECT oxvoucherserieid FROM oxvouchers WHERE oxorderid = ".oxDb::getDb()->quote($this->getId()); - $aVoucherIds = oxDb::getDb()->getArray($sSelect); - $aVoucherSerieList = array(); - - foreach ($aVoucherIds as $aVoucherId) - { - $oVoucherSerie = oxNew('oxvoucherserie'); - $oVoucherSerie->Load($aVoucherId[0]); - $aVoucherSerieList[] = $oVoucherSerie; - } - - return $aVoucherSerieList; - } -} \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/menu.xml b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/menu.xml deleted file mode 100644 index 9c22a45..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/menu.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/metadata.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/metadata.php deleted file mode 100644 index 615e311..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/metadata.php +++ /dev/null @@ -1,26 +0,0 @@ - 'd3_googleanalytics', - 'title' => oxLang::getInstance()->translateString('D3_GOOGLEANALYTICS_METADATA_TITLE'), - 'description' => oxLang::getInstance()->translateString('D3_GOOGLEANALYTICS_METADATA_DESC'), - 'thumbnail' => 'picture.png', - 'version' => '2.4.0', - 'author' => oxLang::getInstance()->translateString('D3_MOD_LIB_METADATA_AUTHOR'), - 'email' => 'support@shopmodule.com', - 'url' => 'http://www.oxidmodule.com/', - 'extend' => array( - 'oxcmp_utils' => 'd3GoogleAnalytics/views/d3_oxcmp_utils_googleanalytics', - 'oxorder' => 'd3GoogleAnalytics/core/d3_oxorder_googleanalytics', - 'order' => 'd3GoogleAnalytics/views/d3_order_googleanalytics', - 'thankyou' => 'd3GoogleAnalytics/views/d3_thankyou_googleanalytics' - ) -); \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/picture.png b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/picture.png deleted file mode 100644 index 2789033..0000000 Binary files a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/picture.png and /dev/null differ diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_order_googleanalytics.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_order_googleanalytics.php deleted file mode 100644 index 8664e96..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_order_googleanalytics.php +++ /dev/null @@ -1,15 +0,0 @@ -getUser(); - $isNewCustomer = $oUser->inGroup('oxidnotyetordered'); - - oxSession::setVar('newcustomer', (int)$isNewCustomer); - } - -} \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleanalytics.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleanalytics.php deleted file mode 100644 index 0694ac7..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_oxcmp_utils_googleanalytics.php +++ /dev/null @@ -1,22 +0,0 @@ -_oSet = oxNew('d3_cfg_mod'); - $this->_oSet->Load($this->_oSet->getModOxid($this->_sModId), true); - - $this->_oParent->addTplParam('blD3GoogleAnalyticsActive', $this->_oSet->getFieldData('oxactive')); - $this->_oParent->addTplParam('oD3GASettings', $this->_oSet); - - return $ret; - } -} \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_thankyou_googleanalytics.php b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_thankyou_googleanalytics.php deleted file mode 100644 index c51035d..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/copy_this/modules/d3GoogleAnalytics/views/d3_thankyou_googleanalytics.php +++ /dev/null @@ -1,9 +0,0 @@ -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'); - -UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_googleanalytics'; \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/setup+doku/install_pe_ce.sql b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/setup+doku/install_pe_ce.sql deleted file mode 100644 index a392a60..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/setup+doku/install_pe_ce.sql +++ /dev/null @@ -1,8 +0,0 @@ -REPLACE INTO `d3_cfg_mod` (`OXID`, `OXSHOPID`, `OXMODID`, `OXNAME`, `OXACTIVE`, `OXSERIAL`, `OXINSTALLDATE`, `OXVERSION`, `OXSHOPVERSION`, `OXISMODULELOG`, `OXREQUIREMENTS`, `OXVALUE`, `OXVALUE_1`, `OXVALUE_2`, `OXNEWREVISION`) VALUES -(MD5(RAND()), 'oxbaseshop', 'd3_googleanalytics', 'Google Analytics', 1, '', NOW(), '2.4.1', 'PE4 / CE4', 0, '', 'TyUzQTglM0ElMjJzdGRDbGFzcyUyMiUzQTI1JTNBJTdCcyUzQTMzJTNBJTIyZDNfY2ZnX21vZF9fYmxNdWx0aVZhcmlhbnRzX2RlYnVnJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fc0QzR29vZ2xlQW5hbHl0aWNzSWQlMjIlM0JzJTNBNiUzQSUyMlVBLVlZWSUyMiUzQnMlM0E0MiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NBbm9ueW1pemVJUCUyMiUzQnMlM0ExJTNBJTIyMSUyMiUzQnMlM0E0NCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHb29nbGVBbmFseXRpY3NTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTE5JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FJZCUyMiUzQnMlM0E2JTNBJTIyVUEtLi4uJTIyJTNCcyUzQTI5JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQW5vbnltaXplSVAlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZW5kRUNvbW1lcmNlJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCcyUzQTM1JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBQWxsb3dEb21haW5MaW5rZXIlMjIlM0JzJTNBMSUzQSUyMjElMjIlM0JzJTNBMzQlM0ElMjJkM19jZmdfbW9kX19ibEQzR0FTZXRDYW1wYWlnblRyYWNrJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTQxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wYWlnbkNvb2tpZVRpbWVvdXQlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldENhbXBOb0tleSUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EyOSUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBQ2FtcGFpZ25Db2RlJTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBOYW1lS2V5JTIyJTNCcyUzQTAlM0ElMjIlMjIlM0JzJTNBMzMlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldENhbXBNZWRpdW1LZXklMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMyUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q2FtcFNvdXJjZUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wVGVybUtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTM0JTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FTZXRDYW1wQ29udGVudEtleSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTI2JTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBVXNlTmV0dG8lMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzAlM0ElMjJkM19jZmdfbW9kX19zRDNHQVNldERvbWFpbk5hbWUlMjIlM0JzJTNBMCUzQSUyMiUyMiUzQnMlM0EzMCUzQSUyMmQzX2NmZ19tb2RfX3NEM0dBU2V0Q29va2llUGF0aCUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fc0QzR0FDb29raWVQYXRoQ29weSUyMiUzQnMlM0EwJTNBJTIyJTIyJTNCcyUzQTMxJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0Q2xpZW50SW5mbyUyMiUzQnMlM0ExJTNBJTIyMCUyMiUzQnMlM0EzMiUzQSUyMmQzX2NmZ19tb2RfX2JsRDNHQVNldERldGVjdEZsYXNoJTIyJTNCcyUzQTElM0ElMjIwJTIyJTNCcyUzQTMyJTNBJTIyZDNfY2ZnX21vZF9fYmxEM0dBU2V0RGV0ZWN0VGl0bGUlMjIlM0JzJTNBMSUzQSUyMjAlMjIlM0JzJTNBMzElM0ElMjJkM19jZmdfbW9kX19ibEQzR0FVc2VDdXN0b21WYXJzJTIyJTNCcyUzQTElM0ElMjIxJTIyJTNCJTdE' -, '', '', 57); - -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 -(MD5(RAND()), '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'); - -UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_googleanalytics'; \ No newline at end of file diff --git a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/setup+doku/update.sql b/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/setup+doku/update.sql deleted file mode 100644 index a893611..0000000 --- a/Sources/d3GoogleAnalytic_Kundenversion indivParams Thankyou/setup+doku/update.sql +++ /dev/null @@ -1,42 +0,0 @@ -# ==== 2.0.0 => 2.1.0 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.0', `OXINSTALLDATE` = NOW(), `OXREVISION` = '14', `OXNEWREVISION` = '14' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.0 => 2.1.1 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.1', `OXINSTALLDATE` = NOW(), `OXREVISION` = '16', `OXNEWREVISION` = '16' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.1 => 2.1.2 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.2', `OXINSTALLDATE` = NOW(), `OXREVISION` = '18', `OXNEWREVISION` = '18' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.2 => 2.1.3 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.3', `OXINSTALLDATE` = NOW(), `OXREVISION` = '20', `OXNEWREVISION` = '20' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.3 => 2.1.4 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.4', `OXINSTALLDATE` = NOW(), `OXREVISION` = '21', `OXNEWREVISION` = '21' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.4 => 2.1.5 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.5', `OXINSTALLDATE` = NOW(), `OXREVISION` = '23', `OXNEWREVISION` = '23' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.5 => 2.1.6 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.6', `OXINSTALLDATE` = NOW(), `OXREVISION` = '25', `OXNEWREVISION` = '25' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.6 => 2.1.7 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.1.7', `OXINSTALLDATE` = NOW(), `OXREVISION` = '26', `OXNEWREVISION` = '26' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.1.7 => 2.2.0 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.2.0', `OXINSTALLDATE` = NOW(), `OXREVISION` = '30', `OXNEWREVISION` = '30' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.2.0 => 2.2.1 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.2.1', `OXINSTALLDATE` = NOW(), `OXREVISION` = '38', `OXNEWREVISION` = '38' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.2.1 => 2.2.2 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.2.2', `OXINSTALLDATE` = NOW(), `OXNEWREVISION` = '42' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.2.2 => 2.2.3 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.2.3', `OXINSTALLDATE` = NOW(), `OXNEWREVISION` = '45' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.2.3 => 2.3.0 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.3.0', `OXINSTALLDATE` = NOW(), `OXNEWREVISION` = '52' WHERE `OXMODID` = 'd3_googleanalytics'; - -# ==== 2.3.0 => 2.4.1 ==== -UPDATE `d3_cfg_mod` SET `OXVERSION` = '2.4.1', `OXINSTALLDATE` = NOW(), `OXNEWREVISION` = '57' WHERE `OXMODID` = 'd3_googleanalytics'; -UPDATE `d3_cfg_mod` SET `OXREVISION` = `OXNEWREVISION` WHERE `OXMODID` = 'd3_googleanalytics'; \ No newline at end of file diff --git a/changed_full/480-/application/views/azure/tpl/form/login.tpl.bak b/changed_full/480-/application/views/azure/tpl/form/login.tpl.bak deleted file mode 100644 index 3447f7b..0000000 --- a/changed_full/480-/application/views/azure/tpl/form/login.tpl.bak +++ /dev/null @@ -1,30 +0,0 @@ -[{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] -[{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] - -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -[{assign var="sAddClassParams" value="cl="|cat:$oViewConf->getActiveClassName()}] -
-[{assign var="aErrors" value=$oView->getFieldValidationErrors()}] -
    -
  • - [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - - - -

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

    -
    • -
  • - - -  ? -

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

    -
    • -
    • -
-
\ No newline at end of file diff --git a/changed_full/480-/application/views/azure/tpl/form/user_checkout_change.tpl.bak b/changed_full/480-/application/views/azure/tpl/form/user_checkout_change.tpl.bak deleted file mode 100644 index 4da671a..0000000 --- a/changed_full/480-/application/views/azure/tpl/form/user_checkout_change.tpl.bak +++ /dev/null @@ -1,82 +0,0 @@ -[{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" }] - -
- -
-
- [{block name="user_checkout_billing"}] - [{block name="user_checkout_billing_head"}] -

- [{oxmultilang ident="FORM_REGISTER_BILLINGADDRESS" }] - -

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

[{ oxmultilang ident="FORM_REGISTER_SHIPPINGADDRESS" }] - [{if $oView->showShipAddress() and $oxcmp_user->getSelectedAddress()}] - - [{/if}] -

- [{oxscript add="$('#userChangeShippingAddress').toggle($(this).is(':not(:checked)'));"}] - [{/block}] - [{block name="user_checkout_shipping_change"}] -

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

- [{oxscript add="$('#showShipAddress').change( function() { $('#shippingAddress').toggle($(this).is(':not(:checked)'));});"}] - [{/block}] - [{block name="user_checkout_shipping_form"}] -
    showShipAddress()}]style="display: none;"[{/if}]> - [{include file="form/fieldset/user_shipping.tpl" noFormSubmit=true onChangeClass='user'}] -
- [{/block}] - [{block name="user_checkout_shipping_feedback"}] -
    -
  • - [{include file="form/fieldset/order_newsletter.tpl" blSubscribeNews=true}] - [{include file="form/fieldset/order_remark.tpl" blOrderRemark=true}] -
    • -
- [{/block}] - [{/block}] -
-
- -
- [{ oxmultilang ident="FORM_USER_CHECKOUT_CHANGE_BACKSTEP" }] - -
- [{/block}] -
-[{/block}] \ No newline at end of file diff --git a/changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl.bak b/changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl.bak deleted file mode 100644 index 2a4dbcb..0000000 --- a/changed_full/480-/application/views/azure/tpl/form/user_checkout_noregistration.tpl.bak +++ /dev/null @@ -1,61 +0,0 @@ -[{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="NOTREGISTERED_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/480-/application/views/azure/tpl/form/user_checkout_registration.tpl.bak b/changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl.bak deleted file mode 100644 index 8859827..0000000 --- a/changed_full/480-/application/views/azure/tpl/form/user_checkout_registration.tpl.bak +++ /dev/null @@ -1,61 +0,0 @@ -[{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/480-/application/views/azure/tpl/page/checkout/basket.tpl.bak b/changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl.bak deleted file mode 100644 index 9ce1561..0000000 --- a/changed_full/480-/application/views/azure/tpl/page/checkout/basket.tpl.bak +++ /dev/null @@ -1,120 +0,0 @@ -[{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/480-/application/views/azure/tpl/page/checkout/inc/options.tpl.bak b/changed_full/480-/application/views/azure/tpl/page/checkout/inc/options.tpl.bak deleted file mode 100644 index f306203..0000000 --- a/changed_full/480-/application/views/azure/tpl/page/checkout/inc/options.tpl.bak +++ /dev/null @@ -1,60 +0,0 @@ -[{block name="checkout_user_options"}] - [{oxscript include="js/widgets/oxequalizer.js" priority=10 }] - [{oxscript add="$(function(){oxEqualizer.equalHeight($( '.checkoutOptions .option' ));});"}] -
- [{block name="checkout_options_noreg"}] - [{if $oView->getShowNoRegOption() }] -
-

[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_NOREGISTRATION" }]

- [{block name="checkout_options_noreg_text"}] -

[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_NOREGISTRATION_DESCRIPTION" }]

- [{if $oView->isDownloadableProductWarning() }] -

[{ oxmultilang ident="MESSAGE_DOWNLOADABLE_PRODUCT" }]

- [{/if}] - [{/block}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-

- [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - - - -

-
-
- [{/if}] - [{/block}] - - [{block name="checkout_options_reg"}] -
-

[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_REGISTRATION" }]

- [{block name="checkout_options_reg_text"}] -

[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_REGISTRATION_DESCRIPTION" }]

- [{/block}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-

- [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - - - -

-
-
- [{/block}] - - [{block name="checkout_options_login"}] -
-

[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_LOGIN" }]

- [{block name="checkout_options_login_text"}] -

[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_LOGIN_DESCRIPTION" }]

- [{/block}] - [{ include file="form/login.tpl"}] -
- [{/block}] -
-[{/block}] \ No newline at end of file diff --git a/changed_full/480-/application/views/azure/tpl/page/checkout/order.tpl.bak b/changed_full/480-/application/views/azure/tpl/page/checkout/order.tpl.bak deleted file mode 100644 index 496ccf0..0000000 --- a/changed_full/480-/application/views/azure/tpl/page/checkout/order.tpl.bak +++ /dev/null @@ -1,234 +0,0 @@ -[{capture append="oxidBlock_content"}] - - [{block name="checkout_order_errors"}] - [{ if $oView->isConfirmAGBActive() && $oView->isConfirmAGBError() == 1 }] - [{include file="message/error.tpl" statusMessage="PAGE_CHECKOUT_ORDER_READANDCONFIRMTERMS"|oxmultilangassign }] - [{/if}] - [{assign var="iError" value=$oView->getAddressError() }] - [{ if $iError == 1}] - [{include file="message/error.tpl" statusMessage="ERROR_DELIVERY_ADDRESS_WAS_CHANGED_DURING_CHECKOUT"|oxmultilangassign }] - [{ /if}] - [{/block}] - - [{* ordering steps *}] - [{include file="page/checkout/inc/steps.tpl" active=4 }] - - [{block name="checkout_order_main"}] - [{if !$oView->showOrderButtonOnTop()}] -
-   - [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_TITLE2" }] -
- [{/if}] - - [{block name="checkout_order_details"}] - [{ if !$oxcmp_basket->getProductsCount() }] - [{block name="checkout_order_emptyshippingcart"}] -
[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BASKETEMPTY" }]
- [{/block}] - [{else}] - [{assign var="currency" value=$oView->getActCurrency() }] - - [{if $oView->isLowOrderPrice()}] - [{block name="checkout_order_loworderprice_top"}] -
[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
- [{/block}] - [{else}] - -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - - - -
- [{if $oView->isActive('PsLogin') }] - - [{else}] - [{if $oView->isConfirmAGBActive()}] - [{oxifcontent ident="oxrighttocancellegend" object="oContent"}] -

- [{ $oContent->oxcontents__oxtitle->value }] -

- - - [{ $oContent->oxcontents__oxcontent->value }] - [{/oxifcontent}] - [{else}] - [{oxifcontent ident="oxrighttocancellegend2" object="oContent"}] -

- [{ $oContent->oxcontents__oxtitle->value }] -

- - [{ $oContent->oxcontents__oxcontent->value }] - [{/oxifcontent}] - [{/if}] - [{/if}] -
- - [{oxscript add="$('#checkAgbTop').click(function(){ $('input[name=ord_agb]').val( parseInt($('input[name=ord_agb]').val()) ^ 1);});"}] - - [{if $oView->showOrderButtonOnTop()}] -
- [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BACKSTEP" }] - -
- [{/if}] -
-
- [{/if}] - - [{block name="checkout_order_vouchers"}] - [{ if $oViewConf->getShowVouchers() && $oxcmp_basket->getVouchers()}] - [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_USEDCOUPONS" }] -
- [{foreach from=$Errors.basket item=oEr key=key }] - [{if $oEr->getErrorClassType() == 'oxVoucherException'}] - [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_COUPONNOTACCEPTED1" }] [{ $oEr->getValue('voucherNr') }] [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_COUPONNOTACCEPTED2" }]
- [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_REASON" }] - [{ $oEr->getOxMessage() }]
- [{/if}] - [{/foreach}] - [{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=aVouchers}] - [{ $sVoucher->sVoucherNr }]
- [{/foreach }] -
- [{/if}] - [{/block}] - - [{block name="checkout_order_address"}] -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-

- [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_ADDRESSES" }] - [{ $oViewConf->getHiddenSid() }] - - - -

-
-
-
[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BILLINGADDRESS" }]
-
- [{include file="widget/address/billing_address.tpl"}] -
-
- [{assign var="oDelAdress" value=$oView->getDelAddress() }] - [{if $oDelAdress }] -
-
[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_SHIPPINGADDRESS" }]
-
- [{include file="widget/address/shipping_address.tpl" delivadr=$oDelAdress}] -
-
- [{/if}] - - [{if $oView->getOrderRemark() }] -
-
[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_WHATIWANTEDTOSAY" }]
-
- [{ $oView->getOrderRemark() }] -
-
- [{/if}] -
-
- [{/block}] - - [{block name="shippingAndPayment"}] -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-

- [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_SHIPPINGCARRIER" }] - [{ $oViewConf->getHiddenSid() }] - - - -

-
- [{assign var="oShipSet" value=$oView->getShipSet() }] - [{ $oShipSet->oxdeliveryset__oxtitle->value }] -
- -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-

- [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_PAYMENTMETHOD" }] - [{ $oViewConf->getHiddenSid() }] - - - -

-
- [{assign var="payment" value=$oView->getPayment() }] - [{ $payment->oxpayments__oxdesc->value }] -
- [{/block}] - -
-[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
-

- [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BASKET" }] - [{ $oViewConf->getHiddenSid() }] - - - -

-
-
- - [{block name="order_basket"}] -
- [{include file="page/checkout/inc/basketcontents.tpl" editable=false}] -
- [{/block}] - - [{if $oView->isLowOrderPrice() }] - [{block name="checkout_order_loworderprice_bottom"}] -
-
[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
-
- [{/block}] - [{else}] - [{block name="checkout_order_btn_confirm_bottom"}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] -
- [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - - - - -
- [{if $oView->isActive('PsLogin') }] - - [{else}] - [{if $oView->isConfirmAGBActive()}] - - [{/if}] - [{/if}] -
- -
- [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BACKSTEP" }] - -
-
- [{/block}] - [{/if}] - [{/if}] - [{/block}] - [{/block}] - [{insert name="oxid_tracker" title=$template_title }] -[{/capture}] - -[{assign var="template_title" value="PAGE_CHECKOUT_ORDER_TITLE"|oxmultilangassign}] -[{include file="layout/page.tpl" title=$template_title location=$template_title}] \ No newline at end of file diff --git a/changed_full/480-/application/views/azure/tpl/page/checkout/payment.tpl.bak b/changed_full/480-/application/views/azure/tpl/page/checkout/payment.tpl.bak deleted file mode 100644 index ddac56b..0000000 --- a/changed_full/480-/application/views/azure/tpl/page/checkout/payment.tpl.bak +++ /dev/null @@ -1,154 +0,0 @@ -[{capture append="oxidBlock_content"}] - - [{* ordering steps *}] - [{include file="page/checkout/inc/steps.tpl" active=3 }] - - [{block name="checkout_payment_main"}] - [{assign var="currency" value=$oView->getActCurrency() }] - [{block name="change_shipping"}] - [{ if $oView->getAllSets() }] - [{assign var="aErrors" value=$oView->getFieldValidationErrors()}] -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] - [{assign var="sAddClassParams" value="cl="|cat:$oViewConf->getActiveClassName()}] -
-
- [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - -
-

[{if $oView->getAllSetsCnt() > 1}][{ oxmultilang ident="SELECT_SHIPPING_METHOD" suffix="COLON" }][{else}][{ oxmultilang ident="SELECT_SHIPPING_METHOD" suffix="COLON"}][{/if}]

-
    -
  • - [{block name="act_shipping"}] - - - [{/block}] -
    • -
- [{assign var="oDeliveryCostPrice" value=$oxcmp_basket->getDeliveryCost() }] - [{if $oDeliveryCostPrice && $oDeliveryCostPrice->getPrice() > 0}] - [{if $oViewConf->isFunctionalityEnabled('blShowVATForDelivery') }] -
- [{ oxmultilang ident="CHARGES" suffix="COLON"}] [{oxprice price=$oDeliveryCostPrice->getNettoPrice() currency=$currency}] - ([{ oxmultilang ident="PLUS_VAT" }] - [{oxprice price=$oDeliveryCostPrice->getVatValue() currency=$currency}]) - -
- [{ else }] -
- [{ oxmultilang ident="CHARGES" suffix="COLON" }] [{oxprice price=$oDeliveryCostPrice->getBruttoPrice() currency=$currency}] -
- [{/if}] - [{/if}] -
-
- [{/if}] - [{/block}] - - [{block name="checkout_payment_errors"}] - [{assign var="iPayError" value=$oView->getPaymentError() }] - [{ if $iPayError == 1}] -
[{ oxmultilang ident="ERROR_MESSAGE_COMPLETE_FIELDS_CORRECTLY" }]
- [{ elseif $iPayError == 2}] -
[{ oxmultilang ident="MESSAGE_PAYMENT_AUTHORIZATION_FAILED" }]
- [{ elseif $iPayError == 4 }] -
[{ oxmultilang ident="MESSAGE_UNAVAILABLE_SHIPPING_METHOD" }]
- [{ elseif $iPayError == 5 }] -
[{ oxmultilang ident="MESSAGE_PAYMENT_UNAVAILABLE_PAYMENT" }]
- [{ elseif $iPayError == 6 }] -
[{ oxmultilang ident="TRUSTED_SHOP_UNAVAILABLE_PROTECTION" }]
- [{ elseif $iPayError > 6 }] - -
[{ oxmultilang ident="MESSAGE_PAYMENT_UNAVAILABLE_PAYMENT" }]
- [{ elseif $iPayError == -1}] -
[{ oxmultilang ident="MESSAGE_PAYMENT_UNAVAILABLE_PAYMENT_ERROR" suffix="COLON" }] "[{ $oView->getPaymentErrorText() }]").
- [{ elseif $iPayError == -2}] -
[{ oxmultilang ident="MESSAGE_NO_SHIPPING_METHOD_FOUND" }]
- [{ elseif $iPayError == -3}] -
[{ oxmultilang ident="MESSAGE_PAYMENT_SELECT_ANOTHER_PAYMENT" }]
- [{elseif $iPayError == -4}] -
[{ oxmultilang ident="MESSAGE_PAYMENT_BANK_CODE_INVALID" }]
- [{elseif $iPayError == -5}] -
[{ oxmultilang ident="MESSAGE_PAYMENT_ACCOUNT_NUMBER_INVALID" }]
- [{/if}] - [{/block}] - - [{block name="change_payment"}] - [{oxscript include="js/widgets/oxpayment.js" priority=10 }] - [{oxscript add="$( '#payment' ).oxPayment();"}] - [{oxscript include="js/widgets/oxinputvalidator.js" priority=10 }] - [{oxscript add="$('form.js-oxValidate').oxInputValidator();"}] - -[{*** D3 MOD NEXT_LINE * GoogleAnalytics ***}] - [{assign var="sAddClassParams" value="cl="|cat:$oViewConf->getActiveClassName()}] -
-
- [{ $oViewConf->getHiddenSid() }] - [{ $oViewConf->getNavFormParams() }] - - -
- - [{if $oView->getPaymentList()}] -

[{ oxmultilang ident="PAYMENT_METHOD" }]

- [{ assign var="inptcounter" value="-1"}] - [{foreach key=sPaymentID from=$oView->getPaymentList() item=paymentmethod name=PaymentSelect}] - [{ assign var="inptcounter" value="`$inptcounter+1`"}] - [{block name="select_payment"}] - [{if $sPaymentID == "oxidcashondel"}] - [{include file="page/checkout/inc/payment_oxidcashondel.tpl"}] - [{elseif $sPaymentID == "oxidcreditcard"}] - [{include file="page/checkout/inc/payment_oxidcreditcard.tpl"}] - [{elseif $sPaymentID == "oxiddebitnote"}] - [{include file="page/checkout/inc/payment_oxiddebitnote.tpl"}] - [{else}] - [{include file="page/checkout/inc/payment_other.tpl"}] - [{/if}] - [{/block}] - [{/foreach}] - - [{* TRUSTED SHOPS BEGIN *}] - [{include file="page/checkout/inc/trustedshops.tpl"}] - [{* TRUSTED SHOPS END *}] - - [{block name="checkout_payment_nextstep"}] - [{if $oView->isLowOrderPrice()}] -
-
[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{oxprice price=$oxcmp_basket->getMinOrderPrice() currency=$currency}]
-
- [{else}] -
- [{ oxmultilang ident="PREVIOUS_STEP" }] - -
- [{/if}] - [{/block}] - - [{elseif $oView->getEmptyPayment()}] - [{block name="checkout_payment_nopaymentsfound"}] -
-

[{ oxmultilang ident="PAYMENT_INFORMATION" }]

- [{oxifcontent ident="oxnopaymentmethod" object="oCont"}] - [{$oCont->oxcontents__oxcontent->value}] - [{/oxifcontent}] - -
- [{ oxmultilang ident="PREVIOUS_STEP" }] - -
- [{/block}] - [{/if}] -
- [{/block}] - [{/block}] - [{insert name="oxid_tracker" title=$template_title }] -[{/capture}] - -[{include file="layout/page.tpl"}] \ No newline at end of file diff --git a/copy_this/modules/d3/d3_googleanalytics/d3_googleanalytics_stub.php b/copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php similarity index 100% rename from copy_this/modules/d3/d3_googleanalytics/d3_googleanalytics_stub.php rename to copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/copy_this/modules/d3/d3_googleanalytics/metadata.php index 1bc6b64..12d2c3f 100644 --- a/copy_this/modules/d3/d3_googleanalytics/metadata.php +++ b/copy_this/modules/d3/d3_googleanalytics/metadata.php @@ -37,7 +37,7 @@ $aModule = array( 'en' => 'Provides a quick and easy integration with your Google Analytics account to your shop.', ), 'thumbnail' => 'picture.png', - 'version' => '3.0.0.2', + 'version' => '3.0.0.3', 'author' => 'D³ Data Development (Inh. Thomas Dartsch)', 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', @@ -69,4 +69,4 @@ $aModule = array( 'block'=>'head_css', 'file'=>'/views/blocks/layout/d3_base_googleanalytics.tpl'), ), -); \ No newline at end of file +); diff --git a/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php b/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php index 40c3b8f..2ec13e2 100644 --- a/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php +++ b/copy_this/modules/d3/d3_googleanalytics/models/d3_googleanalytics_update.php @@ -11,32 +11,47 @@ * http://www.shopmodule.com * * @copyright (C) D3 Data Development (Inh. Thomas Dartsch) - * @author D3 Data Development - Daniel Seifert - * @link http://www.oxidmodule.com + * @author D3 Data Development - Daniel Seifert + * @link http://www.oxidmodule.com */ - class d3_googleanalytics_update extends d3install_updatebase { public $sModKey = 'd3_googleanalytics'; + public $sModName = 'Google Analytics Schnittstelle'; - public $sModVersion = '3.0.0.2'; - public $sModRevision = '99'; - public $sBaseConf = 'WxUSlVXQ0ZjeG44Z3RyZWN3TlhqTFdlNVdJcWFVaDgwOTYwcUdOdHVycnFCRnJDQjBpTDhRMHhqRCt0U -jQrcldHdzArR0xMaGtNdTM2MFdRcTRNZ0tOQnFZWDJPckR1T3FTcmY5U0l6MjBrSmpMa0VkS2t0MXFGT -lVPdFVIMGpNSTNpcjV5ejBLR1hpVktaTHNtbnVZVzNqT3diUEFNRXpJUjNZTDg0SmZHYjlYYW5ZaXZPY -XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V -0tmeFpBS2hpZVFjc29qdFRiSm9UZEVkTnFsUXB3M292anJyVG5wUkd6bG5MVzR4NThFRE9TYjJYaStuR -3M9'; + + public $sModVersion = '3.0.0.3'; + + public $sModRevision = '100'; + + public $sBaseConf = << 'checkModCfgItemExist', - 'do' => 'updateModCfgItemExist'), - array('check' => 'checkContentGANoticeItemExist', - 'do' => 'updateContentGANoticeItemExist'), - array('check' => 'checkModCfgSameRevision', - 'do' => 'updateModCfgSameRevision'), + array( + 'check' => 'checkModCfgItemExist', + 'do' => 'updateModCfgItemExist' + ), + array( + 'check' => 'checkContentGANoticeItemExist', + 'do' => 'updateContentGANoticeItemExist' + ), + array( + 'check' => 'checkModCfgSameRevision', + 'do' => 'updateModCfgSameRevision' + ), ); protected $_aRefreshMetaModuleIds = array('d3_googleanalytics'); @@ -46,9 +61,8 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V */ public function checkModCfgItemExist() { - $blRet = FALSE; - foreach ($this->_getShopList() as $oShop) - { + $blRet = false; + foreach ($this->_getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxmodid' => $this->sModKey, @@ -58,8 +72,7 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V $blRet = $this->_checkTableItemNotExist('d3_cfg_mod', $aWhere); - if ($blRet) - { + if ($blRet) { return $blRet; } } @@ -72,12 +85,10 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V */ public function updateModCfgItemExist() { - $blRet = FALSE; + $blRet = false; - if ($this->checkModCfgItemExist()) - { - foreach ($this->_getShopList() as $oShop) - { + if ($this->checkModCfgItemExist()) { + foreach ($this->_getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxmodid' => $this->sModKey, @@ -85,68 +96,66 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V 'oxnewrevision' => $this->sModRevision, ); - if ($this->_checkTableItemNotExist('d3_cfg_mod', $aWhere)) - { + if ($this->_checkTableItemNotExist('d3_cfg_mod', $aWhere)) { // update don't use this property unset($aWhere['oxnewrevision']); $aInsertFields = array( 'OXID' => array( - 'content' => "md5('" . $this->sModKey . " " . $oShop->getId() . "')", - 'force_update' => false, + 'content' => "md5('" . $this->sModKey . " " . $oShop->getId() . "')", + 'force_update' => false, ), 'OXSHOPID' => array( - 'content' => "'" . $oShop->getId() . "'", - 'force_update' => false, + 'content' => "'" . $oShop->getId() . "'", + 'force_update' => false, ), 'OXMODID' => array( - 'content' => "'" . $this->sModKey . "'", - 'force_update' => TRUE, + 'content' => "'" . $this->sModKey . "'", + 'force_update' => true, ), 'OXNAME' => array( - 'content' => "'" . $this->sModName . "'", - 'force_update' => TRUE, + 'content' => "'" . $this->sModName . "'", + 'force_update' => true, ), 'OXACTIVE' => array( - 'content' => "0", - 'force_update' => FALSE, + 'content' => "0", + 'force_update' => false, ), 'OXBASECONFIG' => array( - 'content' => "'" . $this->sBaseConf . "'", - 'force_update' => TRUE, + 'content' => "'" . $this->sBaseConf . "'", + 'force_update' => true, ), 'OXINSTALLDATE' => array( - 'content' => "NOW()", - 'force_update' => TRUE, + 'content' => "NOW()", + 'force_update' => true, ), 'OXVERSION' => array( - 'content' => "'" . $this->sModVersion . "'", - 'force_update' => TRUE, + 'content' => "'" . $this->sModVersion . "'", + 'force_update' => true, ), 'OXSHOPVERSION' => array( - 'content' => "'" . oxRegistry::getConfig()->getEdition() . "'", - 'force_update' => TRUE, + 'content' => "'" . oxRegistry::getConfig()->getEdition() . "'", + 'force_update' => true, ), 'OXREQUIREMENTS' => array( - 'content' => "'" . $this->sRequirements . "'", - 'force_update' => TRUE, + 'content' => "'" . $this->sRequirements . "'", + 'force_update' => true, ), 'OXVALUE' => array( - 'content' => "'" . $this->sBaseValue . "'", - 'force_update' => FALSE, + 'content' => "'" . $this->sBaseValue . "'", + 'force_update' => false, ), 'OXNEWREVISION' => array( - 'content' => "'" . $this->sModRevision . "'", - 'force_update' => TRUE, + 'content' => "'" . $this->sModRevision . "'", + 'force_update' => true, ), ); $aRet = $this->_updateTableItem('d3_cfg_mod', $aInsertFields, $aWhere); $blRet = $aRet['blRet']; $this->_setActionLog('SQL', $aRet['sql'], __METHOD__); - $this->_setUpdateBreak(FALSE); + $this->_setUpdateBreak(false); - if ($this->getStepByStepMode()) - { + if ($this->getStepByStepMode()) { break; } } @@ -161,9 +170,8 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V */ public function checkContentGANoticeItemExist() { - $blRet = FALSE; - foreach ($this->_getShopList() as $oShop) - { + $blRet = false; + foreach ($this->_getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxloadid' => 'Analytics_Security_Informations', @@ -172,8 +180,7 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V $blRet = $this->_checkTableItemNotExist('oxcontents', $aWhere); - if ($blRet) - { + if ($blRet) { return $blRet; } } @@ -186,83 +193,80 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V */ public function updateContentGANoticeItemExist() { - $blRet = FALSE; + $blRet = false; - if ($this->checkContentGANoticeItemExist()) - { - foreach ($this->_getShopList() as $oShop) - { + if ($this->checkContentGANoticeItemExist()) { + foreach ($this->_getShopList() as $oShop) { /** @var $oShop oxshop */ $aWhere = array( 'oxloadid' => 'Analytics_Security_Informations', 'oxshopid' => $oShop->getId(), ); - if ($this->_checkTableItemNotExist('oxcontents', $aWhere)) - { + if ($this->_checkTableItemNotExist('oxcontents', $aWhere)) { $aInsertFields = array( 'OXID' => array( - 'content' => "md5(RAND())", - 'force_update' => FALSE, + 'content' => "md5(RAND())", + 'force_update' => false, ), 'OXLOADID' => array( - 'content' => "'Analytics_Security_Informations'", - 'force_update' => TRUE, + 'content' => "'Analytics_Security_Informations'", + 'force_update' => true, ), 'OXSHOPID' => array( - 'content' => "'" . $oShop->getId() . "'", - 'force_update' => TRUE, + 'content' => "'" . $oShop->getId() . "'", + 'force_update' => true, ), 'OXSNIPPET' => array( - 'content' => "'1'", - 'force_update' => FALSE, + 'content' => "'1'", + 'force_update' => false, ), 'OXTYPE' => array( - 'content' => "'0'", - 'force_update' => FALSE, + 'content' => "'0'", + 'force_update' => false, ), 'OXACTIVE' => array( - 'content' => "'1'", - 'force_update' => FALSE, + 'content' => "'1'", + 'force_update' => false, ), 'OXACTIVE_1' => array( - 'content' => "'1'", - 'force_update' => FALSE, + 'content' => "'1'", + 'force_update' => false, ), 'OXPOSITION' => array( - 'content' => "''", - 'force_update' => FALSE, + 'content' => "''", + 'force_update' => false, ), 'OXTITLE' => array( - 'content' => "'Analytics Datenschutz Information'", - 'force_update' => FALSE, + 'content' => "'Analytics Datenschutz Information'", + 'force_update' => false, ), 'OXCONTENT' => array( - 'content' => "'

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.

'", - 'force_update' => FALSE, + 'content' => "'

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.

'", + 'force_update' => false, ), 'OXCATID' => array( - 'content' => "''", - 'force_update' => FALSE, + 'content' => "''", + 'force_update' => false, ), 'OXFOLDER' => array( - 'content' => "'CMSFOLDER_USERINFO'", - 'force_update' => FALSE, + 'content' => "'CMSFOLDER_USERINFO'", + 'force_update' => false, ), ); $aRet = $this->_updateTableItem('oxcontents', $aInsertFields, $aWhere); $blRet = $aRet['blRet']; $this->_setActionLog('SQL', $aRet['sql'], __METHOD__); - $this->_setUpdateBreak(FALSE); + $this->_setUpdateBreak(false); - if ($this->getStepByStepMode()) - { + if ($this->getStepByStepMode()) { break; } } } } + return $blRet; } @@ -279,17 +283,16 @@ XJmQVVpcER0K1pXcUJRdjhOWFlFYi9jZUY1blN4cGhQdktNTTcrMTluRFF6MHZKWEVrUEw2czBuM1B0V */ public function updateModCfgSameRevision() { - $blRet = FALSE; + $blRet = false; - if ($this->checkModCfgSameRevision($this->sModKey)) - { + if ($this->checkModCfgSameRevision($this->sModKey)) { $aRet = $this->_updateModCfgSameRevision($this->sModKey); $this->_setActionLog('SQL', $aRet['sql'], __METHOD__); - $this->_setUpdateBreak(FALSE); + $this->_setUpdateBreak(false); $blRet = $aRet['blRet']; } return $blRet; } -} \ No newline at end of file +} diff --git a/setup+doku/changelog.txt b/setup+doku/changelog.txt index 602eb25..2bed666 100644 --- a/setup+doku/changelog.txt +++ b/setup+doku/changelog.txt @@ -1,3 +1,6 @@ +=== 3.0.0.2 => 3.0.0.3 === +- Umstellung auf teilautomatische Installation + === 3.0.0.0 => 3.1.0.0 === - Umstellung auf teilautomatische Installation - Übergabe der Steuer @@ -39,4 +42,4 @@ - Preise werden in Shophauptwährung übertragen - Templates für OXID 4.5.1 kompatibel -... \ No newline at end of file +... diff --git a/setup+doku/d3precheck.php b/setup+doku/d3precheck.php index 73dfc10..4f0cabc 100644 --- a/setup+doku/d3precheck.php +++ b/setup+doku/d3precheck.php @@ -1,102 +1,52 @@ - * @link http://www.oxidmodule.com - * @version 2.0 - */ -/** - * Alle Anforderungen sind über $this->_aCheck konfigurierbar. Manche Anforderungen haben dazu noch weitergehende - * Informationen. Die Struktur dieser Requirementbeschreibungen: - * - * array( - * 'blExec' => 1, // obligatorisch: 0 = keine Prüfung, 1 = Püfung wird ausgeführt - * 'aParams' => array(...), // optional, Inhalt ist von jeweiliger Prüfung abhängig - * ) - * - * "Desc1": Diese Struktur kann allein eine Bedingung beschreiben. Wenn mehrere dieser Bedingungen - * nötig sind (z.B. bei unterschiedlichen Bibliotheksanforderungen), kann diese Struktur als - * Arrayelemente auch mehrfach genannt werden (kaskadierbar). Grundsätzlich sind alle Requirements - * kaskadierbar, jedoch ergibt dies nicht bei allen Sinn. :) Eine Kaskadierung sieht so aus: - * - * array( - * array( - * 'blExec' => 1, - * ... - * ), - * array( - * 'blExec' => 1, - * ... - * ) - * ) - * - * Unbedingt zu vermeiden sind Änderungen in der Scriptlogik, da diese bei Updates nur schwer zu übernehmen sind. - */ - -class requcheck +class requConfig { - protected $_db = false; + public $sModName = 'D³ GoogleAnalytics'; - public $dbHost; + public $sModId = 'd3_googleanalytics'; - public $dbUser; + public $sModVersion = '3.0.0.3'; - public $dbPwd; + /********************** check configuration section ************************/ - public $dbName; - - protected $_sModName = 'D³ Google Analytics'; - - protected $_sModVersion = '3.0.0.X'; - - protected $_aCheck = array( + public $aCheck = array( // kleinste erlaubte PHP-Version 'hasMinPhpVersion' => array( 'blExec' => 0, 'aParams' => array( - '5.2.0' + 'version' => '5.2.0' ) ), + // größte erlaubte PHP-Version 'hasMaxPhpVersion' => array( - 'blExec' => 1, + 'blExec' => 0, 'aParams' => array( - '5.4.99' + 'version' => '5.4.200' ) ), - // PHP-Version zwischen 5.2 und 5.4 - 'hasPhp52to54' => array('blExec' => 1), - // PHP-Version ist 5.2 - 'hasPhp52' => array('blExec' => 0), - // PHP-Version ist 5.3 - 'hasPhp53' => array('blExec' => 0), - // PHP-Version ist 5.4 - 'hasPhp54' => array('blExec' => 0), - // benötigt Zend Optimizer (PHP 5.2) bzw. Zend Guard Loader (> PHP 5.2) - 'hasZendLoaderOptimizer' => array('blExec' => 1), - // benötigt IonCubeLoader - 'hasIonCubeLoader' => array('blExec' => 0), - // benötigt PHP-Extension (kaskadierbar (siehe "Desc1")) - 'hasExtension' => array( - array( - 'blExec' => 0, - 'aParams' => array( - 'curl' - ), - ), - array( - 'blExec' => 0, - 'aParams' => array( - 'soap' - ), - ), + + // PHP-Version zwischen 'from' und 'to' + 'hasFromToPhpVersion' => array( + 'blExec' => 1, + 'aParams' => array( + 'from' => '5.2.0', + 'to' => '5.4.200', + ) ), - // minimal benötigte Shopversion (editionsgetrennt) + + // benötigt Zend Optimizer (PHP 5.2) bzw. Zend Guard Loader (> PHP 5.2) + 'hasZendLoaderOptimizer' => array( + 'blExec' => 1, + ), + + // benötigt IonCubeLoader + 'hasIonCubeLoader' => array( + 'blExec' => 0, + ), + + // minimal benötigte Shopversion (editionsgetrennt), wird (sofern möglich) Remote aktualisiert 'hasMinShopVersion' => array( 'blExec' => 1, 'aParams' => array( @@ -105,16 +55,18 @@ class requcheck 'EE' => '5.0.0' ), ), - // maximal verwendbare Shopversion (editionsgetrennt) + + // maximal verwendbare Shopversion (editionsgetrennt), wird (sofern möglich) Remote aktualisiert 'hasMaxShopVersion' => array( - 'blExec' => 0, + 'blExec' => 1, 'aParams' => array( - 'PE' => '4.7.0', - 'CE' => '4.7.0', - 'EE' => '5.0.0' + 'PE' => '4.8.4', + 'CE' => '4.8.4', + 'EE' => '5.1.4' ), ), - // verfügbar für diese Shopeditionen + + // verfügbar für diese Shopeditionen, wird (sofern möglich) Remote aktualisiert 'isShopEdition' => array( 'blExec' => 1, 'aParams' => array( @@ -125,49 +77,106 @@ class requcheck ), ), ), - // benötigt Modul-Connector + + // benötigt Modul-Connector 'hasModCfg' => array('blExec' => 1), + // benötigt mindestens diese Erweiterungen / Version lt. d3_cfg_mod (kaskadierbar (siehe "Desc1")) 'hasMinModCfgVersion' => array( array( 'blExec' => 1, 'aParams' => array( - 'd3modcfg_lib', - 'Modul-Connector', - '3.9.0.0', + 'id' => 'd3modcfg_lib', + 'name' => 'Modul-Connector', + 'version' => '3.9.0.0', ), ), array( 'blExec' => 1, 'aParams' => array( - 'd3install_lib', - 'Installationsautomatik', - '2.4.0.0', + 'id' => 'd3install_lib', + 'name' => 'Installationsautomatik', + 'version' => '2.5.0.0', ), ), ), + // verwendbar bis zu diesen Erweiterungen / Version lt. d3_cfg_mod (kaskadierbar (siehe "Desc1")) 'hasMaxModCfgVersion' => array( array( 'blExec' => 0, 'aParams' => array( - 'd3modcfg_lib', - 'Modul-Connector', - '3.9.0.5' + 'id' => 'd3modcfg_lib', + 'name' => 'Modul-Connector', + 'version' => '3.9.0.5', ), ), ), ); +} - protected $_blGlobalResult = true; +/********* don't change content from here **********************/ + +date_default_timezone_set('Europe/Berlin'); + +/** + * Class requcheck + */ +class requCheck +{ + public $sVersion = '4.1'; + + protected $_db = false; + + public $dbHost; + + public $dbUser; + + public $dbPwd; + + public $dbName; + + /** @var requConfig */ + public $oConfig; + + /** @var requLayout */ + public $oLayout; + + protected $_sInFolderFileName = 'd3precheckinfolder.php'; + + /********************** functional section ************************/ + + public $blGlobalResult = true; + + /** + * + */ + public function __construct() + { + $this->oConfig = new requConfig(); + $this->oLayout = new requLayout($this, $this->oConfig); + $this->oRemote = new requRemote(); + } + + /** + * @param string $sName + * @param array $aArguments + */ + public function __call($sName, $aArguments) + { + $this->oLayout->{$sName}($aArguments); + } public function startCheck() { - $this->getHTMLHeader(); + $this->oLayout->getHTMLHeader(); - $this->_runThroughChecks($this->_aCheck); + $oCheckTransformation = new requTransformation($this); + $this->oConfig->aCheck = $oCheckTransformation->transformCheckList($this->oConfig->aCheck); - $this->getHTMLFooter(); + $this->_runThroughChecks($this->oConfig->aCheck); + + $this->oLayout->getHTMLFooter(); } /** @@ -193,454 +202,156 @@ class requcheck } /** - * @param $sCheckType - * @param $aConfiguration + * @param $sMethodName + * @param null $aArguments + * + * @return array */ - public function displayCheck($sCheckType, $aConfiguration) + public function checkInSubDirs($sMethodName, $aArguments = null) { - $sGenCheckType = preg_replace("@(\_[0-9]$)@", "", $sCheckType); + $sFolder = '.'; - if (method_exists($this, $sGenCheckType) && call_user_func(array($this, $sGenCheckType), $aConfiguration)) { - echo "
" . $this->translate($sCheckType, $aConfiguration) . "
"; - } elseif (method_exists($this, $sGenCheckType)) { - echo "
" . $this->translate($sCheckType, $aConfiguration) . "
"; - } else { - echo "
" . $this->translate($sCheckType, $aConfiguration) . " (" . $this->translate( - 'RequNotCheckable' - ) . ")
"; - } + $aCheckScripts = $this->_walkThroughDirs($sFolder); + $aReturn = $this->_checkScripts($aCheckScripts, $sMethodName, $aArguments); + + return $aReturn; } /** - * @return bool + * @param $sFolder + * + * @return array */ - public function hasMinPhpVersion() + protected function _walkThroughDirs($sFolder) { - $aArgs = func_get_args(); + $aIgnoreDirItems = array('.', '..'); + $aCheckScripts = array(); - if (version_compare(phpversion(), $aArgs[0]['aParams'][0], '>=')) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasPhp52to54() - { - if ((version_compare(phpversion(), '5.2.0', '>=')) && (version_compare(phpversion(), '5.4.900', '<'))) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasPhp52() - { - if ((version_compare(phpversion(), '5.2.0', '>=')) && (version_compare(phpversion(), '5.2.900', '<'))) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasPhp53() - { - if ((version_compare(phpversion(), '5.3.0', '>=')) && (version_compare(phpversion(), '5.3.999', '<'))) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasPhp54() - { - if ((version_compare(phpversion(), '5.4.0', '>=')) && (version_compare(phpversion(), '5.4.999', '<'))) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasMaxPhpVersion() - { - $aArgs = func_get_args(); - - if (version_compare(phpversion(), $aArgs[0]['aParams'][0], '<=')) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasExtension() - { - $aArgs = func_get_args(); - - if (extension_loaded($aArgs[0]['aParams'][0])) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasMinShopVersion() - { - if ($this->_getDb()) { - $aArgs = func_get_args(); - $sField = 'oxversion'; - $sSelect = "SELECT " . $sField . " FROM oxshops WHERE 1 ORDER BY oxversion ASC LIMIT 1"; - $rResult = mysql_query($sSelect, $this->_getDb()); - $oResult = mysql_fetch_object($rResult); - - $oEditionResult = $this->_getShopEdition(); - $sEdition = strtoupper($oEditionResult->oxedition); - - $aArgs[0]['aParams'] = $aArgs[0]['aParams'][$sEdition]; - - if (version_compare($oResult->oxversion, $aArgs[0]['aParams'], '>=')) { - return true; - } - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function isShopEdition() - { - if ($this->_getDb()) { - $aArgs = func_get_args(); - $oResult = $this->_getShopEdition(); - - if (in_array(strtoupper($oResult->oxedition), $aArgs[0]['aParams'][0])) { - $aArgs[0]['aParams'][0] = strtoupper($oResult->oxedition); - - return true; - } - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool|object|stdClass - */ - protected function _getShopEdition() - { - if ($this->_getDb()) { - $sField = 'oxedition'; - $sSelect = "SELECT " . $sField . " FROM oxshops WHERE 1 LIMIT 1"; - $rResult = mysql_query($sSelect, $this->_getDb()); - $oResult = mysql_fetch_object($rResult); - - return $oResult; - } - - return false; - } - - /** - * @return bool - */ - public function hasMaxShopVersion() - { - if ($this->_getDb()) { - $aArgs = func_get_args(); - $sField = 'oxversion'; - $sSelect = "SELECT " . $sField . " FROM oxshops WHERE 1 ORDER BY oxversion DESC LIMIT 1"; - $rResult = mysql_query($sSelect, $this->_getDb()); - $oResult = mysql_fetch_object($rResult); - - $oEditionResult = $this->_getShopEdition(); - $sEdition = strtoupper($oEditionResult->oxedition); - - $aArgs[0]['aParams'] = $aArgs[0]['aParams'][$sEdition]; - - if (version_compare($oResult->oxversion, $aArgs[0]['aParams'], '<=')) { - return true; - } - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasModCfg() - { - if ($this->_getDb()) { - $oResult = new stdClass(); - $sModId = 'd3modcfg_lib'; - $sSelect = "SELECT 1 as result FROM d3_cfg_mod WHERE oxmodid = '" . $sModId . "' LIMIT 1"; - $rResult = mysql_query($sSelect, $this->_getDb()); - if (is_resource($rResult)) { - $oResult = mysql_fetch_object($rResult); - - if ($oResult->result) { - return true; + /** @var SplFileInfo $oFileInfo */ + foreach (new RecursiveDirectoryIterator($sFolder) AS $oFileInfo) { + if (!in_array($oFileInfo->getFileName(), $aIgnoreDirItems) && $oFileInfo->isDir()) { + $aCheckScripts = array_merge($aCheckScripts, $this->_walkThroughDirs($oFileInfo->getRealPath())); + } elseif ($oFileInfo->isFile()) { + if (strtolower($oFileInfo->getFilename()) == $this->_sInFolderFileName) { + $aCheckScripts[] = str_replace('\\', '/', $oFileInfo->getRealPath()); } } } - $this->_blGlobalResult = false; - - return false; + return $aCheckScripts; } /** - * @return bool - */ - public function hasMinModCfgVersion() - { - if ($this->_getDb()) { - $aArgs = func_get_args(); - $sSelect = "SELECT IF (INET_ATON(oxversion) >= INET_ATON('".$aArgs[0]['aParams'][2]."'), 1, 0) AS result - FROM d3_cfg_mod WHERE - oxmodid = '" . $aArgs[0]['aParams'][0] . "' AND - oxversion != 'basic' - ORDER BY oxversion ASC LIMIT 1"; - - $rResult = mysql_query($sSelect, $this->_getDb()); - $aResult = mysql_fetch_assoc($rResult); - - if (!(int) $aResult['result']) - { - $this->_blGlobalResult = false; - } - - return (int) $aResult['result']; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasMaxModCfgVersion() - { - if ($this->_getDb()) { - $aArgs = func_get_args(); - $sSelect = "SELECT - IF (INET_ATON(oxversion) <= INET_ATON('".$aArgs[0]['aParams'][2]."'), 1, 0) AS result - FROM d3_cfg_mod WHERE - oxmodid = '" . $aArgs[0]['aParams'][0] . "' AND - oxversion != 'basic' - ORDER BY oxversion ASC LIMIT 1"; - - $rResult = mysql_query($sSelect, $this->_getDb()); - $aResult = mysql_fetch_assoc($rResult); - - if (!(int) $aResult['result']) - { - $this->_blGlobalResult = false; - } - - return (int) $aResult['result']; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasZendLoaderOptimizer() - { - if (version_compare(phpversion(), '5.2.0', '>=') && version_compare( - phpversion(), - '5.2.900', - '<' - ) && function_exists('zend_optimizer_version') - ) { - return true; - } elseif (version_compare(phpversion(), '5.3.0', '>=') && version_compare( - phpversion(), - '5.4.900', - '<' - ) && function_exists('zend_loader_version') - ) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @return bool - */ - public function hasIonCubeLoader() - { - if (function_exists('ioncube_loader_version')) { - return true; - } - - $this->_blGlobalResult = false; - - return false; - } - - /** - * @param $sIdent - * @param array $aConfiguration + * @param $aScriptList + * @param $sMethodName + * @param $aArguments * - * @return mixed|string + * @return array */ - public function translate($sIdent, $aConfiguration = array()) + protected function _checkScripts($aScriptList, $sMethodName, $aArguments) { - $sGenIdent = preg_replace("@(\_[0-9]$)@", "", $sIdent); - $aTransl = array( - 'de' => array( - 'RequCheck' => 'Mindestanforderungsprüfung', - 'ExecNotice' => 'Führen Sie diese Prüfung immer aus dem Stammverzeichnis Ihres Shops aus. Nur dann können die Prüfungen erfolgreich durchgeführt werden.', - 'RequSucc' => 'Bedingung erfüllt', - 'RequNotSucc' => 'Bedingung nicht erfüllt', - 'RequNotCheckable' => 'Bedingung nicht prüfbar', - 'hasMinPhpVersion' => 'mindestens PHP Version %s', - 'hasMaxPhpVersion' => 'maximal PHP Version %s', - 'hasPhp52to54' => 'Server verwendet PHP 5.2, 5.3 oder 5.4', - 'hasPhp52' => 'Server verwendet PHP 5.2', - 'hasPhp53' => 'Server verwendet PHP 5.3', - 'hasPhp54' => 'Server verwendet PHP 5.4', - 'hasSoap' => 'SOAP-Erweiterung verfügbar', - 'hasCurl' => 'Curl-Erweiterung verfügbar', - 'hasExtension' => '%s-Erweiterung verfügbar', - 'hasMinShopVersion' => 'mindestens Shop Version %s', - 'hasMaxShopVersion' => 'maximal Shop Version %s', - 'hasMinModCfgVersion' => 'ModCfg-Eintrag "%s" (%s) mit mindestens Version %s', - 'hasMaxModCfgVersion' => 'ModCfg-Eintrag "%s" (%s) mit maximal Version %s', - 'hasModCfg' => 'Modul-Connector installiert', - 'isShopEdition' => 'ist Shopedition %s', - 'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) oder Zend Guard Loader (PHP 5.3, 5.4) installiert **', - 'hasIonCubeLoader' => 'ionCube loader installiert', - 'globalSuccess' => 'Die Prüfung war erfolgreich. Sie können das Modul installieren.*

', - 'globalNotSuccess' => 'Die Prüfung war nicht erfolgreich. Bitte kontrollieren Sie die rot markierten Bedingungen.

', - 'deleteFile1' => 'Löschen Sie diese Datei nach der Verwendung bitte unbedingt wieder von Ihrem Server! Klicken Sie hier, um diese Datei zu löschen.', - 'showPhpInfo' => 'PHPinfo anzeigen', - 'dependentoffurther' => '* abhängig von ungeprüften Voraussetzungen', - 'oneandonedescription' => '** geprüft wurde das Ausführungsverzeichnis, providerabhängig müssen Unterverzeichnisse separat geprüft werden (z.B. bei 1&1)', - 'or' => ' oder ', - ), - 'en' => array( - 'RequCheck' => 'Requirement check', - 'ExecNotice' => 'Execute this check script in the root directory of your shop. In this case only checks can executed succesfully.', - 'RequSucc' => 'condition is fulfilled', - 'RequNotSucc' => 'condition isn\'t fulfilled', - 'RequNotCheckable' => 'condition isn\'t checkable', - 'hasMinPhpVersion' => 'at least PHP version %s', - 'hasMaxPhpVersion' => 'not more than PHP version %s', - 'hasPhp52to54' => 'server use PHP 5.2, 5.3 or 5.4', - 'hasPhp52' => 'server use PHP 5.2', - 'hasPhp53' => 'server use PHP 5.3', - 'hasPhp54' => 'server use PHP 5.4', - 'hasSoap' => 'SOAP extension available', - 'hasCurl' => 'curl extension available', - 'hasExtension' => '%s extension is available', - 'hasMinShopVersion' => 'at least shop version %s', - 'hasMaxShopVersion' => 'not more than shop version %s', - 'hasMinModCfgVersion' => 'ModCfg item "%s" (%s) has at least version %s', - 'hasMaxModCfgVersion' => 'ModCfg item "%s" (%s) has not more than version %s', - 'hasModCfg' => 'Module Connector installed', - 'isShopEdition' => 'shop edition is %s', - 'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) or Zend Guard Loader (PHP 5.3, 5.4) installed **', - 'hasIonCubeLoader' => 'ionCube loader installed', - 'globalSuccess' => 'The test was successful. Your server is ready for installing the module.*

', - 'globalNotSuccess' => 'The test wasn\'t successfull. Please check the red marked conditions.

', - 'deleteFile1' => 'Please delete this file after use on your server! Click here, to delete this file.', - 'showPhpInfo' => 'show PHPinfo', - 'dependentoffurther' => '* dependent of further unchecked conditions', - 'oneandonedescription' => '** this check use execution directory only, provider dependend subdirectories have to check separately (e.g. at 1&1)', - 'or' => ' or ', - ), - ); + $aReturn = array(); - if (isset($aConfiguration['aParams']) && is_array($aConfiguration['aParams'])) { - array_walk($aConfiguration['aParams'], array($this, 'aTos'), $sIdent); + foreach ($aScriptList as $sScriptPath) { + $sUrl = $this->_getFolderCheckUrl( + $sScriptPath, + $sMethodName, + $aArguments + ); + + $aReturn[$this->getBasePath($sScriptPath)] = unserialize(file_get_contents($sUrl)); } - if (($sTranslation = $aTransl[$this->_getLang()][$sGenIdent])) { - if (isset($aConfiguration['aParams'])) { - return vsprintf($sTranslation, $aConfiguration['aParams']); - } else { - return $sTranslation; + return $aReturn; + } + + /** + * @param $sScriptPath + * @param $sMethodName + * @param $aArguments + * + * @return string + */ + protected function _getFolderCheckUrl($sScriptPath, $sMethodName, $aArguments) + { + $sBaseDir = str_replace( + array(basename($_SERVER['SCRIPT_FILENAME']), '\\'), + array('', '/'), + realpath($_SERVER['SCRIPT_FILENAME']) + ); + $sUrlAdd = str_replace($sBaseDir, '', $sScriptPath); + $sBaseUrl = 'http://' . $_SERVER['HTTP_HOST'] . str_replace( + basename($_SERVER['SCRIPT_NAME']), + '', + $_SERVER['SCRIPT_NAME'] + ); + + $sUrl = $sBaseUrl . $sUrlAdd . '?fnc=' . $sMethodName . '¶ms=' . urlencode(serialize($aArguments)); + + return $sUrl; + } + + /** + * @param null $sFolder + * + * @return mixed + */ + public function getBasePath($sFolder = null) + { + if (!$sFolder) { + $sFolder = $_SERVER['SCRIPT_FILENAME']; + } + + $sScriptFileName = str_replace('\\', '/', realpath($_SERVER['SCRIPT_FILENAME'])); + $sSearch = substr(str_replace(basename($sScriptFileName), '', $sScriptFileName), 0, -1); + + $sFolder = str_replace('\\', '/', realpath($sFolder)); + + return str_replace(array(basename($sFolder), $sSearch), '', $sFolder); + } + + /** + * @param $aResult + * + * @return bool + */ + protected function _hasFalseInResult($aResult) + { + if (is_array($aResult)) { + foreach ($aResult as $blResult) { + if (!$blResult) { + $this->blGlobalResult = false; + + return true; + } } + + return false; } else { - return $sGenIdent; + if (!$aResult) { + $this->blGlobalResult = false; + } + + return !$aResult; } } + /********************** conversion function section ************************/ + /** * @param $mParam */ - protected function aTos(&$mParam) + public function aTos(&$mParam) { if (is_array($mParam)) { - $mParam = implode($this->translate('or'), $mParam); + $mParam = implode($this->oLayout->translate('or'), $mParam); } } /** * @return string */ - protected function _getLang() + public function getLang() { if (isset($_REQUEST['lang'])) { return strtolower($_REQUEST['lang']); @@ -652,7 +363,7 @@ class requcheck /** * @return bool|resource */ - protected function _getDb() + public function getDb() { if (!$this->_db) { if (file_exists('config.inc.php')) { @@ -688,12 +399,104 @@ class requcheck ); } + /********************** layout function section ************************/ + + public function deleteme() + { + $sFolder = '.'; + + $this->_checkDelFilesInDir($sFolder); + $this->_delFile($_SERVER['SCRIPT_FILENAME']); + + if (is_file($_SERVER['SCRIPT_FILENAME'])) { + exit($this->oLayout->translate('unableDeleteFile')); + } else { + exit($this->oLayout->translate('goodBye')); + } + } + + /** + * @param $sFolder + */ + protected function _checkDelFilesInDir($sFolder) + { + $aIgnoreDirItems = array('.', '..'); + + /** @var SplFileInfo $oFileInfo */ + foreach (new RecursiveDirectoryIterator($sFolder) as $oFileInfo) { + if (!in_array($oFileInfo->getFileName(), $aIgnoreDirItems) && $oFileInfo->isDir()) { + $this->_checkDelFilesInDir($oFileInfo->getRealPath()); + } elseif ($oFileInfo->isFile()) { + if (strtolower($oFileInfo->getFilename()) == $this->_sInFolderFileName) { + $this->_delFile(str_replace('\\', '/', $oFileInfo->getRealPath())); + } + } + } + } + + /** + * @param $sPath + */ + protected function _delFile($sPath) + { + unlink($sPath); + } + + /** + * @param $sCheckType + * @param $aConfiguration + */ + public function displayCheck($sCheckType, &$aConfiguration) + { + $sGenCheckType = preg_replace("@(\_[0-9]$)@", "", $sCheckType); + $oTests = new requTests($this, $this->oConfig, $this->getDb(), $this->oRemote); + + if (method_exists($oTests, $sGenCheckType)) { + $aResult = $oTests->{$sGenCheckType}($aConfiguration); + $sElementId = (md5($sGenCheckType . serialize($aConfiguration))); + + if ($this->_hasFalseInResult($aResult)) { + $this->oLayout->getNoSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration); + } else { + $this->oLayout->getSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration); + } + } else { + $this->oLayout->getUncheckableItem($sCheckType, $aConfiguration); + $this->blGlobalResult = false; + } + } + + public function showinfo() + { + phpinfo(); + } +} + +/** + * Class requLayout + */ +class requLayout +{ + public $oBase; + + public $oConfig; + + /** + * @param requCheck $oBase + * @param requConfig $oConfig + */ + public function __construct(requCheck $oBase, requConfig $oConfig) + { + $this->oBase = $oBase; + $this->oConfig = $oConfig; + } + public function getHTMLHeader() { $sScriptName = $_SERVER['SCRIPT_NAME']; $sTranslRequCheck = $this->translate('RequCheck'); - $sModName = $this->_sModName; - $sModVersion = $this->_sModVersion; + $sModName = $this->oConfig->sModName; + $sModVersion = $this->oConfig->sModVersion; echo <<< EOT @@ -711,7 +514,8 @@ class requcheck .box_warning { text-align: center; background-color: DarkRed; border: 1px solid black; color: white; font-weight: normal; padding: 1px;} .box_ok { text-align: center; background-color: DarkGreen; border: 1px solid black; color: white; font-weight: normal; padding: 1px;} .box_warning a, .box_ok a {font-weight: bold; color: white;} - .squ_bullet {height: 10px; width: 10px; border: 1px solid black; margin: 0px 5px; display: inline-block; margin-left: 50px;} + .squ_bullet {float: left; height: 10px; width: 10px; border: 1px solid black; margin: 0 5px 0 50px; display: inline-block;} + .squ_toggle {font-size: 15px; line-height: 0.5; cursor: pointer; float: left; height: 10px; width: 9px; padding-left: 1px; border: 1px solid black; margin: 0 5px 0 3px; display: inline-block;} --> @@ -719,8 +523,8 @@ class requcheck EOT; - echo "

" . $this->translate('RequCheck') . ' "' . $this->_sModName . ' ' . $sModVersion . '"

'; - echo '

' . $this->translate('ExecNotice') . '

'; + echo "

" . $this->translate('RequCheck') . ' "' . $this->oConfig->sModName . ' ' . $sModVersion . '"

'; + echo '

' . $this->translate('ExecNotice') . '

' . PHP_EOL; return; } @@ -730,21 +534,17 @@ EOT; $sScriptName = $_SERVER['SCRIPT_NAME']; $sTranslShopPhpInfo = $this->translate('showPhpInfo'); $sTranslDependent = $this->translate('dependentoffurther'); - $sOneAndOneNote = $this->translate('oneandonedescription'); - if ($this->_blGlobalResult) { - echo '

' . $this->translate('globalSuccess') . '' . $this->translate( - 'deleteFile1' - ) . $sScriptName . $this->translate('deleteFile2') . '

'; + if ($this->oBase->blGlobalResult) { + echo '

' . $this->translate('globalSuccess') . '' . + $this->translate('deleteFile1') . $sScriptName . $this->translate('deleteFile2') . '

'; } else { - echo '

' . $this->translate('globalNotSuccess') . '' . $this->translate( - 'deleteFile1' - ) . $sScriptName . $this->translate('deleteFile2') . '

'; + echo '

' . $this->translate('globalNotSuccess') . '' . + $this->translate('deleteFile1') . $sScriptName . $this->translate('deleteFile2') . '

'; } echo <<< EOT - $sTranslDependent
- $sOneAndOneNote
+ $sTranslDependent

$sTranslShopPhpInfo @@ -758,25 +558,128 @@ EOT; return; } - public function deleteme() + /** + * @param $aResult + * @param $sElementId + * @param $sCheckType + * @param $aConfiguration + */ + public function getNoSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration) { - unlink($_SERVER['SCRIPT_FILENAME']); + echo "

" . $this->_addToggleScript($aResult, $sElementId) . + $this->translate($sCheckType, $aConfiguration) . "
" . PHP_EOL; - if (is_file($_SERVER['SCRIPT_FILENAME'])) { - exit('Datei konnte nicht gelöscht werden. Bitte löschen Sie diese manuell.'); - } else { - exit('Auf Wiedersehen.'); + $this->getSubDirItems($aResult, $sElementId); + } + + /** + * @param $aResult + * @param $sElementId + * @param $sCheckType + * @param $aConfiguration + */ + public function getSuccessItem($aResult, $sElementId, $sCheckType, $aConfiguration) + { + echo "
" . + $this->_addToggleScript($aResult, $sElementId) . + $this->translate($sCheckType, $aConfiguration) . "
" . PHP_EOL; + + $this->getSubDirItems($aResult, $sElementId); + } + + /** + * @param $sCheckType + * @param $aConfiguration + */ + public function getUncheckableItem($sCheckType, $aConfiguration) + { + echo "
" . + $this->translate($sCheckType, $aConfiguration) . " (" . $this->translate('RequNotCheckable') . ")
"; + } + + /** + * @param $aResult + * @param $sElementId + */ + public function getSubDirItems($aResult, $sElementId) + { + if (is_array($aResult) && count($aResult)) { + echo "" . PHP_EOL; } } - public function showinfo() + /** + * @param $aResult + * @param $sElementId + * + * @return string + */ + protected function _addToggleScript($aResult, $sElementId) { - phpinfo(); + if (is_array($aResult) && count($aResult)) { + $sScript = + "
+
"; + } else { + $sScript = ""; + } + + return $sScript; + } + + /** + * @param $sIdent + * @param array $aConfiguration + * + * @return mixed|string + */ + public function translate($sIdent, $aConfiguration = array()) + { + $sGenIdent = preg_replace("@(\_[0-9]$)@", "", $sIdent); + $oTranslations = new requTranslations(); + $aTransl = $oTranslations->getTranslations(); + + if (isset($aConfiguration['aParams']) && is_array($aConfiguration['aParams'])) { + array_walk($aConfiguration['aParams'], array($this->oBase, 'aTos'), $sIdent); + } + + if (($sTranslation = $aTransl[$this->oBase->getLang()][$sGenIdent])) { + if (isset($aConfiguration['aParams'])) { + return vsprintf($sTranslation, $aConfiguration['aParams']); + } else { + return $sTranslation; + } + } else { + return $sGenIdent; + } } public function getPngButton() { - $sImg = "iVBORw0KGgoAAAANSUhEUgAABDgAAAAWCAYAAAAl+SzaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABMpJREFUeNrs3Y1O4zgUhuFY4hbb2ZthRjtczOz0Ght7cZwfQ5u2E4K0a55XiNDUXyWcT+ZwfGyHw+HQvZI6AACAT+J0OgW9AAAAtnA8Hh/JWYSnbkxuvAYeeg0AAAAAAPynuJevOB6P+ZKe6sYvLy96DgAA7M7z87NOAAAAm7iVq8gxRs5p5CTH03Tz758/uzAUc7x+Hy4pf71ex9fDj2leyxLG1vnNELpmdJPqo21a7afy+/MIj/AIj7zVhS/seWPD4zoAAIAtxJhW44+cy/jx/ftw/2kRxDEQSd0Uraah/RKVlLfK+/kDS0T7eieGZnTdA33QfeF+CpFHeIRHeORSF1Lw3I0Nd3UAAACbEhwprscfadnma05wpL7v8v0Sh4QiLimREqWEt7mSmK9xnLlrSBe6fdq02k9D1oxHeIRHeORCFz13Y8NtHQAAwNYER+zX44+q3Zzg6GOcbw6haqhmXG5MvuQPiw3q9mrTaj/xCI/wCI9c13juxoY/0wEAANxNcPTxbvzxLsHRd7mEo8y+pJIFCWEupy2XMTcSxjKQUMqSl1mb/79urzbN9hOP8AiP8MgV3Zf2vLHhIR0AAMBWcr5iNf6o4owlwdGPCY68hiUsZbRh2DGsWkz7/mUaVl83oxu3R/xwm1b7KfEIj/AIj1zRDfc9d2PDTR0AAMA2hgqOtfijWqOybDKaExzj6pVpzWyYG04zdGn5vByohVC924ou7NSm3X7iER7hER55r/P3w9jw6NgAAADwp+SCjPX442oFR5URWeaY5pKPsmNpmI+SnctN5zKRVnR7tWm1nwKP8AiP8MiKznM3NqzrAAAANic4zuf1+ONaBce576dQZAhMplPepvWzYdn6vSoBCUNJSCkPaUS3V5tm+4lHeIRHeORS97U9b2x4RAcAALA5wZEPRVmJP1K4ckxsPJ/H9SzjOvpuEc11INP805gtWQ6Ka0gXdmrTaD8NGTMe4REe4ZFrOs/d2HBLBwAAsJHzuV+PP6qJlKqCI3ZdvaZliVGm3MiYKZm3EJuvXera0aW0T5tG+2kKYHmER3iER2pdU8/Pc/+0sQEAAGALec/Q9fjjSgVH358v/zFZJNXy6ukYuFQqREZBK7q0U5tm+4lHeIRHeOSqLnnuxoa7YwMAAMAWzvF8M/64THDEOB+xEsYIJlV7d5R1tdNGHsMnlvW2I63opirrj7Zptp86HuERHuGRS92X9ryx4cGxAQAAYBv5mNi1+OP6HhzDMbEVad5JrKoxrdbfzlFa155urzYt9lPgER7hER658bt47saGVR0AAMA28ikqj8QfVQVH3705ceU1KEm5qmM+0y7N8crwOqY5a5Ja0sWd2jTaTykmHuERHuGRS52/H8aGuzoAAIBtxCGIWok/riU4Yl8EZVOwEpSUG9X62XmRS1w+oV5z24RurzaN9tO0QR6P8AiP8MgbnedubLitAwAA2EqfExo34o+LBMevX7+6b9/+KkFItYZlmI0tP1XBS3UE3LhNeju6vdq02k8dj/AIj/DIhW48W8NzNzbcHBsAAAC2MGypsRJ//P7n9/J/yOFwGO6fTie9BgAAPgvrVAAAwFZuzpgcj8fh+jQGHGm6AQAAsDcmUgAAwFYezFeEfwUYAAoCUXB0RZrTAAAAAElFTkSuQmCC"; + $sImg = + "iVBORw0KGgoAAAANSUhEUgAABDgAAAAWCAYAAAAl+SzaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABMpJREFUeNrs3Y1O4zgUhuFY4hbb2ZthRjtczOz0Ght7cZwfQ5u2E4K0a55XiNDUXyWcT+ZwfGyHw+HQvZI6AACAT+J0OgW9AAAAtnA8Hh/JWYSnbkxuvAYeeg0AAAAAAPynuJevOB6P+ZKe6sYvLy96DgAA7M7z87NOAAAAm7iVq8gxRs5p5CTH03Tz758/uzAUc7x+Hy4pf71ex9fDj2leyxLG1vnNELpmdJPqo21a7afy+/MIj/AIj7zVhS/seWPD4zoAAIAtxJhW44+cy/jx/ftw/2kRxDEQSd0Uraah/RKVlLfK+/kDS0T7eieGZnTdA33QfeF+CpFHeIRHeORSF1Lw3I0Nd3UAAACbEhwprscfadnma05wpL7v8v0Sh4QiLimREqWEt7mSmK9xnLlrSBe6fdq02k9D1oxHeIRHeORCFz13Y8NtHQAAwNYER+zX44+q3Zzg6GOcbw6haqhmXG5MvuQPiw3q9mrTaj/xCI/wCI9c13juxoY/0wEAANxNcPTxbvzxLsHRd7mEo8y+pJIFCWEupy2XMTcSxjKQUMqSl1mb/79urzbN9hOP8AiP8MgV3Zf2vLHhIR0AAMBWcr5iNf6o4owlwdGPCY68hiUsZbRh2DGsWkz7/mUaVl83oxu3R/xwm1b7KfEIj/AIj1zRDfc9d2PDTR0AAMA2hgqOtfijWqOybDKaExzj6pVpzWyYG04zdGn5vByohVC924ou7NSm3X7iER7hER55r/P3w9jw6NgAAADwp+SCjPX442oFR5URWeaY5pKPsmNpmI+SnctN5zKRVnR7tWm1nwKP8AiP8MiKznM3NqzrAAAANic4zuf1+ONaBce576dQZAhMplPepvWzYdn6vSoBCUNJSCkPaUS3V5tm+4lHeIRHeORS97U9b2x4RAcAALA5wZEPRVmJP1K4ckxsPJ/H9SzjOvpuEc11INP805gtWQ6Ka0gXdmrTaD8NGTMe4REe4ZFrOs/d2HBLBwAAsJHzuV+PP6qJlKqCI3ZdvaZliVGm3MiYKZm3EJuvXera0aW0T5tG+2kKYHmER3iER2pdU8/Pc/+0sQEAAGALec/Q9fjjSgVH358v/zFZJNXy6ukYuFQqREZBK7q0U5tm+4lHeIRHeOSqLnnuxoa7YwMAAMAWzvF8M/64THDEOB+xEsYIJlV7d5R1tdNGHsMnlvW2I63opirrj7Zptp86HuERHuGRS92X9ryx4cGxAQAAYBv5mNi1+OP6HhzDMbEVad5JrKoxrdbfzlFa155urzYt9lPgER7hER658bt47saGVR0AAMA28ikqj8QfVQVH3705ceU1KEm5qmM+0y7N8crwOqY5a5Ja0sWd2jTaTykmHuERHuGRS52/H8aGuzoAAIBtxCGIWok/riU4Yl8EZVOwEpSUG9X62XmRS1w+oV5z24RurzaN9tO0QR6P8AiP8MgbnedubLitAwAA2EqfExo34o+LBMevX7+6b9/+KkFItYZlmI0tP1XBS3UE3LhNeju6vdq02k8dj/AIj/DIhW48W8NzNzbcHBsAAAC2MGypsRJ//P7n9/J/yOFwGO6fTie9BgAAPgvrVAAAwFZuzpgcj8fh+jQGHGm6AQAAsDcmUgAAwFYezFeEfwUYAAoCUXB0RZrTAAAAAElFTkSuQmCC"; header("Content-type: image/png"); echo base64_decode($sImg); exit; @@ -784,7 +687,8 @@ EOT; public function getPngLogo() { - $sImg = "iVBORw0KGgoAAAANSUhEUgAAADMAAAA0CAYAAAAnpACSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAEIxJREFUeNq8Wgl4VNXZfu+dLZkkk5BA9kACYQlB2aIga6myuIEtFX+kLW1BJVT/akVrRds+rVqRX2lLRSsal5/nUaCgtmhi8BeaUhAl7EYTIWyGQPZlMsnM3Lnn/865dzJ3biaLVnsfDpk59yzf++3fOSMxxvANPlZqUdQs1FRqXmq+Ac7NpbaI2jxqQ6nZqDVR+z9qr1H71DxB+nfBPHYYSHUCK8fATl+HUZtK7Wpqo1SGeZ0BQCEYFolQETSrhDJ6d4rax9Q+pFa18SQ8HX6aHAcszUUS9T3U0IU1710ASqiddwNuBciMARbSDjcQtDQnnnj7HNYuGvY1gqHnW9RWBBi+f7kT+LwVKG8AjlDj38+0AR1EiJ1kk0XEZFAbO4gQJwOj44F0+m6TsYvWKKKWQOQUvVwFPHCAxNBlZDs1psk30wXsv4XWi8VvqefXXwcYWg6FRPy8racBzsXjjQxtXim4sra5bKCG6X3QCLOR4lxBwGakS1g+ChhORN5FcttWpSumpCunZADEH5L2iATa71bAaUUW9XzxVcEs4yCq2zD9qaMML1QQXQGdaMmwYW8PM41RQxwvmgu0+yU8Qap7uUMbN59UykUKXF4P0J5hgD4gi5qTjuW6DQkDHehDfMNvLnbgvp/vV7GdpKEGdA5aTMRiAIAQDj6HJHR7rgyHBc+T/a16jaQzNFbYB0FDXa0HC0a+QSrrD82J1qj3G73NQJ6buTT+eppdf+cehuauCCCCLDeDkcwAWM8xjA+T8JcKxp3FKu4oFGLUOZJEpyJNIqKfpP4F/kBI9bLIWUxIErPLvozNFLb5sOmRgwwbj6kaMbIUrjJMJzIIRooAUOpNzwzdAcMX+hfvlFC6UEaCQ8K0N4FGrzbVQuM+InuZNBjruOcLzpL7AbLSr2LT0lIVG8tpBZnpxDOtwfgX4X2snz5z4y8swaYRfWM2+fhkaS/3gotyqE/RVGnrAgHkz6daQ0D6A8Mlsvm24gDerSYgNhaZiP4avvq4giFCgkdJzZa+MAv442zCQxby9hmgK4C7c+MxZCBgZtJam24tVvBmlS4RhoERaH6nRhpvkg4FKfipKXrj32nPjy+p+NsZ9d4WL16noPvTu/OBuSSt/z1BaUCNoPN2c7phfhJoqbLfk1qVconwEUw3DEm3L1Xq3W0x9Ix0TDLnHTpwzZ5W5MsYP1gCqTSsxN5jFK+KTgbweiW1ChXzhksoXmh7lkx11Vvz8fxsCsaXOsVKI/sD84t3z6pYu5fkaZdCXJUkLSbQd56aWCQz5ZLJ57Juwn3csFV9jaDDCeoEfX+owIbceGmT3qseqmOri44oWjam8vmWoMt4iYJk/Pb5WPdpi/h+vC8wszwKHrpzt08zRE4Ql4LEwqL39httGJckD8in8yleUhs7sfVsG8MFN0PJ2QB2nAp0A/RrXmzrU+VK2YOTrWlXJEmr7y2w4C0ac90wGQ8UWPmwe1+pCCg/GmvZnO7EOovmPZ19gSn8w2E/LraomlRUg6fSmc0lMi1NRopTmjCAeB+UFN80YfQgiUeGoSvzLXMrm9nsxw76sOWYQvmbirxEy3i3j5Vtr1Jqbx1lXbBhtq3wd9Nsi2JteIfmPPer/b53HCKuWZafa2dYuduLD74XtYHo2UKdDeY4c2t1K9s2qsgj7E8I3Kw11AZFEYdXRlOKIZEp4tzsHT4Rdny6vrtINdq8DA76nEBjaygtSaIi4Hu5FhSfU9FFBs6Xeusm+xKyka1PH/LjUJ2KN25w8PlLlhd3bR8WL2Goy4qV4yxxtxd72/laL893pNK0R4/Vq6t/VOLF0Ysqdi6OwndyLb+i/t+ZwXxw127vnBdIMkJXI5kAETwxRcZHy5x8Y/L+8NyyywdKNZBNEfm2kTJON6nYVulHTryMKekyTjWrpGYS8pOtKK9jcJPX4uBHJkhYP8M2nta4Z8Nh/4r9NQG8OM+BeIf0Z+qjZAluPceglBJ5LV62nIeIHxZ3IaDncwUZRMtSJ1dBXn74g2AyPH72Re5LHtS2q707bNLtFRNstGnUe/RtAe96eJ8PWS4Z01IlJJIEslwWzsEMPWequ39P16Wq5gAmJVuQ6LTgIAFqpkienyhhIsWRZWOskzv87FD28x1IiqHsOd+GkYNkwYxOkmJFYwDnyda2fKrgXLMalkJxs65cGUMZtHw9fS0J2sxtB2oDqG0OaFLpLcOhtaani9WOBrsmEEH5SZoRE5ApRNiHfHOeBA6mdOTpOVH/omGbHz/Q9Wqak+HaDF5sSeRAJMTSmLdPKeWLcq3/s+E6x5of7PTg4fqApgnBPCyo7rJJ9fkQkvLm4z48OSuqkIORdYBPFx33adT2E6XzNS92LLhgLXmnd6sV7D6naA6k3IsrX2xHXlE7xtDfJX/zTP/7aeWVtddEbeK2aJd5ccZQ5w5QUAzgRL1wZe9clWKBhTNS1uOZVU9tJC2ARgzUtNZrn/hBWrWQawOnLLexk2FnpU+P9KrWVL0xHSB9jqINsuPlcP9O72Ta6IGrHXz28rLzCmW8ZOjkEWrIS23/xIuFW9txsFYpXJpnX9alcAdBCkBuKI8YMzpRrFeV5ZIwhNRMeB/VkD2YswlVDX0moLXNCg5fFgy5lq805RSpV1eXakozQh5MW4QhJ0HmBsonng9iibNrHo6e5E4S+4l6xRDhma4aDH85Is4xttwx3i4pKhMSaupUcdktInGHhazYaWEh5jHdylUWYm7QWQXfiX6GDy8KrZjFt5q274ISmsQMC+iDxV/i2NQ0UTy9T3Pag2AoNqDdKzbJqyHCLrUEQioRlC6BO3rJL9IVeuzbKrzYd8GHzFgJmXGCEVHcEfkUfT+oBimo4RIS/dDX1hi274Koz/K5Axj+aYMSLo1IyRZNLEgT/uKk8e2JOiVY3ow7SfrPWITii/ClkApZtXHKt4dZyVMBu075hI3fMsqeQK6X1C8oDUOKFFbMRfBMNKShQ0xwceoyq5uVUKTv45mcIsB8ZOzjbjR4znW+lajmQUAyJQYEMI3AUHfxmvfdAU5ffLQMa7SkxQyiodFDYDyqyWP1TxN/39wpbIY7R8R+wYmQ+phIxEhESZJTEHnW+CrZKWvSJuY3dhhUwpjpUN+0DMGIE7F2SbzxikyABaU66bNGJZwRPQrSCBWqTm9rl+CIg+9gc3sD4VxgekWJUJYbbZMQL7JoLQ8KPpfd3bXu0MpGv67v4SUCp2/BCB6ksWtyqlW84XbmJ5A6eXNLT3t1G5HCj6UkYwkSQdXoq0870pA5GCWaK7MaiFCHsO4Jg0klXJonazKudY4MftONLhflXNccqfUb0iCdEiL427kOpMeJYHuwneyCM2bEIC2UT820pdPcubsqO00luYEh3bWP2rPaoC82jSMqB+PmXuVMAzOkMSaVI0/GOWrXLLjZCGZ6lk2YTksXw1kuGWbkHmcbw9oZMVydVq/bx30f6bWdZwxM0EhgZleQO7/YpIiz25DxM5PNs8jaRovEOwThPv5/3XDOpUAf0Z+4Oz5VFEgvw7CdiHYNQsbjqgiI32+I1Dz4UeBcPT0Gs7MdfMyr1w53YA595mVEdVNASJWeG3dUdA7gnEANxa4wV60iMVqg6+CSqbwy2TpLGxDpiEjrvzpD6Pwhs29QNOv/1t5q0nmeoAU0I3GRY1g3LwF3XhXLpbL4klv1pMVS8kiAp2TYxHYFGfZC8oDLNvyjLfycofusTYrgBGAoxTU3nqw5plYO5vDkdLsehCTzyZwYzA147BBbjxgjDpzH8BsLfD5miBX/PTMOIxKtGE2fx6fakRpneYberW/wqJeaPAGUVXfiDIWBRfkxmDbUMZyEt+mON5vQyYshrviqGgIhzEENnTWHqZehwCKveGWKoO0MB1PGCXGS3/fwRU14eEuLt5BbFnrZ404kWTPs55aMc4LaOPrcoo8rXfxGY+WDM1y42OrDsYteECjUk/smIHzfNa8dcaP0kw5DVduLvZj/Gg2aNGdOjlDjUr7oZ8mxFszKtqOkwoNgmDZG7/GpNsRoLqPRDGZLeTsWXxnbvPGA+4nPyYhvGBklJMklQCUvPr7QiaM1XRgcQw6EjGXr7ckjaNr9JVWdhT/ZWq/t91VvImhabJSM8WnCBMqs+sHR2nuuiXu85AQVdxZTZUa6MGuYgxP4qtn4+fPI2/XYdqwdflKNFkocm1u9WDIhFh2Ur2TGyGij6Gwho+FG/8xNSYXkhje9Wu7Gqh31+jFvX1Ge9X3MQPZ3x4w4Ks/lYl6dBouz12dmRz3u4pt7TekIcW1iukB+JOKC5BaPX/B2B7RaovGmPCc2Lx7CjYnfnUzmHpxaweEa79Sf72rEP6o6Q0cprD+6+5Aa0baiIE4cQRlPZ87EOeR/fndczMxXPmwVV1lBjsmkBukihcN8vYWv91RupN1jKY7MaqE0o5pc9p7TnaRuXuw82aHZRlCVVaPn6hFA+pYKacyEoVEYM0QwusR81PTcfTPjZ76yv8WwicaV1TvqqG6hOtvSvxZwT+4iPa5u8uOzOj/aOgIhB8TVStbT9+50KZzT3QeO/YmMnFXhVBe3ij/xGGM+neGlkbK2uBG/L2nQ6lvzxVAk8RuPXoMMUAz1u3lymJs1EGrsY4aBkhR+tyOCG9VWOdHYuzqLskspjzsx88F5gKZd//C1gxDH3XBADVV0YOFltKqGru/CxhjuMSVT9A5O6C7F1fCC0Fh4ITzCh0V+vRX9VyoH8mAQSKRbgJJYu/yHjd9NoRw9SDALJ5gZozALVw9jqmGu9LqBm3I/4x1ON1NgcJyGdflDdK2aOQh5yfb3j9d61/d3pfHsD69y4Z7rEvkhsYGDhvMAY3ltrtG736H3iyUjk4xSCkoNxvMIA1hfAFdkReGZRcnCxr1KeKSIBOYUqdt31t+cjGtyozUJhXE/Aje7uWzipvlkxaiW5kOTsLXR82SGCOfZxnuFWbyEeKS6wbeTHyoO5LLpLdLHNcWFw5Cf6dAlFEG/zX2RiOhxCYWBXVIhHAgv6fb8LBtpLutTlXW+x/nhiBLAgMDw5+n4KPnRsp/lYPrIGHHvFvn2DF/t2m+gjVxwOuWGx9fmYmyK49mqOt8veiO4v0uWx0iU979LElo+fZAmIfVrJraPGorvN2loNPbdNxx5KY4n/3nac3dfxA7kxugZCoJLX1qWgUdvTtESTkWNcIJi0vkw2zGU0oz19GbmrEXRwPxgWiL23puDnCT7w6WfuX/Z7y3Ql/i5Cc+vCmta/Mt+vOUCdp9s1wKaBaHAJvXyK4w+k0jDxIBWoU7KceLF72diYmb0Xu61XtjftC070U6GLyMlzhqGe3Sy/d/6VdMqX4A9V/xJO/60pwF7PneD+fXfYMkSvvTDdBA0dSKp1E9IGsunJCIuSv7liwean+QXWLQfvikw4oiZ2l2kCetP13vx+qEWvHygUTvQ0AnrBiYhdDFrVCk9/0uItWJpQYIAcUV6NI/qfxTS+FdTJT+rs1m+eTDBx6ar353tXnXpR2c94O3QeQ9qWv3ooBjVTIkmJ8ZG4FxUzbqiLUgmABMyojBleAymZDsxJNZayu9wqO3+bfHl1iQq5PgtwX8ajPFJ039IN4faWP36Llb/WaOs5yc+PcNt1a/6+I94PuBnCF8HAf8vwADS7GaT0D4fMwAAAABJRU5ErkJggg=="; + $sImg = + "iVBORw0KGgoAAAANSUhEUgAAADMAAAA0CAYAAAAnpACSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAEIxJREFUeNq8Wgl4VNXZfu+dLZkkk5BA9kACYQlB2aIga6myuIEtFX+kLW1BJVT/akVrRds+rVqRX2lLRSsal5/nUaCgtmhi8BeaUhAl7EYTIWyGQPZlMsnM3Lnn/865dzJ3biaLVnsfDpk59yzf++3fOSMxxvANPlZqUdQs1FRqXmq+Ac7NpbaI2jxqQ6nZqDVR+z9qr1H71DxB+nfBPHYYSHUCK8fATl+HUZtK7Wpqo1SGeZ0BQCEYFolQETSrhDJ6d4rax9Q+pFa18SQ8HX6aHAcszUUS9T3U0IU1710ASqiddwNuBciMARbSDjcQtDQnnnj7HNYuGvY1gqHnW9RWBBi+f7kT+LwVKG8AjlDj38+0AR1EiJ1kk0XEZFAbO4gQJwOj44F0+m6TsYvWKKKWQOQUvVwFPHCAxNBlZDs1psk30wXsv4XWi8VvqefXXwcYWg6FRPy8racBzsXjjQxtXim4sra5bKCG6X3QCLOR4lxBwGakS1g+ChhORN5FcttWpSumpCunZADEH5L2iATa71bAaUUW9XzxVcEs4yCq2zD9qaMML1QQXQGdaMmwYW8PM41RQxwvmgu0+yU8Qap7uUMbN59UykUKXF4P0J5hgD4gi5qTjuW6DQkDHehDfMNvLnbgvp/vV7GdpKEGdA5aTMRiAIAQDj6HJHR7rgyHBc+T/a16jaQzNFbYB0FDXa0HC0a+QSrrD82J1qj3G73NQJ6buTT+eppdf+cehuauCCCCLDeDkcwAWM8xjA+T8JcKxp3FKu4oFGLUOZJEpyJNIqKfpP4F/kBI9bLIWUxIErPLvozNFLb5sOmRgwwbj6kaMbIUrjJMJzIIRooAUOpNzwzdAcMX+hfvlFC6UEaCQ8K0N4FGrzbVQuM+InuZNBjruOcLzpL7AbLSr2LT0lIVG8tpBZnpxDOtwfgX4X2snz5z4y8swaYRfWM2+fhkaS/3gotyqE/RVGnrAgHkz6daQ0D6A8Mlsvm24gDerSYgNhaZiP4avvq4giFCgkdJzZa+MAv442zCQxby9hmgK4C7c+MxZCBgZtJam24tVvBmlS4RhoERaH6nRhpvkg4FKfipKXrj32nPjy+p+NsZ9d4WL16noPvTu/OBuSSt/z1BaUCNoPN2c7phfhJoqbLfk1qVconwEUw3DEm3L1Xq3W0x9Ix0TDLnHTpwzZ5W5MsYP1gCqTSsxN5jFK+KTgbweiW1ChXzhksoXmh7lkx11Vvz8fxsCsaXOsVKI/sD84t3z6pYu5fkaZdCXJUkLSbQd56aWCQz5ZLJ57Juwn3csFV9jaDDCeoEfX+owIbceGmT3qseqmOri44oWjam8vmWoMt4iYJk/Pb5WPdpi/h+vC8wszwKHrpzt08zRE4Ql4LEwqL39httGJckD8in8yleUhs7sfVsG8MFN0PJ2QB2nAp0A/RrXmzrU+VK2YOTrWlXJEmr7y2w4C0ac90wGQ8UWPmwe1+pCCg/GmvZnO7EOovmPZ19gSn8w2E/LraomlRUg6fSmc0lMi1NRopTmjCAeB+UFN80YfQgiUeGoSvzLXMrm9nsxw76sOWYQvmbirxEy3i3j5Vtr1Jqbx1lXbBhtq3wd9Nsi2JteIfmPPer/b53HCKuWZafa2dYuduLD74XtYHo2UKdDeY4c2t1K9s2qsgj7E8I3Kw11AZFEYdXRlOKIZEp4tzsHT4Rdny6vrtINdq8DA76nEBjaygtSaIi4Hu5FhSfU9FFBs6Xeusm+xKyka1PH/LjUJ2KN25w8PlLlhd3bR8WL2Goy4qV4yxxtxd72/laL893pNK0R4/Vq6t/VOLF0Ysqdi6OwndyLb+i/t+ZwXxw127vnBdIMkJXI5kAETwxRcZHy5x8Y/L+8NyyywdKNZBNEfm2kTJON6nYVulHTryMKekyTjWrpGYS8pOtKK9jcJPX4uBHJkhYP8M2nta4Z8Nh/4r9NQG8OM+BeIf0Z+qjZAluPceglBJ5LV62nIeIHxZ3IaDncwUZRMtSJ1dBXn74g2AyPH72Re5LHtS2q707bNLtFRNstGnUe/RtAe96eJ8PWS4Z01IlJJIEslwWzsEMPWequ39P16Wq5gAmJVuQ6LTgIAFqpkienyhhIsWRZWOskzv87FD28x1IiqHsOd+GkYNkwYxOkmJFYwDnyda2fKrgXLMalkJxs65cGUMZtHw9fS0J2sxtB2oDqG0OaFLpLcOhtaani9WOBrsmEEH5SZoRE5ApRNiHfHOeBA6mdOTpOVH/omGbHz/Q9Wqak+HaDF5sSeRAJMTSmLdPKeWLcq3/s+E6x5of7PTg4fqApgnBPCyo7rJJ9fkQkvLm4z48OSuqkIORdYBPFx33adT2E6XzNS92LLhgLXmnd6sV7D6naA6k3IsrX2xHXlE7xtDfJX/zTP/7aeWVtddEbeK2aJd5ccZQ5w5QUAzgRL1wZe9clWKBhTNS1uOZVU9tJC2ARgzUtNZrn/hBWrWQawOnLLexk2FnpU+P9KrWVL0xHSB9jqINsuPlcP9O72Ta6IGrHXz28rLzCmW8ZOjkEWrIS23/xIuFW9txsFYpXJpnX9alcAdBCkBuKI8YMzpRrFeV5ZIwhNRMeB/VkD2YswlVDX0moLXNCg5fFgy5lq805RSpV1eXakozQh5MW4QhJ0HmBsonng9iibNrHo6e5E4S+4l6xRDhma4aDH85Is4xttwx3i4pKhMSaupUcdktInGHhazYaWEh5jHdylUWYm7QWQXfiX6GDy8KrZjFt5q274ISmsQMC+iDxV/i2NQ0UTy9T3Pag2AoNqDdKzbJqyHCLrUEQioRlC6BO3rJL9IVeuzbKrzYd8GHzFgJmXGCEVHcEfkUfT+oBimo4RIS/dDX1hi274Koz/K5Axj+aYMSLo1IyRZNLEgT/uKk8e2JOiVY3ow7SfrPWITii/ClkApZtXHKt4dZyVMBu075hI3fMsqeQK6X1C8oDUOKFFbMRfBMNKShQ0xwceoyq5uVUKTv45mcIsB8ZOzjbjR4znW+lajmQUAyJQYEMI3AUHfxmvfdAU5ffLQMa7SkxQyiodFDYDyqyWP1TxN/39wpbIY7R8R+wYmQ+phIxEhESZJTEHnW+CrZKWvSJuY3dhhUwpjpUN+0DMGIE7F2SbzxikyABaU66bNGJZwRPQrSCBWqTm9rl+CIg+9gc3sD4VxgekWJUJYbbZMQL7JoLQ8KPpfd3bXu0MpGv67v4SUCp2/BCB6ksWtyqlW84XbmJ5A6eXNLT3t1G5HCj6UkYwkSQdXoq0870pA5GCWaK7MaiFCHsO4Jg0klXJonazKudY4MftONLhflXNccqfUb0iCdEiL427kOpMeJYHuwneyCM2bEIC2UT820pdPcubsqO00luYEh3bWP2rPaoC82jSMqB+PmXuVMAzOkMSaVI0/GOWrXLLjZCGZ6lk2YTksXw1kuGWbkHmcbw9oZMVydVq/bx30f6bWdZwxM0EhgZleQO7/YpIiz25DxM5PNs8jaRovEOwThPv5/3XDOpUAf0Z+4Oz5VFEgvw7CdiHYNQsbjqgiI32+I1Dz4UeBcPT0Gs7MdfMyr1w53YA595mVEdVNASJWeG3dUdA7gnEANxa4wV60iMVqg6+CSqbwy2TpLGxDpiEjrvzpD6Pwhs29QNOv/1t5q0nmeoAU0I3GRY1g3LwF3XhXLpbL4klv1pMVS8kiAp2TYxHYFGfZC8oDLNvyjLfycofusTYrgBGAoxTU3nqw5plYO5vDkdLsehCTzyZwYzA147BBbjxgjDpzH8BsLfD5miBX/PTMOIxKtGE2fx6fakRpneYberW/wqJeaPAGUVXfiDIWBRfkxmDbUMZyEt+mON5vQyYshrviqGgIhzEENnTWHqZehwCKveGWKoO0MB1PGCXGS3/fwRU14eEuLt5BbFnrZ404kWTPs55aMc4LaOPrcoo8rXfxGY+WDM1y42OrDsYteECjUk/smIHzfNa8dcaP0kw5DVduLvZj/Gg2aNGdOjlDjUr7oZ8mxFszKtqOkwoNgmDZG7/GpNsRoLqPRDGZLeTsWXxnbvPGA+4nPyYhvGBklJMklQCUvPr7QiaM1XRgcQw6EjGXr7ckjaNr9JVWdhT/ZWq/t91VvImhabJSM8WnCBMqs+sHR2nuuiXu85AQVdxZTZUa6MGuYgxP4qtn4+fPI2/XYdqwdflKNFkocm1u9WDIhFh2Ur2TGyGij6Gwho+FG/8xNSYXkhje9Wu7Gqh31+jFvX1Ge9X3MQPZ3x4w4Ks/lYl6dBouz12dmRz3u4pt7TekIcW1iukB+JOKC5BaPX/B2B7RaovGmPCc2Lx7CjYnfnUzmHpxaweEa79Sf72rEP6o6Q0cprD+6+5Aa0baiIE4cQRlPZ87EOeR/fndczMxXPmwVV1lBjsmkBukihcN8vYWv91RupN1jKY7MaqE0o5pc9p7TnaRuXuw82aHZRlCVVaPn6hFA+pYKacyEoVEYM0QwusR81PTcfTPjZ76yv8WwicaV1TvqqG6hOtvSvxZwT+4iPa5u8uOzOj/aOgIhB8TVStbT9+50KZzT3QeO/YmMnFXhVBe3ij/xGGM+neGlkbK2uBG/L2nQ6lvzxVAk8RuPXoMMUAz1u3lymJs1EGrsY4aBkhR+tyOCG9VWOdHYuzqLskspjzsx88F5gKZd//C1gxDH3XBADVV0YOFltKqGru/CxhjuMSVT9A5O6C7F1fCC0Fh4ITzCh0V+vRX9VyoH8mAQSKRbgJJYu/yHjd9NoRw9SDALJ5gZozALVw9jqmGu9LqBm3I/4x1ON1NgcJyGdflDdK2aOQh5yfb3j9d61/d3pfHsD69y4Z7rEvkhsYGDhvMAY3ltrtG736H3iyUjk4xSCkoNxvMIA1hfAFdkReGZRcnCxr1KeKSIBOYUqdt31t+cjGtyozUJhXE/Aje7uWzipvlkxaiW5kOTsLXR82SGCOfZxnuFWbyEeKS6wbeTHyoO5LLpLdLHNcWFw5Cf6dAlFEG/zX2RiOhxCYWBXVIhHAgv6fb8LBtpLutTlXW+x/nhiBLAgMDw5+n4KPnRsp/lYPrIGHHvFvn2DF/t2m+gjVxwOuWGx9fmYmyK49mqOt8veiO4v0uWx0iU979LElo+fZAmIfVrJraPGorvN2loNPbdNxx5KY4n/3nac3dfxA7kxugZCoJLX1qWgUdvTtESTkWNcIJi0vkw2zGU0oz19GbmrEXRwPxgWiL23puDnCT7w6WfuX/Z7y3Ql/i5Cc+vCmta/Mt+vOUCdp9s1wKaBaHAJvXyK4w+k0jDxIBWoU7KceLF72diYmb0Xu61XtjftC070U6GLyMlzhqGe3Sy/d/6VdMqX4A9V/xJO/60pwF7PneD+fXfYMkSvvTDdBA0dSKp1E9IGsunJCIuSv7liwean+QXWLQfvikw4oiZ2l2kCetP13vx+qEWvHygUTvQ0AnrBiYhdDFrVCk9/0uItWJpQYIAcUV6NI/qfxTS+FdTJT+rs1m+eTDBx6ar353tXnXpR2c94O3QeQ9qWv3ooBjVTIkmJ8ZG4FxUzbqiLUgmABMyojBleAymZDsxJNZayu9wqO3+bfHl1iQq5PgtwX8ajPFJ039IN4faWP36Llb/WaOs5yc+PcNt1a/6+I94PuBnCF8HAf8vwADS7GaT0D4fMwAAAABJRU5ErkJggg=="; header("Content-type: image/png"); echo base64_decode($sImg); exit; @@ -792,7 +696,8 @@ EOT; public function getGifBg() { - $sImg = "R0lGODlhCgAyANUAANHo+pfK85rM8/X6/vb6/v///5jL85bJ8+Hv/KbS9dzt+87m+qTR9fH4/er1/b7e+MTh+P3+/63V9u/3/dfq+rnc97fa96DP9Nns+53N9LLY9tTp+sHg+Mzl+cfi+OPx/Pv9/7DX9p/O9Oz2/bTZ9uXy/KLQ9Pj7/ujz/bzd9/7+//r8//P5/snj+ZvM897u+6nT9avU9qvU9QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAKADIAAAbFwINwSAwYj0iDcskUOJ9Ql3RKzVivWJF2y714v2CTeExmmM/ohHrNhrnf8Jh8PpdJ7vh8aM/va/6AgSSDhIUWh4iJFYuMjSmPkJEPk5SVHJeYmRCbnJ0en6ChLaOkpR2nqKkLq6ytAK+wsRuztLUUt7i5GLu8vQq/wMEvw8TFCMfIyR/LzM0lz9DRKNPU1Q7X2Nkj29zdE9/g4Q3j5OUs5+jpA+vs7QTv8PEn8/T1K/f4+SD7/P0R/wADqhhIsGCBgwgTBgEAOw=="; + $sImg = + "R0lGODlhCgAyANUAANHo+pfK85rM8/X6/vb6/v///5jL85bJ8+Hv/KbS9dzt+87m+qTR9fH4/er1/b7e+MTh+P3+/63V9u/3/dfq+rnc97fa96DP9Nns+53N9LLY9tTp+sHg+Mzl+cfi+OPx/Pv9/7DX9p/O9Oz2/bTZ9uXy/KLQ9Pj7/ujz/bzd9/7+//r8//P5/snj+ZvM897u+6nT9avU9qvU9QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAKADIAAAbFwINwSAwYj0iDcskUOJ9Ql3RKzVivWJF2y714v2CTeExmmM/ohHrNhrnf8Jh8PpdJ7vh8aM/va/6AgSSDhIUWh4iJFYuMjSmPkJEPk5SVHJeYmRCbnJ0en6ChLaOkpR2nqKkLq6ytAK+wsRuztLUUt7i5GLu8vQq/wMEvw8TFCMfIyR/LzM0lz9DRKNPU1Q7X2Nkj29zdE9/g4Q3j5OUs5+jpA+vs7QTv8PEn8/T1K/f4+SD7/P0R/wADqhhIsGCBgwgTBgEAOw=="; header("Content-type: image/Gif"); echo base64_decode($sImg); exit; @@ -800,7 +705,8 @@ EOT; public function getGifDe() { - $sImg = "R0lGODlhEgANAIQZAAAAABAFBhEGBhIGBhQHBxUHCCYNDZQqH5QrI9c4M+M4M9w9M+g/MuNDM/BFM99tI+t3H+CyDerIB+zIBuzKBurLCPfcAPfgAPjlAP///////////////////////////ywAAAAAEgANAAAFVaARCGRpmoExAGzrvsBAwHRLFHVdIEfv/8ADouEoGo9IR2PBaDqfUMYioahar1hF4gHper9gyKOCKZvPaExFcmm73/CLZGKp2+94yyRCmfj/gIAUESEAOw=="; + $sImg = + "R0lGODlhEgANAIQZAAAAABAFBhEGBhIGBhQHBxUHCCYNDZQqH5QrI9c4M+M4M9w9M+g/MuNDM/BFM99tI+t3H+CyDerIB+zIBuzKBurLCPfcAPfgAPjlAP///////////////////////////ywAAAAAEgANAAAFVaARCGRpmoExAGzrvsBAwHRLFHVdIEfv/8ADouEoGo9IR2PBaDqfUMYioahar1hF4gHper9gyKOCKZvPaExFcmm73/CLZGKp2+94yyRCmfj/gIAUESEAOw=="; header("Content-type: image/Gif"); echo base64_decode($sImg); exit; @@ -808,13 +714,726 @@ EOT; public function getGifEn() { - $sImg = "R0lGODlhEgANAOfRANzd6P9LQP7//93e6ba32v8HB/J4ef//+/85Of8fFVddwP8aFq+13P8aFPr////f3f8XE/n//62s3fQuLAIDj6ys3uHZ5P8uLOjp793f6dbX6uvBxsyasurCx/9fXcadtS88r+Da5EZHr+Hi7A0NlUVGqcjR9MKaunh5x/8REQAAkv9IP/9BPnh6wi4/td3c5uLl7P8PD7vO9aGSw7bM9uDh6UpLsf8hFv/f3PPx9/Dx9DFCuMDE4cHF4/sAANPU3ufp8JSDvuVocf8ODvz8+/xRTPQgG+PM0ZSWzs/R476+4ujp8v8/PurO0uPZ3//u5fQCAOPj6nFxxf8UE8rM4P/w5YGM18PH4/79/ExUuP3//4CAxqmo3KaZxv7+/RcstO3v89XW6fS8waOj2snM7Nra7Ccon+no9v03OFJZvuK2xBEipP89Ov8dE+be4u3u8/w3OOVocv8sKv8EBOjo9+/u+Kap15SFvgwRlba327uXteHh7tvc5yo3q9XX5SQ4uU5MrtjW5qaVxvDS2f8DA+Tj6vr6/j1FtVlgvL+euvHw9v+rqe7u+XKJ1ebn7p2x7CUmnvb2+dPW8P8cEc/P4efn8/38/5Ws66mYx/ccGNfY5vh0d927zSUlov96ev88OgAAjmmA09rb5v+xsPF5eMnR8i0upuuAgvEyLx0rq97f6cunwEBIuO/Aw/9/fuTm6vn5+vTEyM7P5rq63BESlf+Fgv8fF8SWsOfp7+2rrvX1+La23RgmqLe43PPV2vdydhcnqIWQ2BEgoube4wASn82atOHj6uTT2f97etKjuf9dWsSduZyb08fJ4fn5+/z8/f+ZAP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////ywAAAAAEgANAAAI/gB/YHCkig+AAVGGuSmUAYCoEbpgGXsFY8kWM7T6JEI14QMIEpBaVNIBRBOSOtEqmAK27EabYqk6jYl2hpksKnjSmIgmqdEqWw2ShSITrZQCFXb8IDpkRdGBCLGmpBDj4ECOYKyyXHFyyoCQX8hceShQQFktT5viGCDV5AgUaHDjypXrI9exIgHYwEHA5MIcQnJYIEDzKcCKVi+63BE0CMeTUTGGLKrywBemIDMCJVnz5ZIWATI4LYCghoaAaI/+EGNAqQQXQ4xQuDiRYBKHHVLoWJIAaFaNZkSU2KAgTI+RTLd4gRKxC0uZPQPAvAnTiwCPEB02WOiRh4CGZ15wAgUEADs="; + $sImg = + "R0lGODlhEgANAOfRANzd6P9LQP7//93e6ba32v8HB/J4ef//+/85Of8fFVddwP8aFq+13P8aFPr////f3f8XE/n//62s3fQuLAIDj6ys3uHZ5P8uLOjp793f6dbX6uvBxsyasurCx/9fXcadtS88r+Da5EZHr+Hi7A0NlUVGqcjR9MKaunh5x/8REQAAkv9IP/9BPnh6wi4/td3c5uLl7P8PD7vO9aGSw7bM9uDh6UpLsf8hFv/f3PPx9/Dx9DFCuMDE4cHF4/sAANPU3ufp8JSDvuVocf8ODvz8+/xRTPQgG+PM0ZSWzs/R476+4ujp8v8/PurO0uPZ3//u5fQCAOPj6nFxxf8UE8rM4P/w5YGM18PH4/79/ExUuP3//4CAxqmo3KaZxv7+/RcstO3v89XW6fS8waOj2snM7Nra7Ccon+no9v03OFJZvuK2xBEipP89Ov8dE+be4u3u8/w3OOVocv8sKv8EBOjo9+/u+Kap15SFvgwRlba327uXteHh7tvc5yo3q9XX5SQ4uU5MrtjW5qaVxvDS2f8DA+Tj6vr6/j1FtVlgvL+euvHw9v+rqe7u+XKJ1ebn7p2x7CUmnvb2+dPW8P8cEc/P4efn8/38/5Ws66mYx/ccGNfY5vh0d927zSUlov96ev88OgAAjmmA09rb5v+xsPF5eMnR8i0upuuAgvEyLx0rq97f6cunwEBIuO/Aw/9/fuTm6vn5+vTEyM7P5rq63BESlf+Fgv8fF8SWsOfp7+2rrvX1+La23RgmqLe43PPV2vdydhcnqIWQ2BEgoube4wASn82atOHj6uTT2f97etKjuf9dWsSduZyb08fJ4fn5+/z8/f+ZAP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////ywAAAAAEgANAAAI/gB/YHCkig+AAVGGuSmUAYCoEbpgGXsFY8kWM7T6JEI14QMIEpBaVNIBRBOSOtEqmAK27EabYqk6jYl2hpksKnjSmIgmqdEqWw2ShSITrZQCFXb8IDpkRdGBCLGmpBDj4ECOYKyyXHFyyoCQX8hceShQQFktT5viGCDV5AgUaHDjypXrI9exIgHYwEHA5MIcQnJYIEDzKcCKVi+63BE0CMeTUTGGLKrywBemIDMCJVnz5ZIWATI4LYCghoaAaI/+EGNAqQQXQ4xQuDiRYBKHHVLoWJIAaFaNZkSU2KAgTI+RTLd4gRKxC0uZPQPAvAnTiwCPEB02WOiRh4CGZ15wAgUEADs="; header("Content-type: image/Gif"); echo base64_decode($sImg); exit; } } +/** + * Class requTranslations + */ +class requTranslations +{ + /** + * @return array + */ + public function getTranslations() + { + return array( + 'de' => array( + 'RequCheck' => 'Mindestanforderungsprüfung', + 'ExecNotice' => + 'Führen Sie diese Prüfung immer aus dem Stammverzeichnis Ihres Shops aus. ' . + 'Nur dann können die Prüfungen erfolgreich durchgeführt werden.', + 'RequSucc' => 'Bedingung erfüllt', + 'RequNotSucc' => 'Bedingung nicht erfüllt', + 'RequNotCheckable' => 'Bedingung nicht prüfbar', + 'hasMinPhpVersion' => 'mindestens PHP Version %s', + 'hasMaxPhpVersion' => 'maximal PHP Version %s', + 'hasFromToPhpVersion' => 'Server verwendet PHP Version zwischen %s und %s', + 'hasSoap' => 'SOAP-Erweiterung verfügbar', + 'hasCurl' => 'Curl-Erweiterung verfügbar', + 'hasExtension' => '%s-Erweiterung verfügbar', + 'hasMinShopVersion' => 'mindestens Shop Version %s', + 'hasMaxShopVersion' => 'maximal Shop Version %s', + 'hasMinModCfgVersion' => 'ModCfg-Eintrag "%s" (%s) mit mindestens Version %s', + 'hasMaxModCfgVersion' => 'ModCfg-Eintrag "%s" (%s) mit maximal Version %s', + 'hasModCfg' => 'Modul-' . + 'Connector installiert', + 'isShopEdition' => 'ist Shopedition %s', + 'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) oder Zend Guard Loader (PHP 5.3, 5.4) ' . + 'installiert', + 'hasIonCubeLoader' => 'ionCube loader installiert', + 'globalSuccess' => 'Die Prüfung war erfolgreich. Sie können das Modul installieren.*

', + 'globalNotSuccess' => 'Die Prüfung war nicht erfolgreich. Bitte kontrollieren Sie die rot ' . + 'markierten Bedingungen.

', + 'deleteFile1' => 'Löschen Sie diese Datei nach der Verwendung bitte unbedingt wieder von ' . + 'Ihrem Server! Klicken Sie hier, um diese Datei zu löschen.', + 'showPhpInfo' => 'PHPinfo anzeigen', + 'dependentoffurther' => '* abhängig von ungeprüften Voraussetzungen', + 'oneandonedescription' => '** geprüft wurde das Ausführungsverzeichnis, providerabhängig müssen ' . + 'Unterverzeichnisse separat geprüft werden (z.B. bei 1&1)', + 'or' => ' oder ', + 'toggleswitch' => 'Klick für Details zur Prüfung', + 'unableDeleteFile' => 'Datei konnte nicht gelöscht werden. Bitte löschen Sie diese manuell.', + 'goodBye' => 'Auf Wiedersehen.', + ), + 'en' => array( + 'RequCheck' => 'Requirement check', + 'ExecNotice' => 'Execute this check script in the root directory of your shop. In this ' . + 'case only checks can executed succesfully.', + 'RequSucc' => 'condition is fulfilled', + 'RequNotSucc' => 'condition isn\'t fulfilled', + 'RequNotCheckable' => 'condition isn\'t checkable', + 'hasMinPhpVersion' => 'at least PHP version %s', + 'hasMaxPhpVersion' => 'not more than PHP version %s', + 'hasFromToPhpVersion' => 'server use PHP version between %s and %s', + 'hasSoap' => 'SOAP extension available', + 'hasCurl' => 'curl extension available', + 'hasExtension' => '%s extension is available', + 'hasMinShopVersion' => 'at least shop version %s', + 'hasMaxShopVersion' => 'not more than shop version %s', + 'hasMinModCfgVersion' => 'ModCfg item "%s" (%s) has at least version %s', + 'hasMaxModCfgVersion' => 'ModCfg item "%s" (%s) has not more than version %s', + 'hasModCfg' => 'Module ' . + 'Connector installed', + 'isShopEdition' => 'shop edition is %s', + 'hasZendLoaderOptimizer' => 'Zend Optimizer (PHP 5.2) or Zend Guard Loader (PHP 5.3, 5.4) installed', + 'hasIonCubeLoader' => 'ionCube loader installed', + 'globalSuccess' => 'The test was successful. Your server is ready for installing the ' . + 'module.*

', + 'globalNotSuccess' => 'The test wasn\'t successfull. Please check the red marked ' . + 'conditions.

', + 'deleteFile1' => 'Please delete this file after use on your server! Click here, to delete this file.', + 'showPhpInfo' => 'show PHPinfo', + 'dependentoffurther' => '* dependent of further unchecked conditions', + 'oneandonedescription' => '** this check use execution directory only, provider dependend ' . + 'subdirectories have to check separately (e.g. at 1&1)', + 'or' => ' or ', + 'toggleswitch' => 'click for details', + 'unableDeleteFile' => 'Unable to delete file. Please delete it manually.', + 'goodBye' => 'Good Bye.', + ), + ); + } +} + +/** + * Class requRemote + */ +class requRemote +{ + public $blUseRemote = true; + + public $oModuleData = array(); + + /** + * @param $sModId + * @param $sModVersion + * @param $sShopEdition + * + * @return bool|array + */ + public function getShopEdition($sModId, $sModVersion, $sShopEdition) + { + $sUrl = "moduleversion/"; + $sUrl .= 'modid/' . urlencode($sModId) . '/'; + $sUrl .= 'forcemodversion/' . urlencode($sModVersion) . '/'; + $sUrl .= 'edition/' . urlencode($sShopEdition) . '/'; + + /** @var stdClass $oModuleData */ + $oModuleData = $this->_getRemoteServerData($sUrl); + + if ($oModuleData->status == 'OK' && isset($oModuleData->moduleversion->compatible_release)) { + return explode(',', $oModuleData->moduleversion->compatible_release->shopedition); + } + + return false; + } + + /** + * @param $sModId + * @param $sModVersion + * @param $sShopEdition + * + * @return bool|string + */ + public function getMinShopVersion($sModId, $sModVersion, $sShopEdition) + { + $sUrl = "moduleversion/"; + $sUrl .= 'modid/' . urlencode($sModId) . '/'; + $sUrl .= 'forcemodversion/' . urlencode($sModVersion) . '/'; + $sUrl .= 'edition/' . urlencode($sShopEdition) . '/'; + + /** @var stdClass $oModuleData */ + $oModuleData = $this->_getRemoteServerData($sUrl); + + if ($oModuleData->status == 'OK' && isset($oModuleData->moduleversion->compatible_release)) { + return $this->shortenVersion($oModuleData->moduleversion->compatible_release->fromshopversion); + } + + return false; + } + + /** + * @param $sModId + * @param $sModVersion + * @param $sShopEdition + * + * @return bool|string + */ + public function getMaxShopVersion($sModId, $sModVersion, $sShopEdition) + { + $sUrl = "moduleversion/"; + $sUrl .= 'modid/' . urlencode($sModId) . '/'; + $sUrl .= 'forcemodversion/' . urlencode($sModVersion) . '/'; + $sUrl .= 'edition/' . urlencode($sShopEdition) . '/'; + + /** @var stdClass $oModuleData */ + $oModuleData = $this->_getRemoteServerData($sUrl); + + if ($oModuleData->status == 'OK' && isset($oModuleData->moduleversion->compatible_release)) { + return $this->shortenVersion($oModuleData->moduleversion->compatible_release->toshopversion); + } + + return false; + } + + /** + * @param $sUrl + * + * @return stdClass + */ + protected function _getRemoteServerData($sUrl) + { + if (isset($this->oModuleData[$sUrl])) { + return $this->oModuleData[$sUrl]; + } + + $oFailureData = new stdClass(); + $oFailureData->status = 'NOK'; + + if (false === $this->blUseRemote) { + return $oFailureData; + } + $sHost = "http://update.oxidmodule.com"; + $sData = $this->curlConnect($sHost . '/serialized/' . $sUrl); + $oData = unserialize($sData); + + if (false == $oData) { + return $oFailureData; + } + $this->oModuleData[$sUrl] = $oData; + + return $this->oModuleData[$sUrl]; + } + + /** + * @param $sFilePath + * + * @return string + */ + public function curlConnect($sFilePath) + { + $sContent = ''; + + if (extension_loaded('curl') + && function_exists('curl_init') + && function_exists('curl_exec') + && $ch = curl_init() + ) { + $sCurl_URL = preg_replace('@^((http|https)://)@', '', $sFilePath); + curl_setopt($ch, CURLOPT_URL, $sCurl_URL); + if ($_SERVER['HTTP_USER_AGENT']) { + curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); + } + curl_setopt($ch, CURLOPT_HEADER, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($ch, CURLOPT_TIMEOUT, 1); + curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1); + curl_setopt($ch, CURLOPT_POST, 0); + $sContent = curl_exec($ch); + } + + return $sContent; + } + + /** + * @param $sVersion + * + * @return string + */ + public function shortenVersion($sVersion) + { + $aVersion = explode('.', $sVersion); + + unset($aVersion[3]); + + return implode('.', $aVersion); + } +} + +/** + * Class requTests + * contains test functions + */ +class requTests +{ + public $oBase; + + public $oDb; + + public $oConfig; + + public $blGlobalResult = false; + + /** + * @param requCheck $oCheckInstance + * @param requConfig $oConfig + * @param $oDb + * @param requRemote $oRemote + */ + public function __construct(requCheck $oCheckInstance, requConfig $oConfig, $oDb, requRemote $oRemote) + { + $this->oBase = $oCheckInstance; + $this->oConfig = $oConfig; + $this->oDb = $oDb; + $this->oRemote = $oRemote; + } + + /** + * @return requCheck + */ + public function getBase() + { + return $this->oBase; + } + + public function getDb() + { + return $this->oDb; + } + + /** + * @return string + */ + public function getBasePath() + { + return $this->getBase()->getBasePath(); + } + + /** + * @param bool $blResult + */ + public function setGlobalResult($blResult) + { + $this->getBase()->blGlobalResult = $blResult; + } + + /** + * @param $sMethodName + * @param null $aArguments + * + * @return array + */ + public function checkInSubDirs($sMethodName, $aArguments = null) + { + return $this->getBase()->checkInSubDirs($sMethodName, $aArguments); + } + + /** + * @param $aConfiguration + * + * @return array + */ + public function hasMinPhpVersion(&$aConfiguration) + { + $aResult[$this->getBasePath()] = false; + + if (version_compare(phpversion(), $aConfiguration['aParams']['version'], '>=')) { + $aResult[$this->getBasePath()] = true; + } + + $aResult = array_merge($aResult, $this->checkInSubDirs(__FUNCTION__, $aConfiguration['aParams'])); + + return $aResult; + } + + /** + * @param $aConfiguration + * + * @return array + */ + public function hasFromToPhpVersion(&$aConfiguration) + { + $aResult[$this->getBasePath()] = false; + + if ((version_compare(phpversion(), $aConfiguration['aParams']['from'], '>=')) + && (version_compare(phpversion(), $aConfiguration['aParams']['to'], '<')) + ) { + $aResult[$this->getBasePath()] = true; + } + + $aResult = array_merge($aResult, $this->checkInSubDirs(__FUNCTION__, $aConfiguration['aParams'])); + + return $aResult; + } + + /** + * @param $aConfiguration + * + * @return array + */ + public function hasMaxPhpVersion(&$aConfiguration) + { + $aResult[$this->getBasePath()] = false; + + if (version_compare(phpversion(), $aConfiguration['aParams']['version'], '<=')) { + $aResult[$this->getBasePath()] = true; + } + + $aResult = array_merge($aResult, $this->checkInSubDirs(__FUNCTION__, $aConfiguration['aParams'])); + + return $aResult; + } + + /** + * @param $aConfiguration + * + * @return array + */ + public function hasExtension(&$aConfiguration) + { + $aResult[$this->getBasePath()] = false; + + if (extension_loaded($aConfiguration['aParams']['type'])) { + $aResult[$this->getBasePath()] = true; + } + + $aResult = array_merge($aResult, $this->checkInSubDirs(__FUNCTION__, $aConfiguration['aParams'])); + + return $aResult; + } + + /** + * @param $aConfiguration + * + * @return bool + */ + public function hasMinShopVersion(&$aConfiguration) + { + if ($this->getDb()) { + $sField = 'oxversion'; + $sSelect = "SELECT " . $sField . " FROM oxshops WHERE 1 ORDER BY oxversion ASC LIMIT 1"; + $rResult = mysql_query($sSelect, $this->getDb()); + $oResult = mysql_fetch_object($rResult); + + $oEditionResult = $this->_getShopEdition(); + $sEdition = strtoupper($oEditionResult->oxedition); + + $mMinRemoteVersion = $this->oRemote->getMinShopVersion( + $this->oConfig->sModId, + $this->oConfig->sModVersion, + $sEdition + ); + + if ($mMinRemoteVersion) { + $aConfiguration['aParams'] = array('version' => $mMinRemoteVersion); + } else { + $aConfiguration['aParams'] = array('version' => $aConfiguration['aParams'][$sEdition]); + } + + if (version_compare($oResult->oxversion, $aConfiguration['aParams']['version'], '>=')) { + return true; + } + } + + return false; + } + + /** + * @param $aConfiguration + * + * @return bool + */ + public function hasMaxShopVersion(&$aConfiguration) + { + if ($this->getDb()) { + $sField = 'oxversion'; + $sSelect = "SELECT " . $sField . " FROM oxshops WHERE 1 ORDER BY oxversion DESC LIMIT 1"; + $rResult = mysql_query($sSelect, $this->getDb()); + $oResult = mysql_fetch_object($rResult); + + $oEditionResult = $this->_getShopEdition(); + $sEdition = strtoupper($oEditionResult->oxedition); + + $mMaxRemoteVersion = $this->oRemote->getMaxShopVersion( + $this->oConfig->sModId, + $this->oConfig->sModVersion, + $sEdition + ); + + if ($mMaxRemoteVersion) { + $aConfiguration['aParams'] = array('version' => $mMaxRemoteVersion); + } else { + $aConfiguration['aParams'] = array('version' => $aConfiguration['aParams'][$sEdition]); + } + + if (version_compare($oResult->oxversion, $aConfiguration['aParams']['version'], '<=')) { + return true; + } + } + + return false; + } + + /** + * @param $aConfiguration + * + * @return bool + */ + public function isShopEdition(&$aConfiguration) + { + if ($this->getDb()) { + $oResult = $this->_getShopEdition(); + + $mRemoteShopEditions = $this->oRemote->getShopEdition( + $this->oConfig->sModId, + $this->oConfig->sModVersion, + $oResult->oxedition + ); + + if (is_array($mRemoteShopEditions)) { + $aConfiguration['aParams'][0] = $mRemoteShopEditions; + } + + if (in_array(strtoupper($oResult->oxedition), $aConfiguration['aParams'][0])) { + $aConfiguration['aParams'][0] = strtoupper($oResult->oxedition); + + return true; + } + } + + return false; + } + + /** + * @return bool|object|stdClass + */ + protected function _getShopEdition() + { + if ($this->getDb()) { + $sField = 'oxedition'; + $sSelect = "SELECT " . $sField . " FROM oxshops WHERE 1 LIMIT 1"; + $rResult = mysql_query($sSelect, $this->getDb()); + $oResult = mysql_fetch_object($rResult); + + return $oResult; + } + + return false; + } + + /** + * @return bool + */ + public function hasModCfg() + { + if ($this->getDb()) { + $sModId = 'd3modcfg_lib'; + $sSelect = "SELECT 1 as result FROM d3_cfg_mod WHERE oxmodid = '" . $sModId . "' LIMIT 1"; + $rResult = mysql_query($sSelect, $this->getDb()); + if (is_resource($rResult)) { + $oResult = mysql_fetch_object($rResult); + + if ($oResult->result) { + return true; + } + } + } + + return false; + } + + /** + * @param $aConfiguration + * + * @return bool|int + */ + public function hasMinModCfgVersion(&$aConfiguration) + { + if ($this->getDb()) { + $sSelect = + "SELECT IF " . + "(INET_ATON(oxversion) >= INET_ATON('" + . $aConfiguration['aParams']['version'] + . "'), 1, 0) AS result " + . + "FROM d3_cfg_mod " + . + "WHERE + oxmodid = '" . $aConfiguration['aParams']['id'] . "' AND + oxversion != 'basic' + ORDER BY oxversion ASC LIMIT 1"; + + $rResult = mysql_query($sSelect, $this->getDb()); + $aResult = mysql_fetch_assoc($rResult); + + if (!(int)$aResult['result']) { + $this->setGlobalResult(false); + } + + return (int)$aResult['result']; + } + + $this->setGlobalResult(false); + + return false; + } + + /** + * @param $aConfiguration + * + * @return bool|int + */ + public function hasMaxModCfgVersion(&$aConfiguration) + { + if ($this->getDb()) { + $sSelect = "SELECT + IF (INET_ATON(oxversion) <= INET_ATON('" . $aConfiguration['aParams']['version'] . "'), 1, 0) AS result + FROM d3_cfg_mod WHERE + oxmodid = '" . $aConfiguration['aParams']['id'] . "' AND + oxversion != 'basic' + ORDER BY oxversion ASC LIMIT 1"; + + $rResult = mysql_query($sSelect, $this->getDb()); + $aResult = mysql_fetch_assoc($rResult); + + if (!(int)$aResult['result']) { + $this->setGlobalResult(false); + } + + return (int)$aResult['result']; + } + + $this->setGlobalResult(false); + + return false; + } + + /** + * @return array + */ + public function hasZendLoaderOptimizer() + { + $aResult = array($this->getBasePath() => false); + + if ((version_compare(phpversion(), '5.2.0', '>=') + && version_compare(phpversion(), '5.2.900', '<') + && function_exists('zend_optimizer_version') + ) + || ( + version_compare(phpversion(), '5.3.0', '>=') + && version_compare(phpversion(), '5.4.900', '<') + && function_exists('zend_loader_version') + ) + ) { + $aResult[$this->getBasePath()] = true; + } + + $aResult = array_merge($aResult, $this->checkInSubDirs(__FUNCTION__)); + + return $aResult; + } + + /** + * @return array + */ + public function hasIonCubeLoader() + { + $aResult = array($this->getBasePath() => false); + + if (function_exists('ioncube_loader_version')) { + $aResult[$this->getBasePath()] = true; + } + + $aResult = array_merge($aResult, $this->checkInSubDirs(__FUNCTION__)); + + return $aResult; + } +} + +/** + * Class requTransformation + */ +class requTransformation +{ + public $oCheck; + + /** + * @param requCheck $oCheck + */ + public function __construct(requCheck $oCheck) + { + $this->oCheck = $oCheck; + } + + /** + * @param $aCheckList + */ + public function transformCheckList($aCheckList) + { + $this->_removeDeprecatedLibs($aCheckList['hasMinModCfgVersion']); + $this->_removeDeprecatedLibs($aCheckList['hasMaxModCfgVersion']); + + return $aCheckList; + } + + /** + * @param array $aCheck + */ + protected function _removeDeprecatedLibs(&$aCheck) + { + $blDelOldLibs = false; + $sCheckVersion = 0; + + if (is_array($aCheck)) { + $sSelect = "SELECT oxversion as result " . + "FROM d3_cfg_mod " . + "WHERE oxmodid = 'd3modcfg_lib' LIMIT 1"; + $rResult = mysql_query($sSelect, $this->oCheck->getDb()); + if (is_resource($rResult)) { + $oResult = mysql_fetch_object($rResult); + if ($oResult->result) { + $sCheckVersion = $oResult->result; + } + } + + foreach ($aCheck as $aModCfgCheck) { + if (isset($aModCfgCheck['aParams']['id']) + && strtolower($aModCfgCheck['aParams']['id']) == 'd3modcfg_lib' + && version_compare($sCheckVersion, '4.0.0.0', '>=') + ) { + $blDelOldLibs = true; + } + } + + reset($aCheck); + + if ($blDelOldLibs) { + $aOldLibs = array('d3install_lib', 'd3log_lib', 'd3clrtmp_lib'); + foreach ($aCheck as $sKey => $aModCfgCheck) { + if (isset($aModCfgCheck['aParams']['id']) + && in_array(strtolower($aModCfgCheck['aParams']['id']), $aOldLibs) + ) { + unset($aCheck[$sKey]); + } + } + } + } + } +} + +/** + * @param $mVar + */ function dumpvar($mVar) { echo "
";
@@ -827,4 +1446,4 @@ if (isset($_REQUEST['fnc']) && $_REQUEST['fnc']) {
     $oRequCheck->{$_REQUEST['fnc']}();
 } else {
     $oRequCheck->startCheck();
-}
\ No newline at end of file
+}