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

// Fix unit price calculation and display in BO

Browse Source
This commit is contained in:
tDidierjean
2011-12-21 10:12:46 +00:00
parent 099887ef4a
commit 84b2ff94cb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/products/prices.tpl
+2 -2
View File
@@ -205,12 +205,12 @@ jQuery(document).ready(Customer.init);
<tr id="tr_unit_price"> <tr id="tr_unit_price">
<td class="col-left"><label>{l s='Unit price:'}</label></td> <td class="col-left"><label>{l s='Unit price:'}</label></td>
<td style="padding-bottom:5px;"> <td style="padding-bottom:5px;">
{$currency->prefix} <input size="11" maxlength="14" id="unit_price" name="unit_price" type="text" value="{$product->unit_price}" {$currency->prefix} <input size="11" maxlength="14" id="unit_price" name="unit_price" type="text" value="{$unit_price}"
onkeyup="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.'); unitPriceWithTax('unit');"/>{$currency->suffix} 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();"/> --> {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"> <select onchange="unitySecond();" name="unity" id="unity">
{foreach $unities as $unity} {foreach $unities as $unity}
<option value="{$unity}">{$unity}</option> <option value="{$unity}" {if $unity == $product->unity} selected="selected"{/if}>{$unity}</option>
{/foreach} {/foreach}
</select> </select>
{if $ps_tax && $country_display_tax_label} {if $ps_tax && $country_display_tax_label}
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -2605,7 +2605,7 @@ class AdminProductsControllerCore extends AdminController
$data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX')); $data->assign('ps_use_ecotax', Configuration::get('PS_USE_ECOTAX'));
if ($product->unit_price_ratio != 0) if ($product->unit_price_ratio != 0)
$data->assign('unit_price', Tools::ps_round($product->price) / $product->unit_price_ratio); $data->assign('unit_price', Tools::ps_round($product->price / $product->unit_price_ratio, 2));
else else
$data->assign('unit_price', 0); $data->assign('unit_price', 0);