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:
VENKATESHWARAN 2024-10-26 08:50:22 +05:30
commit 34789897c9
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controllers/EmployeeRestController.php
View File

@ -1856,6 +1856,7 @@ class EmployeeRestController extends AdminController
public function iAgreeForAddOn() public function iAgreeForAddOn()
{ {
$postData = json_decode($this->request->getBody(), true); $postData = json_decode($this->request->getBody(), true);
$client_policy_id = $postData['client_policy_id']; $client_policy_id = $postData['client_policy_id'];
sort($client_policy_id); sort($client_policy_id);
@ -1875,6 +1876,9 @@ class EmployeeRestController extends AdminController
{ {
$array_list = []; $array_list = [];
foreach ($client_policy_id as $key => $value) foreach ($client_policy_id as $key => $value)
{
$policy = $this->clientPolicyModel->where('id',$value)->where('open_for_enrollment',1)->find();
if($policy)
{ {
foreach ($empData as $empDataKey => $empDataValue) foreach ($empData as $empDataKey => $empDataValue)
{ {
@ -1889,6 +1893,9 @@ class EmployeeRestController extends AdminController
if(count($find) > 0){ if(count($find) > 0){
$array_list[] = $find; $array_list[] = $find;
} }
}
} }
$notification = $this->notificationModel->where('client_id' ,$client_id)->where('template_name', 'member_review_and_summary_mail')->first(); $notification = $this->notificationModel->where('client_id' ,$client_id)->where('template_name', 'member_review_and_summary_mail')->first();

7
app/Controllers/RestAuthenticationController.php
View File

@ -96,7 +96,14 @@ class RestAuthenticationController extends AdminController
$mobile_number = $this->request->getJSON()->mobile_number; $mobile_number = $this->request->getJSON()->mobile_number;
$otp_verification = $this->request->getJSON()->otp_verification; $otp_verification = $this->request->getJSON()->otp_verification;
if (isset($this->request->getJSON()->login_by_hr))
{
$employeeData = $this->employeeModel->where('id', $this->request->getJSON()->employee_id)->where('relationship', 'self')->first();
}else{
$employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first(); $employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first();
}
if ($employeeData && $otp_verification == true || $employeeData && isset($this->request->getJSON()->login_by_hr)) { if ($employeeData && $otp_verification == true || $employeeData && isset($this->request->getJSON()->login_by_hr)) {
$auth = HttpRequestHelper::getRequestInfo(); $auth = HttpRequestHelper::getRequestInfo();