Merge branch 'staging' into feature/senior-officer

app/Http/Controllers/DebitureController.php

@@ -19,6 +19,7 @@
     use Modules\Lpj\Models\JenisJaminan;
     use Modules\Lpj\Models\JenisLegalitasJaminan;
     use Modules\Lpj\Models\PemilikJaminan;
+    use Illuminate\Support\Facades\Auth;
 
     class DebitureController extends Controller
     {
@@ -128,6 +129,10 @@
             // Retrieve data from the database
             $query = Debiture::query();
 
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->where('branch_id', Auth::user()->branch_id);
+            }
+
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
@@ -167,7 +172,7 @@
             $filteredRecords = $query->count();
 
             // Get the data for the current page
-            $data = $query->with('branch')->get();
+            $data = $query->with(['branch','permohonan'])->get();
 
             // Calculate the page count
             $pageCount = ceil($totalRecords / $request->get('size'));

app/Http/Controllers/DokumenJaminanController.php

@@ -488,7 +488,7 @@
 
             if ($zip->open($zipFilePath, ZipArchive::CREATE) === true) {
                 foreach ($documents as $document) {
-                    $jenisJaminan = $document->debiture->permohonan->nomor_registrasi ?? 'Uncategorized';
+                    $jenisJaminan = $document->permohonan->nomor_registrasi ?? 'Uncategorized';
                     $folderName   = $this->sanitizeFolderName($jenisJaminan);
 
                     foreach ($document->detail as $detail) {

app/Http/Controllers/PermohonanController.php

@@ -280,6 +280,10 @@ class PermohonanController extends Controller
         // Retrieve data from the database
         $query = Permohonan::query()->with('documents')->has('documents', '>', 0)->where('status', '=', 'order');
 
+        if (!Auth::user()->hasAnyRole(['administrator'])) {
+            $query = $query->where('branch_id', Auth::user()->branch_id);
+        }
+
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');

app/Http/Requests/PersetujuanPenawaranRequest.php

@@ -63,7 +63,7 @@
                 'authorized_at.date'                  => 'Tanggal otorisasi harus berupa tanggal yang valid.',
                 'authorized_by.exists'                => 'ID pengguna yang mengotorisasi tidak valid.',
                 '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".',
             ];
         }
     }

app/Models/Debiture.php

@@ -61,7 +61,7 @@
         }
 
         public function permohonan(){
-            return $this->hasOne(Permohonan::class, 'debiture_id', 'id' );
+            return $this->hasMany(Permohonan::class, 'debiture_id', 'id' );
         }
 
         public function laporanAdminKredit(): HasMany

database/migrations/2025_03_24_080648_update_permohonan_table.php

@@ -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();
+    }
+};

resources/views/debitur/components/debitur.blade.php

@@ -7,22 +7,22 @@
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
         <label class="form-label max-w-56 gap-1">
             Cabang
-            <span class="text-danger">
+            <span class="text-danger">*</span>
-                *
-           </span>
         </label>
         <div class="flex flex-wrap items-baseline w-full">
+            @if(auth()->user()->hasRole('administrator'))
                 <select class="input tomselect w-full @error('branch_id') border-danger bg-danger-light @enderror" name="branch_id" id="branch_id">
                     <option value="">Pilih Cabang</option>
                     @foreach($branches as $branch)
-                    @if(isset($debitur))
+                        <option value="{{ $branch->id }}" {{ (isset($debitur) && $branch->id == $debitur->branch_id) || (old('branch_id') == $branch->id) ? 'selected' : '' }}>
-                        <option value="{{ $branch->id }}" {{ $branch->id == $debitur->branch_id ? 'selected' : '' }}>{{ $branch->name }}</option>
+                            {{ $branch->name }}
-                    @else
+                        </option>
-                        <option value="{{ $branch->id }}">{{ $branch->name }}</option>
-                    @endif
-
                     @endforeach
                 </select>
+            @else
+                <input type="hidden" name="branch_id" value="{{ auth()->user()->branch_id }}">
+                <input type="text" class="input w-full" value="{{ auth()->user()->branch->name }}" readonly>
+            @endif
             @error('branch_id')
             <em class="alert text-danger text-sm">{{ $message }}</em>
             @enderror

resources/views/debitur/index.blade.php

@@ -20,7 +20,9 @@
                     <div class="flex flex-wrap gap-2.5">
                         <div class="h-[24px] border border-r-gray-200"></div>
                         <a class="btn btn-sm btn-light" href="{{ route('debitur.export') }}"> Export to Excel </a>
+                        @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao']))
                             <a class="btn btn-sm btn-primary" href="{{ route('debitur.create') }}"> Tambah Debitur </a>
+                        @endif
                     </div>
                 </div>
             </div>
@@ -90,6 +92,10 @@
 @endsection
 
 @push('scripts')
+    <script>
+        const userRoles = @json(auth()->user()->roles->pluck('name'));
+    </script>
+
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function () {
 
@@ -118,8 +124,7 @@
                             window.location.reload();
                         });
                     }).catch((error) => {
-                        console.error('Error:', error);
+                        Swal.fire('Error!', error.responseJSON.message, 'error');
-                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
                     });
                 }
             })
