Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2025-01-21 12:32:55 +07:00
3 changed files with 146 additions and 115 deletions

View File

@@ -183,8 +183,8 @@
Data Jaminan Data Jaminan
</h3> </h3>
</div> </div>
@endif @endif
<div data-accordion="true"> <div data-accordion="true">
@foreach ($permohonan->debiture->documents as $dokumen) @foreach ($permohonan->debiture->documents as $dokumen)
<div class="accordion-item {{ count($permohonan->debiture->documents) == 1 ? 'active' : '' }} [&:not(:last-child)]:border-b border-b-gray-200" <div class="accordion-item {{ count($permohonan->debiture->documents) == 1 ? 'active' : '' }} [&:not(:last-child)]:border-b border-b-gray-200"
data-accordion-item="true" id="accordion_detail_jaminan"> data-accordion-item="true" id="accordion_detail_jaminan">
@@ -257,10 +257,24 @@
<td class="py-2 text-gray-600 font-normal max-w-[100px]"> <td class="py-2 text-gray-600 font-normal max-w-[100px]">
{{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }} {{ $loop->index + 1 }}. {{ $detail->jenisLegalitasJaminan->name }}
</td> </td>
<td class="py-2 text-gray-800 font-normaltext-sm"> <td class="py-2 text-gray-800 font-normal text-2sm">
{{ $detail->name ?? '' }} {{ $detail->name ?? '' }}
</td> </td>
</tr> </tr>
@if(isset($detail->details))
@if(json_decode($detail->details))
@foreach (json_decode($detail->details) as $key => $value)
<tr>
<td class="py-3 capitalize">
{{ str_replace("_"," ",$key) ?? "" }}
</td>
<td class="py-2 text-gray-800 font-normal text-2sm">
{{ $value ?? "" }}
</td>
</tr>
@endforeach
@endif
@endif
<tr> <tr>
<td class="py-3 max-w-[100px] align-top"> <td class="py-3 max-w-[100px] align-top">
Dokumen Jaminan Dokumen Jaminan
@@ -315,8 +329,8 @@
</div> </div>
</div> </div>
@endforeach @endforeach
</div> </div>
@if (!isset($status)) @if (!isset($status))
</div> </div>
@include('lpj::component.history-permohonan') @include('lpj::component.history-permohonan')
@endif @endif

View File

@@ -321,7 +321,7 @@
{{ str_replace('_',' ',$detail->jenisLegalitasJaminan->custom_field) }} {{ str_replace('_',' ',$detail->jenisLegalitasJaminan->custom_field) }}
</label> </label>
<div class="flex flex-wrap items-baseline w-full"> <div class="flex flex-wrap items-baseline w-full">
<input class="input" type="text" name="custom_field[][$detail->jenisLegalitasJaminan->custom_field]" value="{{ $custom_field[$detail->jenisLegalitasJaminan->custom_field] ?? '' }}"> <input class="input" type="text" name="custom_field[][{{$detail->jenisLegalitasJaminan->custom_field}}]" value="{{ $custom_field[$detail->jenisLegalitasJaminan->custom_field] ?? '' }}">
</div> </div>
</div> </div>
@endif @endif

View File

@@ -102,6 +102,23 @@
</div> </div>
<div class="border-t border-gray-300 border-dashed"> <div class="border-t border-gray-300 border-dashed">
</div> </div>
@if(isset($detail->details))
@if(json_decode($detail->details))
@foreach (json_decode($detail->details) as $key => $value)
<div class="flex items-start justify-between flex-wrap my-2.5 gap-2">
<span class="text-2xs text-gray-600 uppercase pl-3">
{{ str_replace("_"," ",$key) ?? "" }}
</span>
<p class="text-2xs text-gray-600 text-right max-w-[250px]">
{{ $value ?? "" }}
</p>
</div>
<div class="border-t border-gray-300 border-dashed">
</div>
@endforeach
@endif
@endif
<div class="flex items-start justify-between flex-wrap my-2.5 gap-2"> <div class="flex items-start justify-between flex-wrap my-2.5 gap-2">
<span class="text-2xs text-gray-600 uppercase pl-3"> <span class="text-2xs text-gray-600 uppercase pl-3">
keterangan keterangan