antadis/privilegedemarque
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: antadis:dev
Branches Tags
antadis:dev
antadis:master
antadis:ticket/r13031-colissimo-webservice
antadis:ticket/r13883-exportnewsletterpro
antadis:ticket/r13756-slider
antadis:ticket/r13721-mobile-inscription
antadis:ticket/r13612-logo-cadre
antadis:ticket/private-sale-logo-13612
antadis:ticket/r13031-socolissimo
antadis:ticket/r13046-column-blocked-mailjet
antadis:devel
antadis:ticket/10533
...
pull from: antadis:devel
Branches Tags
antadis:master
antadis:dev
antadis:ticket/r13031-colissimo-webservice
antadis:ticket/r13883-exportnewsletterpro
antadis:ticket/r13756-slider
antadis:ticket/r13721-mobile-inscription
antadis:ticket/r13612-logo-cadre
antadis:ticket/private-sale-logo-13612
antadis:ticket/r13031-socolissimo
antadis:ticket/r13046-column-blocked-mailjet
antadis:devel
antadis:ticket/10533

3 Commits
dev ... devel

Author SHA1 Message Date
Rodney Figaro
f9726267e0 Merge branch 'ticket_11119' into devel 2016-10-25 10:31:28 +02:00
Rodney Figaro
3f9ba907ac Merge branch 'ticket_11119' into devel 2016-10-24 15:51:46 +02:00
Christophe Latour
8a04e57771 Tunnel achat url friendly 2016-10-18 12:29:15 +02:00
3 changed files with 9 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
themes/site/order-address.tpl
View File

@ -32,7 +32,7 @@
{l s='Addresses'}
<span class="shape-red-long"></span>
</h1>
<form action="{$link->getPageLink($back_order_page, true)|escape:'html':'UTF-8'}" class="formaddress" method="post">
<form action="{$link->getPageLink('order', true, NULL, 'step=2')|escape:'html':'UTF-8'}" class="formaddress" method="post">
{if !$opc}
<p class="cart_navigation top_submit snotmobile right">
<button type="submit" name="processAddress" class="button-grey right">
@ -116,7 +116,7 @@
</button>
<input type="hidden" class="hidden" name="step" value="2" />
<input type="hidden" name="back" value="{$back}" />
<a href="{$link->getPageLink($back_order_page, true, NULL, "step=0{if $back}&back={$back}{/if}")|escape:'html':'UTF-8'}" title="{l s='Previous'}" class="button-grey button-grey-min left">
<a href="{$link->getPageLink($back_order_page, true, NULL)|escape:'html':'UTF-8'}" title="{l s='Previous'}" class="button-grey button-grey-min left">
<span>
{l s='Continue Shopping'}
</span>

9
themes/site/order-carrier.tpl
View File

@ -30,7 +30,7 @@
<h1 class="page-heading">{l s='Shipping:'}
<span class="shape-red-long"></span></h1>
{include file="$tpl_dir./errors.tpl"}
<form id="form" action="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}" method="post" name="carrier_area">
<form id="form" action="{$link->getPageLink('order', true, NULL, "step=3")|escape:'html':'UTF-8'}" method="post" name="carrier_area">
{else}
<div id="carrier_area" class="opc-main-block">
<h1 class="page-heading step-num"><span>2</span> {l s='Delivery methods'}</h1>
@ -280,10 +280,11 @@
</span>
</button>
{/if}
<input class="hidden" type="hidden" name="multi-shipping" value="{$multi_shipping}" />
{if !$is_guest}
{if $back}
<a
href="{$link->getPageLink('order', true, NULL, "step=1&back={$back}&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}"
href="{$link->getPageLink('order', true, NULL, "step=1")|escape:'html':'UTF-8'}"
title="{l s='Previous'}"
class="button-grey button-grey-min left">
<span>
@ -292,7 +293,7 @@
</a>
{else}
<a
href="{$link->getPageLink('order', true, NULL, "step=1&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}"
href="{$link->getPageLink('order', true, NULL, "step=1")|escape:'html':'UTF-8'}"
title="{l s='Previous'}"
class="button-grey button-grey-min left">
<span>
@ -302,7 +303,7 @@
{/if}
{else}
<a
href="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}"
href="{$link->getPageLink('order', true, NULL, "step=1")|escape:'html':'UTF-8'}"
title="{l s='Previous'}"
class="button-grey button-grey-min left">
<span>

4
themes/site/order-steps.tpl
View File

@ -46,7 +46,7 @@
</li>
<li class="col-sm-3 {if $current_step=='address'}step_current{elseif $current_step=='shipping'}step_done step_done_last{else}{if $current_step=='payment' || $current_step=='shipping'}step_done{else}step_todo{/if}{/if} third">
{if $current_step=='payment' || $current_step=='shipping'}
<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=1&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}">
<a href="{$link->getPageLink('order', true, NULL, "step=1")|escape:'html':'UTF-8'}">
{l s='Address'}
</a>
{else}
@ -55,7 +55,7 @@
</li>
<li class="col-sm-3 {if $current_step=='shipping'}step_current{else}{if $current_step=='payment'}step_done step_done_last{else}step_todo{/if}{/if} four">
{if $current_step=='payment'}
<a href="{$link->getPageLink('order', true, NULL, "{$smarty.capture.url_back}&step=2&multi-shipping={$multi_shipping}")|escape:'html':'UTF-8'}">
<a href="{$link->getPageLink('order', true, NULL, "step=2")|escape:'html':'UTF-8'}">
{l s='Shipping'}
</a>
{else}