fix widthraw spelling
This commit is contained in:
@@ -2833,25 +2833,17 @@ class AdministratorController extends BaseController
|
||||
|
||||
$hasRemovalCondition = false;
|
||||
if ($hasIsWithdrawn) {
|
||||
$builder->where('is_withdrawn', 1);
|
||||
$builder->orWhere('is_withdrawn', 1);
|
||||
$hasRemovalCondition = true;
|
||||
}
|
||||
|
||||
if ($hasEnrollmentStatus) {
|
||||
if ($hasRemovalCondition) {
|
||||
$builder->orWhereIn('enrollment_status', ['withdrawn', 'widthran', 'denied']);
|
||||
} else {
|
||||
$builder->whereIn('enrollment_status', ['withdrawn', 'widthran', 'denied']);
|
||||
}
|
||||
$builder->orWhereIn('enrollment_status', ['withdrawn', 'denied']);
|
||||
$hasRemovalCondition = true;
|
||||
}
|
||||
|
||||
if ($hasAdmissionStatus) {
|
||||
if ($hasRemovalCondition) {
|
||||
$builder->orWhere('admission_status', 'denied');
|
||||
} else {
|
||||
$builder->where('admission_status', 'denied');
|
||||
}
|
||||
$builder->orWhere('admission_status', 'denied');
|
||||
$hasRemovalCondition = true;
|
||||
}
|
||||
|
||||
@@ -2901,7 +2893,7 @@ class AdministratorController extends BaseController
|
||||
return 'denied';
|
||||
}
|
||||
|
||||
if (in_array($enrollmentStatus, ['withdrawn', 'widthran'], true) || (int)($row['is_withdrawn'] ?? 0) === 1) {
|
||||
if ($enrollmentStatus === 'withdrawn' || (int)($row['is_withdrawn'] ?? 0) === 1) {
|
||||
return 'withdrawn';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user