TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check by default the first delivery method and check by default the default delivery address

Browse Source
This commit is contained in:
touffies
2013-10-25 11:28:54 +02:00
parent 166407844b
commit 0de3245eb6
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
templates/default/order-delivery.html
View File

@@ -31,6 +31,7 @@
</div> </div>
{form name="thelia.order.delivery"} {form name="thelia.order.delivery"}
{assign var="isPost" value="{$smarty.post|count}"}
<form id="form-cart-delivery" action="{url path="/order/delivery"}" method="post" role="form" {form_enctype form=$form}> <form id="form-cart-delivery" action="{url path="/order/delivery"}" method="post" role="form" {form_enctype form=$form}>
{form_hidden_fields form=$form} {form_hidden_fields form=$form}
@@ -42,7 +43,7 @@
<div id="delivery-address" class="panel"> <div id="delivery-address" class="panel">
<div class="panel-heading clearfix"> <div class="panel-heading clearfix">
<a href="{url path="/address/create"}" class="btn btn-add-address">{intl l="Add a new address"}</a> <a href="{url path="/address/create"}" class="btn btn-add-address">{intl l="Add a new address"}</a>
{intl l="Chose your delivery address"} {intl l="Choose your delivery address"}
{if $error} {if $error}
<span class="help-block"><span class="icon-remove"></span> {$message}</span> <span class="help-block"><span class="icon-remove"></span> {$message}</span>
{/if} {/if}
@@ -50,15 +51,19 @@
<div class="panel-body"> <div class="panel-body">
<table class="table table-address" role="presentation" summary="Address Books"> <table class="table table-address" role="presentation" summary="Address Books">
<tbody> <tbody>
{loop type="address" name="customer.addresses" customer="current"} {loop type="address" name="customer.addresses" customer="current"}
{if $isPost}
{if $value == $ID}
{assign var="isDeliveryAddressChecked" value="true"}
{/if}
{elseif $DEFAULT}
{assign var="isDeliveryAddressChecked" value="true"}
{/if}
<tr> <tr>
<th> <th>
<div class="radio"> <div class="radio">
<label for="delivery-address_{$ID}"> <label for="delivery-address_{$ID}">
<input type="radio" name="{$name}" value="{$ID}" {if $value == $ID}checked="checked"{/if} id="delivery-address_{$ID}"> <input type="radio" name="{$name}" value="{$ID}"{if isDeliveryAddressChecked } checked="checked"{/if} id="delivery-address_{$ID}">
{$LABEL|default:"{intl l='Address %nb' nb={$LOOP_COUNT}}"} {$LABEL|default:"{intl l='Address %nb' nb={$LOOP_COUNT}}"}
</label> </label>
</div> </div>
@@ -124,8 +129,15 @@
{loop type="delivery" name="deliveries" force_return="true"} {loop type="delivery" name="deliveries" force_return="true"}
<div class="radio"> <div class="radio">
{form_field form=$form field='delivery-module'} {form_field form=$form field='delivery-module'}
{if $isPost}
{if $value == $ID}
{assign var="isDeliveryMethodChecked" value="true"}
{/if}
{elseif $LOOP_COUNT == 1}
{assign var="isDeliveryMethodChecked" value="true"}
{/if}
<label for="delivery-method_{$ID}"> <label for="delivery-method_{$ID}">
<input type="radio" name="{$name}" id="delivery-method_{$ID}" {if $value == $ID}checked="checked"{/if} value="{$ID}"> <input type="radio" name="{$name}" id="delivery-method_{$ID}"{if $isDeliveryMethodChecked} checked="checked"{/if} value="{$ID}">
<strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE} <strong>{$TITLE}</strong> / {currency attr="symbol"} {$POSTAGE}
</label> </label>
{/form_field} {/form_field}