daengdeni/lpj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into feature/senior-officer

Browse Source
This commit is contained in:
majid
2025-02-28 13:37:24 +07:00
parent 2793e397b0 476106a58c
commit 5389cd1d3a
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/SpkController.php
View File

@@ -175,7 +175,7 @@ use Illuminate\Support\Facades\Auth;
->select('permohonan.*', 'jenis_jaminan.name as jenis_jaminan_name', ->select('permohonan.*', 'jenis_jaminan.name as jenis_jaminan_name',
'dokumen_jaminan.address as dokumen_jaminan_address'); 'dokumen_jaminan.address as dokumen_jaminan_address');
$data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan'])->first(); $data = $permohonan->with(['user', 'debiture', 'branch', 'tujuanPenilaian','dokumenjaminan.detail'])->first();
if($penawaran->detail_penawaran_tgl_proposal) if($penawaran->detail_penawaran_tgl_proposal)
$penawaran->detail_penawaran_tgl_proposal = Carbon::parse($penawaran->detail_penawaran_tgl_proposal)->format('d F Y'); $penawaran->detail_penawaran_tgl_proposal = Carbon::parse($penawaran->detail_penawaran_tgl_proposal)->format('d F Y');

5
resources/views/penawaran/edit.blade.php
View File

@@ -91,7 +91,10 @@
@if ($row->status == 1) @if ($row->status == 1)
<option value="{{ $row->id }}" <option value="{{ $row->id }}"
{{ in_array($row->id, old('kjpp', $kjpps ?? [])) ? 'selected' : '' }}> {{ in_array($row->id, old('kjpp', $kjpps ?? [])) ? 'selected' : '' }}>
{{ $row->name }} {{ $row->name }} | {{ $row->jenis_kantor }}
@if($row->jenis_kantor == 'Kantor Cabang')
{{ str_replace(['KOTA','KAB.','KAB'],'',$row->city->name) }}
@endif
</option> </option>
@endif @endif
@endforeach @endforeach

35
resources/views/spk/documentSPK.blade.php
View File

@@ -90,9 +90,9 @@
</tr> </tr>
@php @php
$i=1; $i=1;
$totalAsset = count($data->debiture->documents); $totalAsset = count($data->dokumenjaminan);
@endphp @endphp
@foreach ($data->debiture->documents as $dokumen) @foreach ($data->dokumenjaminan as $dokumen)
<tr valign="top"> <tr valign="top">
<td>Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }}</td> <td>Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }}</td>
<td>:</td> <td>:</td>
@@ -125,21 +125,26 @@
@if(!$shouldExclude) @if(!$shouldExclude)
@php $details = $dokumen_jaminans->detail; @endphp @php $details = $dokumen_jaminans->detail; @endphp
@foreach ($details as $index => $detail) @foreach ($details as $index => $detail)
@php @if($detail->dokumen_jaminan)
$shouldExcludeNomor = false; {{ $detail->name }}
foreach ($excludedDocuments as $excludedDoc) { @php
if (str_contains(strtolower($detail->dokumen_nomor), strtolower($excludedDoc))) { $shouldExcludeNomor = false;
$shouldExcludeNomor = true; foreach ($excludedDocuments as $excludedDoc) {
break; if (str_contains(strtolower($detail->dokumen_nomor), strtolower($excludedDoc))) {
$shouldExcludeNomor = true;
break;
}
} }
} @endphp
@endphp @if(!$shouldExcludeNomor)
@if(!$shouldExcludeNomor) @if($detail->dokumen_nomor)
@if($detail->dokumen_nomor) {{ " | " }}
@foreach(json_decode($detail->dokumen_nomor) as $item) @foreach(json_decode($detail->dokumen_nomor) as $key => $item)
{{ $item }}<br> {{ $item }}{{ $key < count(json_decode($detail->dokumen_nomor)) - 1 ? ',' : '' }}
@endforeach @endforeach
@endif
@endif @endif
<br>
@endif @endif
@endforeach @endforeach
@endif @endif

16
resources/views/spk/edit.blade.php
View File

@@ -106,10 +106,9 @@
</tr> </tr>
@php @php
$i=1; $i=1;
$totalAsset = count($data->debiture->documents); $totalAsset = count($data->dokumenjaminan);
@endphp @endphp
@foreach ($data->dokumenjaminan as $dokumen)
@foreach ($data->debiture->documents as $dokumen)
<tr valign="top"> <tr valign="top">
<td>Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }}</td> <td>Lokasi Jaminan {{ $totalAsset >1 ? $i : '' }}</td>
<td>:</td> <td>:</td>
@@ -127,7 +126,7 @@
@endphp @endphp
@foreach ($data->dokumenjaminan as $dokumen_jaminans) @foreach ($data->dokumenjaminan as $dokumen_jaminans)
@if ($dokumen->id== $dokumen_jaminans->id) @if ($dokumen->id == $dokumen_jaminans->id)
@php @php
$shouldExclude = false; $shouldExclude = false;
$shouldExcludeNomor = false; $shouldExcludeNomor = false;
@@ -142,6 +141,8 @@
@if(!$shouldExclude) @if(!$shouldExclude)
@php $details = $dokumen_jaminans->detail; @endphp @php $details = $dokumen_jaminans->detail; @endphp
@foreach ($details as $index => $detail) @foreach ($details as $index => $detail)
@if($detail->dokumen_jaminan)
{{ $detail->name }}
@php @php
$shouldExcludeNomor = false; $shouldExcludeNomor = false;
foreach ($excludedDocuments as $excludedDoc) { foreach ($excludedDocuments as $excludedDoc) {
@@ -153,11 +154,14 @@
@endphp @endphp
@if(!$shouldExcludeNomor) @if(!$shouldExcludeNomor)
@if($detail->dokumen_nomor) @if($detail->dokumen_nomor)
@foreach(json_decode($detail->dokumen_nomor) as $item) {{ " | " }}
{{ $item }}<br> @foreach(json_decode($detail->dokumen_nomor) as $key => $item)
{{ $item }}{{ $key < count(json_decode($detail->dokumen_nomor)) - 1 ? ',' : '' }}
@endforeach @endforeach
@endif @endif
@endif @endif
<br>
@endif
@endforeach @endforeach
@endif @endif
@endif @endif