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

[-] BO : Fix #PSFV-868 : Unity price can be set

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14815 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-04-23 13:41:36 +00:00
parent e50fa1ae2a
commit 6683903b1a
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/template/controllers/products/prices.tpl
+2 -7
View File
@@ -199,16 +199,11 @@ jQuery(document).ready(Customer.init);
<td>
{$currency->prefix} <input size="11" maxlength="14" id="unit_price" name="unit_price" type="text" value="{$unit_price|string_format:'%.2f'}"
onkeyup="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.'); unitPriceWithTax('unit');"/>{$currency->suffix}
{l s='/'} <!--<input size="6" maxlength="10" id="unity" name="unity" type="text" value="{$product->unity|htmlentitiesUTF8}" onkeyup="if (isArrowKey(event)) return ;unitySecond();" onchange="unitySecond();"/> -->
<select onchange="unitySecond();" name="unity" id="unity">
{foreach $unities as $unity}
<option value="{$unity}" {if $unity == $product->unity} selected="selected"{/if}>{$unity}</option>
{/foreach}
</select>
{l s='per'}&nbsp;<input size="6" maxlength="10" id="unity" name="unity" type="text" value="{$product->unity|htmlentitiesUTF8}" onkeyup="if (isArrowKey(event)) return ;unitySecond();" onchange="unitySecond();"/>
{if $ps_tax && $country_display_tax_label}
<span style="margin-left:15px">{l s='or'}
{$currency->prefix}<span id="unit_price_with_tax">0.00</span>{$currency->suffix}
{l s='/'} <span id="unity_second">{$product->unity}</span> {l s='with tax'}
{l s='per'} <span id="unity_second">{$product->unity}</span> {l s='with tax'}
</span>
{/if}
<p>{l s='e.g. per lb'}</p>
controllers/admin/AdminProductsController.php
-7
View File
@@ -2777,16 +2777,9 @@ class AdminProductsControllerCore extends AdminController
$data->assign('ps_tax', Configuration::get('PS_TAX'));
$data->assign('country_display_tax_label', $this->context->country->display_tax_label);
$unities = array(
'PS_WEIGHT_UNIT' => Configuration::get('PS_WEIGHT_UNIT'),
'PS_DISTANCE_UNIT' => Configuration::get('PS_DISTANCE_UNIT'),
'PS_VOLUME_UNIT' => Configuration::get('PS_VOLUME_UNIT'),
'PS_DIMENSION_UNIT' => Configuration::get('PS_DIMENSION_UNIT')
);
$data->assign(array(
'currency', $this->context->currency,
'product' => $product,
'unities' => $unities,
'token' => $this->token
));
translations/fr/admin.php
+1 -1
View File
@@ -2597,7 +2597,6 @@ $_LANGADM['AdminProducts6453b853979579ed50ec58e2e7d13816'] = 'Vous perdrez toute
$_LANGADM['AdminProducts6492d670e42151cc37574d99f4071f85'] = 'Nom du fichier :';
$_LANGADM['AdminProducts64b53bc0cc0715cf944e23104df45d66'] = 'Produit dématérialisé (services, réservations et produits téléchargeables)';
$_LANGADM['AdminProducts6624493bea28e951b0e89cb12a324bcf'] = 'Est-ce un produit virtuel ?';
$_LANGADM['AdminProducts6666cd76f96956469e7be39d750cc7d9'] = '/';
$_LANGADM['AdminProducts6844aa7b2ea9577a34cea194362d5509'] = 'dépasse le poids autorisé par le serveur, cette limite est fixée à';
$_LANGADM['AdminProducts686e697538050e4664636337cc3b834f'] = 'Créer';
$_LANGADM['AdminProducts694e8d1f2ee056f98ee488bdc4982d73'] = 'Quantité';
@@ -2867,6 +2866,7 @@ $_LANGADM['AdminProductsfb9244e71ff86107b58d0328f15fb9b1'] = 'Poids (du paquet)
$_LANGADM['AdminProductsfb9500d8a4ef9a70c6a91cae122c7cba'] = 'Vous devez indiquer les fournisseurs associés à ce produit et le fournisseur par défaut avant de définir les références.';
$_LANGADM['AdminProductsfbd99ad01b92dbafc686772a39e3d065'] = 'UPC';
$_LANGADM['AdminProductsfc55a6e78b7d33b0241db646dc913ef9'] = 'Modifier cette déclinaison';
$_LANGADM['AdminProductsfe3838c7c11aa406dd956566e17360d5'] = 'par';
$_LANGADM['AdminProductsfec264a44022140bb9724c19c8e954ab'] = 'Action non définie';
$_LANGADM['AdminProductsfee1ad396cfeab246802224002123f39'] = 'Modifier cette image de produit';
$_LANGADM['AdminProductsffac76aafed78da915f1440bc67b8166'] = 'Mettre un fichier en ligne depuis votre poste de travail';