Merge branch 'dev' of bitbucket.org:jubilian/nhance-enrollment into dev
This commit is contained in:
commit
abd4895de9
@ -289,7 +289,7 @@ class EmployeeController extends AdminController
|
||||
$data['page_name'] = 'View Inception';
|
||||
|
||||
//for TPA/insurer upload
|
||||
$data['events'] = ['inception' => 'Inception (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
|
||||
// $data['events'] = ['inception' => 'Inception (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement'];
|
||||
//for inception upload
|
||||
// $data['actions'] = ['inception' => 'Inception (Employee + Dependents)', 'missed_inception' => 'Missed Inception (Employee + Dependents)', 'addition' => 'Addition (Employee + Dependents)', 'dependent_addition' => 'Dependent Addition (Only Dependents)', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement','enrollment' => 'Enrolment'];
|
||||
$data['actions'] = ['enrollment' => 'Enrolment'];
|
||||
@ -336,20 +336,20 @@ class EmployeeController extends AdminController
|
||||
->find();
|
||||
// dd($data['fileList']);
|
||||
|
||||
$data['batch_list'] = $this->batchFileModel->select(
|
||||
'batch_files.*,
|
||||
clients.short_name as client_short_name,
|
||||
client_branch.branch_name,
|
||||
client_policy.policy_no,
|
||||
policy_type.policy_type
|
||||
')
|
||||
->join('client_policy', 'client_policy.id = batch_files.client_policy_id')
|
||||
->join('client_branch', 'client_branch.id = batch_files.client_branch_id')
|
||||
->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
|
||||
->join('clients', 'clients.id = client_policy.client_id')
|
||||
->orderBy('batch_files.id', 'desc')
|
||||
->limit(100)
|
||||
->find();
|
||||
// $data['batch_list'] = $this->batchFileModel->select(
|
||||
// 'batch_files.*,
|
||||
// clients.short_name as client_short_name,
|
||||
// client_branch.branch_name,
|
||||
// client_policy.policy_no,
|
||||
// policy_type.policy_type
|
||||
// ')
|
||||
// ->join('client_policy', 'client_policy.id = batch_files.client_policy_id')
|
||||
// ->join('client_branch', 'client_branch.id = batch_files.client_branch_id')
|
||||
// ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
|
||||
// ->join('clients', 'clients.id = client_policy.client_id')
|
||||
// ->orderBy('batch_files.id', 'desc')
|
||||
// ->limit(100)
|
||||
// ->find();
|
||||
|
||||
|
||||
// dd($data['fileList']);die();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user