FIX_Opportunities_LIVE_ISSUES
This commit is contained in:
parent
29ac2e4087
commit
00b1afd8fb
@ -471,7 +471,7 @@ class ClientController extends AdminController
|
|||||||
$headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same.
|
$headerData['page_name'] = 'Clients'; // Both Browser Tab name And Page name are same.
|
||||||
// $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type
|
// $data['clientList'] = $this->clientModel->getCreatedByUserName(1); // passing client_type
|
||||||
$data['client_rm'] = $this->clientRMModel->getAllClientRM();
|
$data['client_rm'] = $this->clientRMModel->getAllClientRM();
|
||||||
$data['lead_data'] = $this->leadsModel->getLeadForInsertClientList();
|
$data['lead_data'] = $this->leadsModel->getLeadForInsertClientList([1, 3]);
|
||||||
|
|
||||||
$rawList = $this->clientModel->getCreatedByUserName(1);
|
$rawList = $this->clientModel->getCreatedByUserName(1);
|
||||||
$clientRM = $data['client_rm'];
|
$clientRM = $data['client_rm'];
|
||||||
@ -1037,7 +1037,7 @@ class ClientController extends AdminController
|
|||||||
$editData['client_branch'] = $this->clientBranchModel->where(['client_id' => $id, 'is_active' => 1])->findAll();
|
$editData['client_branch'] = $this->clientBranchModel->where(['client_id' => $id, 'is_active' => 1])->findAll();
|
||||||
$editData['client_relation'] = $this->clientRMModel->where(['client_id' => $id, 'is_active' => 1])->findAll();
|
$editData['client_relation'] = $this->clientRMModel->where(['client_id' => $id, 'is_active' => 1])->findAll();
|
||||||
$editData['client_branch']['role'] = get_role_id();
|
$editData['client_branch']['role'] = get_role_id();
|
||||||
$editData['lead_data'] = $this->leadsModel->getLeadForInsertClientList(null, $id);
|
$editData['lead_data'] = $this->leadsModel->getLeadForInsertClientList([2], $id);
|
||||||
$clientPoliceData = $this->clientPolicyModel->getClientPolicyByClientId($id);
|
$clientPoliceData = $this->clientPolicyModel->getClientPolicyByClientId($id);
|
||||||
|
|
||||||
foreach ($clientPoliceData as $key => $value) {
|
foreach ($clientPoliceData as $key => $value) {
|
||||||
|
|||||||
@ -2895,6 +2895,11 @@ class LeadsController extends BaseController
|
|||||||
$filename = "{$rfq_data['client_name']}_{$rfq_data['policy_type']}_{$string}_" . $policy_year . '_' . '.xlsx';
|
$filename = "{$rfq_data['client_name']}_{$rfq_data['policy_type']}_{$string}_" . $policy_year . '_' . '.xlsx';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$filenameBase = pathinfo($filename, PATHINFO_FILENAME);
|
||||||
|
$filenameBase = preg_replace('/[^a-zA-Z0-9\-_ ]/u', '', $filenameBase);
|
||||||
|
$filenameBase = preg_replace('/\s+/', ' ', trim($filenameBase));
|
||||||
|
$filename = ($filenameBase !== '' ? $filenameBase : 'export') . '.xlsx';
|
||||||
|
|
||||||
//claim history new sheet;
|
//claim history new sheet;
|
||||||
if ($claim_history == 1 && !empty($rfq_data['fin_years_claims'])) {
|
if ($claim_history == 1 && !empty($rfq_data['fin_years_claims'])) {
|
||||||
|
|
||||||
|
|||||||
@ -205,7 +205,7 @@ class LeadsModel extends Model
|
|||||||
->groupEnd();
|
->groupEnd();
|
||||||
|
|
||||||
if ($type) {
|
if ($type) {
|
||||||
$query->where('leads.lead_type', $type);
|
$query->whereIn('leads.lead_type', $type);
|
||||||
}
|
}
|
||||||
if ($client_id) {
|
if ($client_id) {
|
||||||
$query->where('leads.client_id', $client_id);
|
$query->where('leads.client_id', $client_id);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user