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

perbaikan diskon data pembanding, luas tanah, bangunan, apartement di form inspeksi

Browse Source
This commit is contained in:
majid
2025-01-06 16:30:11 +07:00
parent a74f3a1865
commit fcc53a7111
5 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/views/surveyor/components/apartemen-kantor.blade.php
View File

@@ -13,9 +13,16 @@
@if (isset($permohonan->debiture->documents)) @if (isset($permohonan->debiture->documents))
@foreach ($permohonan->debiture->documents as $item) @foreach ($permohonan->debiture->documents as $item)
@php @php
$luas = $item->detail; $luas_units = 'N/A';
$details = json_decode($luas[0]->details, true); if ($item->detail) {
$luas_units = isset($details['luas']) ? $details['luas'] : 'N/A'; foreach ($item->detail as $luas) {
if (isset($luas->name) && $luas->name === 'Sertifikat') {
$details = json_decode($luas->details, true);
$luas_units = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A';
break;
}
}
}
@endphp @endphp
<input type="hidden" name="luas_unit_sesuai" class="input" value="{{ $luas_units }}"> <input type="hidden" name="luas_unit_sesuai" class="input" value="{{ $luas_units }}">
<p class="text-2sm text-gray-700">{{ $luas_units }} m<sup>2</sup></p> <p class="text-2sm text-gray-700">{{ $luas_units }} m<sup>2</sup></p>
@@ -29,7 +36,7 @@
<input <input
onclick="toggleFieldVisibility('luas_unit','luas_unit_tidak_sesuai', ['tidak sesuai'])" onclick="toggleFieldVisibility('luas_unit','luas_unit_tidak_sesuai', ['tidak sesuai'])"
type="radio" class="radio" name="luas_unit" value="sesuai" type="radio" class="radio" name="luas_unit" value="sesuai"
{{ old('luas_unit', isset($forminspeksi['luas_unit']['sesuai'])) ? 'checked' : ''}}> {{ old('luas_unit', isset($forminspeksi['luas_unit']['sesuai'])) ? 'checked' : '' }}>
<span class="ml-2">Sesuai</span> <span class="ml-2">Sesuai</span>
</label> </label>
<label class="form-label flex items-center gap-2.5 text-nowrap"> <label class="form-label flex items-center gap-2.5 text-nowrap">
@@ -41,11 +48,11 @@
</label> </label>
<div id="luas_unit_tidak_sesuai" class="flex items-baseline gap-2" <div id="luas_unit_tidak_sesuai" class="flex items-baseline gap-2"
style="{{ old('luas_unit', isset($forminspeksi['luas_unit']['tidak sesuai'])) ? '' : 'display: none;' }}"> style="{{ old('luas_unit', isset($forminspeksi['luas_unit']['tidak sesuai'])) ? '' : 'display: none;' }}">
<div class="input"> <div class="input">
<input id="analisa_luas_unit_tidak_sesuai" type="text" name="luas_unit_tidak_sesuai" <input id="analisa_luas_unit_tidak_sesuai" type="text" name="luas_unit_tidak_sesuai"
class="number-format w-full" placeholder="Masukan Luas Tanah" class="number-format w-full" placeholder="Masukan Luas Tanah"
value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}"> value="{{ old('luas_unit_tidak_sesuai', $forminspeksi['luas_unit_tidak_sesuai'] ?? '') }}">
<i>M<sup>2</sup></i> <i>M<sup>2</sup></i>
</div> </div>
<button type="button" class="btn btn-md btn-primary" <button type="button" class="btn btn-md btn-primary"

30
resources/views/surveyor/components/bangunan.blade.php
View File

@@ -11,17 +11,25 @@
<div class="mt-2"> <div class="mt-2">
@if (isset($permohonan->debiture->documents)) @if (isset($permohonan->debiture->documents))
@foreach ($permohonan->debiture->documents as $item) @foreach ($permohonan->debiture->documents as $item)
@php @php
$luas = $item->detail; $luas_bangunan = 'N/A';
$details = json_decode($luas[0]->details, true); if ($item->detail) {
$luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 'N/A'; foreach ($item->detail as $luas) {
@endphp if (isset($luas->name) && $luas->name === 'IMB') {
<input type="hidden" name="luas_bangunan_sesuai" class="input" value="{{ $luas_bangunan }}"> $details = json_decode($luas->details, true);
<p class="text-2sm text-gray-700">{{ $luas_bangunan }} m<sup>2</sup></p> $luas_bangunan = isset($details['luas_bangunan']) ? $details['luas_bangunan'] : 'N/A';
@endforeach break;
}
@endif }
}
@endphp
<input type="hidden" name="luas_bangunan_sesuai" class="input" value="{{ $luas_bangunan }}">
<p class="text-2sm text-gray-700">{{ $luas_bangunan }} m<sup>2</sup></p>
@endforeach
@endif
<div class="flex-wrap items-stretch"> <div class="flex-wrap items-stretch">
<div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2"> <div class="grid grid-cols-2 md:grid-cols-3 gap-4 mt-2">
<label class="form-label flex items-center gap-3 text-nowrap"> <label class="form-label flex items-center gap-3 text-nowrap">

