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

// Small fixes

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16426 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard committed 2012-07-13 18:25:39 +00:00
1 parent 4e3dbfb5cb
commit a711041580
3 files changed
+6 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default/js/product.js
+2 -1
View File
@@ -312,7 +312,8 @@ function updateDisplay()
$('#reduction_amount').hide();
$('#reduction_percent_display').html('-' + parseFloat(selectedCombination['specific_price'].reduction_percent) + '%');
$('#reduction_percent').show();
} else if (selectedCombination['specific_price'].reduction_type == 'amount') {
} else if (selectedCombination['specific_price'].reduction_type == 'amount' && selectedCombination['specific_price'].reduction_price != 0) {
$('#reduction_amount_display').html('-' + formatCurrency(selectedCombination['specific_price'].reduction_price, currencyFormat, currencySign, currencyBlank));
$('#reduction_percent').hide();
$('#reduction_amount').show();
} else {
themes/default/product.tpl
+2 -5
View File
@@ -395,11 +395,8 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<span id="pretaxe_price"><span id="pretaxe_price_display">{convertPrice price=$product->getPrice(false, $smarty.const.NULL)}</span>&nbsp;{l s='tax excl.'}</span>
{/if}
</div>
{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}
<p id="reduction_percent"><span id="reduction_percent_display">-{$product->specificPrice.reduction*100}%</span></p>
{elseif $product->specificPrice AND $product->specificPrice.reduction_type == 'amount' && $product->specificPrice.reduction|intval !=0}
<p id="reduction_amount"><span id="reduction_amount_display">-{convertPrice price=$product->specificPrice.reduction|floatval}</span></p>
{/if}
<p id="reduction_percent"><span id="reduction_percent_display">{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}-{$product->specificPrice.reduction*100}%{/if}</span></p>
<p id="reduction_amount"><span id="reduction_amount_display">{if $product->specificPrice AND $product->specificPrice.reduction_type == 'amount' && $product->specificPrice.reduction|intval !=0}-{convertPrice price=$product->specificPrice.reduction|floatval}{/if}</span></p>
{if $product->specificPrice AND $product->specificPrice.reduction}
<p id="old_price"><span class="bold">