Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
bitbucket 2024-07-11 14:58:41 +05:30
commit c1c5699ae2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/EmployeeController.php
View File

@ -674,14 +674,14 @@ class EmployeeController extends AdminController
// client_policy_id pull draft and enrolled status employees and proceed to calculatin and make entry in DB // client_policy_id pull draft and enrolled status employees and proceed to calculatin and make entry in DB
public function initiateManualEmployeesOnboardProcess($client_policy_id) public function initiateManualEmployeesOnboardProcess($client_policy_id)
{ {
$client_data = $this->clientPolicyModel->select('clients.client_name as client_name, policies.name as policy_name') $client_data = $this->clientPolicyModel->select('clients.client_name as client_name, policies.name as policy_name,client_branch_id')
->join('clients', 'clients.id = client_policy.client_id') ->join('clients', 'clients.id = client_policy.client_id')
->join('policies', 'policies.id = client_policy.policy_id') ->join('policies', 'policies.id = client_policy.policy_id')
->where('client_policy.id', $client_policy_id) ->where('client_policy.id', $client_policy_id)
->first(); ->first();
$empServiceController = new EmployeeServiceController(); $empServiceController = new EmployeeServiceController();
$res = $empServiceController->employeesOnboardPreprocess(['client_policy_id' => $client_policy_id]); $res = $empServiceController->employeesOnboardPreprocess(['client_policy_id' => $client_policy_id,'client_branch_id' => $client_data['client_branch_id']]);
// dd($res); // dd($res);
$count = count($res); $count = count($res);

2
app/Controllers/EmployeeServiceController.php
View File

@ -1206,7 +1206,7 @@ class EmployeeServiceController extends AdminController
// $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception']; // $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception'];
$file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception','created_by' => get_session_userid()]; $file = ['id' => null,'client_id' => $client_id,'policy_id' => $client_policy_id,'action' => 'inception','created_by' => get_session_userid(),'client_branch_id' => $params['client_branch_id']];
// dd($this->employeeModel->getLastQuery()); // dd($this->employeeModel->getLastQuery());
// Kint::dump($existing_famility_details);die(); // Kint::dump($existing_famility_details);die();
$employee_data_group_by_family = data_group_by_family($existing_famility_details,$data_source = 'db'); $employee_data_group_by_family = data_group_by_family($existing_famility_details,$data_source = 'db');

6
app/Helpers/sendMailNotification.php
View File

@ -182,7 +182,7 @@ class sendMailNotification
$table_content .= $policy_name.'</h4></div><table style="width:60%"><thead style="background-color: #02a8b5;"><tr><th style="width:20%">Name</th><th>Mobile Number</th><th>Sum Insure</th><th style="width:15%">Date Of Birth</th></tr></thead><tbody>'; $table_content .= $policy_name.'</h4></div><table style="width:60%"><thead style="background-color: #02a8b5;"><tr><th style="width:20%">Name</th><th>Mobile Number</th><th>Sum Insure</th><th style="width:15%">Date Of Birth</th></tr></thead><tbody>';
$table_content .= $temp_data; $table_content .= $temp_data;
$table_content .= '</tbody></table></div>'; $table_content .= '</tbody></table></div>';
$Addon_list = [];
if ($is_addon == 2 || $is_addon == 3) { if ($is_addon == 2 || $is_addon == 3) {
$addon_list_array = [ $addon_list_array = [
'policy_name'=>$policy_name, 'policy_name'=>$policy_name,
@ -288,7 +288,7 @@ class sendMailNotification
$table_content .= $policy_name.'</h4></div><table style="width:60%"><thead style="background-color: #02a8b5;"><tr><th style="width:20%">Name</th><th>Mobile Number</th><th>Sum Insure</th><th style="width:15%">Date Of Birth</th></tr></thead><tbody>'; $table_content .= $policy_name.'</h4></div><table style="width:60%"><thead style="background-color: #02a8b5;"><tr><th style="width:20%">Name</th><th>Mobile Number</th><th>Sum Insure</th><th style="width:15%">Date Of Birth</th></tr></thead><tbody>';
$table_content .= $temp_data; $table_content .= $temp_data;
$table_content .= '</tbody></table></div>'; $table_content .= '</tbody></table></div>';
$Addon_list = [];
if ($is_addon == 2 || $is_addon == 3) { if ($is_addon == 2 || $is_addon == 3) {
$addon_list_array = [ $addon_list_array = [
'policy_name'=>$policy_name, 'policy_name'=>$policy_name,
@ -395,7 +395,7 @@ class sendMailNotification
$table_content .= $policy_name.'</h4></div><table style="width:60%"><thead style="background-color: #02a8b5;"><tr><th style="width:20%">Name</th><th>Mobile Number</th><th>Sum Insure</th><th style="width:15%">Date Of Birth</th></tr></thead><tbody>'; $table_content .= $policy_name.'</h4></div><table style="width:60%"><thead style="background-color: #02a8b5;"><tr><th style="width:20%">Name</th><th>Mobile Number</th><th>Sum Insure</th><th style="width:15%">Date Of Birth</th></tr></thead><tbody>';
$table_content .= $temp_data; $table_content .= $temp_data;
$table_content .= '</tbody></table></div>'; $table_content .= '</tbody></table></div>';
$Addon_list = [];
if ($is_addon == 2 || $is_addon == 3) { if ($is_addon == 2 || $is_addon == 3) {
$addon_list_array = [ $addon_list_array = [
'policy_name'=>$policy_name, 'policy_name'=>$policy_name,