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

Merge pull request #584 from Captain-FLAM/patch-3

Browse Source 
[-] FO : product with declinaisons without reductions, reduction price is showed anyway
This commit is contained in:
Gregory Roussac committed 2013-07-26 00:58:00 -07:00
2 parents 5015f88a46 2e860d6750
commit 30c689df22
1 file changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/js/product.js
+1 -2
View File
@@ -312,7 +312,7 @@ function updateDisplay()
var taxExclPrice = (specific_currency ? product_specific_price.price : product_specific_price.price * currencyRate) + (selectedCombination['price'] * currencyRate); var taxExclPrice = (specific_currency ? product_specific_price.price : product_specific_price.price * currencyRate) + (selectedCombination['price'] * currencyRate);
if (!displayPrice && !noTaxForThisProduct) if (!displayPrice && !noTaxForThisProduct)
productPriceDisplay = taxExclPrice * tax; // Need to be global => no var productPriceDisplay = ps_round(taxExclPrice * tax, 2); // Need to be global => no var
else else
productPriceDisplay = ps_round(taxExclPrice, 2); // Need to be global => no var productPriceDisplay = ps_round(taxExclPrice, 2); // Need to be global => no var
@@ -372,7 +372,6 @@ function updateDisplay()
$('#not_impacted_by_discount').hide(); $('#not_impacted_by_discount').hide();
productPriceDisplay -= reduction; productPriceDisplay -= reduction;
var tmp = productPriceDisplay * group_reduction;
productPriceDisplay = ps_round(productPriceDisplay * group_reduction, 2); productPriceDisplay = ps_round(productPriceDisplay * group_reduction, 2);
var ecotaxAmount = !displayPrice ? ps_round(selectedCombination['ecotax'] * (1 + ecotaxTax_rate / 100), 2) : selectedCombination['ecotax']; var ecotaxAmount = !displayPrice ? ps_round(selectedCombination['ecotax'] * (1 + ecotaxTax_rate / 100), 2) : selectedCombination['ecotax'];