diff --git a/app/Http/Controllers/MemoController.php b/app/Http/Controllers/MemoController.php index c0cecb9..4176468 100644 --- a/app/Http/Controllers/MemoController.php +++ b/app/Http/Controllers/MemoController.php @@ -184,13 +184,13 @@ class MemoController extends Controller // Mengambil data dari database dengan kondisi yang sama seperti LaporanController $query = Permohonan::query() ->whereIn('status', ['proses-laporan', 'done', 'paparan', 'proses-paparan', 'memo-penyelesaian']) - ->whereNotNull('approval_so_at') + /*->whereNotNull('approval_so_at') ->whereNotNull('approval_eo_at') ->where(function ($q) { $q->whereIn('nilai_plafond_id', [1, 4]) ->whereNotNull('approval_dd_at') ->orWhereIn('nilai_plafond_id', [2, 3]); - }) + })*/ ->whereHas('noc'); // Hanya tampilkan permohonan yang memiliki NOC diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php index 393467c..1b679d9 100644 --- a/app/Http/Controllers/NocController.php +++ b/app/Http/Controllers/NocController.php @@ -59,11 +59,11 @@ 'total_pembukuan' => $validated['total_pembukuan'], 'tanggal_pembayaran' => $validated['tanggal_pembayaran'] ?? date('Y-m-d'), 'status_bayar' => $validated['nominal_bayar'] < $validated['total_harus_bayar'] ? false : true, - 'catatan_noc' => $validated['catatan_noc'], - 'status_kurang_bayar' => $validated['status_kurang_bayar'] ?? '', - 'status_lebih_bayar' => $validated['status_lebih_bayar'] ?? '', - 'nominal_kurang_bayar' => $validated['nominal_kurang_bayar'] ?? 0, - 'nominal_lebih_bayar' => $validated['nominal_lebih_bayar'] ?? 0, + 'catatan_noc' => $validated['catatan_noc'] ?? '', + 'status_kurang_bayar' => $validated['status_kurang_bayar'] ?? '0', + 'status_lebih_bayar' => $validated['status_lebih_bayar'] ?? '0', + 'nominal_kurang_bayar' => $validated['nominal_kurang_bayar'] ?? '0', + 'nominal_lebih_bayar' => $validated['nominal_lebih_bayar'] ?? '0', 'bukti_pengembalian' => $validated['bukti_pengembalian'] ?? '', ]; $noc = Noc::updateOrCreate( diff --git a/module.json b/module.json index 66789d2..00cde6b 100644 --- a/module.json +++ b/module.json @@ -387,7 +387,8 @@ "permission": "", "roles": [ "administrator", - "admin" + "admin", + "noc" ], "sub": [ { diff --git a/routes/web.php b/routes/web.php index b89d4f2..61c7a59 100644 --- a/routes/web.php +++ b/routes/web.php @@ -799,6 +799,7 @@ Route::middleware(['auth'])->group(function () { Route::get('/datatables', [BucokController::class, 'dataForDatatables'])->name('datatables'); Route::get('/{id}', [BucokController::class, 'show'])->name('show'); Route::post('/import', [BucokController::class, 'import'])->name('import'); + Route::get('/export', [BucokController::class, 'export'])->name('export'); }); });