FIX_leadsNonEBFixes
This commit is contained in:
parent
0f7258a0ee
commit
d10d849389
@ -366,18 +366,6 @@ class LeadsController extends BaseController
|
|||||||
// print_r($this->request->getPost()); die;
|
// print_r($this->request->getPost()); die;
|
||||||
$id = $this->request->getPost('id');
|
$id = $this->request->getPost('id');
|
||||||
$data = $this->prepareLeadData();
|
$data = $this->prepareLeadData();
|
||||||
// print_r($data); die;
|
|
||||||
|
|
||||||
|
|
||||||
if (!$id) {
|
|
||||||
return $this->insertNewLead($data);
|
|
||||||
} else {
|
|
||||||
return $this->updateOldLead($id, $data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function prepareLeadData()
|
|
||||||
{
|
|
||||||
$rules = [
|
$rules = [
|
||||||
|
|
||||||
'lead_type' => [
|
'lead_type' => [
|
||||||
@ -396,16 +384,12 @@ class LeadsController extends BaseController
|
|||||||
'rules' => 'required|regex_match[/^[a-zA-Z0-9_ -]+$/]',
|
'rules' => 'required|regex_match[/^[a-zA-Z0-9_ -]+$/]',
|
||||||
'errors' => [
|
'errors' => [
|
||||||
'required' => 'Client Name is required',
|
'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' => [
|
'client_short_name' => [
|
||||||
'rules' => 'required|regex_match[/^[a-zA-Z0-9_-]+$/]',
|
'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']
|
'errors' => ['required' => 'Client Short Name is required','regex_match' => 'Client Short Name only letters, numbers, hyphens and underscores are allowed']
|
||||||
],
|
|
||||||
'gst' => [
|
|
||||||
'rules' => 'required',
|
|
||||||
'errors' => ['required' => 'GST Number is required']
|
|
||||||
],
|
],
|
||||||
'gst' => [
|
'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}$/]',
|
'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' => [
|
'contact_person_mobile' => [
|
||||||
'rules' => 'required',
|
'rules' => 'required',
|
||||||
'rules' => 'required|regex_match[/^[0-9]+$/]',
|
'rules' => 'required|exact_length[10]|regex_match[/^[0-9]+$/]',
|
||||||
'errors' => ['required' => 'Contact Person Mobile is required' ,
|
'errors' => [
|
||||||
'regex_match' => 'Contact Person Mobile Only numbers'
|
'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' => [
|
'contact_person_email' => [
|
||||||
@ -462,8 +448,7 @@ class LeadsController extends BaseController
|
|||||||
'errors' => ['required' => 'Status is required']
|
'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) {
|
if (isset($data['lead_form_type']) && (int)$data['lead_form_type'] === 2) {
|
||||||
$rules['client_type'] = [
|
$rules['client_type'] = [
|
||||||
'rules' => 'required',
|
'rules' => 'required',
|
||||||
@ -525,6 +510,21 @@ 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['client_type'] = 1;
|
||||||
$data['pan'] = "";
|
$data['pan'] = "";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user