diff --git a/resources/views/debitur/components/dokumen.blade.php b/resources/views/debitur/components/dokumen.blade.php
index 91a9e03..6f35db5 100644
--- a/resources/views/debitur/components/dokumen.blade.php
+++ b/resources/views/debitur/components/dokumen.blade.php
@@ -748,7 +748,7 @@
- ${customFieldsHtml}
+ ${customFieldsHtml}
`;
diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php
index 3f452b0..791212f 100644
--- a/resources/views/penawaran/kirimEmailKJPP.blade.php
+++ b/resources/views/penawaran/kirimEmailKJPP.blade.php
@@ -126,35 +126,41 @@
@endphp
@foreach ($permohonan->documents as $document)
- @foreach ($document->detail as $detail)
- @php
- $details = json_decode($detail->details);
- @endphp
+ @foreach ($document->detail as $index => $detail)
+ @if($detail->details)
+ @php $luastanah = $luasbangunan = null; @endphp
+ @foreach (json_decode($detail->details) as $key => $value)
+ @foreach($value as $k => $v)
+ @if($k=='luas_tanah')
+ @php
+ $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @if($k=='luas_bangunan')
+ @php
+ $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @endforeach
+ @endforeach
+
+ @if (isset($luastanah) && isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah / Luas Bangunan: {{ $luastanah }} m2 / {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luastanah))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah : {{ $luastanah }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Bangunan: {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @endif
- @if (isset($details->luas_tanah) && isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah / Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
- /
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_tanah))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah :
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
@endif
@endforeach
@endforeach
diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php
index fe651cd..d7ad287 100644
--- a/resources/views/penawaran/surat_tender.blade.php
+++ b/resources/views/penawaran/surat_tender.blade.php
@@ -109,35 +109,41 @@
@endphp
@foreach ($permohonan->documents as $document)
- @foreach ($document->detail as $detail)
- @php
- $details = json_decode($detail->details);
- @endphp
+ @foreach ($document->detail as $index => $detail)
+ @if($detail->details)
+ @php $luastanah = $luasbangunan = null; @endphp
+ @foreach (json_decode($detail->details) as $key => $value)
+ @foreach($value as $k => $v)
+ @if($k=='luas_tanah')
+ @php
+ $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @if($k=='luas_bangunan')
+ @php
+ $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @endforeach
+ @endforeach
+
+ @if (isset($luastanah) && isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah / Luas Bangunan: {{ $luastanah }} m2 / {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luastanah))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah : {{ $luastanah }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Bangunan: {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @endif
- @if (isset($details->luas_tanah) && isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah / Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
- /
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_tanah))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah :
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
@endif
@endforeach
@endforeach
diff --git a/resources/views/penawaran/surat_tender_download.blade.php b/resources/views/penawaran/surat_tender_download.blade.php
index 42180b1..db007cc 100644
--- a/resources/views/penawaran/surat_tender_download.blade.php
+++ b/resources/views/penawaran/surat_tender_download.blade.php
@@ -124,35 +124,41 @@
@endphp
@foreach ($permohonan->documents as $document)
- @foreach ($document->detail as $detail)
- @php
- $details = json_decode($detail->details);
- @endphp
+ @foreach ($document->detail as $index => $detail)
+ @if($detail->details)
+ @php $luastanah = $luasbangunan = null; @endphp
+ @foreach (json_decode($detail->details) as $key => $value)
+ @foreach($value as $k => $v)
+ @if($k=='luas_tanah')
+ @php
+ $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @if($k=='luas_bangunan')
+ @php
+ $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @endforeach
+ @endforeach
+
+ @if (isset($luastanah) && isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah / Luas Bangunan: {{ $luastanah }} m2 / {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luastanah))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah : {{ $luastanah }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Bangunan: {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @endif
- @if (isset($details->luas_tanah) && isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah / Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
- /
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_tanah))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah :
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
@endif
@endforeach
@endforeach
diff --git a/resources/views/penawaran/surat_tender_kjpp.blade.php b/resources/views/penawaran/surat_tender_kjpp.blade.php
index 37e54f0..8402599 100644
--- a/resources/views/penawaran/surat_tender_kjpp.blade.php
+++ b/resources/views/penawaran/surat_tender_kjpp.blade.php
@@ -107,35 +107,41 @@
@endphp
@foreach ($permohonan->documents as $document)
- @foreach ($document->detail as $detail)
- @php
- $details = json_decode($detail->details);
- @endphp
+ @foreach ($document->detail as $index => $detail)
+ @if($detail->details)
+ @php $luastanah = $luasbangunan = null; @endphp
+ @foreach (json_decode($detail->details) as $key => $value)
+ @foreach($value as $k => $v)
+ @if($k=='luas_tanah')
+ @php
+ $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @if($k=='luas_bangunan')
+ @php
+ $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @endforeach
+ @endforeach
+
+ @if (isset($luastanah) && isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah / Luas Bangunan: {{ $luastanah }} m2 / {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luastanah))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah : {{ $luastanah }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Bangunan: {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @endif
- @if (isset($details->luas_tanah) && isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah / Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
- /
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_tanah))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah :
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
@endif
@endforeach
@endforeach
diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php
index 0c14894..7bd9b0b 100644
--- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php
+++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php
@@ -126,35 +126,41 @@
@endphp
@foreach ($permohonan->documents as $document)
- @foreach ($document->detail as $detail)
- @php
- $details = json_decode($detail->details);
- @endphp
+ @foreach ($document->detail as $index => $detail)
+ @if($detail->details)
+ @php $luastanah = $luasbangunan = null; @endphp
+ @foreach (json_decode($detail->details) as $key => $value)
+ @foreach($value as $k => $v)
+ @if($k=='luas_tanah')
+ @php
+ $luastanah += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @if($k=='luas_bangunan')
+ @php
+ $luasbangunan += preg_replace('/[^0-9.]/', '', str_replace('m2', '', $v));
+ @endphp
+ @endif
+ @endforeach
+ @endforeach
+
+ @if (isset($luastanah) && isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah / Luas Bangunan: {{ $luastanah }} m2 / {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luastanah))
+ {{ $n }}. {{ $detail->name }}
+ Luas Tanah : {{ $luastanah }} m2
+
+ @php $n++; @endphp
+ @elseif (isset($luasbangunan))
+ {{ $n }}. {{ $detail->name }}
+ Luas Bangunan: {{ $luasbangunan }} m2
+
+ @php $n++; @endphp
+ @endif
- @if (isset($details->luas_tanah) && isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah / Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
- /
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_tanah))
- {{ $n }}. {{ $detail->name }}
- Luas Tanah :
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_tanah)) }}
- m2
-
- @php $n++; @endphp
- @elseif (isset($details->luas_bangunan))
- {{ $n }}. {{ $detail->name }}
- Luas Bangunan:
- {{ preg_replace('/[^0-9.]/', '', str_replace('m2', '', $details->luas_bangunan)) }}
- m2
-
- @php $n++; @endphp
@endif
@endforeach
@endforeach