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

Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into tender

Browse Source
This commit is contained in:
rahmatrafli1
2025-03-24 15:53:59 +07:00
parent 6a01aa1663 94e49a4cc3
commit 0a3c2c4021
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/PersetujuanPenawaranRequest.php
View File

@@ -63,7 +63,7 @@
'authorized_at.date' => 'Tanggal otorisasi harus berupa tanggal yang valid.', 'authorized_at.date' => 'Tanggal otorisasi harus berupa tanggal yang valid.',
'authorized_by.exists' => 'ID pengguna yang mengotorisasi tidak valid.', 'authorized_by.exists' => 'ID pengguna yang mengotorisasi tidak valid.',
'status_bayar.required' => 'Status bayar wajib diisi.', 'status_bayar.required' => 'Status bayar wajib diisi.',
'status_bayar.in' => 'Status bayar harus berupa "sudah_bayar" atau "belum_bayar".', 'status_bayar.in' => 'Status bayar harus berupa "sudah_bayar", "belum_bayar" atau "tidak bayar".',
]; ];
} }
} }

26
database/migrations/2025_03_24_080648_update_permohonan_table.php Normal file
View File

@@ -0,0 +1,26 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('permohonan', function (Blueprint $table) {
$table->enum('status_bayar',['sudah_bayar','belum_bayar','tidak_bayar'])->default('sudah_bayar')->change();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
$table->enum('status_bayar',['sudah_bayar','belum_bayar'])->default('sudah_bayar')->change();
}
};

2
resources/views/laporan/index.blade.php
View File

@@ -254,7 +254,7 @@
</a>`; </a>`;
} }
if(data.status_bayar=="sudah_bayar" && data.nilai_liquidasi >0) { if((data.status_bayar=="sudah_bayar" || data.status_bayar=="tidak_bayar") && data.nilai_liquidasi >0) {
if(data.penilai.type_penilai=='resume' && !data.penilai.resume){ if(data.penilai.type_penilai=='resume' && !data.penilai.resume){
laporanButton = ` laporanButton = `
<a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${type}" class="btn btn-sm btn-primary"> <a href="{{ route('penilai.print-out') }}?permohonanId=${data.id}&documentId=${dokumenID}&inspeksiId=${inspeksiId}&jaminanId=${jenisJaminanID}&statusLpj=0&type=${type}" class="btn btn-sm btn-primary">

11
resources/views/permohonan/form.blade.php
View File

@@ -57,7 +57,8 @@
'nilai_plafond_id' => ['label' => 'Nilai Plafond', 'type' => 'select', 'options' => $plafond], 'nilai_plafond_id' => ['label' => 'Nilai Plafond', 'type' => 'select', 'options' => $plafond],
'status_bayar' => ['label' => 'Status Bayar', 'type' => 'select', 'options' => [ 'status_bayar' => ['label' => 'Status Bayar', 'type' => 'select', 'options' => [
'sudah_bayar' => 'Sudah Bayar', 'sudah_bayar' => 'Sudah Bayar',
'belum_bayar' => 'Belum Bayar' 'belum_bayar' => 'Belum Bayar',
'tidak_bayar' => 'Tidak Bayar'
]], ]],
'nilai_njop' => ['label' => 'Nilai NJOP', 'type' => 'text'], 'nilai_njop' => ['label' => 'Nilai NJOP', 'type' => 'text'],
]; ];
@@ -130,8 +131,12 @@
const nilaiPlafondValue = nilaiPlafondSelect.value; const nilaiPlafondValue = nilaiPlafondSelect.value;
console.log('Tujuan Penilaian:', tujuanPenilaianValue, 'Nilai Plafond:', nilaiPlafondValue); console.log('Tujuan Penilaian:', tujuanPenilaianValue, 'Nilai Plafond:', nilaiPlafondValue);
if (tujuanPenilaianValue === '2' && (nilaiPlafondValue === '2' || nilaiPlafondValue === '3')) { const hideAndSetTidakBayar = (tujuanPenilaianValue === '2' || tujuanPenilaianValue === '4') &&
statusBayarTomSelect.setValue('sudah_bayar'); ['1', '2', '3'].includes(nilaiPlafondValue);
if (hideAndSetTidakBayar) {
statusBayarTomSelect.setValue('tidak_bayar');
statusBayarWrapper.style.display = 'none'; statusBayarWrapper.style.display = 'none';
} else { } else {
@if(isset($permohonan)) @if(isset($permohonan))