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

// Merge -> revision 8851

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-28 16:03:30 +00:00
parent ccd0383e88
commit be8d2136be
8 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/prestashop/js/order-opc.js
+6 -1
View File
@@ -66,12 +66,17 @@ function updateCarrierList(json)
else
var extraHtml = '';
if (taxEnabled && displayPrice == 0)
var price = carriers[i].price;
else
var price = carriers[i].price_tax_exc;
html = html +
'<tr class="'+itemType+'">'+
'<td class="carrier_action radio"><input type="radio" name="id_carrier" value="'+carriers[i].id_carrier+'" id="id_carrier'+carriers[i].id_carrier+'" onclick="updateCarrierSelectionAndGift();" '+extraHtml+' /></td>'+
'<td class="carrier_name"><label for="id_carrier'+carriers[i].id_carrier+'">'+name+'</label></td>'+
'<td class="carrier_infos">'+carriers[i].delay+'</td>'+
'<td class="carrier_price"><span class="price">'+formatCurrency(carriers[i].price, currencyFormat, currencySign, currencyBlank)+'</span>';
'<td class="carrier_price"><span class="price">'+formatCurrency(price, currencyFormat, currencySign, currencyBlank)+'</span>';
if (taxEnabled && displayPrice == 0)
html = html + ' ' + txtWithTax;
else