From d10d84938966dfcad8190b1d6d1d2021a2a032ea Mon Sep 17 00:00:00 2001 From: "sanjeev.p" Date: Thu, 12 Feb 2026 17:50:46 +0530 Subject: [PATCH] FIX_leadsNonEBFixes --- app/Controllers/LeadsController.php | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 958d7eba..0f96da92 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -366,18 +366,6 @@ class LeadsController extends BaseController // print_r($this->request->getPost()); die; $id = $this->request->getPost('id'); $data = $this->prepareLeadData(); - // print_r($data); die; - - - if (!$id) { - return $this->insertNewLead($data); - } else { - return $this->updateOldLead($id, $data); - } - } - - private function prepareLeadData() - { $rules = [ 'lead_type' => [ @@ -396,16 +384,12 @@ class LeadsController extends BaseController 'rules' => 'required|regex_match[/^[a-zA-Z0-9_ -]+$/]', 'errors' => [ 'required' => 'Client Name is required', - 'regex_match' => 'Client Name only letters, numbers and characters _ - and space are allowed' + 'regex_match' => 'Client Name only letters, numbers, space, hyphens and underscores are allowed' ] ], 'client_short_name' => [ 'rules' => 'required|regex_match[/^[a-zA-Z0-9_-]+$/]', - 'errors' => ['required' => 'Client Short Name is required','regex_match' => 'Client Short Name only letters, numbers and characters _ and - are allowed'] - ], - 'gst' => [ - 'rules' => 'required', - 'errors' => ['required' => 'GST Number is required'] + 'errors' => ['required' => 'Client Short Name is required','regex_match' => 'Client Short Name only letters, numbers, hyphens and underscores are allowed'] ], 'gst' => [ 'rules' => 'required|regex_match[/^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$/]', @@ -438,9 +422,11 @@ class LeadsController extends BaseController ], 'contact_person_mobile' => [ 'rules' => 'required', - 'rules' => 'required|regex_match[/^[0-9]+$/]', - 'errors' => ['required' => 'Contact Person Mobile is required' , - 'regex_match' => 'Contact Person Mobile Only numbers' + 'rules' => 'required|exact_length[10]|regex_match[/^[0-9]+$/]', + 'errors' => [ + 'required' => 'Contact Person Mobile is required' , + 'regex_match' => 'Contact Person Mobile Only numbers', + 'exact_length'=> 'Contact Person Mobile must be exactly 10 digits long.' ] ], 'contact_person_email' => [ @@ -462,8 +448,7 @@ class LeadsController extends BaseController 'errors' => ['required' => 'Status is required'] ] ]; - $request_data = $this->request->getPost(); - $data = sanitizeInputArrayAdvanced($request_data); + if (isset($data['lead_form_type']) && (int)$data['lead_form_type'] === 2) { $rules['client_type'] = [ 'rules' => 'required', @@ -524,8 +509,23 @@ class LeadsController extends BaseController ]); } - + // print_r($data); die; + + + if (!$id) { + return $this->insertNewLead($data); + } else { + return $this->updateOldLead($id, $data); + } + } + + private function prepareLeadData() + { + + $request_data = $this->request->getPost(); + $data = sanitizeInputArrayAdvanced($request_data); + $data['client_type'] = 1; $data['pan'] = "";