From a4d0a5d942b35c8d1843705f2104a73f4ffd6bbf Mon Sep 17 00:00:00 2001
From: majid <rustammajid76@gmail.com>
Date: Thu, 13 Mar 2025 09:11:44 +0700
Subject: [PATCH] fix(alamat): perbaikkan alamat

---
 app/Services/SaveFormInspesksiService.php     | 30 ++++++++++++-------
 .../components/lokasi-jaminan.blade.php       |  8 ++---
 .../components/print-out/alat-berat.blade.php | 14 +++++++--
 .../components/print-out/pesawat.blade.php    | 14 +++++++--
 4 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/app/Services/SaveFormInspesksiService.php b/app/Services/SaveFormInspesksiService.php
index ebfbab6..aebbf1b 100644
--- a/app/Services/SaveFormInspesksiService.php
+++ b/app/Services/SaveFormInspesksiService.php
@@ -567,9 +567,11 @@ class SaveFormInspesksiService
         'perumahan_gang' => $data['perumahan_gang'] ?? null,
         'blok_nomor' => $data['blok_nomor'] ?? null,
         'bandara' => $data['bandara'] ?? null,
-        'alamat' => [
-            'sesuai' => $alamatData
-        ],
+        'asset' => [
+            'alamat'  => [
+                  'sesuai' => $alamatData
+              ],
+          ],
             'jenis_kapal' => $data['jenis_kapal'] ?? null,
             'jenis_kapal_lainnya' => $data['jenis_kapal_lainnya'] ?? null,
             'size' => $data['size'] ?? null,
@@ -670,9 +672,11 @@ class SaveFormInspesksiService
             'nama_jalan' => $data['nama_jalan'] ?? null,
             'perumahan_gang' => $data['perumahan_gang'] ?? null,
             'blok_nomor' => $data['blok_nomor'] ?? null,
-            'alamat' => [
-                'sesuai' => $alamatData
-            ],
+            'asset' => [
+                'alamat'  => [
+                      'sesuai' => $alamatData
+                  ],
+              ],
             'masa_stnk' => $data['masa_stnk'] ?? null,
             'masa_pajak' => $data['masa_pajak'] ?? null,
             'kendaraan' => $data['kendaraan'] ?? null,
@@ -790,8 +794,10 @@ class SaveFormInspesksiService
             'nama_jalan' => $data['nama_jalan'] ?? null,
             'perumahan_gang' => $data['perumahan_gang'] ?? null,
             'blok_nomor' => $data['blok_nomor'] ?? null,
