diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index cd00205e8..992bdf743 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -193,12 +193,13 @@   {l s='of'}  {if $currency->format % 2 != 0}{$currency->sign} {/if} - {if $currency->format % 2 == 0} {$currency->sign}{/if} + + {if $currency->format % 2 == 0} {$currency->sign}{/if} {if $country_display_tax_label} {l s='(tax excl.)'} {l s='or'} {if $currency->format % 2 != 0}{$currency->sign} {/if} - + {if $currency->format % 2 == 0} {$currency->sign}{/if} {l s='(tax incl.)'} {l s='final product price will be set to'} {if $currency->format % 2 != 0}{$currency->sign} {/if} diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl index 902913e2d..9ad23d214 100644 --- a/admin-dev/themes/default/template/controllers/products/prices.tpl +++ b/admin-dev/themes/default/template/controllers/products/prices.tpl @@ -121,7 +121,8 @@ jQuery(document).ready(Customer.init); - {$currency->prefix}{$currency->suffix} + + {$currency->prefix}{$currency->suffix}

{l s='The pre-tax retail price to sell this product'}

diff --git a/js/attributesBack.js b/js/attributesBack.js index 131d37c77..b0f4b2777 100644 --- a/js/attributesBack.js +++ b/js/attributesBack.js @@ -53,6 +53,7 @@ virtual_product_nb_days, is_shareable) getE('attribute_upc').value = upc; getE('attribute_wholesale_price').value = Math.abs(wholesale_price); getE('attribute_price').value = ps_round(Math.abs(price_impact), 2); + getE('attribute_priceTEReal').value = Math.abs(price_impact); getE('attribute_weight').value = Math.abs(weight_impact); getE('attribute_unity').value = Math.abs(unit_impact); if ($('#attribute_ecotax').length != 0) diff --git a/js/price.js b/js/price.js index fa78b2e1a..af3e2cf10 100644 --- a/js/price.js +++ b/js/price.js @@ -61,7 +61,7 @@ function calcPrice() function calcPriceTI() { var tax = getTax(); - var priceTE = parseFloat(document.getElementById('priceTE').value.replace(/,/g, '.')); + var priceTE = parseFloat(document.getElementById('priceTEReal').value.replace(/,/g, '.')); var newPrice = priceTE * ((tax / 100) + 1); document.getElementById('priceTI').value = (isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice, 2); @@ -79,8 +79,9 @@ function calcPriceTE() var tax = getTax(); var priceTI = parseFloat(document.getElementById('priceTI').value.replace(/,/g, '.')); 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); + document.getElementById('priceTEReal').value = (isNaN(newPrice) == true || newPrice < 0) ? 0 : ps_round(newPrice, 9); document.getElementById('finalPrice').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(priceTI.toFixed(2), 2); document.getElementById('finalPriceWithoutTax').innerHTML = (isNaN(newPrice) == true || newPrice < 0) ? '' : @@ -91,9 +92,9 @@ function calcPriceTE() function calcImpactPriceTI() { var tax = getTax(); - var priceTE = parseFloat(document.getElementById('attribute_price').value.replace(/,/g, '.')); + var priceTE = parseFloat(document.getElementById('attribute_priceTEReal').value.replace(/,/g, '.')); var newPrice = priceTE * ((tax / 100) + 1); - $('#attribute_priceTI').val((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice.toFixed(6), 6).toFixed(2)); + $('#attribute_priceTI').val((isNaN(newPrice) == true || newPrice < 0) ? '' : ps_round(newPrice, 2).toFixed(2)); var total = ps_round((parseFloat($('#attribute_priceTI').val())*parseInt($('#attribute_price_impact').val())+parseFloat($('#finalPrice').html())), 2); if (isNaN(total) || total < 0) $('#attribute_new_total_price').html('0.00'); @@ -107,7 +108,8 @@ function calcImpactPriceTE() var priceTI = parseFloat(document.getElementById('attribute_priceTI').value.replace(/,/g, '.')); priceTI = (isNaN(priceTI)) ? 0 : ps_round(priceTI); var newPrice = ps_round(priceTI, 2) / ((tax / 100) + 1); - $('#attribute_price').val((isNaN(newPrice) == true || newPrice < 0) ? '' :ps_round(newPrice.toFixed(6), 6)); + $('#attribute_price').val((isNaN(newPrice) == true || newPrice < 0) ? '' :ps_round(newPrice, 2).toFixed(2)); + $('#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); if (isNaN(total) || total < 0) $('#attribute_new_total_price').html('0.00');