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

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
François Gaillard
2013-03-19 09:47:46 +01:00
parent a7f4f82fc0 ce4148b89a
commit fddbfa6032
10 changed files with 53 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/mobile/order-detail.tpl
+1 -1
View File
@@ -203,7 +203,7 @@
<ul data-role="listview" >
{foreach from=$order->getShipping() item=line}
<li>
<h3>{$line.state_name}</h3>
<h3>{$line.carrier_name}</h3>
<p><strong>{l s='Weight'}</strong> {$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}</p>
<p><strong>{l s='Shipping cost'}</strong> {if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}{else}{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}{/if}</p>
<p><strong>{l s='Tracking number'}</strong> {if $line.url && $line.tracking_number}<a href="{$line.url|replace:'@':$line.tracking_number}" data-ajax="false">{$line.tracking_number}</a>{elseif $line.tracking_number != ''}{$line.tracking_number}{else}----{/if}</p>
themes/default/order-detail.tpl
+1 -1
View File
@@ -326,7 +326,7 @@
{foreach from=$order->getShipping() item=line}
<tr class="item">
<td>{$line.date_add}</td>
<td>{$line.state_name}</td>
<td>{$line.carrier_name}</td>
<td>{if $line.weight > 0}{$line.weight|string_format:"%.3f"} {Configuration::get('PS_WEIGHT_UNIT')}{else}-{/if}</td>
<td>{if $order->getTaxCalculationMethod() == $smarty.const.PS_TAX_INC}{displayPrice price=$line.shipping_cost_tax_incl currency=$currency->id}{else}{displayPrice price=$line.shipping_cost_tax_excl currency=$currency->id}{/if}</td>
<td>