-            'alamat' => [
-                'sesuai' => $alamatData
+            'asset' => [
+              'alamat'  => [
+                    'sesuai' => $alamatData
+                ],
             ],
             'jenis_model' => $data['jenis_model'] ?? null,
             'nomor_lambung' => $data['nomor_lambung'] ?? null,
@@ -862,9 +868,11 @@ class SaveFormInspesksiService
             'perumahan_gang' => $data['perumahan_gang'] ?? null,
             'blok_nomor' => $data['blok_nomor'] ?? null,
             'bandara' => $data['bandara'] ?? null,
-            'alamat' => [
-                'sesuai' => $alamatData
-            ],
+            'asset' => [
+                'alamat'  => [
+                      'sesuai' => $alamatData
+                  ],
+              ],
             'jenis_pesawat' => $data['jenis_pesawat'] ?? null,
             'jenis_pesawat_lainnya' => $data['jenis_pesawat_lainnya'] ?? null,
 
diff --git a/resources/views/surveyor/components/lokasi-jaminan.blade.php b/resources/views/surveyor/components/lokasi-jaminan.blade.php
index 6ad21d9..309d772 100644
--- a/resources/views/surveyor/components/lokasi-jaminan.blade.php
+++ b/resources/views/surveyor/components/lokasi-jaminan.blade.php
@@ -57,7 +57,7 @@
 
                     <option value="">Pilih Provinsi</option>
                     @foreach ($provinces as $item)
-                        <option value="{{ $item->code }}" {{ ($forminspeksi['alamat']['sesuai']['province_code'] ?? '') == $item->code ? 'selected' : '' }}>{{ $item->name }}</option>
+                        <option value="{{ $item->code }}" {{ ($cekAlamat['province_code'] ?? '') == $item->code ? 'selected' : '' }}>{{ $item->name }}</option>
                     @endforeach
                 </select>
             </div>
@@ -70,7 +70,7 @@
                     <option value="">Pilih Kota/Kabupaten</option>
                     @if(isset($cities))
                         @foreach ($cities as $item)
-                            <option value="{{ $item->code }}" {{ $forminspeksi['alamat']['sesuai']['city_code'] == $item->code ? 'selected' : '' }}>{{ $item->name }}</option>
+                            <option value="{{ $item->code }}" {{ $cekAlamat['city_code'] == $item->name ? 'selected' : '' }}>{{ $item->name }}</option>
                         @endforeach
                     @endif
                 </select>
@@ -84,7 +84,7 @@
                     <option value="">Pilih Kecamatan</option>
                     @if(isset($districts))
                         @foreach ($districts as $item)
-                            <option value="{{ $item->code }}" {{ ($forminspeksi['alamat']['sesuai']['district_code'] ?? '') == $item->code ? 'selected' : '' }}>{{ $item->name }}</option>
+                            <option value="{{ $item->code }}" {{ ($cekAlamat['district_code'] ?? '') == $item->code ? 'selected' : '' }}>{{ $item->name }}</option>
                         @endforeach
                     @endif
                 </select>
@@ -98,7 +98,7 @@
                     <option value="">Pilih Kelurahan</option>
                     @if(isset($villages))
                         @foreach ($villages as $item)
-                            <option value="{{ $item->code }}" {{ ($forminspeksi['alamat']['sesuai']['village_code'] ?? '') == $item->code ? 'selected' : '' }}>{{ $item->name }}</option>
+                            <option value="{{ $item->code }}" {{ ($cekAlamat['village_code'] ?? '') == $item->code ? 'selected' : '' }}>{{ $item->name }}</option>
                         @endforeach
                     @endif
                 </select>
diff --git a/resources/views/surveyor/components/print-out/alat-berat.blade.php b/resources/views/surveyor/components/print-out/alat-berat.blade.php
index 0b10c79..a562e9f 100644
--- a/resources/views/surveyor/components/print-out/alat-berat.blade.php
+++ b/resources/views/surveyor/components/print-out/alat-berat.blade.php
@@ -104,9 +104,19 @@
 
 
         <tr>
-            <td width="20%">Terletak di</td>
+            <td width="20%">Nama Jalan</td>
             <td style="width: 1%; vertical-align: top;">:</td>
-            <td> {{ $alamat['address'] ?? '' }}</td>
+            <td> {{ $forminspeksi['nama_jalan'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td width="20%">Perumahan/Gang</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $forminspeksi['perumahan_gang'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td width="20%">Blok/Nomor</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $forminspeksi['blok_nomor'] ?? '' }}</td>
         </tr>
         <tr>
             <td>Kelurahan</td>
diff --git a/resources/views/surveyor/components/print-out/pesawat.blade.php b/resources/views/surveyor/components/print-out/pesawat.blade.php
index 01df141..e038c5f 100644
--- a/resources/views/surveyor/components/print-out/pesawat.blade.php
+++ b/resources/views/surveyor/components/print-out/pesawat.blade.php
@@ -112,9 +112,19 @@
 
 
         <tr>
-            <td width="20%">Terletak di</td>
+            <td width="20%">Nama Jalan</td>
             <td style="width: 1%; vertical-align: top;">:</td>
-            <td> {{ $alamat['address'] ?? '' }}</td>
+            <td> {{ $forminspeksi['nama_jalan'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td width="20%">Perumahan/Gang</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $forminspeksi['perumahan_gang'] ?? '' }}</td>
+        </tr>
+        <tr>
+            <td width="20%">Blok/Nomor</td>
+            <td style="width: 1%; vertical-align: top;">:</td>
+            <td> {{ $forminspeksi['blok_nomor'] ?? '' }}</td>
         </tr>
         <tr>
             <td>Kelurahan</td>