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-07 17:42:39 +05:30
commit 0c2c99c34d
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/EmployeeRestController.php
View File

@ -1453,7 +1453,7 @@ class EmployeeRestController extends AdminController
if ($value > 0) { if ($value > 0) {
if($value == 1 && $key ==='either-parents-pil') { if($value == 1 && $key ==='either-parents-pil') {
$result .= ' + Either 2 Parents or 2 Parents in law'; $result .= ' + Either 2 Parents or 2 Parents in law';
}if($value == 2 && $key ==='either-parents-pil') { }else if($value == 2 && $key ==='either-parents-pil') {
$result .= ' + Any 2 of Parents and Parents in law'; $result .= ' + Any 2 of Parents and Parents in law';
}else if($value != 0 && $key ==='spouse') { }else if($value != 0 && $key ==='spouse') {
$string = str_replace('-', ' ', $key); $string = str_replace('-', ' ', $key);

7
app/Controllers/EmployeeServiceController.php
View File

@ -2046,13 +2046,13 @@ public function employeesEnrollmentInsert($params)
//store email and mail content via helper to send notification //store email and mail content via helper to send notification
$emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params); $emp_emails[] = sendMailNotification::sendMailNotification('member_welcome_mail', $params);
Kint::dump($emp_emails); // Kint::dump($emp_emails);
Kint::dump($key.'-'.count($excel_data)); // Kint::dump($key.'-'.count($excel_data));
// if mail count is 20 send bulk mail and reset emp_emails variable // if mail count is 20 send bulk mail and reset emp_emails variable
if (count($emp_emails) == 20 || $key == count($excel_data) ) { if (count($emp_emails) == 20 || $key == count($excel_data) ) {
$job_details = new Jobs(); $job_details = new Jobs();
$r = Jobs::addJob(['job_name' => 'bulk_mail','payload' => $emp_emails]); $r = Jobs::addJob(['job_name' => 'bulk_mail','payload' => $emp_emails]);
echo 'Mail triggered'; // echo 'Mail triggered';
$emp_emails = []; $emp_emails = [];
} }
@ -2065,6 +2065,7 @@ public function employeesEnrollmentInsert($params)
$this->setPullNotification($this->getFileMetaDataByFileId($file_id,'success')); $this->setPullNotification($this->getFileMetaDataByFileId($file_id,'success'));
return true; return true;
} }

8
app/Controllers/RestAuthenticationController.php
View File

@ -71,7 +71,9 @@ class RestAuthenticationController extends AdminController
$mobile_number = $this->request->getJSON()->mobile_number; $mobile_number = $this->request->getJSON()->mobile_number;
$employeeData = $this->employeeModel->where('mobile', $mobile_number)->where('relationship', 'self')->first(); $employeeData = $this->employeeModel->where('mobile', $mobile_number)
->where('relationship', 'self')
->where('is_active', 1)->first();
if ($employeeData) { if ($employeeData) {
@ -126,7 +128,9 @@ class RestAuthenticationController extends AdminController
try { try {
$mobile_number = $this->request->getJSON()->mobile_number; $mobile_number = $this->request->getJSON()->mobile_number;
$HrData = $this->hrModel->where('mobile', $mobile_number)->where('contact_type', 'client')->first(); $HrData = $this->hrModel->where('mobile', $mobile_number)
->where('contact_type', 'client')
->where('is_active', 1)->first();
if ($HrData) { if ($HrData) {