Merge branch 'staging' into feature/senior-officer

app/Http/Controllers/LaporanController.php

@@ -31,11 +31,22 @@ class LaporanController extends Controller
     /**
      * Show the specified resource.
      */
-    public function show($id) {}
+    public function show($id) {
+        $permohonan = Permohonan::with([
+            'penilai'])->find($id);
+        return view('lpj::laporan.show', compact('permohonan'));
+    }
     /**
      * Store form inspeksi.
      */
-    public function store(Request $request) {}
+    public function store(Request $request) {
+        $permohonan = Permohonan::find($request->permohonan_id);
+        if($request->nilai_liquidasi) {
+            $permohonan->nilai_liquidasi = $request->liquidasi;
+            $permohonan->save();
+            return redirect()->route('laporan.index')->with('success', 'Nilai Liquidasi updated successfully');
+        }
+    }
 
     public function update(Request $request, $id) {}
 
@@ -46,7 +57,11 @@ class LaporanController extends Controller
         }
 
         // Retrieve data from the database
-        $query = Permohonan::query()->whereIn('status',['proses-laporan','done']);
+        $query = Permohonan::query()->whereIn('status',['proses-laporan','done'])->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]);
+        });
 
         $query = $query->orderBy('nomor_registrasi', 'desc');
         // Apply search filter if provided

app/Http/Controllers/PembayaranController.php

@@ -173,14 +173,30 @@
                     if ($request->keterangan) {
                         $data['approve_keterangan_bayar'] = $request->keterangan;
                     }
-
                     $output['data'] = $data;
 
-                    $modal = Permohonan::find($id);
-                    $modal->update($data);
-                    //
+                    // Update the status of the related permohonan to 'spk'
+                    $permohonan = Permohonan::find($id);
+
+                    if ($permohonan) {
+                        $data['status_bayar'] = 'sudah_bayar';
+                        if($permohonan->jenis_penilaian_id == 2) {
+                            $data['status'] = 'spk';
+                        }
+
+                        $permohonan->update($data);
+
+                        if($permohonan->jenis_penilaian_id == 2) {
+                            PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
+                                'status'     => 'spk',
+                                'updated_by' => Auth::id(),
+                                'updated_at' => now(),
+                            ]);
+                        }
+                    }
+
                     $output['status']  = 'success';
-                    $output['message'] = ['Otorisasi' . $modal->nomor_registrasi . 'berhasil di lakukan'];
+                    $output['message'] = ['Otorisasi' . $permohonan->nomor_registrasi . 'berhasil di lakukan'];
                 } catch (Exception $e) {
                     $output['status']  = 'error';
                     $output['message'] = ['Otorisasi gagal di lakukan.'];

app/Http/Controllers/PenilaianController.php

@@ -550,7 +550,7 @@ class PenilaianController extends Controller
         $filteredRecords = $query->count();
 
         // Ambil data dengan relasi
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'approveSo'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'approveSo', 'approveEo', 'approveDd'])->get();
 
 
         // Hitung jumlah halaman

app/Http/Controllers/PersetujuanPenawaranController.php

@@ -67,24 +67,6 @@
 
             $persetujuanPenawaran->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_bayar');
-                $permohonan->status       = 'noc';
-                $permohonan->save();
-
-                // andy add, update status penawaran.status='spk'
-                // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
-                PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
-                    'status'     => 'noc',
-                    'updated_by' => Auth::id(),
-                    'updated_at' => now(),
-                ]);
-                // andy add, update status penawaran.status='spk'
-
-            }
-
             return redirect()
                 ->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran berhasil disimpan.');
         }

app/Http/Controllers/RegistrasiFinalController.php

@@ -46,12 +46,11 @@
             }
 
             // Retrieve data from the database
-            $query = PenawaranTender::with(['permohonan', 'tujuanPenilaianKjpp'])->whereHas(
-                    'permohonan',
-                    function ($q) {
-                        $q->where('status', '=', 'spk');
-                    },
-                )->withCount('penawarandetails');
+            $query =PenawaranTender::query()
+                                   ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                                   ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
+                                   ->where('penawaran.status','=','spk')
+                                   ->withCount('penawarandetails');
 
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {