[-] FO: fix display of quantity discount prices
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16299 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
8abbcecc54
commit
f5a192e27e
2 files changed
+2
-5
No files matched your search
@@ -543,7 +543,7 @@ class ProductControllerCore extends FrontController
|
|||||||
foreach ($specific_prices as $key => &$row)
|
foreach ($specific_prices as $key => &$row)
|
||||||
{
|
{
|
||||||
$row['quantity'] = &$row['from_quantity'];
|
$row['quantity'] = &$row['from_quantity'];
|
||||||
if ($row['price'] != 0) // The price may be directly set
|
if ($row['price'] >= 0) // The price may be directly set
|
||||||
{
|
{
|
||||||
$cur_price = (Product::$_taxCalculationMethod == PS_TAX_EXC ? $row['price'] : $row['price'] * (1 + $tax_rate / 100));
|
$cur_price = (Product::$_taxCalculationMethod == PS_TAX_EXC ? $row['price'] : $row['price'] * (1 + $tax_rate / 100));
|
||||||
|
|
||||||
|
|||||||
@@ -467,9 +467,6 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr id="noQuantityDiscount">
|
|
||||||
<td colspan='3'>{l s='There is not any quantity discount for this product.'}</td>
|
|
||||||
</tr>
|
|
||||||
{foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'}
|
{foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'}
|
||||||
<tr id="quantityDiscount_{$quantity_discount.id_product_attribute}">
|
<tr id="quantityDiscount_{$quantity_discount.id_product_attribute}">
|
||||||
<td>
|
<td>
|
||||||
@@ -481,7 +478,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
|
|||||||
</td>
|
</td>
|
||||||
<td>{$quantity_discount.quantity|intval}</td>
|
<td>{$quantity_discount.quantity|intval}</td>
|
||||||
<td>
|
<td>
|
||||||
{if $quantity_discount.price != 0 OR $quantity_discount.reduction_type == 'amount'}
|
{if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'}
|
||||||
-{convertPrice price=$quantity_discount.real_value|floatval}
|
-{convertPrice price=$quantity_discount.real_value|floatval}
|
||||||
{else}
|
{else}
|
||||||
-{$quantity_discount.real_value|floatval}%
|
-{$quantity_discount.real_value|floatval}%
|
||||||
|
|||||||
Reference in new issue
Block a user