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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-07 09:47:47 +01:00
parent 3f3dc0feb9 514c087962
commit f3147b4e57
32 changed files with 274 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/js/cart-summary.js
+1 -1
View File
@@ -873,4 +873,4 @@ function updateExtraCarrier(id_delivery_option, id_address)
$('#HOOK_EXTRACARRIER_' + id_address).html(jsonData['content']);
}
});
}
}
themes/default/product.tpl
+36 -28
View File
@@ -459,34 +459,42 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
</ul>
<div id="quantityDiscount">
<table class="std">
<thead>
<tr>
<th>{l s='Product'}</th>
<th>{l s='From (qty)'}</th>
<th>{l s='Discount'}</th>
</tr>
</thead>
<tbody>
{foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'}
<tr id="quantityDiscount_{$quantity_discount.id_product_attribute}" class="quantityDiscount_{$quantity_discount.id_product_attribute}">
<td>
{if (isset($quantity_discount.attributes) && ($quantity_discount.attributes))}
{$product->getProductName($quantity_discount.id_product, $quantity_discount.id_product_attribute)}
{else}
{$product->getProductName($quantity_discount.id_product)}
{/if}
</td>
<td>{$quantity_discount.quantity|intval}</td>
<td>
{if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'}
-{convertPrice price=$quantity_discount.real_value|floatval}
{else}
-{$quantity_discount.real_value|floatval}%
{/if}
</td>
</tr>
{/foreach}
</tbody>
<thead>
<tr>
<th>{l s='Product'}</th>
<th>{l s='From (qty)'}</th>
<th>{if Configuration::get('PS_DISPLAY_DISCOUNT_PRICE')}{l s='Price'}{else}{l s='Discount'}{/if}</th>
</tr>
</thead>
<tbody>
{foreach from=$quantity_discounts item='quantity_discount' name='quantity_discounts'}
<tr id="quantityDiscount_{$quantity_discount.id_product_attribute}" class="quantityDiscount_{$quantity_discount.id_product_attribute}">
<td>
{if (isset($quantity_discount.attributes) && ($quantity_discount.attributes))}
{$product->getProductName($quantity_discount.id_product, $quantity_discount.id_product_attribute)}
{else}
{$product->getProductName($quantity_discount.id_product)}
{/if}
</td>
<td>{$quantity_discount.quantity|intval}</td>
<td>
{if $quantity_discount.price >= 0 OR $quantity_discount.reduction_type == 'amount'}
{if Configuration::get('PS_DISPLAY_DISCOUNT_PRICE')}
{convertPrice price=$productPrice-$quantity_discount.real_value|floatval}
{else}
-{convertPrice price=$quantity_discount.real_value|floatval}
{/if}
{else}
{if Configuration::get('PS_DISPLAY_DISCOUNT_PRICE')}
{convertPrice price = $productPrice-($productPrice*$quantity_discount.reduction)|floatval}
{else}
-{$quantity_discount.real_value|floatval}%
{/if}
{/if}
</td>
</tr>
{/foreach}
</tbody>
</table>
</div>
{/if}