diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index c351d0b1..d5b65670 100644 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -873,7 +873,7 @@ class EmployeeServiceController extends AdminController $job_details = new Jobs(); $r = Jobs::addJob(['job_name' => 'excelFileDataValidation','payload' => ['file_id' => $file_id]]); // $jobWorker = new JobWorker(); - // JobWorker::processJob($r);s + // JobWorker::processJob($r); } return $result; diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 11f9a5ee..a3e4369d 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -632,7 +632,7 @@ if (!function_exists('check_dependent_conflict')) } } //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); $result['status'] = false;