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

[-] MO : #PSFV-532 - Fix bug on the module Loyalty - "points" are not upgrading on changing combination

Browse Source
This commit is contained in:
mDeflotte
2012-02-17 13:36:29 +00:00
parent 8a53019e6c
commit c32c7c9dd3
4 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/css/global.css
+2 -1
View File
@@ -1718,7 +1718,8 @@ ul#suppliers_list li .right_side {float:right;}
#product p#loyalty {
padding:10px 0 0 20px;
border-top:1px solid #ccc;
background:url(../img/icon/info.png) no-repeat 0 8px
background:url(../img/icon/info.png) no-repeat 0 8px;
margin-top: 10px;
}
#footer .myaccount li.loyalty img {display:none}
themes/default/js/product.js
+4 -3
View File
@@ -345,17 +345,17 @@ function updateDisplay()
var taxExclPrice = (display_specific_price ? (specific_currency ? display_specific_price : display_specific_price * currencyRate) : priceTaxExclWithoutGroupReduction) + selectedCombination['price'] * currencyRate;
if (display_specific_price)
var productPriceWithoutReduction = priceTaxExclWithoutGroupReduction + selectedCombination['price'] * currencyRate;
productPriceWithoutReduction = priceTaxExclWithoutGroupReduction + selectedCombination['price'] * currencyRate; // Need to be global => no var
if (!displayPrice && !noTaxForThisProduct)
{
var productPrice = taxExclPrice * tax;
productPrice = taxExclPrice * tax; // Need to be global => no var
if (display_specific_price)
productPriceWithoutReduction = ps_round(productPriceWithoutReduction * tax, 2);
}
else
{
var productPrice = ps_round(taxExclPrice, 2);
productPrice = ps_round(taxExclPrice, 2); // Need to be global => no var
if (display_specific_price)
productPriceWithoutReduction = ps_round(productPriceWithoutReduction, 2);
}
@@ -393,6 +393,7 @@ function updateDisplay()
$('#our_price_display').text(formatCurrency(productPrice, currencyFormat, currencySign, currencyBlank));
else
$('#our_price_display').text(formatCurrency(0, currencyFormat, currencySign, currencyBlank));
$('#old_price_display').text(formatCurrency(productPriceWithoutReduction, currencyFormat, currencySign, currencyBlank));
if (productPriceWithoutReduction > productPrice)