daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rahmatrafli1
2025-04-17 20:41:41 +07:00
parent d9d99f7108
commit b20e950c3c
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Http/Controllers/PembayaranController.php
View File

@@ -210,8 +210,13 @@ class PembayaranController extends Controller
} }
if ($permohonan->jenis_penilaian_id == 2) { if ($permohonan->jenis_penilaian_id == 2) {
$data['status_bayar'] = 'sudah_bayar'; if ($request->type === 'revisi') {
$data['status'] = 'spk'; $data['status'] = 'revisi-pembayaran';
$data['status_bayar'] = 'belum_bayar';
} else {
$data['status_bayar'] = 'sudah_bayar';
$data['status'] = 'spk';
}
} }
if ($permohonan->jenis_penilaian_id == 1) { if ($permohonan->jenis_penilaian_id == 1) {
@@ -224,12 +229,11 @@ class PembayaranController extends Controller
$data['approval_dd_at'], $data['approval_dd_at'],
$data['keterangan'] $data['keterangan']
); );
} }
$permohonan->update($data); $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([ PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
'status' => 'spk', 'status' => 'spk',
'updated_by' => Auth::id(), 'updated_by' => Auth::id(),
@@ -256,16 +260,16 @@ class PembayaranController extends Controller
$query = Permohonan::query()->where(function ($query) { $query = Permohonan::query()->where(function ($query) {
$query->where(['status_bayar' => 'belum_bayar', 'jenis_penilaian_id' => 1]) $query->where(['status_bayar' => 'belum_bayar', 'jenis_penilaian_id' => 1])
->orWhere('status', 'revisi-pembayaran'); ->orWhere('status', 'revisi-pembayaran');
}) })
->where(function ($query) { ->where(function ($query) {
$query->whereNotIn('id', function ($subquery) { $query->whereNotIn('id', function ($subquery) {
$subquery->select('permohonan_id') $subquery->select('permohonan_id')
->from('persetujuan_penawaran') ->from('persetujuan_penawaran')
->whereNotNull('permohonan_id'); ->whereNotNull('permohonan_id');
}) })
->orWhere('status', 'revisi-pembayaran'); ->orWhere('status', 'revisi-pembayaran');
}); });
// Pencarian berdasarkan parameter search // Pencarian berdasarkan parameter search