From 70f2269041997806929a9d494bbde52607c2a200 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 15:00:31 +0700
Subject: [PATCH 1/4] Tambah field 'status' ke PermohonanRequest

Menambahkan field 'status' dengan nilai default 'order' ke dalam PermohonanRequest untuk menyimpan status permohonan saat pertama kali dibuat. Commit ini bertujuan untuk mempermudah pelacakan dan pengelolaan status permohonan.
---
 app/Http/Requests/PermohonanRequest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php
index 1919029..9dddc42 100644
--- a/app/Http/Requests/PermohonanRequest.php
+++ b/app/Http/Requests/PermohonanRequest.php
@@ -49,6 +49,7 @@
                     'tanggal_permohonan' => date('Y-m-d'),
                     'user_id'            => auth()->user()->id,
                     'branch_id'          => auth()->user()->branch_id,
+                    'status'             => 'order'
                 ]);
             }
         }

From 52ea624bbc24fa6ff29a29de95db08ef7b50ba3b Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 15:01:49 +0700
Subject: [PATCH 2/4] Perbaiki penanganan error dan pemilihan dropdown

Memperbaiki referensi keys untuk penanganan error pada beberapa field. Sekarang, keys error mengacu pada field yang benar (jenis_fasilitas_kredit_id, nilai_plafond_id, dan status_bayar). Juga, menambahkan logika untuk menetapkan value yang dipilih dengan benar pada dropdown (menggunakan nilai 'old' atau nilai dari 'permohonan'). Menghapus pengulangan kode untuk 'status permohonan'.
---
 resources/views/permohonan/form.blade.php | 92 +++++++----------------
 1 file changed, 26 insertions(+), 66 deletions(-)

diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index cfb066b..223194a 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -95,7 +95,7 @@
                                             @endforeach
                                         @endif
                                     </select>