16
resources/views/surveyor/components/data-pembanding.blade.php
View File

@@ -405,12 +405,12 @@
<tr> <tr>
<td class="px-4 py-2">Harga</td> <td class="px-4 py-2">Harga</td>
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="harga" class="input currency" <input type="text" name="harga" class="input currency-format"
value="{{ $inspectionData['asset']['harga'] ?? '' }}"> value="{{ $inspectionData['asset']['harga'] ?? '' }}">
</td> </td>
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="harga_pembanding[]" <input type="text" name="harga_pembanding[]"
class="input currency"> class="input currency-format">
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -428,7 +428,7 @@
<td class=" px-4 py-2"> <td class=" px-4 py-2">
<div class="input"> <div class="input">
<input type="text" name="diskon_pembanding[]" <input type="text" name="diskon_pembanding[]"
class="currency-format"> class="currency">
<span class="btn btn-icon"> <span class="btn btn-icon">
<i class="ki-outline ki-percentage"></i> <i class="ki-outline ki-percentage"></i>
</i> </i>
@@ -445,18 +445,18 @@
</td> </td>
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="total_pembanding[]" <input type="text" name="total_pembanding[]"
class="input currency"> class="input currency-format">
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="px-4 py-2">Harga Setelah Diskon</td> <td class="px-4 py-2">Harga Setelah Diskon</td>
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="harga_diskon" class="input currency" readonly <input type="text" name="harga_diskon" class="input currency-format" readonly
value="{{ $inspectionData['asset']['harga_diskon'] ?? '' }}"> value="{{ $inspectionData['asset']['harga_diskon'] ?? '' }}">
</td> </td>
<td class="px-4 py-2"> <td class="px-4 py-2">
<input type="text" name="harga_diskon_pembanding[]" readonly <input type="text" name="harga_diskon_pembanding[]" readonly
class="input currency"> class="input currency-format">
</td> </td>
</tr> </tr>
</tbody> </tbody>
@@ -529,9 +529,7 @@
// Batasi diskon maksimal 100% // Batasi diskon maksimal 100%
diskon = Math.min(diskon, 100); diskon = Math.min(diskon, 100);
diskonInput.value = formatCurrency(diskon.toString());
// Hitung total dan harga setelah diskon
const total = harga; const total = harga;
const hargaSetelahDiskon = harga - (harga * (diskon / 100)); const hargaSetelahDiskon = harga - (harga * (diskon / 100));

13
resources/views/surveyor/components/tanah.blade.php
View File

@@ -13,9 +13,16 @@
@if (isset($permohonan->debiture->documents)) @if (isset($permohonan->debiture->documents))
@foreach ($permohonan->debiture->documents as $item) @foreach ($permohonan->debiture->documents as $item)
@php @php
$luas = $item->detail; $luas_tanah = 'N/A';
$details = json_decode($luas[0]->details, true); if ($item->detail) {
$luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A'; foreach ($item->detail as $luas) {
if (isset($luas->name) && $luas->name === 'Sertifikat') {
$details = json_decode($luas->details, true);
$luas_tanah = isset($details['luas_tanah']) ? $details['luas_tanah'] : 'N/A';
break;
}
}
}
@endphp @endphp
<input type="hidden" name="luas_tanah_sesuai" class="input" value="{{ $luas_tanah }}"> <input type="hidden" name="luas_tanah_sesuai" class="input" value="{{ $luas_tanah }}">
<p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p> <p class="text-2sm text-gray-700">{{ $luas_tanah }} m<sup>2</sup></p>

8
routes/breadcrumbs.php
View File

@@ -433,7 +433,7 @@
$trail->push('Surveyor', route('surveyor.index')); $trail->push('Surveyor', route('surveyor.index'));
}); });
Breadcrumbs::for('surveyor.inspeksi', function (BreadcrumbTrail $trail) { Breadcrumbs::for('surveyor.inspeksi', function (BreadcrumbTrail $trail) {
$trail->parent('surveyor'); $trail->parent('surveyor.show');
$trail->push('Form Inspeksi'); $trail->push('Form Inspeksi');
}); });
@@ -445,17 +445,17 @@
Breadcrumbs::for('surveyor.denah', function (BreadcrumbTrail $trail) { Breadcrumbs::for('surveyor.denah', function (BreadcrumbTrail $trail) {
$trail->parent('surveyor'); $trail->parent('surveyor.show');
$trail->push('Denah'); $trail->push('Denah');
}); });
Breadcrumbs::for('surveyor.foto', function (BreadcrumbTrail $trail) { Breadcrumbs::for('surveyor.foto', function (BreadcrumbTrail $trail) {
$trail->parent('surveyor'); $trail->parent('surveyor.show');
$trail->push('Form Foto'); $trail->push('Form Foto');
}); });
Breadcrumbs::for('surveyor.data-pembanding', function (BreadcrumbTrail $trail) { Breadcrumbs::for('surveyor.data-pembanding', function (BreadcrumbTrail $trail) {
$trail->parent('surveyor'); $trail->parent('surveyor.show');
$trail->push('Form Pembanding'); $trail->push('Form Pembanding');
}); });