From db77a8fde4cf50e5ec5c4d2bdfbd5d2663bf5a8e Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Wed, 18 Mar 2026 11:54:30 +0530 Subject: [PATCH 1/2] FIX_cliq group reported fixed --- app/Controllers/LeadsController.php | 4 ---- app/Views/leads_form.php | 12 ++++++------ app/Views/newClientModal.php | 4 ++++ app/Views/rfq/gmc.php | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 95fe4d80..b710a183 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -487,10 +487,6 @@ class LeadsController extends BaseController // print_r($rules); die; if ((int) $this->request->getPost('lead_form_type') === 2) { - $rules['client_type'] = [ - 'rules' => 'required', - 'errors' => ['required' => 'Client Type is required'], - ]; $rules['policy_type_id'] = [ 'rules' => 'required', 'errors' => ['required' => 'Policy Type is required'], diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php index 9ece0333..e305b1f0 100644 --- a/app/Views/leads_form.php +++ b/app/Views/leads_form.php @@ -302,13 +302,13 @@
- +
- +
@@ -321,7 +321,7 @@
- +
@@ -401,7 +401,7 @@
- +
@@ -1243,7 +1243,7 @@
- +
@@ -1252,7 +1252,7 @@
- +
diff --git a/app/Views/newClientModal.php b/app/Views/newClientModal.php index bc70d874..3d40798d 100644 --- a/app/Views/newClientModal.php +++ b/app/Views/newClientModal.php @@ -244,6 +244,10 @@ appendClients(res.clients, res.client_id); appendBranch(res.branches, res.branch_id); + $('#client_name').val($('#client_name_for_modal').val()); + $('#client_short_name').val($('#client_short_name_for_modal').val()); + $('#contact_person_name').val(res.data.name); + $('#gst').val(res.data.gst); $('#branch_name').val(res.data.branch_name); $('#branch_code').val(res.data.branch_code); diff --git a/app/Views/rfq/gmc.php b/app/Views/rfq/gmc.php index 4dd3e6d1..906057e6 100644 --- a/app/Views/rfq/gmc.php +++ b/app/Views/rfq/gmc.php @@ -6,7 +6,7 @@
From 95285dd602438260720aeff0b9c2a127392fbc87 Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Wed, 18 Mar 2026 12:11:21 +0530 Subject: [PATCH 2/2] FIX_user_team --- app/Controllers/UserController.php | 101 +++++++++++++++-------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 09b458dc..0e29438a 100755 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -202,52 +202,53 @@ class UserController extends AdminController // ]; // $this->bookStack->createEditUser($bookStackData); - // if ($insert) { - // $teamData['user_id'] = $insert; - // foreach ($teams as $value) { - // $teamData['team_id'] = $value; - // $teamData['created_by'] = get_session_userid(); - // $this->userTeamsModel->insert($teamData); - // } + if ($insert) { - // $db = \Config\Database::connect(); - // $tableName = 'hdz_staff'; + $teamData['user_id'] = $insert; + foreach ($teams as $value) { + $teamData['team_id'] = $value; + $teamData['created_by'] = get_session_userid(); + $this->userTeamsModel->insert($teamData); + } + + // $db = \Config\Database::connect(); + // $tableName = 'hdz_staff'; - // // Set default values - // $admin = 0; - // $acm = 0; - // $acm_id = null; + // // Set default values + // $admin = 0; + // $acm = 0; + // $acm_id = null; - // if ($userData['role'] == 3) { - // $admin = 0; - // $acm = 1; - // $acm_id = $insert; - // } else if (in_array($userData['role'], [1, 5])) { - // $admin = 1; - // $acm = 0; - // $acm_id = null; - // } + // if ($userData['role'] == 3) { + // $admin = 0; + // $acm = 1; + // $acm_id = $insert; + // } else if (in_array($userData['role'], [1, 5])) { + // $admin = 1; + // $acm = 0; + // $acm_id = null; + // } - // $password = '12345678'; // Default password - // $hashedPassword = password_hash($password, PASSWORD_DEFAULT); + // $password = '12345678'; // Default password + // $hashedPassword = password_hash($password, PASSWORD_DEFAULT); - // $hdz_staff = [ - // 'emp_code' => $userData['emp_code'], - // 'fullname' => $userData['first_name'], - // 'username' => strtolower($userData['first_name']), - // 'email' => $userData['email'], - // 'admin' => $admin, - // 'acm' => $acm, - // 'acm_id' => $acm_id, - // 'registration' => time(), - // 'password' => $hashedPassword, - // 'active' => 1, - // 'department' => 'a:7:{i:0;s:1:"1";i:1;s:1:"2";i:2;s:1:"5";i:3;s:1:"3";i:4;s:1:"9";i:5;s:1:"4";i:6;s:2:"10";}', - // ]; + // $hdz_staff = [ + // 'emp_code' => $userData['emp_code'], + // 'fullname' => $userData['first_name'], + // 'username' => strtolower($userData['first_name']), + // 'email' => $userData['email'], + // 'admin' => $admin, + // 'acm' => $acm, + // 'acm_id' => $acm_id, + // 'registration' => time(), + // 'password' => $hashedPassword, + // 'active' => 1, + // 'department' => 'a:7:{i:0;s:1:"1";i:1;s:1:"2";i:2;s:1:"5";i:3;s:1:"3";i:4;s:1:"9";i:5;s:1:"4";i:6;s:2:"10";}', + // ]; - // $db->table($tableName)->insert($hdz_staff); + // $db->table($tableName)->insert($hdz_staff); - // } + } } $this->myLogger->logme('error', 'User create Successfully created by id {data}', ['data' => get_session_userid()]); return redirect()->to(base_url('/user/list')); @@ -400,17 +401,17 @@ class UserController extends AdminController // $this->bookStack->createEditUser($bookStackData,$existingData); - // if ($update) { + if ($update) { - // if ($teams) { - // $this->userTeamsModel->where('user_id', $id)->delete(); - // $teamData['user_id'] = $id; - // foreach ($teams as $value) { - // $teamData['team_id'] = $value; - // $teamData['created_by'] = get_session_userid(); - // $this->userTeamsModel->insert($teamData); - // } - // } + if ($teams) { + $this->userTeamsModel->where('user_id', $id)->delete(); + $teamData['user_id'] = $id; + foreach ($teams as $value) { + $teamData['team_id'] = $value; + $teamData['created_by'] = get_session_userid(); + $this->userTeamsModel->insert($teamData); + } + } // $db = \Config\Database::connect(); // $tableName = 'hdz_staff'; @@ -461,7 +462,7 @@ class UserController extends AdminController // $db->table($tableName)->insert($hdz_staff); // } - // } + } return redirect()->to(base_url('/user/list')); }