Merge pull request PrestaShop#2924 from jeromenadaud/hotfix-PSCSX-5255

[-] FO : FixBug #PSCSX-5255 - Quantity reduction now base on original pr...
Captain-FLAM · Apr 29, 2015 · 844a862 · 844a862
2 parents 19d0cbc + 8913e34
commit 844a862
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/themes/default-bootstrap/js/product.js b/themes/default-bootstrap/js/product.js
@@ -797,7 +797,7 @@ function updatePrice()
 
 	// If there is a quantity discount table,
 	// we update it according to the new price
-	updateDiscountTable(priceWithDiscountsDisplay);
+	updateDiscountTable(basePriceDisplay);
 }
 
 //update display of the large image
@@ -848,7 +848,7 @@ function displayDiscounts(combination)
 	else if(allQuantityDiscount.length != 0)
 	{
 		allQuantityDiscount.show();
-		$('tr', quantityDiscountTable).not('#quantityDiscount_0').hide();
+		$('tbody tr', quantityDiscountTable).not('#quantityDiscount_0').hide();
 		quantityDiscountTable.show();
 	}
 	else

diff --git a/themes/default-bootstrap/product.tpl b/themes/default-bootstrap/product.tpl
@@ -418,13 +418,13 @@
 								<td>
 									{if $quantity_discount.price >= 0 || $quantity_discount.reduction_type == 'amount'}
 										{if $display_discount_price}
-											{convertPrice price=$productPrice|floatval-$quantity_discount.real_value|floatval}
+											{convertPrice price=$productPriceWithoutReduction|floatval-$quantity_discount.real_value|floatval}
 										{else}
 											{convertPrice price=$quantity_discount.real_value|floatval}
 										{/if}
 									{else}
 										{if $display_discount_price}
-											{convertPrice price = $productPrice|floatval-($productPrice*$quantity_discount.reduction)|floatval}
+											{convertPrice price = $productPriceWithoutReduction|floatval-($productPriceWithoutReduction*$quantity_discount.reduction)|floatval}
 										{else}
 											{$quantity_discount.real_value|floatval}%
 										{/if}
@@ -433,12 +433,12 @@
 								<td>
 									<span>{l s='Up to'}</span>
 									{if $quantity_discount.price >= 0 || $quantity_discount.reduction_type == 'amount'}
-										{$discountPrice=$productPrice|floatval-$quantity_discount.real_value|floatval}
+										{$discountPrice=$productPriceWithoutReduction|floatval-$quantity_discount.real_value|floatval}
 									{else}
-										{$discountPrice=$productPrice|floatval-($productPrice*$quantity_discount.reduction)|floatval}
+										{$discountPrice=$productPriceWithoutReduction|floatval-($productPriceWithoutReduction*$quantity_discount.reduction)|floatval}
 									{/if}
 									{$discountPrice=$discountPrice * $quantity_discount.quantity}
-									{$qtyProductPrice=$productPrice|floatval * $quantity_discount.quantity}
+									{$qtyProductPrice=$productPriceWithoutReduction|floatval * $quantity_discount.quantity}
 									{convertPrice price=$qtyProductPrice - $discountPrice}
 								</td>
 							</tr>