Merge branch 'staging' into lpj-db-migratio

This commit is contained in:
majid
2025-06-11 10:00:41 +07:00
41 changed files with 1404 additions and 990 deletions

View File

@@ -61,7 +61,7 @@ class LaporanHasilPenilaianJaminanInternalExternalController extends Controller
$q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
$q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
$q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
$q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search->search) . '%');
$q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search->search) . '%');
$q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
$q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
$q->orWhere('status', 'LIKE', '%' . $search->search . '%');
@@ -192,7 +192,7 @@ class LaporanHasilPenilaianJaminanInternalExternalController extends Controller
$pageCount = ceil($totalRecords / $request->get('size'));
// Calculate the current page number
$currentPage = $request->get('page', 1);
$currentPage = $request->get('page') ?: 1;
// Return the response data as a JSON object
return response()->json([