Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

app/Controllers/EmployeeController.php

@@ -1123,6 +1123,7 @@ class EmployeeController extends AdminController
                     '{FRONT_CARD}' => base_url() . 'public/uploads/template_bg/' . $value['front_card'],
                     '{BACK_CARD}' => base_url() . 'public/uploads/template_bg/' . $value['back_card'],
                     '{EMP_ID}' => $value['emp_code'],
+                    '{SI_AMT}' => $value['basic_cover_si'],
                     '{CORPORATE_NAME}' => $value['client_name'],
                     '{AGE}' => $value['emp_age'],
                     '{TPA_NAME}' => $value['tpa_name'],
@@ -1304,10 +1305,9 @@ class EmployeeController extends AdminController
         }
     }
 
+    // Preview E-Card Template function
     public function previewTemplate($id = null)
     {
-
-        
         $value = [
             'tpa_id' => 'TPA12345',
             'name' => 'John Doe',
@@ -1324,10 +1324,10 @@ class EmployeeController extends AdminController
             'emp_age' => 39,
             'tpa_name' => 'Example TPA',
             'insurer_branch_city' => 'New York',
-            'relationship' => 'Self'
+            'relationship' => 'Self',
+            'basic_cover_si' => '5,00,000',
         ];
         
-
         $tpa_id = $this->TPAModel->where('id', $id)->first();
 
         $template_data_path =  WRITEPATH . 'e_card_template/';
@@ -1354,6 +1354,7 @@ class EmployeeController extends AdminController
             '{POLICY_NO}' => $value['policy_no'], 
             '{INSURER_NAME}' => strtoupper($value['insurer_name']),
             '{EMP_ID}' => $value['emp_code'],
+            '{SI_AMT}' => $value['basic_cover_si'], 
             '{CORPORATE_NAME}' => $value['client_name'],
             '{AGE}' => $value['emp_age'],
             '{TPA_NAME}' => $value['tpa_name'],

app/Models/EmployeePolicyModel.php

@@ -851,6 +851,7 @@ class EmployeePolicyModel extends Model
                     ep.tpa_id, 
                     ep.uhid,
                     ep.policy_end_date,
+                    ep.basic_cover_si,
 
                     clients.client_name, 
                     clients.short_name AS client_short_name,
@@ -858,8 +859,6 @@ class EmployeePolicyModel extends Model
                     cp.policy_start_date,
                     cp.policy_no,
 
-                    policies.name AS policy_name,
-
                     insurers.name AS insurer_name, 
                     insurers.short_name AS insurer_short_name,
                     insurers.insurer_logo,
@@ -878,7 +877,6 @@ class EmployeePolicyModel extends Model
         ->join('employee_polices ep', 'ep.employee_id = e.id')
         ->join('client_policy cp', 'cp.id = ep.client_policy_id')
         ->join('clients', 'clients.id = cp.client_id')
-        ->join('policies', 'policies.id = cp.policy_id')
         ->join('insurers', 'insurers.id = cp.insurer_id')
         ->join('insurer_branch', 'insurer_branch.id = cp.insurer_branch_id')
         ->join('tpa', 'tpa.id = cp.tpa_id')
@@ -918,6 +916,7 @@ class EmployeePolicyModel extends Model
                     ep.tpa_id, 
                     ep.uhid,
                     ep.policy_end_date,
+                    ep.basic_cover_si,
 
                     clients.client_name, 
                     clients.short_name AS client_short_name,
@@ -925,8 +924,6 @@ class EmployeePolicyModel extends Model
                     cp.policy_start_date,
                     cp.policy_no,
 
-                    policies.name AS policy_name,
-
                     insurers.name AS insurer_name, 
                     insurers.short_name AS insurer_short_name,
                     insurers.insurer_logo,
@@ -945,7 +942,6 @@ class EmployeePolicyModel extends Model
         ->join('employee_polices ep', 'ep.employee_id = e.id')
         ->join('client_policy cp', 'cp.id = ep.client_policy_id')
         ->join('clients', 'clients.id = cp.client_id')
-        ->join('policies', 'policies.id = cp.policy_id')
         ->join('insurers', 'insurers.id = cp.insurer_id')
         ->join('insurer_branch', 'insurer_branch.id = cp.insurer_branch_id')
         ->join('tpa', 'tpa.id = cp.tpa_id')

app/Views/layout/header.php

@@ -663,7 +663,7 @@
                         </a>
                     </li> -->
 
-                    <?php if((get_role_id() == 1 || get_role_id() == 5) && (in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()))) { ?>
+                    <?php if((get_role_id() == 1 || get_role_id() == 5) && (in_array(BUSINESS_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(MANAGEMENT_TEAM_ID, user_team()))) { ?>
 
                     <li>
                         <a href="#sidebarDashboards" data-toggle="collapse" class="waves-effect">