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

// stock : bug fix on discount rates and tax rates management

Browse Source
This commit is contained in:
dSevere
2011-11-09 17:58:43 +00:00
parent c2ff0141bd
commit 7cf3d8fdc1
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/supplier_orders/form.tpl
+2 -2
View File
@@ -89,10 +89,10 @@
<input type="text" name="input_quantity_expected_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity_expected}" size="5" /> <input type="text" name="input_quantity_expected_{$product.id_product}_{$product.id_product_attribute}" value="{$product.quantity_expected}" size="5" />
</td> </td>
<td class="center"> <td class="center">
<input type="text" name="input_discount_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.discount_rate, 2)}" size="5" />% <input type="text" name="input_discount_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.discount_rate, 4)}" size="5" />%
</td> </td>
<td class="center"> <td class="center">
<input type="text" name="input_tax_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.tax_rate, 2)}" size="5" />% <input type="text" name="input_tax_rate_{$product.id_product}_{$product.id_product_attribute}" value="{round($product.tax_rate, 4)}" size="5" />%
</td> </td>
<td class="center"> <td class="center">
<a href="#" id="deletelink|{$product.id_product}_{$product.id_product_attribute}" class="removeProductFromSupplierOrderLink"> <a href="#" id="deletelink|{$product.id_product}_{$product.id_product_attribute}" class="removeProductFromSupplierOrderLink">
controllers/admin/AdminSupplierOrdersController.php
+12 -3
View File
@@ -137,7 +137,10 @@ class AdminSupplierOrdersControllerCore extends AdminController
*/ */
public function initForm() public function initForm()
{ {
if (Tools::isSubmit('addsupplier_order_state') || Tools::isSubmit('updatesupplier_order_state')) if (Tools::isSubmit('addsupplier_order_state') ||
Tools::isSubmit('updatesupplier_order_state') ||
Tools::isSubmit('submitAddsupplier_order_state') ||
Tools::isSubmit('submitUpdatesupplier_order_state'))
{ {
if (Tools::isSubmit('updatesupplier_order_state')) if (Tools::isSubmit('updatesupplier_order_state'))
$this->toolbar_title = $this->l('Stock : Update Supplier order state'); $this->toolbar_title = $this->l('Stock : Update Supplier order state');
@@ -363,6 +366,9 @@ class AdminSupplierOrdersControllerCore extends AdminController
) )
); );
//specific discount display
$this->object->discount_rate = Tools::ps_round($this->object->discount_rate, 4);
return parent::initForm(); return parent::initForm();
} }
@@ -1046,6 +1052,9 @@ class AdminSupplierOrdersControllerCore extends AdminController
// specify global reference currency // specify global reference currency
$_POST['id_ref_currency'] = Currency::getDefaultCurrency()->id; $_POST['id_ref_currency'] = Currency::getDefaultCurrency()->id;
//specific discount check
$_POST['discount_rate'] = (float)str_replace(array(' ', ','), array('', '.'), Tools::getValue('discount_rate', 0));
// manage each associated product // manage each associated product
$this->manageOrderProducts(); $this->manageOrderProducts();
} }
@@ -1570,8 +1579,8 @@ class AdminSupplierOrdersControllerCore extends AdminController
$item['price_with_order_discount_te'] = Tools::ps_round($item['price_with_order_discount_te'], 2); $item['price_with_order_discount_te'] = Tools::ps_round($item['price_with_order_discount_te'], 2);
$item['discount_value_te'] = Tools::ps_round($item['discount_value_te'], 2); $item['discount_value_te'] = Tools::ps_round($item['discount_value_te'], 2);
$item['discount_rate'] = Tools::ps_round($item['discount_rate'], 2); $item['discount_rate'] = Tools::ps_round($item['discount_rate'], 4);
$item['tax_rate'] = Tools::ps_round($item['tax_rate'], 2); $item['tax_rate'] = Tools::ps_round($item['tax_rate'], 4);
} }
// renders list // renders list