add further form params

.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

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()}]
+<form class="js-oxValidate" name="login" action="[{ $oViewConf->getSslSelfLink()|oxaddparams:$sAddClassParams }]" method="post">
+[{assign var="aErrors" value=$oView->getFieldValidationErrors()}]
+    <ul class="form">
+        <li [{if $aErrors}]class="oxInValid"[{/if}]>
+            [{ $oViewConf->getHiddenSid() }]
+            [{ $oViewConf->getNavFormParams() }]
+            <input type="hidden" name="fnc" value="login_noredirect">
+            <input type="hidden" name="cl" value="[{ $oViewConf->getActiveClassName() }]">
+            <label class="short">[{ oxmultilang ident="WIDGET_LOGINBOX_EMAIL_ADDRESS" }]</label>
+            <input type="text" name="lgn_usr" class="textbox js-oxValidate js-oxValidate_notEmpty" data-fieldsize="pair-xsmall">
+            <p class="underInput short oxValidateError">
+                <span class="js-oxError_notEmpty">[{ oxmultilang ident="EXCEPTION_INPUT_NOTALLFIELDS" }]</span>
+            </p>
+        </li>
+        <li [{if $aErrors}]class="oxInValid"[{/if}]>
+            <label class="short">[{ oxmultilang ident="WIDGET_LOGINBOX_PASSWORD" }]</label>
+            <input type="password" name="lgn_pwd" class="js-oxValidate js-oxValidate_notEmpty textbox stepsPasswordbox" data-fieldsize="pair-xsmall">
+            &nbsp;<strong><a class="forgotPasswordOpener" id="step2PswdOpener" href="#" title="[{ oxmultilang ident="WIDGET_LOGINBOX_FORGOT_PASSWORD" }]">?</a></strong>
+            <p class="underInput short oxValidateError">
+                <span class="js-oxError_notEmpty">[{ oxmultilang ident="EXCEPTION_INPUT_NOTALLFIELDS" }]</span>
+            </p>
+        </li>
+        <li><button type="submit" class="submitButton">[{ oxmultilang ident="LOGIN" }]</button></li>
+    </ul>
+</form>

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' ));});"}]
+    <div class="checkoutOptions clear">
+        [{block name="checkout_options_noreg"}]
+            [{if $oView->getShowNoRegOption() }]
+            <div class="lineBox option" id="optionNoRegistration">
+                <h3>[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_NOREGISTRATION" }]</h3>
+                [{block name="checkout_options_noreg_text"}]
+                    <p>[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_NOREGISTRATION_DESCRIPTION" }]</p>
+                    [{if $oView->isDownloadableProductWarning() }]
+                        <p class="errorMsg">[{ oxmultilang ident="MESSAGE_DOWNLOADABLE_PRODUCT" }]</p>
+                    [{/if}]
+                [{/block}]
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=user" }]" method="post">
+                    <p>
+                        [{ $oViewConf->getHiddenSid() }]
+                        [{ $oViewConf->getNavFormParams() }]
+                        <input type="hidden" name="cl" value="user">
+                        <input type="hidden" name="fnc" value="">
+                        <input type="hidden" name="option" value="1">
+                        <button class="submitButton nextStep" type="submit">[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_NEXT" }]</button>
+                    </p>
+                </form>
+            </div>
+            [{/if}]
+        [{/block}]
+
+        [{block name="checkout_options_reg"}]
+            <div class="lineBox option" id="optionRegistration">
+                <h3>[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_REGISTRATION" }]</h3>
+                [{block name="checkout_options_reg_text"}]
+                    <p>[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_REGISTRATION_DESCRIPTION" }]</p>
+                [{/block}]
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=user" }]" method="post">
+                    <p>
+                        [{ $oViewConf->getHiddenSid() }]
+                        [{ $oViewConf->getNavFormParams() }]
+                        <input type="hidden" name="cl" value="user">
+                        <input type="hidden" name="fnc" value="">
+                        <input type="hidden" name="option" value="3">
+                        <button class="submitButton nextStep" type="submit">[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_NEXT" }]</button>
+                    </p>
+                </form>
+            </div>
+        [{/block}]
+
+        [{block name="checkout_options_login"}]
+            <div class="lineBox option" id="optionLogin">
+                <h3>[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_LOGIN" }]</h3>
+                [{block name="checkout_options_login_text"}]
+                    <p>[{ oxmultilang ident="PAGE_CHECKOUT_USER_OPTION_LOGIN_DESCRIPTION" }]</p>
+                [{/block}]
+                [{ include file="form/login.tpl"}]
+            </div>
+        [{/block}]
+    </div>
+[{/block}]

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()}]
+            <div class="lineBox clear">
+                <span>&nbsp;</span>
+                <span class="title">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_TITLE2" }]</span>
+            </div>
+        [{/if}]
+
+        [{block name="checkout_order_details"}]
+            [{ if !$oxcmp_basket->getProductsCount()  }]
+                [{block name="checkout_order_emptyshippingcart"}]
+                <div class="status corners error">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BASKETEMPTY" }]</div>
+                [{/block}]
+            [{else}]
+                [{assign var="currency" value=$oView->getActCurrency() }]
+
+                [{if $oView->isLowOrderPrice()}]
+                    [{block name="checkout_order_loworderprice_top"}]
+                        <div>[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]</div>
+                    [{/block}]
+                [{else}]
+
+                    <div id="orderAgbTop">
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                        <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=order" }]" method="post" id="orderConfirmAgbTop">
+                            [{ $oViewConf->getHiddenSid() }]
+                            [{ $oViewConf->getNavFormParams() }]
+                            <input type="hidden" name="cl" value="order">
+                            <input type="hidden" name="fnc" value="[{$oView->getExecuteFnc()}]">
+                            <input type="hidden" name="challenge" value="[{$challenge}]">
+                            <input type="hidden" name="sDeliveryAddressMD5" value="[{$oView->getDeliveryAddressMD5()}]">
+                            <div class="agb">
+                                [{if $oView->isActive('PsLogin') }]
+                                    <input type="hidden" name="ord_agb" value="1">
+                                [{else}]
+                                    [{if $oView->isConfirmAGBActive()}]
+                                        [{oxifcontent ident="oxrighttocancellegend" object="oContent"}]
+                                            <h3 class="section">
+                                                <strong>[{ $oContent->oxcontents__oxtitle->value }]</strong>
+                                            </h3>
+                                            <input type="hidden" name="ord_agb" value="0">
+                                            <input id="checkAgbTop" class="checkbox" type="checkbox" name="ord_agb" value="1">
+                                            [{ $oContent->oxcontents__oxcontent->value }]
+                                        [{/oxifcontent}]
+                                    [{else}]
+                                        [{oxifcontent ident="oxrighttocancellegend2" object="oContent"}]
+                                            <h3 class="section">
+                                                <strong>[{ $oContent->oxcontents__oxtitle->value }]</strong>
+                                            </h3>
+                                            <input type="hidden" name="ord_agb" value="1">
+                                            [{ $oContent->oxcontents__oxcontent->value }]
+                                        [{/oxifcontent}]
+                                    [{/if}]
+                                [{/if}]
+                            </div>
+
+                            [{oxscript add="$('#checkAgbTop').click(function(){ $('input[name=ord_agb]').val( parseInt($('input[name=ord_agb]').val()) ^ 1);});"}]
+
+                            [{if $oView->showOrderButtonOnTop()}]
+                                <div class="lineBox clear">
+                                    <a href="[{ oxgetseourl ident=$oViewConf->getPaymentLink() }]" class="prevStep submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BACKSTEP" }]</a>
+                                    <button type="submit" class="submitButton nextStep largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_SUBMITORDER" }]</button>
+                                </div>
+                            [{/if}]
+                        </form>
+                    </div>
+                [{/if}]
+
+                [{block name="checkout_order_vouchers"}]
+                    [{ if $oViewConf->getShowVouchers() && $oxcmp_basket->getVouchers()}]
+                        [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_USEDCOUPONS" }]
+                        <div>
+                            [{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" }]<br>
+                                    [{ oxmultilang ident="PAGE_CHECKOUT_ORDER_REASON" }]
+                                    [{ $oEr->getOxMessage() }]<br>
+                                [{/if}]
+                            [{/foreach}]
+                            [{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=aVouchers}]
+                                [{ $sVoucher->sVoucherNr }]<br>
+                            [{/foreach }]
+                        </div>
+                    [{/if}]
+                [{/block}]
+
+                [{block name="checkout_order_address"}]
+                    <div id="orderAddress">
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                        <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=user" }]" method="post">
+                            <h3 class="section">
+                            <strong>[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_ADDRESSES" }]</strong>
+                            [{ $oViewConf->getHiddenSid() }]
+                            <input type="hidden" name="cl" value="user">
+                            <input type="hidden" name="fnc" value="">
+                            <button type="submit" class="submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_MODIFYADDRESS" }]</button>
+                            </h3>
+                        </form>
+                        <dl>
+                            <dt>[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BILLINGADDRESS" }]</dt>
+                            <dd>
+                                [{include file="widget/address/billing_address.tpl"}]
+                            </dd>
+                        </dl>
+                        [{assign var="oDelAdress" value=$oView->getDelAddress() }]
+                        [{if $oDelAdress }]
+                        <dl class="shippingAddress">
+                            <dt>[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_SHIPPINGADDRESS" }]</dt>
+                            <dd>
+                                [{include file="widget/address/shipping_address.tpl" delivadr=$oDelAdress}]
+                            </dd>
+                        </dl>
+                        [{/if}]
+
+                        [{if $oView->getOrderRemark() }]
+                            <dl class="orderRemarks">
+                                <dt>[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_WHATIWANTEDTOSAY" }]</dt>
+                                <dd>
+                                    [{ $oView->getOrderRemark() }]
+                                </dd>
+                            </dl>
+                        [{/if}]
+                    </div>
+                    <div style="clear:both;"></div>
+                [{/block}]
+
+                [{block name="shippingAndPayment"}]
+                    <div id="orderShipping">
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                    <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=payment" }]" method="post">
+                        <h3 class="section">
+                            <strong>[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_SHIPPINGCARRIER" }]</strong>
+                            [{ $oViewConf->getHiddenSid() }]
+                            <input type="hidden" name="cl" value="payment">
+                            <input type="hidden" name="fnc" value="">
+                            <button type="submit" class="submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_MODIFY2" }]</button>
+                        </h3>
+                    </form>
+                    [{assign var="oShipSet" value=$oView->getShipSet() }]
+                    [{ $oShipSet->oxdeliveryset__oxtitle->value }]
+                    </div>
+
+                    <div id="orderPayment">
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                        <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=payment" }]" method="post">
+                            <h3 class="section">
+                                <strong>[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_PAYMENTMETHOD" }]</strong>
+                                [{ $oViewConf->getHiddenSid() }]
+                                <input type="hidden" name="cl" value="payment">
+                                <input type="hidden" name="fnc" value="">
+                                <button type="submit" class="submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_MODIFY3" }]</button>
+                            </h3>
+                        </form>
+                        [{assign var="payment" value=$oView->getPayment() }]
+                        [{ $payment->oxpayments__oxdesc->value }]
+                    </div>
+                [{/block}]
+
+                <div id="orderEditCart">
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                    <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=basket" }]" method="post">
+                        <h3 class="section">
+                            <strong>[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BASKET" }]</strong>
+                            [{ $oViewConf->getHiddenSid() }]
+                            <input type="hidden" name="cl" value="basket">
+                            <input type="hidden" name="fnc" value="">
+                            <button type="submit" class="submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_MODIFY4" }]</button>
+                        </h3>
+                    </form>
+                </div>
+
+                [{block name="order_basket"}]
+                    <div class="lineBox">
+                        [{include file="page/checkout/inc/basketcontents.tpl" editable=false}]
+                    </div>
+                [{/block}]
+
+                [{if $oView->isLowOrderPrice() }]
+                    [{block name="checkout_order_loworderprice_bottom"}]
+                        <div class="lineBox clear">
+                            <div>[{ oxmultilang ident="MIN_ORDER_PRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]</div>
+                        </div>
+                    [{/block}]
+                [{else}]
+                    [{block name="checkout_order_btn_confirm_bottom"}]
+[{*** D3 MOD NEXT_LINE  * GoogleAnalytics ***}]
+                        <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:"cl=order" }]" method="post" id="orderConfirmAgbBottom">
+                            [{ $oViewConf->getHiddenSid() }]
+                            [{ $oViewConf->getNavFormParams() }]
+                            <input type="hidden" name="cl" value="order">
+                            <input type="hidden" name="fnc" value="[{$oView->getExecuteFnc()}]">
+                            <input type="hidden" name="challenge" value="[{$challenge}]">
+                            <input type="hidden" name="sDeliveryAddressMD5" value="[{$oView->getDeliveryAddressMD5()}]">
+
+                            <div class="agb">
+                                [{if $oView->isActive('PsLogin') }]
+                                    <input type="hidden" name="ord_agb" value="1">
+                                [{else}]
+                                    [{if $oView->isConfirmAGBActive()}]
+                                            <input type="hidden" name="ord_agb" value="0">
+                                    [{/if}]
+                                [{/if}]
+                            </div>
+
+                            <div class="lineBox clear">
+                                <a href="[{ oxgetseourl ident=$oViewConf->getPaymentLink() }]" class="prevStep submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_BACKSTEP" }]</a>
+                                <button type="submit" class="submitButton nextStep largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_ORDER_SUBMITORDER" }]</button>
+                            </div>
+                        </form>
+                    [{/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}]

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()}]
+                <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:$sAddClassParams  }]" name="shipping" id="shipping" method="post">
+                    <div>
+                        [{ $oViewConf->getHiddenSid() }]
+                        [{ $oViewConf->getNavFormParams() }]
+                        <input type="hidden" name="cl" value="[{ $oViewConf->getActiveClassName() }]">
+                        <input type="hidden" name="fnc" value="changeshipping">
+                    </div>
+                    <h3 id="deliveryHeader" class="blockHead">[{ if $oView->getAllSetsCnt() > 1 }][{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_SELECTSHIPPING" }][{else}][{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_SELECTEDSHIPPING" }][{/if}]</h3>
+                    <ul>
+                        <li>
+                            [{block name="act_shipping"}]
+                                <select name="sShipSet" onChange="JavaScript:document.forms.shipping.submit();">
+                                    [{foreach key=sShipID from=$oView->getAllSets() item=oShippingSet name=ShipSetSelect}]
+                                        <option value="[{$sShipID}]" [{if $oShippingSet->blSelected}]SELECTED[{/if}]>[{ $oShippingSet->oxdeliveryset__oxtitle->value }]</option>
+                                    [{/foreach}]
+                                </select>
+                                <noscript>
+                                    <button type="submit" class="submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UPDATESHIPPING" }]</button>
+                                </noscript>
+                            [{/block}]
+                        </li>
+                    </ul>
+                    [{if $oxcmp_basket->getDeliveryCosts() }]
+                        [{if $oxcmp_basket->getDelCostNet()}]
+                        <div id="shipSetCost">
+                            <b>[{ 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 }]
+                            </b>
+                        </div>
+                        [{ else }]
+                        <div id="shipSetCost">
+                            <b>[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_CHARGE" }] [{ $oxcmp_basket->getFDeliveryCosts() }] [{ $currency->sign}]</b>
+                        </div>
+                        [{/if}]
+                    [{/if}]
+                    <div class="lineBlock"></div>
+                </form>
+            [{/if}]
+        [{/block}]
+
+        [{block name="checkout_payment_errors"}]
+            [{assign var="iPayError" value=$oView->getPaymentError() }]
+            [{ if $iPayError == 1}]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_COMLETEALLFIELDS" }]</div>
+            [{ elseif $iPayError == 2}]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_AUTHORIZATIONFAILED" }]</div>
+            [{ elseif $iPayError == 4 }]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLESHIPPING" }]</div>
+            [{ elseif $iPayError == 5 }]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLEPAYMENT" }]</div>
+            [{ elseif $iPayError == 6 }]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLETSPROTECTION" }]</div>
+            [{ elseif $iPayError > 6 }]
+                <!--Add custom error message here-->
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_UNAVAILABLEPAYMENT" }]</div>
+            [{ elseif $iPayError == -1}]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_ERRUNAVAILABLEPAYMENT" }] "[{ $oView->getPaymentErrorText() }]").</div>
+            [{ elseif $iPayError == -2}]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_NOSHIPPINGFOUND" }]</div>
+            [{ elseif $iPayError == -3}]
+                <div class="status error">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_SELECTANOTHERPAYMENT" }]</div>
+            [{/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()}]
+            <form action="[{ $oViewConf->getSslSelfLink()|oxaddparams:$sAddClassParams }]" class="js-oxValidate payment" id="payment" name="order" method="post">
+                <div>
+                    [{ $oViewConf->getHiddenSid() }]
+                    [{ $oViewConf->getNavFormParams() }]
+                    <input type="hidden" name="cl" value="[{ $oViewConf->getActiveClassName() }]">
+                    <input type="hidden" name="fnc" value="validatepayment">
+                </div>
+
+                [{if $oView->getPaymentList()}]
+                    <h3 id="paymentHeader" class="blockHead">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_PAYMENT" }]</h3>
+                    [{ 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()}]
+                            <div class="lineBox clear">
+                            <div><b>[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_MINORDERPRICE" }] [{ $oView->getMinOrderPrice() }] [{ $currency->sign }]</b></div>
+                            </div>
+                        [{else}]
+                            <div class="lineBox clear">
+                                <a href="[{ oxgetseourl ident=$oViewConf->getOrderLink() }]" class="prevStep submitButton largeButton" id="paymentBackStepBottom">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_BACKSTEP" }]</a>
+                                <button type="submit" name="userform" class="submitButton nextStep largeButton" id="paymentNextStepBottom">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_NEXTSTEP" }]</button>
+                            </div>
+                        [{/if}]
+                    [{/block}]
+
+                [{elseif $oView->getEmptyPayment()}]
+                    [{block name="checkout_payment_nopaymentsfound"}]
+                        <div class="lineBlock"></div>
+                        <h3 id="paymentHeader" class="blockHead">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_INFO" }]</h3>
+                        [{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_EMPTY_TEXT" }]
+                        <input type="hidden" name="paymentid" value="oxempty">
+                        <div class="lineBox clear">
+                            <a href="[{ oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=user" }]" class="prevStep submitButton largeButton">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_BACKSTEP" }]</a>
+                            <button type="submit" name="userform" class="submitButton nextStep largeButton" id="paymentNextStepBottom">[{ oxmultilang ident="PAGE_CHECKOUT_PAYMENT_NEXTSTEP" }]</button>
+                        </div>
+                    [{/block}]
+                [{/if}]
+            </form>
+        [{/block}]
+    [{/block}]
+    [{insert name="oxid_tracker" title=$template_title }]
+[{/capture}]
+
+[{include file="layout/page.tpl"}]