diff --git a/admin-dev/themes/template/helper/list/list_content.tpl b/admin-dev/themes/template/helper/list/list_content.tpl
index 99dc41a71..51257e3aa 100644
--- a/admin-dev/themes/template/helper/list/list_content.tpl
+++ b/admin-dev/themes/template/helper/list/list_content.tpl
@@ -82,8 +82,9 @@
{$tr.$key}
{elseif isset($params.type) && $params.type == 'datetime'}
{$tr.$key}
- {elseif isset($params.type) && $params.type == 'editable'}
-
+ {* If type is 'editable', an input is created *}
+ {elseif isset($params.type) && $params.type == 'editable' && isset($tr.id)}
+
{elseif isset($params.callback)}
{$tr.$key}
{elseif isset($tr.$key) && $key == 'color'}
diff --git a/admin-dev/themes/template/supplier_orders/view.tpl b/admin-dev/themes/template/supplier_orders/view.tpl
index d3ae5b67c..a5d4d0c86 100755
--- a/admin-dev/themes/template/supplier_orders/view.tpl
+++ b/admin-dev/themes/template/supplier_orders/view.tpl
@@ -23,87 +23,94 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
-
-
{l s='Supplier Order'} #{$supplier_order_reference}
-
-
-
-
-
-
+{block name="override_tpl"}
-
-
-
+
{l s='Supplier Order'} #{$supplier_order_reference}
+
+
+
+
+
+
+
+
+
+
+
');
+ $this->displayInformation($this->l('Be careful : once you add quantities, you cannot go back unless you add new stock movements.').'
');
// generates content
$content = $helper->generateList($this->_list, $this->fieldsDisplay);
@@ -818,8 +846,8 @@ class AdminSupplierOrdersControllerCore extends AdminController
$this->initUpdateReceiptContent();
else if (Tools::isSubmit('viewsupplier_order') && Tools::isSubmit('id_supplier_order'))
{
+ $this->action = 'view';
$this->display = 'view';
- $this->viewSupplierOrder();
parent::initContent();
}
else if (Tools::isSubmit('updatesupplier_order'))
@@ -887,7 +915,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
// get product informations
$entry->id_product = substr($id, 0, $pos);
- $entry->id_product_attribute = substr($id, $pos+1);
+ $entry->id_product_attribute = substr($id, $pos + 1);
$entry->unit_price_te = (float)Tools::getValue('input_unit_price_te_'.$id, 0);
$entry->quantity = (int)Tools::getValue('input_quantity_'.$id, 0);
$entry->discount_rate = (float)Tools::getValue('input_discount_rate_'.$id, 0);
@@ -925,9 +953,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
$this->_errors[] = Tools::displayError($this->l('Please verify informations of the product: ').$entry->name.' '.$error_str);
}
else
- {
$entry->save();
- }
}
}
}
@@ -943,7 +969,8 @@ class AdminSupplierOrdersControllerCore extends AdminController
// Checks access
if (Tools::isSubmit('submitAddsupplier_order') && !($this->tabAccess['add'] === '1'))
$this->_errors[] = Tools::displayError('You do not have the required permission to add a supplier order.');
-
+ if (Tools::isSubmit('submitUpdateReceipt') && !($this->tabAccess['edit'] === '1'))
+ $this->_errors[] = Tools::displayError('You do not have the required permission to edit an order.');
// Global checks when add / update a supplier order
if (Tools::isSubmit('submitAddsupplier_order'))
{
@@ -1024,9 +1051,77 @@ class AdminSupplierOrdersControllerCore extends AdminController
}
}
+ if (Tools::isSubmit('submitUpdateReceipt') && Tools::isSubmit('id_supplier_order'))
+ $this->postProcessUpdateReceipt();
+
parent::postProcess();
}
+ /**
+ * Helper function for AdminSupplierOrdersController::postProcess()
+ *
+ * @see AdminSupplierOrdersController::postProcess()
+ */
+ protected function postProcessUpdateReceipt()
+ {
+ // gets all box selected
+ $rows = Tools::getValue('supplier_order_detailBox');
+ if (!$rows)
+ {
+ $this->_errors[] = Tools::displayError('You did not select any product to update');
+ return;
+ }
+
+ // final array with id_supplier_order_detail and value to update
+ $to_update = array();
+ // gets quantity for each id_order_detail
+ foreach ($rows as $row)
+ {
+ if (Tools::getValue('quantity_received_today_'.$row))
+ $to_update[$row] = (int)Tools::getValue('quantity_received_today_'.$row);
+ }
+
+ // checks if there is something to update
+ if (!count($to_update))
+ {
+ $this->_errors[] = Tools::displayError('You did not select any product to update');
+ return;
+ }
+
+ foreach ($to_update as $id_supplier_order_detail => $quantity)
+ {
+ $supplier_order_detail = new SupplierOrderDetail($id_supplier_order_detail);
+ if (Validate::isLoadedObject($supplier_order_detail))
+ {
+ // checks if quantity is valid
+ if (!Validate::isInt($quantity) ||
+ $quantity < 0 ||
+ $supplier_order_detail->quantity_received + $quantity > $supplier_order_detail->quantity_expected)
+ $this->_errors[] = sprintf(Tools::displayError('Quantity (%d) for product #%d is not valid'), (int)$quantity, (int)$id_supplier_order_detail);
+ else // everything is valid : updates
+ {
+ $supplier_receipt_history = new SupplierOrderReceiptHistory();
+ $supplier_receipt_history->id_supplier_order_detail = (int)$id_supplier_order_detail;
+ $supplier_receipt_history->id_employee = (int)$this->context->employee->id;
+ $supplier_receipt_history->id_supplier_order_state = (int)4;
+ $supplier_receipt_history->quantity = (int)$quantity;
+ $supplier_receipt_history->add();
+
+ $supplier_order_detail->quantity_received += (int)$quantity;
+ $supplier_order_detail->save();
+ }
+ }
+ }
+
+ if (!count($this_errors))
+ {
+ // display confirm message
+ $token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
+ $redirect = self::$currentIndex.'&token='.$token;
+ Tools::redirectAdmin($redirect.'&conf=4');
+ }
+ }
+
/**
* Display state action link
* @param string $token the token to add to the link
@@ -1139,6 +1234,8 @@ class AdminSupplierOrdersControllerCore extends AdminController
// renders list
$helper = new HelperList();
$helper->no_link = true;
+ $helper->show_toolbar = false;
+ $helper->toolbar_fix = false;
$helper->shopLinkType = '';
$helper->identifier = $this->identifier;
$helper->colorOnBackground = true;
@@ -1151,13 +1248,14 @@ class AdminSupplierOrdersControllerCore extends AdminController
}
/**
- * Used to display details of an order
- * @see AdminSupplierOrdersController::initContent()
+ * @see AdminController::initView()
*/
- protected function viewSupplierOrder()
+ public function initView()
{
$this->displayInformation($this->l('This interface allows you to display detailed informations on your order.').'
');
+ $this->show_toolbar = false;
+ $this->toolbar_fix = false;
$this->table = 'supplier_order_detail';
$this->identifier = 'id_supplier_order_detail';
$this->className = 'SupplierOrderDetail';
@@ -1201,7 +1299,7 @@ class AdminSupplierOrdersControllerCore extends AdminController
'filter' => false,
'search' => false,
),
- 'quantity' => array(
+ 'quantity_expected' => array(
'title' => $this->l('Quantity'),
'align' => 'center',
'width' => 75,
@@ -1325,13 +1423,14 @@ class AdminSupplierOrdersControllerCore extends AdminController
$helper = new HelperList();
$helper->simple_header = true;
$helper->no_link = true;
+ $helper->show_toolbar = false;
+ $helper->toolbar_fix = false;
$helper->shopLinkType = '';
$helper->identifier = $this->identifier;
// generates content
$content = $helper->generateList($this->_list, $this->fieldsDisplay);
// displays content
- $this->context->smarty->assign('supplier_order_detail_content', $content);
// gets global order information
$supplier_order = new SupplierOrder((int)$id_supplier_order);
@@ -1339,26 +1438,27 @@ class AdminSupplierOrdersControllerCore extends AdminController
{
// gets the currency used in this order
$currency = Currency::getCurrency($supplier_order->id_currency);
- $this->context->smarty->assign('supplier_order_currency_sign', $currency ? $currency['sign'] : '');
// gets the employee in charge of the order
$employee = new Employee($supplier_order->id_employee);
- $this->context->smarty->assign('supplier_order_employee', (Validate::isLoadedObject($employee) ? $employee->firstname.' '.$employee->lastname : ''));
// display these global order informations
- $this->context->smarty->assign(
- array(
- 'supplier_order_reference' => $supplier_order->reference,
- 'supplier_order_last_update' => $supplier_order->date_upd,
- 'supplier_order_expected' => $supplier_order->date_delivery_expected,
- 'supplier_order_total_te' => $supplier_order->total_te,
- 'supplier_order_discount_value_te' => $supplier_order->discount_value_te,
- 'supplier_order_total_with_discount_te' => $supplier_order->total_with_discount_te,
- 'supplier_order_total_tax' => $supplier_order->total_tax,
- 'supplier_order_total_ti' => $supplier_order->total_ti,
- )
+ $this->tpl_view_vars = array(
+ 'supplier_order_detail_content' => $content,
+ 'supplier_order_currency_sign' => $currency ? $currency['sign'] : '',
+ 'supplier_order_employee' => (Validate::isLoadedObject($employee) ? $employee->firstname.' '.$employee->lastname : ''),
+ 'supplier_order_reference' => $supplier_order->reference,
+ 'supplier_order_last_update' => $supplier_order->date_upd,
+ 'supplier_order_expected' => $supplier_order->date_delivery_expected,
+ 'supplier_order_total_te' => $supplier_order->total_te,
+ 'supplier_order_discount_value_te' => $supplier_order->discount_value_te,
+ 'supplier_order_total_with_discount_te' => $supplier_order->total_with_discount_te,
+ 'supplier_order_total_tax' => $supplier_order->total_tax,
+ 'supplier_order_total_ti' => $supplier_order->total_ti,
);
}
+
+ return parent::initView();
}
/**
{l s='Back to supplier orders'}
+
+