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

[*] BO: It is now possible to apply a specific price of 0 euros

Browse Source
This commit is contained in:
rGaillard
2012-04-12 14:51:23 +00:00
parent 41aaeb90ff
commit 5f672da8ed
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/prices.tpl
+1 -5
View File
@@ -336,14 +336,10 @@ jQuery(document).ready(Customer.init);
<span id="spm_currency_sign_pre_0" style="font-weight:bold; color:#000000; font-size:12px"> <span id="spm_currency_sign_pre_0" style="font-weight:bold; color:#000000; font-size:12px">
{$currency->prefix} {$currency->prefix}
</span> </span>
<input type="text" name="sp_price" value="0" size="11" /> <input type="text" name="sp_price" value="{$product->price|string_format:'%.2f'}" size="11" />
<span id="spm_currency_sign_post_0" style="font-weight:bold; color:#000000; font-size:12px"> <span id="spm_currency_sign_post_0" style="font-weight:bold; color:#000000; font-size:12px">
{$currency->suffix} {$currency->suffix}
</span> </span>
<p class="preference_description">
{l s='You can set this value to 0 in order to apply the default price.'}
({l s='Current:'}<span id="sp_current_ht_price">{displayWtPrice p=$product->price}</span>)
</p>
</div> </div>
<label>{l s='Apply a discount of:'}</label> <label>{l s='Apply a discount of:'}</label>
classes/Product.php
+2 -2
View File
@@ -2453,12 +2453,12 @@ class ProductCore extends ObjectModel
} }
$result = self::$_pricesLevel2[$cache_id_2]; $result = self::$_pricesLevel2[$cache_id_2];
if (!$specific_price || $specific_price['price'] == 0) if (!$specific_price)
$price = (float)$result['price']; $price = (float)$result['price'];
else else
$price = (float)$specific_price['price']; $price = (float)$specific_price['price'];
// convert only if the specific price is in the default currency (id_currency = 0) // convert only if the specific price is in the default currency (id_currency = 0)
if (!$specific_price || !($specific_price['price'] > 0 && $specific_price['id_currency'])) if (!$specific_price || !($specific_price['price'] >= 0 && $specific_price['id_currency']))
$price = Tools::convertPrice($price, $id_currency); $price = Tools::convertPrice($price, $id_currency);
// Attribute price // Attribute price
modules/blocklanguages/blocklanguages.tpl
+2 -2
View File
@@ -42,9 +42,9 @@
{if $language.iso_code != $lang_iso} {if $language.iso_code != $lang_iso}
{assign var=indice_lang value=$language.id_lang} {assign var=indice_lang value=$language.id_lang}
{if isset($lang_rewrite_urls.$indice_lang)} {if isset($lang_rewrite_urls.$indice_lang)}
<a href="{$lang_rewrite_urls.$indice_lang}" title="{$language.name}"> <a href="{$lang_rewrite_urls.$indice_lang|escape:htmlall}" title="{$language.name}">
{else} {else}
<a href="{$link->getLanguageLink($language.id_lang)}" title="{$language.name}"> <a href="{$link->getLanguageLink($language.id_lang)|escape:htmlall}" title="{$language.name}">
{/if} {/if}
{/if} {/if}