diff --git a/app/Controllers/Books.php b/app/Controllers/Books.php index b7069f77..5cffec7f 100755 --- a/app/Controllers/Books.php +++ b/app/Controllers/Books.php @@ -128,4 +128,26 @@ class Books extends BaseController } return redirect()->route('book_list'); } -} \ No newline at end of file + public function delete_book($id) + { + $BooksModel = new BooksModel(); + + // Check if the business ID exists + $existingBook = $BooksModel->find($id); + if (!$existingBook) { + // return redirect()->to(base_url('Business/index'))->with('error', 'Business not found.'); + return redirect()->route('book_list'); + } + + helper('session'); + $session_uid = get_logged_user_id(); + // Delete the business record + $data['isactive'] = 0; + $data['updated_by'] = $session_uid; + $BooksModel->update($id, $data); + //$BusinessModel->delete($id); + + // return redirect()->to(base_url('Business/index'))->with('success', 'Business deleted successfully.'); + return redirect()->route('book_list'); + } +} diff --git a/app/Controllers/Users.php b/app/Controllers/Users.php index 5c2895c1..800fec88 100755 --- a/app/Controllers/Users.php +++ b/app/Controllers/Users.php @@ -12,8 +12,8 @@ class Users extends BaseController public function index() { helper('session'); - $session_role = get_user_role('user_role'); - $session_bid = get_business_id('business_id'); + $session_role = get_user_role(); + $session_bid = get_business_id(); if (!empty($session_role) && $session_role !== "sadmin") { $where = ['users.business_id' => (int)$session_bid, 'users.isactive' => 1]; @@ -32,7 +32,8 @@ class Users extends BaseController public function user_page($id) { helper('session'); - $session_role = get_user_role('user_role'); + $session_role = get_user_role(); + $session_bid = get_business_id(); if ($id === '0') { $data['page_name'] = 'Add User'; $data['details'] = []; @@ -50,6 +51,7 @@ class Users extends BaseController } $business_details = !empty($session_role) && $session_role === "sadmin" ? $this->business_details() : []; $data['business_details'] = $business_details; + $data['session_bid'] = $session_bid; $this->render_page('user_form', $data); } ## For SuperAdmin Role business Dropdown displayed on Userpage.otherwise Hidden fields @@ -99,13 +101,13 @@ class Users extends BaseController // Delete the previous image file if it exists if ($user_id) { - $previousFileName = $this->request->getPost('previous_file'); + $previousFileName = $this->request->getPost('previous_ufile'); if ($previousFileName && is_file('public/uploads/' . $previousFileName)) { link('public/uploads/' . $previousFileName); } } } else { - $fileName = $this->request->getPost('previous_file', ''); // Use the previous filename if no new image is provided + $fileName = $this->request->getPost('previous_ufile', ''); // Use the previous filename if no new image is provided } @@ -116,6 +118,7 @@ class Users extends BaseController 'profile_picture' => $fileName, 'city' => $this->request->getPost('city'), 'state' => $this->request->getPost('state'), + 'email' => $this->request->getPost('email'), 'postal_code' => $this->request->getPost('postal_code'), 'country' => $this->request->getPost('country'), 'role' => $this->request->getPost('role'), @@ -138,10 +141,10 @@ class Users extends BaseController $UsersModel->insert($data); } else { // It's an update operation - $isactive = $this->request->getPost('bcheckbox'); + $isactive = $this->request->getPost('isactive'); $data['isactive'] = ($isactive == 'on') ? 1 : 0; $data['updated_by'] = $session_uid; - $BooksModel->update($book_id, $data); + $UsersModel->update($user_id, $data); } return redirect()->route('user_list'); } diff --git a/app/Views/book_list.php b/app/Views/book_list.php index abd31d7c..52213954 100644 --- a/app/Views/book_list.php +++ b/app/Views/book_list.php @@ -52,6 +52,7 @@ diff --git a/app/Views/user_form.php b/app/Views/user_form.php index 8e335046..97214ea5 100644 --- a/app/Views/user_form.php +++ b/app/Views/user_form.php @@ -6,160 +6,186 @@ -
" method="post" enctype="multipart/form-data"> + " + method="post" enctype="multipart/form-data">
- - + +
Please provide.
- - + +
Please provide.
- -
- - -
Please provide.
-
+
+ + +
Please provide.
+
-
-
- - +
+ +
Please provide.
-
- - +
+ + +
Please provide.
+
+
+ +
Please provide.
-
- - + +
+ +
Please provide.
-
- - -
Please provide.
-
-
-
-
- - -
-
- - -
Please provide.
-
- -
- - Business Logo -
- -
- - - - - - -
-
- - -
Please provide.
-
-
-
- - -
Please provide.
+
+ +
- - -
Please provide.
-
-
- - + +
Please provide.
-
-
- - + +
+ + Business Logo +
+ +
+
+
+ + + + + +
- - - - - + +
+ + +
Please provide.
+
+
+
+ + +
Please provide.
+
+
+ + +
Please provide.
+
+
+ + +
Please provide.
+
+
+ +
+
+ + +
+
+ + + + +
- > + >

- -
- - - " class="btn btn-secondary waves-effect">Cancel - + +
+ + + " class="btn btn-secondary waves-effect">Cancel + + +
-
-
- - - - - \ No newline at end of file +
diff --git a/public/uploads/2023-06-17_14.png b/public/uploads/2023-06-17_14.png new file mode 100644 index 00000000..32a11680 Binary files /dev/null and b/public/uploads/2023-06-17_14.png differ diff --git a/public/uploads/2023-06-17_15.png b/public/uploads/2023-06-17_15.png new file mode 100644 index 00000000..32a11680 Binary files /dev/null and b/public/uploads/2023-06-17_15.png differ diff --git a/public/uploads/Screenshot 2023-07-14 160403.png b/public/uploads/Screenshot 2023-07-14 160403.png new file mode 100644 index 00000000..f6828068 Binary files /dev/null and b/public/uploads/Screenshot 2023-07-14 160403.png differ diff --git a/public/uploads/Screenshot 2023-07-14 160403_1.png b/public/uploads/Screenshot 2023-07-14 160403_1.png new file mode 100644 index 00000000..f6828068 Binary files /dev/null and b/public/uploads/Screenshot 2023-07-14 160403_1.png differ diff --git a/public/uploads/Screenshot 2023-07-20 120901.png b/public/uploads/Screenshot 2023-07-20 120901.png new file mode 100644 index 00000000..c07a9646 Binary files /dev/null and b/public/uploads/Screenshot 2023-07-20 120901.png differ