@@ -177,14 +182,36 @@
                 actions: {
                     title: 'Status',
                     render: (item, data) => {
-                        return `<div class="flex flex-nowrap justify-center">
+                        let actionHtml = `<div class="flex flex-nowrap justify-center">`;
+
+                        // Fungsi helper untuk memeriksa peran
+                        const hasRole = (roles) => roles.some(role => userRoles.includes(role));
+
+                        // Fungsi helper untuk memeriksa status permohonan
+                        const hasValidStatus = (permohonan) => ['order', 'revisi'].includes(permohonan.status);
+
+                        // Periksa apakah permohonan ada dan merupakan array
+                        const permohonanArray = Array.isArray(data.permohonan) ? data.permohonan : [];
+
+                        // Periksa apakah ada setidaknya satu permohonan dengan status yang valid
+                        const hasAnyValidPermohonan = permohonanArray.some(hasValidStatus);
+
+                        if (hasRole(['administrator']) && hasAnyValidPermohonan || data.permohonan.length < 1) {
+                            actionHtml += `
                             <a class="btn btn-sm btn-icon btn-clear btn-info" href="/debitur/${data.id}/edit">
                                 <i class="ki-outline ki-notepad-edit"></i>
-                            </a>
+                            </a>`;
+                        }
+
+                        if (hasRole(['administrator', 'pemohon-ao']) && data.permohonan.length < 1) {
+                            actionHtml += `
                 <a onclick="deleteData(${data.id})" class="delete btn btn-sm btn-icon btn-clear btn-danger">
                     <i class="ki-outline ki-trash"></i>
-                            </a>
+                </a>`;
-                        </div>`;
+                        }
+
+                        actionHtml += `</div>`;
+                        return actionHtml;
                     },
                 }
             },

resources/views/laporan/index.blade.php

@@ -254,7 +254,7 @@
                             </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){
                                 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">

resources/views/permohonan/form.blade.php

@@ -57,7 +57,8 @@
                             'nilai_plafond_id' => ['label' => 'Nilai Plafond', 'type' => 'select', 'options' => $plafond],
                             'status_bayar' => ['label' => 'Status Bayar', 'type' => 'select', 'options' => [
                                 'sudah_bayar' => 'Sudah Bayar',
-                                'belum_bayar' => 'Belum Bayar'
+                                'belum_bayar' => 'Belum Bayar',
+                                'tidak_bayar' => 'Tidak Bayar'
                             ]],
                             'nilai_njop' => ['label' => 'Nilai NJOP', 'type' => 'text'],
                         ];
@@ -130,8 +131,12 @@
                 const nilaiPlafondValue = nilaiPlafondSelect.value;
                 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';
                 } else {
                     @if(isset($permohonan))

resources/views/permohonan/index.blade.php

@@ -22,7 +22,9 @@
                     <div class="flex flex-wrap gap-2.5">
                         <div class="h-[24px] border border-r-gray-200"></div>
                         <a class="btn btn-sm btn-light" href="{{ route('permohonan.export') }}"> Export to Excel </a>
+                        @if(auth()->user()->hasAnyRole(['administrator', 'pemohon-ao']))
                             <a class="btn btn-sm btn-primary" href="{{ route('permohonan.create') }}"> Tambah Permohonan </a>
+                        @endif
                     </div>
                 </div>
             </div>
@@ -90,6 +92,10 @@
 @endsection
 
 @push('scripts')
+    <script>
+        const userRoles = @json(auth()->user()->roles->pluck('name'));
+    </script>
+
     <script type="text/javascript">
         function deleteData(data, noReg, debitur) {
             Swal.fire({
@@ -213,6 +219,7 @@
                     title: 'Actions',
                     render: (item, data) => {
                         let actionHtml = `<div class="flex flex-nowrap justify-end gap-1.5">`;
+                        const hasRole = (roles) => roles.some(role => userRoles.includes(role));
 
                         if (data.status === 'proses-survey' || data.status == 'rejected-reschedule') {
                             actionHtml += `
@@ -255,18 +262,17 @@ title="Approve Jadwal Kunjungan No Reg ${data.nomor_registrasi}"
             `;
                         }
 
-                        if (data.status !== 'done' && data.status !== 'batal') {
+                        if (data.status !== 'done' && data.status !== 'batal' && hasRole(['administrator', 'pemohon-ao'])) {
                             actionHtml += `
             <a class="btn btn-sm btn-outline btn-info" href="permohonan/${data.id}/edit" title="Edit Permohonan">
                 <i class="ki-outline ki-notepad-edit"></i>
             </a>`;
                         }
-                        if (data.status === 'order') {
+                        if (data.status === 'order' && hasRole(['administrator', 'pemohon-ao'])) {
                             actionHtml += `
             <a onclick="deleteData(${data.id}, '${data.nomor_registrasi}','${data.debiture?.name}')" class="delete btn btn-sm btn-outline btn-danger" title="Batalkan Permohonan">
                 <i class="ki-outline ki-cross-square"></i>
             </a>`;
-
                         }