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

// Changes to product prices tab

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11280 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-12-15 16:58:28 +00:00
parent 4053ce9df6
commit 382bcb986b
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/products/associations.tpl
+2 -2
View File
@@ -67,8 +67,8 @@
</td>
</tr>
</table>
<div class="separation"></div>
{if $feature_shop_active}
<div class="separation"></div>
{* @todo use asso_shop from Helper *}
<label>{l s='Shop association:'}</label>
{$displayAssoShop}
@@ -77,7 +77,7 @@
<div class="separation"></div>
<table>
<tr>
<td class="col-left"><label>{l s='Accessories:'}{*<br /><br /><i>{l s='(Do not forget to Save the product afterward)'}</i>*}</label></td>
<td class="col-left"><label>{l s='Accessories:'}</label></td>
<td style="padding-bottom:5px;">
<input type="hidden" name="inputAccessories" id="inputAccessories" value="{foreach from=$accessories item=accessory}{$accessory.id_product}-{/foreach}" />
<input type="hidden" name="nameAccessories" id="nameAccessories" value="{foreach from=$accessories item=accessory}{$accessory.name|htmlentitiesUTF8}¤{/foreach}" />
admin-dev/themes/template/products/prices.tpl
+6 -2
View File
@@ -150,7 +150,11 @@
<div class="separation"></div>
{if isset($specificPriceModificationForm)}
<h4>{l s='Current specific prices'}</h4>
<h4>{l s='Specific prices'}</h4>
<div class="hint" style="display:block;min-height:0;">
{l s='You can set specific prices for clients belonging to different groups, different countries...'}
</div>
<br />
<a class="button bt-icon" href="#" onclick="$('#add_specific_price').slideToggle();return false;"><img src="../img/admin/add.gif" alt="" /><span>{l s='Add a new specific price'}</span></a>
<br/>
<script type="text/javascript">
@@ -247,7 +251,7 @@
<span id="sp_current_ht_price">{displayWtPrice p=$product->price}</span>
)
</span>
<div class="hint" style="display:block;">
<div class="hint" style="display:block;min-height:0;">
{l s='You can set this value at 0 in order to apply the default price'}
</div>
</div>
controllers/admin/AdminProductsController.php
+5 -4
View File
@@ -2652,10 +2652,10 @@ class AdminProductsControllerCore extends AdminController
$content .= '
<div class="separation"></div>
<h4>'.$this->l('Priorities management').'</h4>
<div class="hint" style="display:block;">
'.$this->l('Sometimes one customer could fit in multiple rules, priorities allows you to define which rule to apply.').'
</div>
<br />
<div class="hint" style="display:block;min-height:0;">
'.$this->l('Sometimes one customer can fit in multiple specific prices rules. Priorities allow you to define which rule applies to the customer.').'
</div
<br /><br />
<label>'.$this->l('Priorities:').'</label>
<div class="margin-form">
<select name="specificPricePriority[]">
@@ -2664,6 +2664,7 @@ class AdminProductsControllerCore extends AdminController
<option value="id_country"'.($specific_price_priorities[0] == 'id_country' ? ' selected="selected"' : '').'>'.$this->l('Country').'</option>
<option value="id_group"'.($specific_price_priorities[0] == 'id_group' ? ' selected="selected"' : '').'>'.$this->l('Group').'</option>
</select>
&gt;
<select name="specificPricePriority[]">
<option value="id_shop"'.($specific_price_priorities[1] == 'id_shop' ? ' selected="selected"' : '').'>'.$this->l('Shop').'</option>
<option value="id_currency"'.($specific_price_priorities[1] == 'id_currency' ? ' selected="selected"' : '').'>'.$this->l('Currency').'</option>
translations/fr/admin.php
+2 -2
View File
@@ -3371,7 +3371,7 @@ $_LANGADM['AdminProducts32b502f33a535f75dcbf63f6753c631e'] = 'Tags :';
$_LANGADM['AdminProducts3e053943605d9e4bf7dd7588ea19e9d2'] = 'Caractères interdits :';
$_LANGADM['AdminProducts8fca858b27c5837dcb22c398aca5e0fc'] = 'Tags séparés par des virgules (ex : dvd, lecteur dvd, hifi)';
$_LANGADM['AdminProducts28006174c29b4b11d08cbb81c5823a0f'] = 'Aller à la catégorie :';
$_LANGADM['AdminProducts290b7c47045d269e2ccfa69e6477acfe'] = 'Le prix des produits';
$_LANGADM['AdminProducts290b7c47045d269e2ccfa69e6477acfe'] = 'Prix du produit';
$_LANGADM['AdminProducts2aa2ef9d99efe99c01d0c1fb2a3838e5'] = 'Prix d\'achat HT :';
$_LANGADM['AdminProducts8a1c241e92c26b92eaae87afa337eaa3'] = 'Le prix d\'achat auquel vous avez eu le produit';
$_LANGADM['AdminProductse8fce60a7ce078b55bd02a1c25748f16'] = 'Prix de vente HT :';
@@ -3392,7 +3392,7 @@ $_LANGADM['AdminProducts7b988b81a5fe3114360063de23f49016'] = 'Prix de vente fina
$_LANGADM['AdminProductse2e79605fc9450ec17957cf0e910f5c6'] = 'TTC';
$_LANGADM['AdminProducts887ee91702c962a70b87cbef07bbcaec'] = 'HT';
$_LANGADM['AdminProducts850611eb409c54ab510153d91572be5b'] = 'Prix spécifique actuel :';
$_LANGADM['AdminProductsc1649abdccba825a27f5820f126c8454'] = 'Ajouter un nouveau prix spécifiques';
$_LANGADM['AdminProductsc1649abdccba825a27f5820f126c8454'] = 'Ajouter un nouveau prix spécifique';
$_LANGADM['AdminProductsf98188b975d57e9dfc3137c7c9f9a5da'] = 'Pour :';
$_LANGADM['AdminProducts8ed07686e8486f87c4e0d491b0949904'] = 'Combinaison :';
$_LANGADM['AdminProductsc77b86cdeed7ed9197db5858fa3b5fd0'] = 'Appliquer à toutes les combinaisons';