diff --git a/app/Http/Controllers/NocController.php b/app/Http/Controllers/NocController.php index 171bfb4..1fe45d1 100644 --- a/app/Http/Controllers/NocController.php +++ b/app/Http/Controllers/NocController.php @@ -6,7 +6,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Modules\Lpj\Http\Requests\NocRequest; - use Modules\Lpj\Models\Noc; +use Modules\Lpj\Models\Bucok; +use Modules\Lpj\Models\Noc; use Modules\Lpj\Models\PersetujuanPenawaran; use Modules\Lpj\Models\JenisPenilaian; @@ -49,15 +50,12 @@ { $validated = $request->validated(); + $validated['updated_by'] = Auth::id(); if (request()->get('status_bayar') == "sudah_bayar") { $validated['status'] = '1'; - $status = "spk"; - } else { - $status = "persetujuan-penawaran"; } - $dataNoc = [ 'nominal_bayar' => $validated['nominal_bayar'], 'total_pembukuan' => $validated['total_pembukuan'], @@ -98,26 +96,11 @@ } $noc->save(); - /* Update the status of the related permohonan to 'spk' - $permohonan = Permohonan::find(request()->get('permohonan_id')); - if ($permohonan) { - $permohonan->status_bayar = request()->get('status_pembayar'); - if ($permohonan->jenis_penilaian_id == 2) { - $permohonan->status = $status; - } - $permohonan->save(); - - // andy add, update status penawaran.status='spk' - // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first(); - if ($permohonan->jenis_penilaian_id == 2) { - PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([ - 'status' => $status, - 'updated_by' => Auth::id(), - 'updated_at' => now(), - ]); - } - // andy add, update status penawaran.status='spk' - }*/ + $bucok = Bucok::where('nomor_tiket', $noc->nomor_tiket)->first(); + $bucok->nominal_penyelesaian = $noc->total_pembukuan ?? ''; + $bucok->tanggal_penyelesaian = $noc->tanggal_pembayaran ?? date('Y-m-d'); + $bucok->penyelesaian = 'Selesai'; + $bucok->save(); return redirect() ->route('noc.index')->with('success', 'NOC berhasil disimpan.'); @@ -130,6 +113,7 @@ { $validated = $request->validated(); + if($request->get('is_memo')){ $memo = Noc::find($request->get('is_memo')); @@ -332,9 +316,7 @@ $query = PersetujuanPenawaran::query(); // Filter for penyelesaian (where memo_penyelesaian is not null) - $query->whereHas('noc', function($q) { - $q->whereNotNull('memo_penyelesaian'); - }); + // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) {