diff --git a/app/Http/Controllers/DokumenJaminanController.php b/app/Http/Controllers/DokumenJaminanController.php index dc4ac6e..a562485 100644 --- a/app/Http/Controllers/DokumenJaminanController.php +++ b/app/Http/Controllers/DokumenJaminanController.php @@ -223,9 +223,8 @@ $document = DokumenJaminan::find($jaminan); $document->update($validate); - - if ($request->detail_dokumen_jaminan_id) { - foreach ($request->detail_dokumen_jaminan_id as $key => $value) { + if($request->jenis_legalitas_jaminan_id){ + foreach($request->jenis_legalitas_jaminan_id as $key => $value){ if (isset($request->dokumen_jaminan[$key])) { $file = $request->dokumen_jaminan[$key]; if ($file) { @@ -245,6 +244,7 @@ 'name' => $request->name[$key], 'keterangan' => $request->keterangan[$key], ]; + if (isset($request->detail_dokumen_jaminan_id[$key])) { $detailDocument = DetailDokumenJaminan::find( $request->detail_dokumen_jaminan_id[$key], @@ -252,6 +252,9 @@ $detailDocument->update($detail); $detailDocument->save(); + } else { + $detailDocument = DetailDokumenJaminan::create($detail); + $detailDocument->save(); } } } else { @@ -290,13 +293,29 @@ ) { $document = DokumenJaminan::find($jaminan); $details = DetailDokumenJaminan::where('dokumen_jaminan_id', $document->id)->get(); + $debitur = Debiture::find($document->debiture_id); $provinces = Province::all(); $cities = City::where('province_code', $document->province_code)->get(); $districts = District::where('city_code', $document->city_code)->get(); $villages = Village::where('district_code', $document->district_code)->get(); + + $jenisJaminan = JenisJaminan::all(); $jenisLegalitasJaminan = JenisLegalitasJaminan::all(); + + $_jenisJaminan = JenisJaminan::find($document->jenis_jaminan_id); + $legalitasJaminan = json_decode($_jenisJaminan->jenis_legalitas_jaminan_id, true); + + $currentLegalitasJaminan = JenisLegalitasJaminan::whereIn('id',$document->detail->pluck('jenis_legalitas_jaminan_id')->toArray())->get(); + + + + // Remove values from $legalitasJaminan that are in $currentLegalitasJaminan + $legalitasJaminan = array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray()); + + $legalitas = JenisLegalitasJaminan::whereIn('code', $legalitasJaminan)->get(); + $pemilikJaminan = PemilikJaminan::where('debiture_id', $document->debiture_id)->get(); $hubunganPemilik = HubunganPemilikJaminan::all(); @@ -314,6 +333,7 @@ 'villages', 'pemilikJaminan', 'hubunganPemilik', + 'legalitas' ), ); } diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php index b3038ed..3de2e04 100644 --- a/resources/views/debitur/components/dokumen.blade.php +++ b/resources/views/debitur/components/dokumen.blade.php @@ -134,11 +134,12 @@ @if(isset($document->id)) + @php $n = 0; @endphp @foreach($document->detail as $detail)
@@ -167,14 +168,14 @@ @if($detail->details) @php $custom_field = json_decode($detail->details,true) @endphp -
- -
- -
+
+ +
+
+
@endif
@@ -185,6 +186,64 @@
+ @php $n++; @endphp + @endforeach + @foreach($legalitas as $item) +
+ + +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + @if($item->custom_field) +
+ +
+ @if($item->custom_field_type === "text") + + @elseif($item->custom_field_type === "number") + + @elseif($item->custom_field_type === "date") + + @elseif($item->custom_field_type === "textarea") + + @else + + @endif +
+
+ @endif + +
+ +
+ +
+
+ @php $n++; @endphp @endforeach @else