Simplify course search functionality and update route names for clarity
This commit is contained in:
@@ -217,10 +217,7 @@ class ProgramController extends Controller
|
||||
}
|
||||
|
||||
if ($request->filled('search')) {
|
||||
$query->where(function ($q) use ($request) {
|
||||
$q->where('keywords', 'like', "%{$request->search}%")
|
||||
->orWhere('title', 'like', "%{$request->search}%");
|
||||
});
|
||||
$query->where('title', 'like', "%{$request->search}%");
|
||||
}
|
||||
|
||||
if ($request->filled('programlevels_id')) {
|
||||
|
@@ -23,7 +23,7 @@ class ProgramService
|
||||
|
||||
if ($request->filled('intake_id')) {
|
||||
$intakeId = $request->intake_id;
|
||||
$query->whereJsonContains('intake', $intakeId);
|
||||
$query->whereJsonContains('intakes', $intakeId);
|
||||
}
|
||||
|
||||
if ($request->filled('status')) {
|
||||
@@ -32,14 +32,13 @@ class ProgramService
|
||||
|
||||
if ($request->filled('search')) {
|
||||
$search = $request->search;
|
||||
$query->where('keywords', 'like', "%{$search}%");
|
||||
$query->where('title', 'like', "%{$search}%");
|
||||
}
|
||||
|
||||
if ($request->filled('location')) {
|
||||
$location = $request->location;
|
||||
$query->where('location', 'like', "%{$location}%");
|
||||
}
|
||||
|
||||
})->latest()->paginate(10)->withQueryString();
|
||||
}
|
||||
|
||||
|
@@ -3,14 +3,18 @@
|
||||
use App\Http\Controllers\WebsiteController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Modules\CCMS\Http\Controllers\EnquiryController;
|
||||
use Modules\CourseFinder\Http\Controllers\CoopController;
|
||||
use Modules\CourseFinder\Http\Controllers\ProgramController;
|
||||
use Modules\CourseFinder\Http\Controllers\ProgramLevelController;
|
||||
|
||||
Route::get('/', [WebsiteController::class, 'home']);
|
||||
Route::get('/course-finder', [WebsiteController::class, 'coursefinder']);
|
||||
Route::get('/course-finder', [WebsiteController::class, 'coursefinder'])->name('program.coursefinder');
|
||||
Route::get('/resources', [WebsiteController::class, 'resources'])->name('resources');
|
||||
Route::get('blog/{alias}', [WebsiteController::class, 'blogSingle'])->name('blog.single');
|
||||
Route::get('service/{alias}', [WebsiteController::class, 'serviceSingle'])->name('service.single');
|
||||
Route::get('test/{alias}', [WebsiteController::class, 'testSingle'])->name('test.single');
|
||||
Route::get('destination/{alias}', [WebsiteController::class, 'countrySingle'])->name('country.single');
|
||||
Route::get('/home/resources', [WebsiteController::class, 'resources']);
|
||||
Route::get('{parent}/{slug?}', [WebsiteController::class, 'loadPage'])->name('page.load');
|
||||
Route::get('getCoursesList', [ProgramController::class, 'getCoursesList'])->name('program.getCoursesList');
|
||||
Route::post('enquiry', [EnquiryController::class, 'store'])->name('enquiry.store');
|
||||
Route::get('{parent}/{slug?}', [WebsiteController::class, 'loadPage'])->name('page.load');
|
||||
|
Reference in New Issue
Block a user