diff --git a/app/Controllers/Notifications.php b/app/Controllers/Notifications.php
index de62d695..475e4cfa 100755
--- a/app/Controllers/Notifications.php
+++ b/app/Controllers/Notifications.php
@@ -45,12 +45,6 @@ class Notifications extends BaseController
public function send_whatsapp_message() {
helper('apiIntegration');
$params = (object) Null;
-
-
-
-
-
-
try {
$this->logger->info("Whatsapp : sending message instance id = ".$this->instance_id);
$params->number = 916369084112;
diff --git a/app/Controllers/Users.php b/app/Controllers/Users.php
index 55d5b105..a60396cf 100755
--- a/app/Controllers/Users.php
+++ b/app/Controllers/Users.php
@@ -67,10 +67,11 @@ class Users extends BaseController
## For inserting/updating details of user
public function insert_users()
{
+ // print_r($this->request->getPost());die();
helper('session');
$session_uid = get_logged_user_id();
$session_bid = get_business_id();
-
+ try {
// print_r($_FILES);die();
$validationRule = [
'userfile' => [
@@ -85,10 +86,9 @@ class Users extends BaseController
];
if (!$this->validate($validationRule) && $this->request->getPost('profile_picture') === '') {
- $data = ['errors' => $this->validator->getErrors()];
- print_r($data);
- return 'hello';
- }
+ $error = $this->validator->getErrors();
+ throw new \Exception((string)$error);
+ }
$img = $this->request->getFile('profile_picture');
$user_id = $this->request->getPost('user_id');
$business_id = $this->request->getPost('business_id');
@@ -104,11 +104,11 @@ class Users extends BaseController
if ($user_id) {
$previousFileName = $this->request->getPost('previous_ufile');
if ($previousFileName && is_file('public/uploads/' . $previousFileName)) {
- link('public/uploads/' . $previousFileName);
+ link('public/uploads/'.$previousFileName,'');
}
}
} else {
- $fileName = $this->request->getPost('previous_ufile', ''); // Use the previous filename if no new image is provided
+ $fileName = $this->request->getPost('previous_ufile')?$this->request->getPost('previous_ufile'):""; // Use the previous filename if no new image is provided
}
@@ -141,34 +141,45 @@ class Users extends BaseController
$data['password'] = $hash_password;
$data['created_by'] = $session_uid;
//print_r($data);die;
- $UsersModel->insert($data);
+ ($UsersModel->insert($data)) ? session()->setFlashdata('success', 'User has been added successfully.')
+ : session()->setFlashdata('error', 'User could not be added. Please try again.');
} else {
// It's an update operation
$isactive = $this->request->getPost('isactive');
$data['isactive'] = ($isactive == 'on') ? 1 : 0;
$data['updated_by'] = $session_uid;
- $UsersModel->update($user_id, $data);
+ // $UsersModel->update($user_id, $data);
+ ($UsersModel->update($user_id, $data)) ? session()->setFlashdata('success', 'User has been updated successfully.')
+ : session()->setFlashdata('error', 'User update failed. Please try again.');
+
}
+ }catch(\Exception $e) {
+ session()->setFlashdata('error', 'Message: ' .$e->getMessage());
+ }
return redirect()->route('user_list');
}
## For delete the user details (Which means inactive the details)
public function delete_user($id)
{
-
helper('session');
$session_uid = get_logged_user_id();
-
- $model = new UsersModel();
-
- $existingBook = $model->find($id);
- if (!$existingBook) {
- return redirect()->route('user_list');
+ try {
+ $model = new UsersModel();
+ $existingBook = $model->find($id);
+ if ($existingBook) {
+ // $data=[];
+ $data['isactive'] = 0;
+ $data['updated_by'] = $session_uid;
+ ($model->update($id, $data)) ? session()->setFlashdata('success', 'Deleted successfully.')
+ : throw new \Exception("Data Not able to Deleted");
+ }
+ else{
+ throw new \Exception("Data Not Available");
+ }
+ }catch(\Exception $e) {
+ session()->setFlashdata('error', 'Message: ' .$e->getMessage());
}
-
- $data['isactive'] = 0;
- $data['updated_by'] = $session_uid;
- $model->update($id, $data);
return redirect()->route('user_list');
}
}
diff --git a/app/Views/notifications_form.php b/app/Views/notifications_form.php
index 79eae16b..39eecea5 100644
--- a/app/Views/notifications_form.php
+++ b/app/Views/notifications_form.php
@@ -38,14 +38,22 @@
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/app/Views/template/footer.php b/app/Views/template/footer.php
index fdfadf58..57229530 100644
--- a/app/Views/template/footer.php
+++ b/app/Views/template/footer.php
@@ -473,6 +473,13 @@
-
+