diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 023acd31..15533b25 100755
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -4834,7 +4834,7 @@ class ClientController extends AdminController
return $this->respond([
'status' => false,
'code' => 404,
- 'message' => 'No data found',
+ 'message' => 'No Employee found',
'param' => $param,
'type' => $type,
'dataForClientAndInsurer' => $dataForClientAndInsurer,
@@ -4843,7 +4843,7 @@ class ClientController extends AdminController
}
}
- public function getTheEmpDataForClaimSearchByMobile($param, $type = 'mobile', $client_policy_id = null)
+ public function getTheEmpDataForClaimSearchByMobile($param, $type = 'mobile', $client_policy_id = null, $client_id = null)
{
$field_name = 'employees.' . $type;
@@ -4866,8 +4866,8 @@ class ClientController extends AdminController
employee_polices.tpa_id AS tpa_no,
employee_polices.client_policy_id AS policy_id
")
- ->join('clients', 'client_policy.client_id = clients.id', 'left')
- ->join('insurers', 'client_policy.insurer_id = insurers.id', 'left')
+ ->join('clients', 'client_policy.client_id = clients.id')
+ ->join('insurers', 'client_policy.insurer_id = insurers.id')
->join('tpa', 'client_policy.tpa_id = tpa.id', 'left')
->join('employees', 'clients.id = employees.client_id')
->join('employee_polices', 'employees.id = employee_polices.employee_id')
@@ -4879,6 +4879,10 @@ class ClientController extends AdminController
->where('employee_polices.is_active', 1)
->where($field_name, $param);
+ if (!empty($client_id)) {
+ $query->where('employees.client_id', $client_id);
+ }
+
if (!empty($client_policy_id)) {
$query->where('employee_polices.client_policy_id', $client_policy_id);
}
@@ -4902,7 +4906,7 @@ class ClientController extends AdminController
if(!empty($data) && count($data) > 0){
- $memberData = $this->employeeModel->getEmployeeByEmployeeCode($data['emp_code'], $data['policy_id']);
+ $memberData = $this->employeeModel->getEmployeeByEmployeeCode($data['emp_code'], $data['policy_id'], $client_id);
$acms = $this->clientRMModel
->select('user_profiles.id, user_profiles.first_name')
@@ -4935,7 +4939,7 @@ class ClientController extends AdminController
return $this->respond([
'status' => false,
'code' => 404,
- 'message' => 'No data found',
+ 'message' => 'No Employee found',
'param' => $param,
'client_policy_id' => $client_policy_id,
'type' => $type,
diff --git a/app/Controllers/TicketController.php b/app/Controllers/TicketController.php
index 3061f378..55672be7 100644
--- a/app/Controllers/TicketController.php
+++ b/app/Controllers/TicketController.php
@@ -34,6 +34,7 @@ class TicketController extends BaseController
public $claimStatus;
public $placeHolders;
public $extraFields;
+ public $nonIDReason;
protected $clientModel;
protected $ticketMasterModel;
@@ -138,6 +139,13 @@ class TicketController extends BaseController
53 => ['cancel_remark'],
58 => ['cancel_remark'],
];
+ $this->nonIDReason = [
+ "Newborn Baby" => "Newborn Baby",
+ "Newly Wedded Spouse" => "Newly Wedded Spouse",
+ "Policy Pending" => "Policy Pending",
+ "New Joinee" => "New Joinee",
+ "Exceptional Case" => "Exceptional Case"
+ ];
$this->ticketMasterModel = new TicketMasterModel();
$this->claimStatus = new TicketClaimStatusModel();
@@ -297,7 +305,8 @@ class TicketController extends BaseController
'ticket_type' => $this->ticketType,
'priorityType' => $this->priorityType,
'relationshipType' => $this->relationshipType,
- 'modeOFIntimate' => $this->modeOFIntimate
+ 'modeOFIntimate' => $this->modeOFIntimate,
+ 'nonIDReason' => $this->nonIDReason
];
switch ($ticket_type) {
@@ -529,6 +538,12 @@ class TicketController extends BaseController
$ticket_data['settled_date'] = change_date_format($ticket_data['settled_date'], null, $out_put_format);
}
+ if (empty($ticket_data['pay_initiate_date'])) {
+ $ticket_data['pay_initiate_date'] = null;
+ } else {
+ $ticket_data['pay_initiate_date'] = change_date_format($ticket_data['pay_initiate_date'], null, $out_put_format);
+ }
+
return $ticket_data;
}
diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php
index 58cf6010..14ec368d 100755
--- a/app/Models/EmployeeModel.php
+++ b/app/Models/EmployeeModel.php
@@ -240,7 +240,7 @@ class EmployeeModel extends Model
return $results;
}
- public function getEmployeeByEmployeeCode($emp_code, $client_policy_id = null)
+ public function getEmployeeByEmployeeCode($emp_code, $client_policy_id = null, $client_id = null)
{
$query = $this->select("
employees.id AS emp_id,
@@ -257,6 +257,10 @@ class EmployeeModel extends Model
->where('employee_polices.is_active', 1)
->where('employees.emp_code', $emp_code);
+ if(!empty($client_id)){
+ $query->where('employees.client_id', $client_id);
+ }
+
if(!empty($client_policy_id)){
$query->where('employee_polices.client_policy_id', $client_policy_id);
}
diff --git a/app/Views/ticket_form_gmc.php b/app/Views/ticket_form_gmc.php
index 23c8151c..b4fe84be 100644
--- a/app/Views/ticket_form_gmc.php
+++ b/app/Views/ticket_form_gmc.php
@@ -23,78 +23,13 @@