[*] Mobile : OPC, display carrier price, gift wrapping price and gift products
This commit is contained in:
Francois Gaillard
@@ -32,10 +32,78 @@
|
||||
{if isset($delivery_option_list)}
|
||||
{foreach $delivery_option_list as $id_address => $option_list}
|
||||
{foreach $option_list as $key => $option}
|
||||
{foreach $option.carrier_list as $carrier}
|
||||
<input type="radio" name="delivery_option[{$id_address}]" class="delivery_option_radio delivery_option_radio_carrier" id="opc_carrier_{$carrier.instance->id}" value="{$carrier.instance->id}" {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}checked="checked"{/if} />
|
||||
<label for="opc_carrier_{$carrier.instance->id}">{$carrier.instance->name}</label>
|
||||
{/foreach}
|
||||
<div class="delivery_option {if ($option@index % 2)}alternate_{/if}item">
|
||||
<input class="delivery_option_radio" type="radio" name="delivery_option[{$id_address}]" onchange="{if $opc}updateCarrierSelectionAndGift();{else}updateExtraCarrier('{$key}', {$id_address});{/if}" id="delivery_option_{$id_address}_{$option@index}" value="{$key}" {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}checked="checked"{/if} />
|
||||
<label for="delivery_option_{$id_address}_{$option@index}">
|
||||
<div class="ui-grid-a">
|
||||
<span class="resume ui-block-a">
|
||||
<div class="ui-grid-b">
|
||||
<p class="delivery_option_logo ui-block-a">
|
||||
{foreach $option.carrier_list as $carrier}
|
||||
{if $carrier.logo}
|
||||
<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
|
||||
{else if !$option.unique_carrier}
|
||||
{$carrier.instance->name}
|
||||
{if !$carrier@last} - {/if}
|
||||
{/if}
|
||||
{/foreach}
|
||||
</p>
|
||||
<div class="ui-block-b" style="padding-left:4px;">
|
||||
{if $option.unique_carrier}
|
||||
{foreach $option.carrier_list as $carrier}
|
||||
<div class="delivery_option_title">{$carrier.instance->name}</div>
|
||||
{/foreach}
|
||||
{/if}
|
||||
</div>
|
||||
<div class="ui-block-c">
|
||||
<div class="delivery_option_price">
|
||||
{if $option.total_price_with_tax && !$free_shipping}
|
||||
{if $use_taxes == 1}
|
||||
{convertPrice price=$option.total_price_with_tax} {l s='(tax incl.)'}
|
||||
{else}
|
||||
{convertPrice price=$option.total_price_without_tax} {l s='(tax excl.)'}
|
||||
{/if}
|
||||
{else}
|
||||
{l s='Free'}
|
||||
{/if}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
<span class="delivery_option_carrier ui-block-b {if isset($delivery_option[$id_address]) && $delivery_option[$id_address] == $key}selected{/if} {if $option.unique_carrier}not-displayable{/if}">
|
||||
{foreach $option.carrier_list as $carrier}
|
||||
<tr>
|
||||
{if !$option.unique_carrier}
|
||||
<td class="first_item">
|
||||
<input type="hidden" value="{$carrier.instance->id}" name="id_carrier" />
|
||||
{if $carrier.logo}
|
||||
<img src="{$carrier.logo}" alt="{$carrier.instance->name}"/>
|
||||
{/if}
|
||||
</td>
|
||||
<td>
|
||||
{$carrier.instance->name}
|
||||
</td>
|
||||
{/if}
|
||||
<td {if $option.unique_carrier}class="first_item" colspan="2"{/if}>
|
||||
<input type="hidden" value="{$carrier.instance->id}" name="id_carrier" />
|
||||
{if isset($carrier.instance->delay[$cookie->id_lang])}
|
||||
{$carrier.instance->delay[$cookie->id_lang]}<br />
|
||||
{if count($carrier.product_list) <= 1}
|
||||
({l s='Product concerned:'}
|
||||
{else}
|
||||
({l s='Products concerned:'}
|
||||
{/if}
|
||||
{* This foreach is on one line, to avoid tabulation in the title attribute of the acronym *}
|
||||
{foreach $carrier.product_list as $product}
|
||||
{if $product@index == 4}<acronym title="{/if}{if $product@index >= 4}{$product.name}{if !$product@last}, {else}">...</acronym>){/if}{else}{$product.name}{if !$product@last}, {else}){/if}{/if}{/foreach}
|
||||
{/if}
|
||||
</td>
|
||||
</tr>
|
||||
{/foreach}
|
||||
</span>
|
||||
</div>
|
||||
</label>
|
||||
</div>
|
||||
{/foreach}
|
||||
{/foreach}
|
||||
{/if}
|
||||
@@ -45,15 +113,26 @@
|
||||
<label for="recyclable">{l s='I agree to receive my order in recycled packaging'}.</label>
|
||||
</fieldset>
|
||||
|
||||
<h3 class="bg">{l s='Gift'}</h3>
|
||||
<fieldset data-role="fieldcontain">
|
||||
<input type="checkbox" id="gift" name="gift" value="1" class="delivery_option_radio" {if $cart->gift == 1}checked="checked"{/if} />
|
||||
<label for="gift">{l s='I would like my order to be gift-wrapped.'}</label>
|
||||
</fieldset>
|
||||
<p class="textarea" id="gift_div" style="display: none;">
|
||||
<label for="gift_message">{l s='If you would like, feel free to add a personalized message.'}</label>
|
||||
<textarea name="gift_message" id="gift_message" cols="35" rows="5">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
|
||||
</p>
|
||||
{if $giftAllowed}
|
||||
<h3 class="gift_title">{l s='Gift'}</h3>
|
||||
<p class="checkbox">
|
||||
<input type="checkbox" name="gift" id="gift" value="1" {if $cart->gift == 1}checked="checked"{/if} />
|
||||
<label for="gift">{l s='I would like my order to be gift wrapped.'}</label>
|
||||
<br />
|
||||
|
||||
{if $gift_wrapping_price > 0}
|
||||
({l s='Additional cost of'}
|
||||
<span class="price" id="gift-price">
|
||||
{if $priceDisplay == 1}{convertPrice price=$total_wrapping_tax_exc_cost}{else}{convertPrice price=$total_wrapping_cost}{/if}
|
||||
</span>
|
||||
{if $use_taxes}{if $priceDisplay == 1} {l s='(tax excl.)'}{else} {l s='(tax incl.)'}{/if}{/if})
|
||||
{/if}
|
||||
</p>
|
||||
<p id="gift_div" class="textarea">
|
||||
<label for="gift_message">{l s='If you\'d like, you can add a note to the gift:'}</label>
|
||||
<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
|
||||
</p>
|
||||
{/if}
|
||||
|
||||
<h3 class="bg">{l s='Terms of service'}</h3>
|
||||
<fieldset data-role="fieldcontain" id="cgv_checkbox">
|
||||
|
||||
Reference in New Issue
Block a user