diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php index 49a0986..4bf28a1 100644 --- a/app/Http/Controllers/NocController.php +++ b/app/Http/Controllers/NocController.php @@ -229,7 +229,10 @@ use Modules\Lpj\Models\Noc; $search = $request->get('search'); $query->where(function ($q) use ($search) { $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%') - ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%'); + ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%') + ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%'); }); } @@ -326,8 +329,15 @@ use Modules\Lpj\Models\Noc; if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); $query->where(function ($q) use ($search) { - $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%') - ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%'); + $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%') + ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%') + ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%') + ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%'); }); }