From 488b4635299fa5e7ea1f205bbf044fd6e4b2fbc8 Mon Sep 17 00:00:00 2001 From: DanielSeifert Date: Thu, 28 Feb 2013 17:01:52 +0000 Subject: [PATCH] add further form params --- .gitattributes | 4 + .../views/azure/tpl/form/login.tpl | 30 +++ .../azure/tpl/page/checkout/inc/options.tpl | 60 +++++ .../views/azure/tpl/page/checkout/order.tpl | 234 ++++++++++++++++++ .../views/azure/tpl/page/checkout/payment.tpl | 149 +++++++++++ 5 files changed, 477 insertions(+) create mode 100644 changed_full/470-/application/views/azure/tpl/form/login.tpl create mode 100644 changed_full/470-/application/views/azure/tpl/page/checkout/inc/options.tpl create mode 100644 changed_full/470-/application/views/azure/tpl/page/checkout/order.tpl create mode 100644 changed_full/470-/application/views/azure/tpl/page/checkout/payment.tpl diff --git a/.gitattributes b/.gitattributes index 4429c60..5d4b763 100644 --- a/.gitattributes +++ b/.gitattributes @@ -247,10 +247,14 @@ 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/470-/application/views/azure/tpl/form/login.tpl -text changed_full/470-/application/views/azure/tpl/form/user_checkout_change.tpl -text changed_full/470-/application/views/azure/tpl/form/user_checkout_noregistration.tpl -text changed_full/470-/application/views/azure/tpl/form/user_checkout_registration.tpl -text changed_full/470-/application/views/azure/tpl/page/checkout/basket.tpl -text +changed_full/470-/application/views/azure/tpl/page/checkout/inc/options.tpl -text +changed_full/470-/application/views/azure/tpl/page/checkout/order.tpl -text +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 copy_this/.noencode -text diff --git a/changed_full/470-/application/views/azure/tpl/form/login.tpl b/changed_full/470-/application/views/azure/tpl/form/login.tpl new file mode 100644 index 0000000..3447f7b --- /dev/null +++ b/changed_full/470-/application/views/azure/tpl/form/login.tpl @@ -0,0 +1,30 @@ +[{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()}] + +
\ No newline at end of file diff --git a/changed_full/470-/application/views/azure/tpl/page/checkout/inc/options.tpl b/changed_full/470-/application/views/azure/tpl/page/checkout/inc/options.tpl new file mode 100644 index 0000000..f306203 --- /dev/null +++ b/changed_full/470-/application/views/azure/tpl/page/checkout/inc/options.tpl @@ -0,0 +1,60 @@ +[{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/470-/application/views/azure/tpl/page/checkout/order.tpl b/changed_full/470-/application/views/azure/tpl/page/checkout/order.tpl new file mode 100644 index 0000000..496ccf0 --- /dev/null +++ b/changed_full/470-/application/views/azure/tpl/page/checkout/order.tpl @@ -0,0 +1,234 @@ +[{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/470-/application/views/azure/tpl/page/checkout/payment.tpl b/changed_full/470-/application/views/azure/tpl/page/checkout/payment.tpl new file mode 100644 index 0000000..d4b3c78 --- /dev/null +++ b/changed_full/470-/application/views/azure/tpl/page/checkout/payment.tpl @@ -0,0 +1,149 @@ +[{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="PAGE_CHECKOUT_PAYMENT_SELECTSHIPPING" }][{else}][{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_SELECTEDSHIPPING" }][{/if}]

+ + [{if $oxcmp_basket->getDeliveryCosts() }] + [{if $oxcmp_basket->getDelCostNet()}] +
+ [{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_CHARGE" }] [{ $oxcmp_basket->getDelCostNet() }] [{ $currency->sign }] + [{if $oxcmp_basket->getDelCostVat() }] + ([{ oxmultilang ident="PAGE_CHECKOUT_BASKETCONTENTS_PLUSTAX1" }] + [{ $oxcmp_basket->getDelCostVat() }] [{ $currency->sign }]) + [{/if }] + +
+ [{ else }] +
+ [{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_CHARGE" }] [{ $oxcmp_basket->getFDeliveryCosts() }] [{ $currency->sign}] +
+ [{/if}] + [{/if}] +
+
+ [{/if}] + [{/block}] + + [{block name="checkout_payment_errors"}] + [{assign var="iPayError" value=$oView->getPaymentError() }] + [{ if $iPayError == 1}] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_COMLETEALLFIELDS" }]
+ [{ elseif $iPayError == 2}] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_AUTHORIZATIONFAILED" }]
+ [{ elseif $iPayError == 4 }] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLESHIPPING" }]
+ [{ elseif $iPayError == 5 }] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLEPAYMENT" }]
+ [{ elseif $iPayError == 6 }] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLETSPROTECTION" }]
+ [{ elseif $iPayError > 6 }] + +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLEPAYMENT" }]
+ [{ elseif $iPayError == -1}] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_ERRUNAVAILABLEPAYMENT" }] "[{ $oView->getPaymentErrorText() }]").
+ [{ elseif $iPayError == -2}] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_NOSHIPPINGFOUND" }]
+ [{ elseif $iPayError == -3}] +
[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_SELECTANOTHERPAYMENT" }]
+ [{/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="PAGE_CHECKOUT_PAYMENT_PAYMENT" }]

+ [{ 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="PAGE_CHECKOUT_PAYMENT_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]
+
+ [{else}] +
+ [{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_BACKSTEP" }] + +
+ [{/if}] + [{/block}] + + [{elseif $oView->getEmptyPayment()}] + [{block name="checkout_payment_nopaymentsfound"}] +
+

[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_INFO" }]

+ [{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_EMPTY_TEXT" }] + +
+ [{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_BACKSTEP" }] + +
+ [{/block}] + [{/if}] +
+ [{/block}] + [{/block}] + [{insert name="oxid_tracker" title=$template_title }] +[{/capture}] + +[{include file="layout/page.tpl"}] \ No newline at end of file