This commit is contained in:
TMMeilleur committed 2013-10-31 15:51:25 +02:00
1 parent ff2954b1d2
commit 68a98b29a6
141 files changed
+8112 -4912

No files matched your search

+4 -3
View File
@@ -611,6 +611,7 @@ function updateCartSummary(json)
initial_price = '';
if (typeof(product_list[i].price_without_quantity_discount) !== 'undefined')
initial_price = formatCurrency(product_list[i].price_without_quantity_discount, currencyFormat, currencySign, currencyBlank);
priceReductionPercent = Math.floor((product_list[i].price_without_quantity_discount - product_list[i].price)/product_list[i].price_without_quantity_discount * -100);
var current_price = '';
if (priceDisplayMethod !== 0)
current_price = formatCurrency(product_list[i].price, currencyFormat, currencySign, currencyBlank);
@@ -618,14 +619,14 @@ function updateCartSummary(json)
current_price = formatCurrency(product_list[i].price_wt, currencyFormat, currencySign, currencyBlank);
if (reduction && typeof(initial_price) !== 'undefined')
if (initial_price !== '' && product_list[i].price_without_quantity_discount > product_list[i].price)
initial_price_text = '<span class="old-price">' + initial_price + '</span>';
initial_price_text = '<span class="price-percent-reduction small">'+priceReductionPercent+'%</span><span class="old-price">' + initial_price + '</span>';
var key_for_blockcart = product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_' + product_list[i].id_address_delivery;
var key_for_blockcart_nocustom = product_list[i].id_product + '_' + product_list[i].id_product_attribute + '_' + ((product_list[i].id_customization && product_list[i].quantity_without_customization != product_list[i].quantity)? 'nocustom' : '0') + '_' + product_list[i].id_address_delivery;
if (priceDisplayMethod !== 0)
{
$('#product_price_' + key_for_blockcart).html(initial_price_text + current_price);
$('#product_price_' + key_for_blockcart).html('<span class="price">' + current_price + '</span>' + initial_price_text);
if (typeof(product_list[i].customizationQuantityTotal) !== 'undefined' && product_list[i].customizationQuantityTotal > 0)
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total_customization, currencyFormat, currencySign, currencyBlank));
else
@@ -635,7 +636,7 @@ function updateCartSummary(json)
}
else
{
$('#product_price_' + key_for_blockcart).html(initial_price_text + current_price);
$('#product_price_' + key_for_blockcart).html('<span class="price">' + current_price + '</span>' + initial_price_text);
if (typeof(product_list[i].customizationQuantityTotal) !== 'undefined' && product_list[i].customizationQuantityTotal > 0)
$('#total_product_price_' + key_for_blockcart).html(formatCurrency(product_list[i].total_customization_wt, currencyFormat, currencySign, currencyBlank));
else