-                                    @error('status')
+                                    @error('jenis_fasilitas_kredit_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -122,7 +122,7 @@
                                             @endforeach
                                         @endif
                                     </select>
-                                    @error('status')
+                                    @error('nilai_plafond_id')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -138,7 +138,7 @@
                                         <option {{ $permohonan->status_bayar=="sudah_bayar" ? 'selected' : '' }} value="sudah_bayar">Sudah Bayar</option>
                                         <option {{ $permohonan->status_bayar=="belum_bayar" ? 'selected' : '' }} value="belum_bayar">Belum Bayar</option>
                                     </select>
-                                    @error('status')
+                                    @error('status_bayar')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
@@ -211,19 +211,14 @@
                                 Tujuan Penilaian
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
                                     <option value="">Pilih Tujuan Penilaian</option>
                                     @if(isset($tujuanPenilaian))
                                         @foreach($tujuanPenilaian as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->tujuan_penilaian_id) && $permohonan->tujuan_penilaian_id == $row->id?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
+                                            <option value="{{ $row->id }}"
+                                                {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
+                                                {{ $row->name }}
+                                            </option>
                                         @endforeach
                                     @endif
                                 </select>
@@ -242,19 +237,14 @@
                                     <option value="">Pilih Fasilitas Kredit</option>
                                     @if(isset($fasilitasKredit))
                                         @foreach($fasilitasKredit as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->jenis_fasilitas_kredit_id) && $permohonan->jenis_fasilitas_kredit_id == $row->id ?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
+                                            <option value="{{ $row->id }}"
+                                                {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
+                                                {{ $row->name }}
+                                            </option>
                                         @endforeach
                                     @endif
                                 </select>
-                                @error('status')
+                                @error('jenis_fasilitas_kredit_id')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -266,22 +256,17 @@
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                    <option value="">Pilih Nilai Flafond</option>
+                                    <option value="">Pilih Nilai Plafond</option>
                                     @if(isset($plafond))
                                         @foreach($plafond as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->id }}" {{ isset($permohonan->nilai_plafond_id) && $permohonan->nilai_plafond_id == $row->id ?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->id }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
+                                            <option value="{{ $row->id }}"
+                                                {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
+                                                {{ $row->name }}
+                                            </option>
                                         @endforeach
                                     @endif
                                 </select>
-                                @error('status')
+                                @error('nilai_plafond_id')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -294,10 +279,10 @@
                             <div class="flex flex-wrap items-baseline w-full">
                                 <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
                                     <option value="">Pilih Status Bayar</option>
-                                    <option value="sudah_bayar">Sudah Bayar</option>
-                                    <option value="belum_bayar">Belum Bayar</option>
+                                    <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
+                                    <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
                                 </select>
-                                @error('status')
+                                @error('status_bayar')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
@@ -308,41 +293,16 @@
                                 Nilai NJOP
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
-                                <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
+                                       type="text"
+                                       name="nilai_njop"
+                                       value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
                                 @error('nilai_njop')
                                 <em class="alert text-danger text-sm">{{ $message }}</em>
                                 @enderror
                             </div>
                         </div>
 
-                        <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                            <label class="form-label max-w-56">
-                                Status Permohonan
-                            </label>
-                            <div class="flex flex-wrap items-baseline w-full">
-                                <select class="input tomselect w-full @error('status') border-danger bg-danger-light @enderror" name="status" id="status">
-                                    <option value="">Pilih Status Permohonan</option>
-                                    @if(isset($status))
-                                        @foreach($status as $row)
-                                            @if(isset($permohonan))
-                                                <option value="{{ $row->slug }}" {{ isset($permohonan->status) && $permohonan->status == $row->slug ?'selected' : '' }}>
-                                                    {{ $row->name }}
-                                                </option>
-                                            @else
-                                                <option value="{{ $row->slug }}">
-                                                    {{ $row->name }}
-                                                </option>
-                                            @endif
-                                        @endforeach
-                                    @endif
-                                </select>
-                                @error('status')
-                                <em class="alert text-danger text-sm">{{ $message }}</em>
-                                @enderror
-                            </div>
-                        </div>
-
-
                         <div class="flex justify-end">
                             <button type="submit" class="btn btn-primary">
                                 Save

From 4fc108896460eafca4305db0d61fb759b10bc603 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 15:25:09 +0700
Subject: [PATCH 3/4] Perbarui validasi permohonan dan penyesuaian form

Jadikan `branch_id` nullable di PermohonanRequest.php untuk menyelaraskan dengan requirement terbaru. Hapus kode yang tidak diperlukan di PermohonanController.php untuk meningkatkan keterbacaan. Optimalisasi form di form.blade.php dengan memperbaiki kesalahan penulisan dan menyederhanakan penanda kondisi pada elemen form. Tambahkan input hidden untuk `id` saat update permohonan.
---
 app/Http/Controllers/PermohonanController.php |  2 +-
 app/Http/Requests/PermohonanRequest.php       |  2 +-
 resources/views/permohonan/form.blade.php     | 54 ++++++++-----------
 3 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index b6a43f6..6bd6bfb 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -108,7 +108,6 @@
         public function update(PermohonanRequest $request, $id)
         {
             $validate = $request->validated();
-
             if ($validate) {
                 try {
                     // Update in database
@@ -116,6 +115,7 @@
                     if ($permohonan->status == 'revisi') {
                         $validate['status'] = 'order';
                     }
+
                     $permohonan->update($validate);
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan updated successfully');
diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php
index 9dddc42..3f2f252 100644
--- a/app/Http/Requests/PermohonanRequest.php
+++ b/app/Http/Requests/PermohonanRequest.php
@@ -17,7 +17,7 @@
                 'nomor_registrasi'          => 'nullable|string|max:10',
                 'tanggal_permohonan'        => 'nullable|date',
                 'user_id'                   => 'nullable|exists:users,id',
-                'branch_id'                 => 'required|exists:branches,id',
+                'branch_id'                 => 'nullable|exists:branches,id',
                 'tujuan_penilaian_id'       => 'required|exists:tujuan_penilaian,id',
                 'debiture_id'               => 'required|exists:debitures,id',
                 'status'                    => 'nullable|string',
diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index 223194a..1336330 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -34,6 +34,7 @@
                         <form action="{{ isset($permohonan->id) ? route('permohonan.update', $permohonan) : route('permohonan.store') }}" method="POST" class="grid gap-5" enctype="multipart/form-data">
                             @if(isset($permohonan->id))
                                 @method('PUT')
+                                <input type="hidden" name="id" value="{{ $permohonan->id }}">
                             @endif
                             @csrf
 
@@ -52,19 +53,14 @@
                                     Tujuan Penilaian
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
+                                    <select class="input tomselect w-full @error('tujuan_penilaian_id') border-danger bg-danger-light @enderror" name="tujuan_penilaian_id" id="tujuan_penilaian_id">
                                         <option value="">Pilih Tujuan Penilaian</option>
                                         @if(isset($tujuanPenilaian))
                                             @foreach($tujuanPenilaian as $row)
-                                                @if(isset($permohonan))
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->tujuan_penilaian_id) && $permohonan->tujuan_penilaian_id == $row->id?'selected' : '' }}>
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
+                                                <option value="{{ $row->id }}"
+                                                    {{ (old('tujuan_penilaian_id') == $row->id) || (isset($permohonan) && $permohonan->tujuan_penilaian_id == $row->id) ? 'selected' : '' }}>
+                                                    {{ $row->name }}
+                                                </option>
                                             @endforeach
                                         @endif
                                     </select>
@@ -83,15 +79,10 @@
                                         <option value="">Pilih Fasilitas Kredit</option>
                                         @if(isset($fasilitasKredit))
                                             @foreach($fasilitasKredit as $row)
-                                                @if(isset($permohonan))
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->jenis_fasilitas_kredit_id) && $permohonan->jenis_fasilitas_kredit_id == $row->id ?'selected' : '' }}>
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
+                                                <option value="{{ $row->id }}"
+                                                    {{ (old('jenis_fasilitas_kredit_id') == $row->id) || (isset($permohonan) && $permohonan->jenis_fasilitas_kredit_id == $row->id) ? 'selected' : '' }}>
+                                                    {{ $row->name }}
+                                                </option>
                                             @endforeach
                                         @endif
                                     </select>
