diff --git a/orif/stock/Controllers/Item.php b/orif/stock/Controllers/Item.php index 33810858..182a115c 100644 --- a/orif/stock/Controllers/Item.php +++ b/orif/stock/Controllers/Item.php @@ -637,7 +637,7 @@ public function create_inventory_control($id = NULL) { */ public function inventory_controls($id = NULL) { if (!empty($id) && isset($_SESSION['logged_in']) && $_SESSION['logged_in'] == true && $_SESSION['user_access'] >= config('\User\Config\UserConfig')->access_lvl_registered) { - + helper('MY_date'); // Get item object with related inventory controls @@ -715,8 +715,15 @@ public function create_loan($id = NULL) { $this->loan_model->insert($loanArray); return redirect()->to("/item/loans/".$id); + } else { + $data['errors'] = $validation->getErrors(); + + // List of data inputs from the user + $inputs = ['date', 'planned_return_date', 'real_return_date', 'loan_to_user_id', 'borrower_email', 'item_localisation']; + foreach ($inputs as $input) { + if (isset($_POST[$input])) $data[$input] = $_POST[$input]; + } } - $data['errors'] = $validation->getErrors(); } $this->display_view('Stock\Views\loan\form', $data); } else { @@ -788,8 +795,15 @@ public function modify_loan($id = NULL) { $this->loan_model->update($id, $loanArray); return redirect()->to("/item/loans/".$data["item_id"]); + } else { + $data['errors'] = $validation->getErrors(); + + // List of data inputs from the user + $inputs = ['date', 'planned_return_date', 'real_return_date', 'loan_to_user_id', 'borrower_email', 'item_localisation']; + foreach ($inputs as $input) { + if (isset($_POST[$input])) $data[$input] = $_POST[$input]; + } } - $data['errors'] = $validation->getErrors(); } $this->display_view('Stock\Views\loan\form', $data); } else { @@ -806,7 +820,7 @@ public function modify_loan($id = NULL) { * @return void */ public function loans($id = NULL) { - if (!empty($id) && isset($_SESSION['logged_in']) && $_SESSION['logged_in'] == true && $_SESSION['user_access']>=config('\User\Config\UserConfig')->access_lvl_admin) { + if (!empty($id) && isset($_SESSION['logged_in']) && $_SESSION['logged_in'] == true && $_SESSION['user_access']>=config('\User\Config\UserConfig')->access_lvl_registered) { // Get item object and related loans $item = $this->item_model->find($id);