diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 58ba30e4..dd81efc5 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -13,8 +13,6 @@ $routes->get('/swagger', 'SwaggerController::index', ['filter' => 'authMVC']); $routes->get("reminder_mail", "NotificationController::reminder_mail"); $routes->get("testing", "ClientController::Testing"); -// $routes->get("testing", "DashboardController::updatePolicyEnrollmentStatus"); -// $routes->get("testing", "DashboardController::sendCroneRemainderMail"); $routes->get("update-policy-terms-for-corrections", "ClientController::updatePolicyTermsForCorrections"); $routes->get("update_rack_rate_json", "ClientController::updateRackRateJson"); $routes->get("updatajson", "EmpDataServiceController::updatajson"); @@ -286,7 +284,6 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) { $routes->get("get_policy_type_for_base_policy/(:any)", "ClientController::getPolicyTypeForBasePolicy/$1"); $routes->get("get_client_details/(:any)", "ClientController::getClientDetails/$1"); $routes->get("featch_dashboard_data/(:any)", "DashboardController::featch_dashboard_data/$1"); - $routes->get("send_manual_remainder/(:any)", "DashboardController::sendManualRemainder/$1"); $routes->get("remove_rack_rate/(:any)", "ClientController::removeRackRate/$1"); $routes->get("rename_rack_rate_tab/(:any)", "ClientController::renameRackRateTab/$1"); $routes->post("create_excel_template", "MasterController::createExcelTemplate"); @@ -315,7 +312,6 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) { $routes->get("get_client_policy_data_using_policy_no_and_endo_no/(:any)", "ClientController::get_client_policy_data_using_policy_no_and_endo_no/$1"); $routes->get("checkInvoiceStatus/(:any)", "PolicyTransactionController::checkInvoiceStatus/$1"); $routes->get("base_policy_for_policy_inception/(:any)", "PolicyTransactionController::getBasePolicy/$1"); - $routes->get("sentTestMail/(:any)", "NotificationController::sentTestMail/$1"); }); @@ -367,8 +363,6 @@ $routes->cli('cli/new_gmail_token', 'MasterController::generateNewGmailAPIToken' $routes->cli('cli/send_mail_cli(/:any)?', 'MasterController::testGmailAPIViaCLI$1'); $routes->cli('cli/app_check_list', 'MasterController::appCheckList'); $routes->cli('cli/new_gdrive_token', 'GoogleDriveController::generateNewGoogleDriveAccessToken'); -$routes->cli('cli/updatePolicyEnrollmentStatus', 'DashboardController::updatePolicyEnrollmentStatus'); -$routes->cli('cli/sendCroneRemainderMail', 'DashboardController::sendCroneRemainderMail'); diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index 66608829..8d6ace5c 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -439,6 +439,29 @@ class EmployeeRestController extends AdminController try { $requestData = $this->request->getJSON(); + foreach ($requestData as $key => $value) + { + + $checkIfExist = $this->employeePolicyModel->where('employee_id', $value->employee_id) + ->where('client_policy_id', $value->client_policy_id) + ->where('is_active', 1 ) + ->findAll(); + + + if ($checkIfExist) { + + $empPolicy = $this->employeePolicyModel->updateSiAndPremium($value->client_policy_id, $value->employee_id, $value->basic_cover_si); + + }else{ + + $data['employee_id']= $value->employee_id; + $data['client_policy_id']= $value->client_policy_id; + $data['basic_cover_si']= $value->basic_cover_si; + $data['status'] = 'draft'; + + $this->employeePolicyModel->insert($data); + } + } if(count($requestData)) { $this->updatePremiumAmount($requestData[0]->client_policy_id , $requestData[0]->emp_code , $requestData[0]->client_branch_id); @@ -1552,6 +1575,7 @@ class EmployeeRestController extends AdminController $responce['OpenForEnrollment'] = $array['open_for_enrollment']; $responce['policy_terms'] = $decodedArray; $responce['policy_type_id'] = $array['policy_type_id']; + $responce['disclaimer'] = $array['disclaimer']; $tpaArray = $this->employeeModel->select('employees.name as name , employee_polices.tpa_id as tpa_id , employee_polices.rand_string as rand_string') ->join('employee_polices', 'employee_polices.employee_id = employees.id') diff --git a/app/Filters/CloseDbConnection.php b/app/Filters/CloseDbConnection.php index ad49eb86..0ce482c9 100755 --- a/app/Filters/CloseDbConnection.php +++ b/app/Filters/CloseDbConnection.php @@ -19,7 +19,7 @@ class CloseDbConnection implements FilterInterface // Get all database configurations $db = \Config\Database::connect(); $log = \Config\Services::mylogger(); - $log->logme('error','CloseDbConnections....!'); + // $log->logme('error','CloseDbConnections....!'); $db->close(); } } diff --git a/app/Helpers/MailHelper.php b/app/Helpers/MailHelper.php index bddd1a49..f94d6419 100755 --- a/app/Helpers/MailHelper.php +++ b/app/Helpers/MailHelper.php @@ -118,7 +118,7 @@ class MailHelper try { - $res = $gmailapi->sendMessage($emaill, $subject, $message, 'info@nhanceindia.in', $reply_to, $cc, $bcc); + $res = $gmailapi->sendMessage($emaill, $subject, $message, 'no-reply@nhanceindia.in', $reply_to, $cc, $bcc); if($res['status']) { diff --git a/app/Models/EmployeeModel.php b/app/Models/EmployeeModel.php index 086dbd88..b84b96a9 100755 --- a/app/Models/EmployeeModel.php +++ b/app/Models/EmployeeModel.php @@ -161,7 +161,7 @@ class EmployeeModel extends Model // for EMP rest API process do not change public function checkExistingEmployee($arr,$client_branch_id) { - return $this->where('emp_code',$arr['emp_code'])->where('name',$arr['name'])->where('client_id', $arr['client_id'])->where('client_branch_id', $client_branch_id)->first(); + return $this->where('emp_code',$arr['emp_code'])->where('name',$arr['name'])->where('client_id', $arr['client_id'])->where('client_branch_id', $client_branch_id)->where('emp_status !=', 'truncated')->first(); }