@@ -107,18 +98,13 @@
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
                                     <select class="input tomselect w-full @error('nilai_plafond_id') border-danger bg-danger-light @enderror" name="nilai_plafond_id" id="nilai_plafond_id">
-                                        <option value="">Pilih Nilai Flafond</option>
+                                        <option value="">Pilih Nilai Plafond</option>
                                         @if(isset($plafond))
                                             @foreach($plafond as $row)
-                                                @if(isset($permohonan))
-                                                    <option value="{{ $row->id }}" {{ isset($permohonan->nilai_plafond_id) && $permohonan->nilai_plafond_id == $row->id ?'selected' : '' }}>
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @else
-                                                    <option value="{{ $row->id }}">
-                                                        {{ $row->name }}
-                                                    </option>
-                                                @endif
+                                                <option value="{{ $row->id }}"
+                                                    {{ (old('nilai_plafond_id') == $row->id) || (isset($permohonan) && $permohonan->nilai_plafond_id == $row->id) ? 'selected' : '' }}>
+                                                    {{ $row->name }}
+                                                </option>
                                             @endforeach
                                         @endif
                                     </select>
@@ -135,8 +121,8 @@
                                 <div class="flex flex-wrap items-baseline w-full">
                                     <select class="input tomselect w-full @error('status_bayar') border-danger bg-danger-light @enderror" name="status_bayar" id="status_bayar">
                                         <option value="">Pilih Status Bayar</option>
-                                        <option {{ $permohonan->status_bayar=="sudah_bayar" ? 'selected' : '' }} value="sudah_bayar">Sudah Bayar</option>
-                                        <option {{ $permohonan->status_bayar=="belum_bayar" ? 'selected' : '' }} value="belum_bayar">Belum Bayar</option>
+                                        <option value="sudah_bayar" {{ (old('status_bayar') == 'sudah_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'sudah_bayar') ? 'selected' : '' }}>Sudah Bayar</option>
+                                        <option value="belum_bayar" {{ (old('status_bayar') == 'belum_bayar') || (isset($permohonan) && $permohonan->status_bayar == 'belum_bayar') ? 'selected' : '' }}>Belum Bayar</option>
                                     </select>
                                     @error('status_bayar')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
@@ -149,12 +135,16 @@
                                     Nilai NJOP
                                 </label>
                                 <div class="flex flex-wrap items-baseline w-full">
-                                    <input class="input  @error('nilai_njop') border-danger bg-danger-light @enderror" type="text" name="nilai_njop" value="{{ $permohonan->nilai_njop ?? '' }}">
+                                    <input class="input @error('nilai_njop') border-danger bg-danger-light @enderror"
+                                           type="text"
+                                           name="nilai_njop"
+                                           value="{{ old('nilai_njop', $permohonan->nilai_njop ?? '') }}">
                                     @error('nilai_njop')
                                     <em class="alert text-danger text-sm">{{ $message }}</em>
                                     @enderror
                                 </div>
                             </div>
+
                             @if($permohonan->status=='revisi')
                                 <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                                     Catatan : <br>

From b73aaac682e3c033eac570903e03ee296d2619a3 Mon Sep 17 00:00:00 2001
From: Daeng Deni Mardaeni <ddeni05@gmail.com>
Date: Wed, 6 Nov 2024 16:13:26 +0700
Subject: [PATCH 4/4] Tambah input file dinamis pada dokumen jaminan

Menambahkan implementasi untuk input file dinamis pada komponen dokumen jaminan. Sekarang pengguna dapat menambahkan lebih dari satu file secara bersamaan dan menambah input file baru dengan menekan tombol "Add More". Perubahan ini meningkatkan fleksibilitas dan kemudahan dalam pengunggahan banyak dokumen.
---
 resources/views/debitur/components/dokumen.blade.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 7e649a0..4278656 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -246,7 +246,13 @@
                         Dokumen Jaminan
                     </label>
                     <div class="flex flex-wrap items-baseline w-full">
-                        <input class="file-input" type="file" name="dokumen_jaminan[]" value="">
+                        <div class="flex flex-col w-full gap-2"  id="file-container-{{$n}}">
+                            <div class="flex items-center gap-2">
+                                <input class="file-input" type="file" name="dokumen_jaminan[{{ $n }}][]" multiple>
+                                <button type="button" class="btn btn-primary w-[100px] text-center" onclick="addFileInput({{ $n }})">Add More</button>
+                            </div>
+                            <div id="additional-files-{{ $n }}"></div>
+                        </div>
                     </div>
                 </div>