From e4ca3d798714cf2b3e00bfdb6d495fb4e56d6c90 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 6 Feb 2025 11:32:12 +0700 Subject: [PATCH] fix(pemohonan): perbaiki pemanggilan dokumen pada berbagai komponen - Mengubah pemanggilan dokumen dari $permohonan->debiture->documents menjadi $permohonan->documents di beberapa file. - Memastikan konsistensi dalam akses data dokumen di seluruh aplikasi. --- app/Http/Controllers/SurveyorController.php | 2 +- app/Http/Controllers/TenderController.php | 29 ++++++++++++------- .../views/component/detail-jaminan.blade.php | 4 +-- .../views/component/form-penilai.blade.php | 12 ++++---- .../penilai/components/call-report.blade.php | 4 +-- .../penilai/components/print-memo.blade.php | 2 +- .../print-out-call-report.blade.php | 2 +- .../components/print-out-rap.blade.php | 2 +- .../components/print-out-sederhana.blade.php | 8 ++--- .../components/print-out-standard.blade.php | 8 ++--- .../penilai/components/print-resume.blade.php | 6 ++-- .../views/penilai/components/resume.blade.php | 6 ++-- resources/views/penilai/show.blade.php | 4 +-- .../views/penilaian/otorisator/show.blade.php | 2 +- .../views/penilaian/otorisator/sla.blade.php | 4 +-- resources/views/permohonan/print.blade.php | 2 +- .../components/apartemen-kantor.blade.php | 4 +-- .../surveyor/components/bangunan.blade.php | 14 ++++----- .../components/data-pembanding.blade.php | 2 +- .../views/surveyor/components/foto.blade.php | 4 +-- .../surveyor/components/header.blade.php | 4 +-- .../surveyor/components/kendaraan.blade.php | 20 ++++++------- .../components/print-out/main.blade.php | 8 ++--- .../views/surveyor/components/tanah.blade.php | 4 +-- 24 files changed, 82 insertions(+), 75 deletions(-) diff --git a/app/Http/Controllers/SurveyorController.php b/app/Http/Controllers/SurveyorController.php index c1dd217..7d7bfae 100644 --- a/app/Http/Controllers/SurveyorController.php +++ b/app/Http/Controllers/SurveyorController.php @@ -2006,7 +2006,7 @@ class SurveyorController extends Controller private function updateJenisAsset($permohonan, $request) { - $jenis_jaminan_id = $permohonan->debiture->documents->first()->jenis_jaminan_id; + $jenis_jaminan_id = $permohonan->documents->first()->jenis_jaminan_id; DokumenJaminan::where('permohonan_id', $permohonan->id) ->where('jenis_jaminan_id', $jenis_jaminan_id) ->update([ diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php index 2a7de01..b459f71 100644 --- a/app/Http/Controllers/TenderController.php +++ b/app/Http/Controllers/TenderController.php @@ -293,12 +293,12 @@ class TenderController extends Controller } // Kalau tidak ada dokumen jaminan maka di arahkan ke halaman dokumen jaminan - if ($permohonan->debiture->documents->isEmpty()) { + if ($permohonan->documents->isEmpty()) { return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id]) ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!'); } - foreach ($permohonan->debiture->documents as $document) { + foreach ($permohonan->documents as $document) { $village_permohonan = $document->village_code; $district_permohonan = $document->district_code; $city_permohonan = $document->city_code; @@ -338,12 +338,12 @@ class TenderController extends Controller } // Kalau tidak ada dokumen jaminan maka di arahkan ke halaman dokumen jaminan - if ($permohonan->debiture->documents->isEmpty()) { + if ($permohonan->documents->isEmpty()) { return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id]) ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!'); } - foreach ($permohonan->debiture->documents as $document) { + foreach ($permohonan->documents as $document) { $village_permohonan = $document->village_code; $district_permohonan = $document->district_code; $city_permohonan = $document->city_code; @@ -535,7 +535,7 @@ class TenderController extends Controller return redirect()->route('otorisasitender.penawaran.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk Otorisasi Tender tidak bisa masuk penawaran lagi!'); } - foreach ($permohonan->debiture->documents as $document) { + foreach ($permohonan->documents as $document) { $village_permohonan = $document->village_code; $district_permohonan = $document->district_code; $city_permohonan = $document->city_code; @@ -563,7 +563,7 @@ class TenderController extends Controller return redirect()->route('otorisasitender.penawaran.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk Otorisasi Tender tidak bisa masuk penawaran lagi!'); } - foreach ($permohonan->debiture->documents as $document) { + foreach ($permohonan->documents as $document) { $village_permohonan = $document->village_code; $district_permohonan = $document->district_code; $city_permohonan = $document->city_code; @@ -602,7 +602,7 @@ class TenderController extends Controller return redirect()->route('otorisasitender.penawaran.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk Otorisasi Tender tidak bisa masuk penawaran lagi!'); } - if ($permohonan->debiture->documents->isEmpty()) { + if ($permohonan->documents->isEmpty()) { return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id]) ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!'); } @@ -679,11 +679,18 @@ class TenderController extends Controller return redirect()->route('otorisasitender.penawaran.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk Otorisasi Tender tidak bisa masuk penawaran lagi!'); } - if ($permohonan->debiture->documents->isEmpty()) { + if ($permohonan->documents->isEmpty()) { return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id]) ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!'); } + $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran->id)->get(); + + + foreach ($detail_penawaran as $detail) { + $this->kirimEmailKJPP($noreg,$detail->kjpp_rekanan_id); + } + $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran->id) ->where('status', '=', 1) ->pluck('kjpp_rekanan_id') @@ -713,7 +720,7 @@ class TenderController extends Controller ]; }); - foreach ($permohonan->debiture->documents as $document) { + foreach ($permohonan->documents as $document) { $village_permohonan = $document->village_code; $district_permohonan = $document->district_code; $city_permohonan = $document->city_code; @@ -880,7 +887,7 @@ class TenderController extends Controller return redirect()->route('otorisasitender.penawaran.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk Otorisasi Tender tidak bisa masuk penawaran lagi!'); } - if ($permohonan->debiture->documents->isEmpty()) { + if ($permohonan->documents->isEmpty()) { return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id]) ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!'); } @@ -910,7 +917,7 @@ class TenderController extends Controller $dp1 = PenawaranDetailTender::with('kjpp')->where('kjpp_rekanan_id', '=', $id)->first(); - foreach ($permohonan->debiture->documents as $document) { + foreach ($permohonan->documents as $document) { $village_permohonan = $document->village_code; $district_permohonan = $document->district_code; $city_permohonan = $document->city_code; diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php index f7af1dc..c29b9d1 100644 --- a/resources/views/component/detail-jaminan.blade.php +++ b/resources/views/component/detail-jaminan.blade.php @@ -191,7 +191,7 @@ -
@if (!isset($status)) diff --git a/resources/views/component/form-penilai.blade.php b/resources/views/component/form-penilai.blade.php index d16a4fa..9b870f6 100644 --- a/resources/views/component/form-penilai.blade.php +++ b/resources/views/component/form-penilai.blade.php @@ -74,8 +74,8 @@
- @if (isset($permohonan->debiture->documents)) - @foreach ($permohonan->debiture->documents as $item) + @if (isset($permohonan->documents)) + @foreach ($permohonan->documents as $item)

{{ $item->jenisJaminan->name }}

@@ -218,7 +218,7 @@
- @foreach ($permohonan->debiture->documents as $dokumen) + @foreach ($permohonan->documents as $dokumen) @php $hubCadebPemilik = $dokumen->pemilik->hubungan_pemilik->name ?? 'N/A'; @endphp @@ -373,7 +373,7 @@
- @foreach ($permohonan->debiture->documents as $dokumen) + @foreach ($permohonan->documents as $dokumen) {{ formatAlamat($dokumen->pemilik) }} {{ formatAlamat($dokumen->pemilik) }} @@ -551,7 +551,7 @@ - @foreach ($permohonan->debiture->documents as $dokumen) + @foreach ($permohonan->documents as $dokumen) @if ($dokumen->jenisJaminan) @php $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); @@ -684,7 +684,7 @@
- @foreach ($permohonan->debiture->documents as $dokumen) + @foreach ($permohonan->documents as $dokumen) @if ($dokumen->jenisJaminan) @php $formKategori = json_decode($dokumen->jenisJaminan->form_kategori, true); diff --git a/resources/views/penilai/components/print-resume.blade.php b/resources/views/penilai/components/print-resume.blade.php index fd4273f..5ad6344 100644 --- a/resources/views/penilai/components/print-resume.blade.php +++ b/resources/views/penilai/components/print-resume.blade.php @@ -109,7 +109,7 @@ @php $data = ''; - foreach ($permohonan->debiture->documents as $dokumen) { + foreach ($permohonan->documents as $dokumen) { $data .= $dokumen->jenisJaminan->name . ', '; $penilai = $permohonan->penilaian->userPenilai->where('role', 'penilai')->first(); @@ -224,8 +224,8 @@ - @if (isset($permohonan->debiture->documents)) - @foreach ($permohonan->debiture->documents as $document) + @if (isset($permohonan->documents)) + @foreach ($permohonan->documents as $document) @foreach ($document->detail as $detail) @if (isset($detail->details)) @php diff --git a/resources/views/penilai/components/resume.blade.php b/resources/views/penilai/components/resume.blade.php index a31d12f..f8833aa 100644 --- a/resources/views/penilai/components/resume.blade.php +++ b/resources/views/penilai/components/resume.blade.php @@ -47,7 +47,7 @@
- @foreach ($permohonan->debiture->documents as $dokumen) + @foreach ($permohonan->documents as $dokumen) {{ formatAlamat($dokumen->pemilik) }} @@ -213,8 +213,8 @@ class="input number-format"> - @if (isset($permohonan->debiture->documents)) - @foreach ($permohonan->debiture->documents as $item) + @if (isset($permohonan->documents)) + @foreach ($permohonan->documents as $item) @php $luas_tanah = ''; $luas_bangunan = ''; diff --git a/resources/views/penilai/show.blade.php b/resources/views/penilai/show.blade.php index 070e224..59a01d7 100644 --- a/resources/views/penilai/show.blade.php +++ b/resources/views/penilai/show.blade.php @@ -359,14 +359,14 @@ $jenisJaminanId = null; $inspeksiId = null; $documentId = null; - foreach ($permohonan->debiture->documents as $item) { + foreach ($permohonan->documents as $item) { $documentId = $item->id; } foreach ($dokumen->inspeksi as $item) { $inspeksiId = $item->id; } @endphp - @foreach ($permohonan->debiture->documents as $document) + @foreach ($permohonan->documents as $document) @if ($document->jenisjaminan) @php $jenisJaminanId = $document->jenisjaminan->id; diff --git a/resources/views/penilaian/otorisator/show.blade.php b/resources/views/penilaian/otorisator/show.blade.php index 025b2db..e46c949 100644 --- a/resources/views/penilaian/otorisator/show.blade.php +++ b/resources/views/penilaian/otorisator/show.blade.php @@ -13,7 +13,7 @@ @include('lpj::component.detail-jaminan', ['backLink' => 'otorisator.' . $dataHeader . '.index']) - @foreach ($permohonan->debiture->documents as $dokumen) + @foreach ($permohonan->documents as $dokumen)

diff --git a/resources/views/penilaian/otorisator/sla.blade.php b/resources/views/penilaian/otorisator/sla.blade.php index 382f6bd..f6f1375 100644 --- a/resources/views/penilaian/otorisator/sla.blade.php +++ b/resources/views/penilaian/otorisator/sla.blade.php @@ -19,7 +19,7 @@ @include('lpj::component.detail-jaminan', ['backLink' => 'otorisator.' . $dataHeader . '.index']) - @foreach ($permohonan->debiture->documents as $dokumen) + @foreach ($permohonan->documents as $dokumen)

@@ -146,7 +146,7 @@ $inspeksiId = null; $documentId = null; $jenisJaminanId = null; - foreach ($permohonan->debiture->documents as $item) { + foreach ($permohonan->documents as $item) { foreach ($item->inspeksi as $key => $value) { $inspeksiId = $item->id; } diff --git a/resources/views/permohonan/print.blade.php b/resources/views/permohonan/print.blade.php index db0b795..4249476 100644 --- a/resources/views/permohonan/print.blade.php +++ b/resources/views/permohonan/print.blade.php @@ -157,7 +157,7 @@

- @foreach($permohonan->debiture->documents as $dokumen) + @foreach($permohonan->documents as $dokumen)
Jaminan {{ $loop->index + 1 }} diff --git a/resources/views/surveyor/components/apartemen-kantor.blade.php b/resources/views/surveyor/components/apartemen-kantor.blade.php index 2a7997c..effaaf2 100644 --- a/resources/views/surveyor/components/apartemen-kantor.blade.php +++ b/resources/views/surveyor/components/apartemen-kantor.blade.php @@ -10,8 +10,8 @@
- @if (isset($permohonan->debiture->documents)) - @foreach ($permohonan->debiture->documents as $item) + @if (isset($permohonan->documents)) + @foreach ($permohonan->documents as $item) @php $luas_units = 'N/A'; if ($item->detail) { diff --git a/resources/views/surveyor/components/bangunan.blade.php b/resources/views/surveyor/components/bangunan.blade.php index f81d3e7..0869965 100644 --- a/resources/views/surveyor/components/bangunan.blade.php +++ b/resources/views/surveyor/components/bangunan.blade.php @@ -10,26 +10,26 @@
- @if (isset($permohonan->debiture->documents)) - @foreach ($permohonan->debiture->documents as $item) + @if (isset($permohonan->documents)) + @foreach ($permohonan->documents as $item) @php - $luas_bangunan = 'N/A'; + $luas_bangunan = 'N/A'; if ($item->detail) { foreach ($item->detail as $luas) { if (isset($luas->name) && $luas->name === 'IMB') { - $details = json_decode($luas->details, true); + $details = json_decode($luas->details, true); $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 'N/A'; - break; + break; } } } @endphp - +

{{ $luas_bangunan }} m2

@endforeach @endif - +