Merge branch 'staging' into surveyor

app/Helpers/Lpj.php

@@ -0,0 +1,10 @@
+<?php
+
+    function formatAlamat($alamat) {
+        return
+            ($alamat->address ? $alamat->address . ', ' : '') .
+            (isset($alamat->village) ? $alamat->village->name.', ' : '') .
+            (isset($alamat->city) ? $alamat->city->name.', ' : '') .
+            (isset($alamat->province) ? $alamat->province->name.', ' : '') .
+            ($alamat->postal_code ?? '');
+    }

module.json

@@ -6,7 +6,9 @@
   "keywords": [],
   "priority": 0,
   "providers": ["Modules\\Lpj\\Providers\\LpjServiceProvider"],
-  "files": [],
+  "files": [
+      "app/Helpers/Lpj.php"
+  ],
   "menu": {
     "main": [
       {
@@ -317,6 +319,14 @@
             "permission": "",
             "roles": ["administrator", "admin"]
           },
+          {
+            "title": "Jenis Laporan",
+            "path": "basicdata.jenis_laporan",
+            "classes": "",
+            "attributes": [],
+            "permission": "",
+            "roles": ["Administrator", "admin"]
+          },
           {
             "title": "Tujuan Penilaian KJPP",
             "path": "basicdata.tujuan_penilaian_kjpp",

resources/views/Ijin_usaha/index.blade.php

@@ -68,7 +68,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/arah_mata_angin/index.blade.php

@@ -58,7 +58,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/assetsku/includenya.blade.php

@@ -1,6 +1,4 @@
-<script type="module" src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js"></script>
+<script>
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-<script tipe="module">
 function removeErrorCssMsg() {
 	$(".inputku").removeClass("border-danger");
 	$("em").text('');

resources/views/authorization/index.blade.php

@@ -74,7 +74,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="module">
         const element = document.querySelector('#authorization-table');
         const searchInput = document.getElementById('search');

resources/views/branch/index.blade.php

@@ -62,7 +62,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/currency/index.blade.php

@@ -66,7 +66,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

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

@@ -10,7 +10,10 @@
         </label>
         <div class="flex flex-wrap items-baseline w-full">
             <input type="hidden" name="debiture_id" value="{{ $debitur->id ?? '' }}">
-            <p class="text-base text-gray-700">{{ $debitur->name }} | {{ $debitur->address.', '.$debitur->village->name.', '.$debitur->city->name.', '.$debitur->province->name.', '.$debitur->postal_code }}</p>
+            <p class="text-base text-gray-700">
+                {{ $debitur->name }} |
+                {{ formatAlamat($debitur) }}
+            </p>
         </div>
     </div>
     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
@@ -78,45 +81,46 @@
     </div>
 
     @if(isset($document->id))
-            @foreach($document->detail as $detail)
+        @foreach($document->detail as $detail)
-                <input type="hidden" name="detail_dokumen_jaminan_id[]" value="{{ $detail->id }}">
+            <input type="hidden" name="detail_dokumen_jaminan_id[]" value="{{ $detail->id }}">
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56 font-bold">
+                <label class="form-label max-w-56 font-bold">
-                        {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
+                    {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
-                    </label>
+                </label>
-                    <input type="hidden" name="jenis_legalitas_jaminan_id[]" value=" {{ $detail->jenis_legalitas_jaminan_id }}">
+                <input type="hidden" name="jenis_legalitas_jaminan_id[]" value=" {{ $detail->jenis_legalitas_jaminan_id }}">
-                </div>
+            </div>
 
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
+                <label class="form-label max-w-56">
-                        Nama Dokumen
+                    Nama Dokumen
-                    </label>
+                </label>
-                    <div class="flex flex-wrap items-baseline w-full">
+                <div class="flex flex-wrap items-baseline w-full">
-                        <input class="input " type="text" id="name" name="name[]" value="{{ $detail->name ?? "" }}" placeholder="Nama Dokumen">
+                    <input class="input " type="text" id="name" name="name[]" value="{{ $detail->name ?? "" }}" placeholder="Nama Dokumen">
-                    </div>
                 </div>
+            </div>
 
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
+                <label class="form-label max-w-56">
-                        Dokumen Jaminan
+                    Dokumen Jaminan
-                    </label>
+                </label>
-                    <div class="flex flex-wrap items-baseline w-full">
+                <div class="flex flex-wrap items-baseline w-full">
-                        <input class="file-input" type="file" name="dokumen_jaminan[]" value="">
+                    <input class="file-input" type="file" name="dokumen_jaminan[]" value="">
-                        @if(isset($detail->dokumen_jaminan))
+                    @if(isset($detail->dokumen_jaminan))
-                            <a href="{{ route('debitur.jaminan.download',['id'=>$debitur->id,'dokumen'=>$detail->id]) }}" class="badge badge-sm badge-outline mt-2">{{ basename($detail->dokumen_jaminan) }} <i class="ki-filled ki-cloud-download"></i></a>
+                        <a href="{{ route('debitur.jaminan.download',['id'=>$debitur->id,'dokumen'=>$detail->id]) }}" class="badge badge-sm badge-outline mt-2">{{ basename($detail->dokumen_jaminan) }}
-                        @endif
+                            <i class="ki-filled ki-cloud-download"></i></a>
-                    </div>
+                    @endif
                 </div>
+            </div>
 
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+            <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
+                <label class="form-label max-w-56">
-                        Keterangan
+                    Keterangan
-                    </label>
+                </label>
-                    <div class="flex flex-wrap items-baseline w-full">
+                <div class="flex flex-wrap items-baseline w-full">
-                        <textarea class="textarea" rows="3" type="number" name="keterangan[]">{{ $detail->keterangan ?? ""  }}</textarea>
+                    <textarea class="textarea" rows="3" type="number" name="keterangan[]">{{ $detail->keterangan ?? ""  }}</textarea>
-                    </div>
                 </div>
-            @endforeach
+            </div>
+        @endforeach
     @else
         <div id="doctainer" class="grid gap-5">
 

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

@@ -48,7 +48,7 @@
                         alamat
                     </span>
                     <p class="text-2xs text-gray-600 text-right max-w-[250px]">
-                        {{ $document->address.', '.$document->village->name.', '.$document->city->name.', '.$document->province->name.', '.$document->postal_code }}
+                        {{ formatAlamat($document) }}
                     </p>
                 </div>
                 <div class="border-t border-gray-300 border-dashed">
@@ -128,7 +128,6 @@
 
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

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

@@ -136,7 +136,6 @@
 
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/debitur/index.blade.php

@@ -90,7 +90,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function () {
 

resources/views/hubungan_pemilik_jaminan/index.blade.php

@@ -58,7 +58,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/hubungan_penghuni_jaminan/index.blade.php

@@ -58,7 +58,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/jenis_aset/index.blade.php

@@ -62,7 +62,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/jenis_dokumen/index.blade.php

@@ -66,7 +66,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/jenis_fasilitas_kredit/index.blade.php

@@ -62,7 +62,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/jenis_jaminan/index.blade.php

@@ -62,7 +62,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/jenis_laporan/index.blade.php

@@ -68,7 +68,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/jenis_legalitas_jaminan/index.blade.php

@@ -62,7 +62,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/jenis_penilaian/index.blade.php

@@ -72,7 +72,6 @@
 
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/kjpp/index.blade.php

@@ -71,7 +71,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/nilai_plafond/index.blade.php

@@ -62,7 +62,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/penawaran/index.blade.php

@@ -87,7 +87,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function formatDate(date) {
             const day = date.getDate().toString().padStart(2, '0');

resources/views/penawaran_ulang/index.blade.php

@@ -88,7 +88,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function formatDate(date) {
             const day = date.getDate().toString().padStart(2, '0');

resources/views/penilaian/index.blade.php

@@ -86,7 +86,6 @@
 
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
       <script type="module">
         const element = document.querySelector('#permohonan-table');
         const searchInput = document.getElementById('search');

resources/views/penilaian/otorisator/index.blade.php

@@ -86,7 +86,6 @@
 
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
       <script type="module">
         const element = document.querySelector('#permohonan-table');
         const searchInput = document.getElementById('search');

resources/views/permohonan/authorization/index.blade.php

@@ -82,7 +82,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/permohonan/create.blade.php

@@ -81,7 +81,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function () {
 

resources/views/permohonan/index.blade.php

@@ -86,7 +86,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/region/index.blade.php

@@ -64,7 +64,6 @@
 
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/status_permohonan/index.blade.php

@@ -66,7 +66,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/teams/index.blade.php

@@ -68,7 +68,6 @@
 
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/tujuan_penilaian/index.blade.php

@@ -62,7 +62,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({

resources/views/tujuan_penilaian_kjpp/index.blade.php

@@ -69,7 +69,6 @@
 @endsection
 
 @push('scripts')
-    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script type="text/javascript">
         function deleteData(data) {
             Swal.fire({