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-01 15:29:07 +05:30
commit b71961e3ba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controllers/EmployeeServiceController.php
View File

@ -873,7 +873,7 @@ class EmployeeServiceController extends AdminController
$job_details = new Jobs(); $job_details = new Jobs();
$r = Jobs::addJob(['job_name' => 'excelFileDataValidation','payload' => ['file_id' => $file_id]]); $r = Jobs::addJob(['job_name' => 'excelFileDataValidation','payload' => ['file_id' => $file_id]]);
// $jobWorker = new JobWorker(); // $jobWorker = new JobWorker();
// JobWorker::processJob($r);s // JobWorker::processJob($r);
} }
return $result; return $result;

2
app/Helpers/excel_util_helper.php
View File

@ -632,7 +632,7 @@ if (!function_exists('check_dependent_conflict'))
} }
} }
//check for any cross parents but not more than two //check for any cross parents but not more than two
if($allowed_adults == 0 && $allowed_parents_count == 1 && $allowed_parent_in_laws_count == 1 && (2 < ($received_parents_count + $received_parent_in_laws_count))) if($allowed_adults == 2 && (2 < ($received_parents_count + $received_parent_in_laws_count)))
{ {
// dd($allowed_adults); // dd($allowed_adults);
$result['status'] = false; $result['status'] = false;