From b20e950c3c553e13585c8bbc54d59016ac1199c9 Mon Sep 17 00:00:00 2001
From: rahmatrafli1 <rahmatrafli1@gmail.com>
Date: Thu, 17 Apr 2025 20:41:41 +0700
Subject: [PATCH] Memperbaiki logic kalau dalam keadaan revisi pembayaran di
 region eksternal terutama dalam keadaan spk maka kondisinya bisa kembali ke
 pembayaran untuk melakukan pembayaran ulang di pemohon ao

---
 app/Http/Controllers/PembayaranController.php | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/PembayaranController.php b/app/Http/Controllers/PembayaranController.php
index f6fe6de..da4c090 100644
--- a/app/Http/Controllers/PembayaranController.php
+++ b/app/Http/Controllers/PembayaranController.php
@@ -210,8 +210,13 @@ class PembayaranController extends Controller
                     }
 
                     if ($permohonan->jenis_penilaian_id == 2) {
-                        $data['status_bayar'] = 'sudah_bayar';
-                        $data['status'] = 'spk';
+                        if ($request->type === 'revisi') {
+                            $data['status'] = 'revisi-pembayaran';
+                            $data['status_bayar'] = 'belum_bayar';
+                        } else {
+                            $data['status_bayar'] = 'sudah_bayar';
+                            $data['status'] = 'spk';
+                        }
                     }
 
                     if ($permohonan->jenis_penilaian_id == 1) {
@@ -224,12 +229,11 @@ class PembayaranController extends Controller
                             $data['approval_dd_at'],
                             $data['keterangan']
                         );
-
                     }
 
                     $permohonan->update($data);
 
-                    if ($permohonan->jenis_penilaian_id == 2) {
+                    if ($permohonan->jenis_penilaian_id == 2 && $permohonan->status_bayar == 'sudah_bayar') {
                         PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
                             'status'     => 'spk',
                             'updated_by' => Auth::id(),
@@ -256,16 +260,16 @@ class PembayaranController extends Controller
 
         $query = Permohonan::query()->where(function ($query) {
             $query->where(['status_bayar' => 'belum_bayar', 'jenis_penilaian_id' => 1])
-                  ->orWhere('status', 'revisi-pembayaran');
+                ->orWhere('status', 'revisi-pembayaran');
         })
-        ->where(function ($query) {
-            $query->whereNotIn('id', function ($subquery) {
-                $subquery->select('permohonan_id')
-                         ->from('persetujuan_penawaran')
-                         ->whereNotNull('permohonan_id');
-            })
-            ->orWhere('status', 'revisi-pembayaran');
-        });
+            ->where(function ($query) {
+                $query->whereNotIn('id', function ($subquery) {
+                    $subquery->select('permohonan_id')
+                        ->from('persetujuan_penawaran')
+                        ->whereNotNull('permohonan_id');
+                })
+                    ->orWhere('status', 'revisi-pembayaran');
+            });
 
 
         // Pencarian berdasarkan parameter search