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

// Fixed 6-decimals price when tex excluded in BO #PSCFV-3778

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17018 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger committed 2012-08-27 13:45:18 +00:00
1 parent 5e8ca44e86
commit 17e71862ac
2 files changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

admin-dev/themes/default/template/controllers/attribute_generator/content.tpl
+2 -4
View File
@@ -37,11 +37,9 @@
if (!isNaN(element_price) && element_price > 0) if (!isNaN(element_price) && element_price > 0)
{ {
if (element_has_tax) if (element_has_tax)
other_element_price = parseFloat(element_price / ((product_tax / 100) + 1)); other_element_price = parseFloat(element_price / ((product_tax / 100) + 1)).toFixed(6);
else else
other_element_price = ps_round(parseFloat(element_price * ((product_tax / 100) + 1)), 2); other_element_price = ps_round(parseFloat(element_price * ((product_tax / 100) + 1)), 2).toFixed(2);
other_element_price = other_element_price.toFixed(2);
} }
$('#related_to_'+element.attr('name')).val(other_element_price); $('#related_to_'+element.attr('name')).val(other_element_price);
js/price.js
+4 -4
View File
@@ -80,12 +80,12 @@ function calcPriceTE()
var priceTI = parseFloat(document.getElementById('priceTI').value.replace(/,/g, '.')); var priceTI = parseFloat(document.getElementById('priceTI').value.replace(/,/g, '.'));
var newPrice = ps_round(priceTI - getEcotaxTaxIncluded(), 2) / ((tax / 100) + 1); var newPrice = ps_round(priceTI - getEcotaxTaxIncluded(), 2) / ((tax / 100) + 1);
document.getElementById('priceTE').value = (isNaN(newPrice) == true || newPrice < 0) ? '' : document.getElementById('priceTE').value = (isNaN(newPrice) == true || newPrice < 0) ? '' :
ps_round(newPrice.toFixed(2), 2); ps_round(newPrice.toFixed(6), 6);
document.getElementById('priceTEReal').value = (isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9); document.getElementById('priceTEReal').value = (isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9);
document.getElementById('finalPrice').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' : document.getElementById('finalPrice').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' :
ps_round(priceTI.toFixed(2), 2); ps_round(priceTI.toFixed(6), 6);
document.getElementById('finalPriceWithoutTax').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' : document.getElementById('finalPriceWithoutTax').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' :
ps_round(newPrice.toFixed(2), 2) + getEcotaxTaxExcluded(); ps_round(newPrice.toFixed(6), 6) + getEcotaxTaxExcluded();
calcReduction(); calcReduction();
} }
@@ -108,7 +108,7 @@ function calcImpactPriceTE()
var priceTI = parseFloat(document.getElementById('attribute_priceTI').value.replace(/,/g, '.')); var priceTI = parseFloat(document.getElementById('attribute_priceTI').value.replace(/,/g, '.'));
priceTI = (isNaN(priceTI)) ? 0 : ps_round(priceTI); priceTI = (isNaN(priceTI)) ? 0 : ps_round(priceTI);
var newPrice = ps_round(priceTI, 2) / ((tax / 100) + 1); var newPrice = ps_round(priceTI, 2) / ((tax / 100) + 1);
$('#attribute_price').val((isNaN(newPrice) == true || newPrice < 0) ? '' :ps_round(newPrice, 2).toFixed(2)); $('#attribute_price').val((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice, 6).toFixed(6));
$('#attribute_priceTEReal').val((isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9)); $('#attribute_priceTEReal').val((isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9));
var total = ps_round((parseFloat($('#attribute_priceTI').val())*parseInt($('#attribute_price_impact').val())+parseFloat($('#finalPrice').html())), 2); var total = ps_round((parseFloat($('#attribute_priceTI').val())*parseInt($('#attribute_price_impact').val())+parseFloat($('#finalPrice').html())), 2);
if (isNaN(total) || total < 0) if (isNaN(total) || total < 0)