dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : fixed bug #PSCFV-3853

Browse Source
This commit is contained in:
vAugagneur
2012-09-05 09:18:06 +00:00
parent ef6baf5f5e
commit cc5c61ed52
2 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/OrderOpcController.php
+1 -1
View File
@@ -494,7 +494,7 @@ class OrderOpcControllerCore extends ParentOrderController
} }
$carriers = $this->context->cart->simulateCarriersOutput(); $carriers = $this->context->cart->simulateCarriersOutput();
$delivery_option = $this->context->cart->getDeliveryOption(null, true, false); $delivery_option = $this->context->cart->getDeliveryOption(null, false, false);
$wrapping_fees = (float)(Configuration::get('PS_GIFT_WRAPPING_PRICE')); $wrapping_fees = (float)(Configuration::get('PS_GIFT_WRAPPING_PRICE'));
$wrapping_fees_tax = new Tax((int)(Configuration::get('PS_GIFT_WRAPPING_TAX'))); $wrapping_fees_tax = new Tax((int)(Configuration::get('PS_GIFT_WRAPPING_TAX')));
$wrapping_fees_tax_inc = $wrapping_fees * (1 + (((float)($wrapping_fees_tax->rate) / 100))); $wrapping_fees_tax_inc = $wrapping_fees * (1 + (((float)($wrapping_fees_tax->rate) / 100)));
themes/default/order-carrier.tpl
+28 -19
View File
@@ -71,21 +71,25 @@
{/if} {/if}
{if !$opc} {if !$opc}
{capture name=path}{l s='Shipping'}{/capture} {capture name=path}{l s='Shipping'}{/capture}
{include file="$tpl_dir./breadcrumb.tpl"} {include file="$tpl_dir./breadcrumb.tpl"}
{/if} {/if}
{if !$opc}<h1>{l s='Shipping'}</h1>{else}<h2><span>2</span> {l s='Delivery methods'}</h2>{/if} {if !$opc}
<h1>{l s='Shipping'}</h1>
{else}
<h2><span>2</span> {l s='Delivery methods'}</h2>
{/if}
{if !$opc} {if !$opc}
{assign var='current_step' value='shipping'} {assign var='current_step' value='shipping'}
{include file="$tpl_dir./order-steps.tpl"} {include file="$tpl_dir./order-steps.tpl"}
{include file="$tpl_dir./errors.tpl"} {include file="$tpl_dir./errors.tpl"}
<form id="form" action="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")}" method="post" onsubmit="return acceptCGV();"> <form id="form" action="{$link->getPageLink('order', true, NULL, "multi-shipping={$multi_shipping}")}" method="post" onsubmit="return acceptCGV();">
{else} {else}
<div id="opc_delivery_methods" class="opc-main-block"> <div id="opc_delivery_methods" class="opc-main-block">
<div id="opc_delivery_methods-overlay" class="opc-overlay" style="display: none;"></div> <div id="opc_delivery_methods-overlay" class="opc-overlay" style="display: none;"></div>
{/if} {/if}
@@ -96,16 +100,20 @@
{else} {else}
<h3 class="carrier_title">{l s='Choose your delivery method'}</h3> <h3 class="carrier_title">{l s='Choose your delivery method'}</h3>
<div id="HOOK_BEFORECARRIER">{if isset($carriers) && isset($HOOK_BEFORECARRIER)}{$HOOK_BEFORECARRIER}{/if}</div> <div id="HOOK_BEFORECARRIER">
{if isset($carriers) && isset($HOOK_BEFORECARRIER)}
{$HOOK_BEFORECARRIER}
{/if}
</div>
{if isset($isVirtualCart) && $isVirtualCart} {if isset($isVirtualCart) && $isVirtualCart}
<p class="warning">{l s='No carrier needed for this order'}</p> <p class="warning">{l s='No carrier needed for this order'}</p>
{else} {else}
{if $recyclablePackAllowed} {if $recyclablePackAllowed}
<p class="checkbox"> <p class="checkbox">
<input type="checkbox" name="recyclable" id="recyclable" value="1" {if $recyclable == 1}checked="checked"{/if} /> <input type="checkbox" name="recyclable" id="recyclable" value="1" {if $recyclable == 1}checked="checked"{/if} />
<label for="recyclable">{l s='I agree to receive my order in recycled packaging'}.</label> <label for="recyclable">{l s='I agree to receive my order in recycled packaging'}.</label>
</p> </p>
{/if} {/if}
<div class="delivery_options_address"> <div class="delivery_options_address">
{if isset($delivery_option_list)} {if isset($delivery_option_list)}
{foreach $delivery_option_list as $id_address => $option_list} {foreach $delivery_option_list as $id_address => $option_list}
@@ -195,7 +203,8 @@
({l s='products concerned:'} ({l s='products concerned:'}
{/if} {/if}
{* This foreach is on one line, to avoid tabulation in the title attribute of the acronym *} {* 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} {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} {/if}
</td> </td>
</tr> </tr>