diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php
index 3c6efac..69510bd 100644
--- a/resources/views/penawaran/kirimEmail.blade.php
+++ b/resources/views/penawaran/kirimEmail.blade.php
@@ -131,12 +131,14 @@
                     @endphp
 
                     @if (is_object($details))
-                        @if (isset($details->luas_tanah) && is_numeric($details->luas_tanah))
-                            @php $luas_tanah = $details->luas_tanah; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_tanah = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
 
-                        @if (isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))
-                            @php $luas_bangunan = $details->luas_bangunan; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_bangunan = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
                     @endif
                 @endforeach
diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php
index fd4745a..f094ece 100644
--- a/resources/views/penawaran/kirimEmailKJPP.blade.php
+++ b/resources/views/penawaran/kirimEmailKJPP.blade.php
@@ -133,12 +133,14 @@
                     @endphp
 
                     @if (is_object($details))
-                        @if (isset($details->luas_tanah) && is_numeric($details->luas_tanah))
-                            @php $luas_tanah = $details->luas_tanah; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_tanah = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
 
-                        @if (isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))
-                            @php $luas_bangunan = $details->luas_bangunan; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_bangunan = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
                     @endif
                 @endforeach
diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php
index 06996a2..a6f84d7 100644
--- a/resources/views/penawaran/surat_tender.blade.php
+++ b/resources/views/penawaran/surat_tender.blade.php
@@ -116,12 +116,14 @@
                                     @endphp
 
                                     @if (is_object($details))
-                                        @if (isset($details->luas_tanah) && is_numeric($details->luas_tanah))
-                                            @php $luas_tanah = $details->luas_tanah; @endphp
+                                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                                            @php $luas_tanah = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                                         @endif
 
-                                        @if (isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))
-                                            @php $luas_bangunan = $details->luas_bangunan; @endphp
+                                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                                            @php $luas_bangunan = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                                         @endif
                                     @endif
                                 @endforeach
@@ -139,7 +141,7 @@
                 </ul>
                 <p>Harap proposal dibuat dengan harga yang minimal sehingga tidak perlu tawar menawar lagi.</p>
                 <p>Mohon proposal dapat saya terima segera, sebelum
-                    <span class="font-bold">{{ formatTanggalIndonesia($penawaran->end_date,true) }}</span>
+                    <span class="font-bold">{{ formatTanggalIndonesia($penawaran->end_date, true) }}</span>
                 </p>
                 <p>Best Regards,
                 <div class="font-bold">
diff --git a/resources/views/penawaran/surat_tender_download.blade.php b/resources/views/penawaran/surat_tender_download.blade.php
index a5b269a..e721755 100644
--- a/resources/views/penawaran/surat_tender_download.blade.php
+++ b/resources/views/penawaran/surat_tender_download.blade.php
@@ -131,12 +131,14 @@
                     @endphp
 
                     @if (is_object($details))
-                        @if (isset($details->luas_tanah) && is_numeric($details->luas_tanah))
-                            @php $luas_tanah = $details->luas_tanah; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_tanah = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
 
-                        @if (isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))
-                            @php $luas_bangunan = $details->luas_bangunan; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_bangunan = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
                     @endif
                 @endforeach
@@ -154,7 +156,7 @@
         <div class="content">
             Harap proposal dibuat dengan harga yang minimal sehingga tidak perlu tawar menawar lagi. <br />
             Mohon proposal dapat saya terima segera, sebelum <span
-                class="important">{{ formatTanggalIndonesia($penawaran->end_date,true) }}</span>
+                class="important">{{ formatTanggalIndonesia($penawaran->end_date, true) }}</span>
         </div>
 
         <div class="signature">
diff --git a/resources/views/penawaran/surat_tender_kjpp.blade.php b/resources/views/penawaran/surat_tender_kjpp.blade.php
index 1bdd19b..895434a 100644
--- a/resources/views/penawaran/surat_tender_kjpp.blade.php
+++ b/resources/views/penawaran/surat_tender_kjpp.blade.php
@@ -114,12 +114,14 @@
                                     @endphp
 
                                     @if (is_object($details))
-                                        @if (isset($details->luas_tanah) && is_numeric($details->luas_tanah))
-                                            @php $luas_tanah = $details->luas_tanah; @endphp
+                                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                                            @php $luas_tanah = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                                         @endif
 
-                                        @if (isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))
-                                            @php $luas_bangunan = $details->luas_bangunan; @endphp
+                                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                                            @php $luas_bangunan = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                                         @endif
                                     @endif
                                 @endforeach
diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php
index 183e4a6..43a9d3c 100644
--- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php
+++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php
@@ -133,12 +133,14 @@
                     @endphp
 
                     @if (is_object($details))
-                        @if (isset($details->luas_tanah) && is_numeric($details->luas_tanah))
-                            @php $luas_tanah = $details->luas_tanah; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_tanah = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
 
-                        @if (isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))
-                            @php $luas_bangunan = $details->luas_bangunan; @endphp
+                        @if (isset($details->{$detail->jenisLegalitasJaminan->custom_field}) &&
+                                is_numeric($details->{$detail->jenisLegalitasJaminan->custom_field}))
+                            @php $luas_bangunan = $details->{$detail->jenisLegalitasJaminan->custom_field}; @endphp
                         @endif
                     @endif
                 @endforeach