Merge branch 'staging' into feature/senior-officer

resources/views/component/detail-jaminan.blade.php

@@ -390,7 +390,7 @@
                 @endforelse
             </div>
 
-            @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin']))
+            @if(Auth::user()->hasRole(['Penilai', 'administrator','penilai','admin','surveyor']))
                 <form action="{{ route('lampiran.upload',) }}" method="POST" enctype="multipart/form-data" class="mt-6">
                     @csrf
                     <input type="hidden" name="permohonan_id" value="{{ $permohonan->id }}">

resources/views/component/print-out-dokument.blade.php

@@ -22,9 +22,13 @@
                                     </td>
                                     <td style="width:1%; padding: 2px; vertical-align: top;">:</td>
                                     <td style="padding: 2px;">
-                                        {{ $item }}
-                                        @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
-                                            <sup>m2</sup>
+                                        @if (strpos(strtolower($key), 'tanggal') !== false)
+                                            {{ formatTanggalIndonesia($item) }}
+                                        @else
+                                            {{ $item }}
+                                            @if ($key == 'luas_bangunan' || $key == 'luas_tanah')
+                                                <sup>m2</sup>
+                                            @endif
                                         @endif
                                     </td>
                                 </tr>

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

@@ -308,6 +308,7 @@
                                                         </a>
                                                         </span>
                                                 <button type="button" class="flex-none btn btn-danger w-[100px] text-center" onclick="removeFileInput(this)">Remove</button>
+
                                             </div>
 
                                             @if($detail->details)

resources/views/penilai/components/print-memo.blade.php

@@ -98,7 +98,6 @@
 
         @include('lpj::component.print-out-dokument')
 
-
         <tr>
             <td style="width: 20%; padding: 2px;">Atas Nama</td>
             <td style="width: 1%;  padding: 2px;">:</td>
@@ -106,31 +105,25 @@
         </tr>
 
         @if (!empty($memo['lokasi']['address']))
-            <tr>
-                <td width="20%">Terletak di</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td> {{ $alamat['address'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Desa/Kelurahan</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['village_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Kecamatan</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['district_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Kabupaten/Kota</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td> {{ $alamat['city_code'] ?? '' }}</td>
-            </tr>
-            <tr>
-                <td>Provinsi</td>
-                <td style="width: 1%; vertical-align: top;">:</td>
-                <td>{{ $alamat['province_code'] ?? '' }}</td>
-            </tr>
+            @php
+                $alamatFields = [
+                    'Terletak di' => 'address',
+                    'Desa/Kelurahan' => 'village_code',
+                    'Kecamatan' => 'district_code',
+                    'Kabupaten/Kota' => 'city_code',
+                    'Provinsi' => 'province_code'
+                ];
+            @endphp
+
+            @foreach ($alamatFields as $label => $field)
+                @if (!empty($alamat[$field]))
+                    <tr>
+                        <td width="20%">{{ $label }}</td>
+                        <td style="width: 1%; vertical-align: top;">:</td>
+                        <td>{{ $alamat[$field] }}</td>
+                    </tr>
+                @endif
+            @endforeach
         @endif
     </table>
 

resources/views/penilai/show.blade.php

@@ -323,11 +323,11 @@
                             </div>
                         </div>
 
-                        @if($permohonan->jenisPenilaian->name=="External")
+                        @if($permohonan->jenisPenilaian->name=="Eksternal")
                             @if(isset($permohonan->laporanExternal->file_resume) || isset($permohonan->laporanExternal->file_laporan))
                                 <div class="dropdown" data-dropdown="true" data-dropdown-trigger="click">
                                     <button class="dropdown-toggle btn btn-primary">
-                                        Laporan External
+                                        Laporan Eksternal
                                     </button>
                                     <div class="dropdown-content w-full max-w-56 py-2 !ml-[200px] !mt-[-20px]">
                                         <div class="menu menu-default flex flex-col w-full">