Merge branch 'staging' into feature/senior-officer

resources/views/surveyor/components/header.blade.php

@@ -69,7 +69,8 @@
                         <input type="text" class="input form-control" name="debitur_perwakilan[]"
                                value="{{ old('debitur_perwakilan') }}" placeholder="Masukkan Debitur/Perwakilan"/>
                         <button type="button" class="btn btn-danger btn-outline btn-xs remove-btn"
-                            style="display: none">Hapus</button>
+                                style="display: none">Hapus
+                        </button>
                     </div>
                 </div>
             @endif
@@ -82,7 +83,6 @@
     </div>
 </div>
 
-
 <div class="card w-full bg-white rounded-lg shadow-md overflow-hidden">
     <div class="card-header">
         <h1 class="text-md font-medium text-gray-900 uppercase">Nama Cadeb/Debitur</h1>
@@ -171,7 +171,7 @@
                 <div class="w-full">
 
                     <span class="text-2sm text-gray-700">
-                            {{ $permohonan->debiture->village->name ?? "" }}, {{ $permohonan->debiture->district->name ?? "" }}, {{ $permohonan->debiture->city->name ?? "" }}, {{ $permohonan->debiture->province->name ?? "" }} - {{ $permohonan->debiture->village->postal_code ?? "" }}
+                        {{ formatAlamat($permohonan->debiture) }}
                     </span>
 
 

routes/breadcrumbs.php

@@ -380,7 +380,7 @@ Breadcrumbs::for('tender.penawaran', function (BreadcrumbTrail $trail) {
     });
 
     Breadcrumbs::for('tender.penawaran.show', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
+        $trail->parent('tender');
         $trail->push('Detail Penawaran', route('tender.penawaran.show', $noreg));
     });
 
@@ -390,23 +390,22 @@ Breadcrumbs::for('tender.penawaran.createPenawaran', function (BreadcrumbTrail $
     });
 
     Breadcrumbs::for('tender.penawaran.editPenawaran', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
+        $trail->parent('tender.penawaran');
         $trail->push('Penawaran Ulang', route('tender.penawaran.editPenawaran', $noreg));
     });
 
     Breadcrumbs::for('tender.penawaran.showSuratTender', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
+        $trail->parent('tender.penawaran');
-    $trail->push('Penawaran Ulang', route('tender.penawaran.editPenawaran', $noreg));
         $trail->push('Surat Tender', route('tender.penawaran.showSuratTender', $noreg));
     });
 
     Breadcrumbs::for('tender.penawaran.suratTenderKJPP', function (BreadcrumbTrail $trail, $noreg, $id) {
-    $trail->parent('tender.penawaran.showKirimEmail', ['noreg' => $noreg]);
+        $trail->parent('tender.penawaran');
         $trail->push('Surat Tender KJPP', route('tender.penawaran.suratTenderKJPP', ['noreg' => $noreg, 'id' => $id]));
     });
 
     Breadcrumbs::for('tender.penawaran.showKirimEmail', function (BreadcrumbTrail $trail, $noreg) {
-    $trail->parent('tender.penawaran.ulang');
+        $trail->parent('tender.penawaran');
         $trail->push('Show Kirim Email Penawaran', route('tender.penawaran.showKirimEmail', $noreg));
     });
 
@@ -419,16 +418,17 @@ Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
     Breadcrumbs::for('surveyor', function (BreadcrumbTrail $trail) {
         $trail->push('Surveyor', route('surveyor.index'));
     });
+    Breadcrumbs::for('surveyor.inspeksi', function (BreadcrumbTrail $trail) {
+        $trail->parent('surveyor');
+        $trail->push('Form Inspeksi');
+    });
 
     Breadcrumbs::for('surveyor.show', function (BreadcrumbTrail $trail) {
         $trail->parent('surveyor');
         $trail->push('Detail');
     });
 
-Breadcrumbs::for('surveyor.inspeksi', function (BreadcrumbTrail $trail) {
+
-    $trail->parent('surveyor');
-    $trail->push('Form Inspeksi');
-});
 
     Breadcrumbs::for('surveyor.denah', function (BreadcrumbTrail $trail) {
         $trail->parent('surveyor');
@@ -475,6 +475,12 @@ $basicDataRoutes = [
         'model-alat-berat'       => 'Model Alat Berat',
         'jenis-kapal'            => 'Jenis kapal',
         'jenis-kendaraan'        => 'Jenis kendaraan',
+        'jenis-unit'             => 'Jenis unit',
+        'terletak-area'          => 'Terletak di Area',
+        'merupakan-daerah'       => 'Merupakan Daerah',
+        'posisi-unit'            => 'Posisi unit',
+        'bentuk-unit'            => 'Bentuk unit',
+        'fasilitas-objek'        => 'Fasilitas Umum Dekat Objek',
     ];
 
 
@@ -556,6 +562,12 @@ Breadcrumbs::for('penilai.show', function (BreadcrumbTrail $trail) {
         $trail->push('Detail Penilai');
     });
 
+    Breadcrumbs::for('penilai.lampiran', function (BreadcrumbTrail $trail) {
+        $trail->parent('penilai');
+        $trail->push('Lampiran Foto dan Dokument');
+    });
+
+
     Breadcrumbs::for('sla', function (BreadcrumbTrail $trail) {
         $trail->parent('basicdata');
         $trail->push('SLA', route('basicdata.sla.index'));