From 3685f6b70a760227311514fa1fdd0c6c7e09ab02 Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Thu, 20 Dec 2012 14:41:06 +0000 Subject: [PATCH] basic implementation --- .gitattributes | 26 +- .../admin/de/d3_googleanalytics_lang.php | 0 .../admin/en/d3_googleanalytics_lang.php | 0 .../tpl/d3_cfg_googleanalytics_campaigns.tpl | 0 .../admin/tpl/d3_cfg_googleanalytics_main.tpl | 70 +-- .../views}/tpl/form/user_checkout_change.tpl | 0 .../tpl/form/user_checkout_noregistration.tpl | 0 .../tpl/form/user_checkout_registration.tpl | 0 .../views}/tpl/layout/footer.tpl | 0 .../views}/tpl/page/checkout/basket.tpl | 0 .../d3googleanalytics/d3GoogleAnalytics.tpl | 0 .../460-464/out/basic/tpl/_footer.tpl | 90 ---- .../460-464/out/basic/tpl/dyn/mini_basket.tpl | 84 --- .../out/basic/tpl/inc/d3GoogleAnalytics.tpl | 182 ------- .../out/basic/tpl/inc/popup_basket.tpl | 65 --- .../out/basic/tpl/page/checkout/basket.tpl | 497 ----------------- .../out/basic/tpl/page/checkout/user.tpl | 502 ------------------ .../modules/d3/d3GoogleAnalytics/metadata.php | 17 +- 18 files changed, 42 insertions(+), 1491 deletions(-) rename changed_full/460-464/{out => modules/d3/d3GoogleAnalytics/views}/admin/de/d3_googleanalytics_lang.php (100%) rename changed_full/460-464/{out => modules/d3/d3GoogleAnalytics/views}/admin/en/d3_googleanalytics_lang.php (100%) rename changed_full/460-464/{out => modules/d3/d3GoogleAnalytics/views}/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl (100%) rename changed_full/460-464/{out => modules/d3/d3GoogleAnalytics/views}/admin/tpl/d3_cfg_googleanalytics_main.tpl (83%) rename changed_full/460-464/{out/azure => modules/d3/d3GoogleAnalytics/views}/tpl/form/user_checkout_change.tpl (100%) rename changed_full/460-464/{out/azure => modules/d3/d3GoogleAnalytics/views}/tpl/form/user_checkout_noregistration.tpl (100%) rename changed_full/460-464/{out/azure => modules/d3/d3GoogleAnalytics/views}/tpl/form/user_checkout_registration.tpl (100%) rename changed_full/460-464/{out/azure => modules/d3/d3GoogleAnalytics/views}/tpl/layout/footer.tpl (100%) rename changed_full/460-464/{out/azure => modules/d3/d3GoogleAnalytics/views}/tpl/page/checkout/basket.tpl (100%) rename changed_full/460-464/{out/azure => modules/d3/d3GoogleAnalytics/views}/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl (100%) delete mode 100644 changed_full/460-464/out/basic/tpl/_footer.tpl delete mode 100644 changed_full/460-464/out/basic/tpl/dyn/mini_basket.tpl delete mode 100644 changed_full/460-464/out/basic/tpl/inc/d3GoogleAnalytics.tpl delete mode 100644 changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl delete mode 100644 changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl delete mode 100644 changed_full/460-464/out/basic/tpl/page/checkout/user.tpl diff --git a/.gitattributes b/.gitattributes index d6b5f5a..2687b18 100644 --- a/.gitattributes +++ b/.gitattributes @@ -245,22 +245,16 @@ Sources/doku/12_gaTrackingOverview-Dateien/local_extensions.css -text Sources/doku/12_gaTrackingOverview-Dateien/semantic_headers.css -text Sources/doku/12_gaTrackingOverview-Dateien/star_off.gif -text Sources/doku/12_gaTrackingOverview.html -text -changed_full/460-464/out/admin/de/d3_googleanalytics_lang.php -text -changed_full/460-464/out/admin/en/d3_googleanalytics_lang.php -text -changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text -changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl -text -changed_full/460-464/out/azure/tpl/form/user_checkout_change.tpl -text -changed_full/460-464/out/azure/tpl/form/user_checkout_noregistration.tpl -text -changed_full/460-464/out/azure/tpl/form/user_checkout_registration.tpl -text -changed_full/460-464/out/azure/tpl/layout/footer.tpl -text -changed_full/460-464/out/azure/tpl/page/checkout/basket.tpl -text -changed_full/460-464/out/azure/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl -text -changed_full/460-464/out/basic/tpl/_footer.tpl -text -changed_full/460-464/out/basic/tpl/dyn/mini_basket.tpl -text -changed_full/460-464/out/basic/tpl/inc/d3GoogleAnalytics.tpl -text -changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl -text -changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl -text -changed_full/460-464/out/basic/tpl/page/checkout/user.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/de/d3_googleanalytics_lang.php -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/en/d3_googleanalytics_lang.php -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/tpl/form/user_checkout_change.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/tpl/form/user_checkout_noregistration.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/tpl/form/user_checkout_registration.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/tpl/layout/footer.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/tpl/page/checkout/basket.tpl -text +changed_full/460-464/modules/d3/d3GoogleAnalytics/views/tpl/widget/d3googleanalytics/d3GoogleAnalytics.tpl -text copy_this/core/smarty/plugins/function.d3getArticleFromOrderArticle.php -text copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics.php -text copy_this/modules/d3/d3GoogleAnalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php -text diff --git a/changed_full/460-464/out/admin/de/d3_googleanalytics_lang.php b/changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/de/d3_googleanalytics_lang.php similarity index 100% rename from changed_full/460-464/out/admin/de/d3_googleanalytics_lang.php rename to changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/de/d3_googleanalytics_lang.php diff --git a/changed_full/460-464/out/admin/en/d3_googleanalytics_lang.php b/changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/en/d3_googleanalytics_lang.php similarity index 100% rename from changed_full/460-464/out/admin/en/d3_googleanalytics_lang.php rename to changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/en/d3_googleanalytics_lang.php diff --git a/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl similarity index 100% rename from changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl rename to changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl diff --git a/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl b/changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl similarity index 83% rename from changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl rename to changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl index e2017d0..277375e 100644 --- a/changed_full/460-464/out/admin/tpl/d3_cfg_googleanalytics_main.tpl +++ b/changed_full/460-464/modules/d3/d3GoogleAnalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl @@ -116,60 +116,21 @@ div.box{background: white url([{$oView->getBGLogoUrl()}]) no-repeat bottom right - - + + +
+
- - - - - -
- - - - - -
- [{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}] -
-   - -   -
-
+ [{assign var="incpath" value=$oViewConf->getModulePath('d3modcfg_lib')|cat:"views/admin/tpl/inc/d3_cfg_mod_active.tpl"}] + [{include file=$incpath}] [{if $oView->getValueStatus() == 'error'}] -
- [{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}]
- +
+ [{oxmultilang ident="D3_CFG_MOD_GENERAL_NOCONFIG_DESC"}] +
+
+ + + + [{else}] @@ -398,9 +359,12 @@ div.box{background: white url([{$oView->getBGLogoUrl()}]) no-repeat bottom right

[{oxmultilang ident="D3_GOOGLEANALYTICS_SECURITYINFORMATIONS"}] [{/if}] +
- -[{include file="bottomitem.tpl"}] +[{assign var="incpath" value=$oViewConf->getModulePath('d3modcfg_lib')|cat:"views/admin/tpl/d3_cfg_mod_inc.tpl"}] +[{include file=$incpath}] - - [{if (!$oD3GASettings->getValue('blD3GASetCampaignOnThankyouOnly') || $oViewConf->getActiveClassName() == 'thankyou') && - !$oD3GASettings->getValue('blD3GASetCampaignTrack') && $oD3GASettings->getValue('sD3GACampaignCode')}] - [{$oD3GASettings->getValue('sD3GACampaignCode')}] - [{/if}] - [{/strip}] -[{/if}] \ No newline at end of file diff --git a/changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl b/changed_full/460-464/out/basic/tpl/inc/popup_basket.tpl deleted file mode 100644 index d5c6090..0000000 --- a/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/changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl b/changed_full/460-464/out/basic/tpl/page/checkout/basket.tpl deleted file mode 100644 index d326e03..0000000 --- a/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/changed_full/460-464/out/basic/tpl/page/checkout/user.tpl b/changed_full/460-464/out/basic/tpl/page/checkout/user.tpl deleted file mode 100644 index 30dd437..0000000 --- a/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/copy_this/modules/d3/d3GoogleAnalytics/metadata.php b/copy_this/modules/d3/d3GoogleAnalytics/metadata.php index 876b44a..eeaeed5 100644 --- a/copy_this/modules/d3/d3GoogleAnalytics/metadata.php +++ b/copy_this/modules/d3/d3GoogleAnalytics/metadata.php @@ -16,8 +16,21 @@ $aModule = array( 'author' => 'D³ Data Development', 'email' => 'support@shopmodule.com', 'url' => 'http://www.oxidmodule.com/', - 'extend' => array( + 'extend' => array( 'oxcmp_utils' => 'd3GoogleAnalytics/views/d3_oxcmp_utils_googleanalytics', 'oxorder' => 'd3GoogleAnalytics/core/d3_oxorder_googleanalytics', - ) + ), + 'files' => array( + 'd3_cfg_googleanalytics' => 'd3\d3GoogleAnalytics\controllers\admin\d3_cfg_googleanalytics.php', + 'd3_cfg_googleanalytics_campaigns' => 'd3\d3GoogleAnalytics\controllers\admin\d3_cfg_googleanalytics_campaigns.php', + 'd3_cfg_googleanalytics_licence' => 'd3\d3GoogleAnalytics\controllers\admin\d3_cfg_googleanalytics_licence.php', + 'd3_cfg_googleanalytics_list' => 'd3\d3GoogleAnalytics\controllers\admin\d3_cfg_googleanalytics_list.php', + 'd3_cfg_googleanalytics_main' => 'd3\d3GoogleAnalytics\controllers\admin\d3_cfg_googleanalytics_main.php', + ), + 'templates' => array( + 'd3_cfg_googleanalytics_campaigns.tpl' => 'd3\d3GoogleAnalytics\views\admin\tpl\d3_cfg_googleanalytics_campaigns.tpl', + 'd3_cfg_googleanalytics_main.tpl' => 'd3\d3GoogleAnalytics\views\admin\tpl\d3_cfg_googleanalytics_main.tpl', + ), + 'events' => array(), + 'blocks' => array(), ); \ No newline at end of file