diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php index c6ff33d..0af93a7 100644 --- a/resources/views/penawaran/kirimEmail.blade.php +++ b/resources/views/penawaran/kirimEmail.blade.php @@ -56,8 +56,8 @@ -
- Dear +
+ Dear @php $allPeople = []; @@ -85,100 +85,101 @@ $allPeople = array_filter($allPeople); $totalPeople = count($allPeople); @endphp - @if ($totalPeople > 0) - @foreach ($allPeople as $index => $person) - {{ $person }}{{ $index === $totalPeople - 2 ? ' dan ' : ($index < $totalPeople - 2 ? ' , ' : '') }} - @endforeach - @else - Tidak Ada - @endif + @if ($totalPeople > 0) + @foreach ($allPeople as $index => $person) + {{ $person }}{{ $index === $totalPeople - 2 ? ' dan ' : ($index < $totalPeople - 2 ? ' , ' : '') }} + @endforeach + @else + Tidak Ada + @endif -
- Mohon untuk dibuatkan proposal jasa appraisal atas nama {{ $permohonan->debiture->name }}, tujuan penilaian untuk {{ $penawaran->tujuanPenilaianKJPP->name }}, laporan dalam bentuk {{ $penawaran->jenisLaporan->name }}, dengan data-data sebagai berikut: -
+
+ Mohon untuk dibuatkan proposal jasa appraisal atas nama {{ $permohonan->debiture->name }}, tujuan penilaian untuk {{ $penawaran->tujuanPenilaianKJPP->name }}, laporan dalam bentuk {{ $penawaran->jenisLaporan->name }}, dengan data-data sebagai berikut: +
-
- Aset Jaminan: @foreach ($permohonan->debiture->documents as $document) - {{ $document->jenisJaminan->name }} - @endforeach - Lokasi Jaminan: @foreach ($permohonan->debiture->documents as $document) - {{ $document->address }}, Kel. @foreach ($villages as $village) - {{ $village->name }} - @endforeach, Kec. @foreach ($districts as $district) - {{ $district->name }} - @endforeach,@foreach ($cities as $city) - {{ ucwords(strtolower($city->name)) }} - @endforeach,@foreach ($provinces as $province) - {{ $province->name }} - @endforeach +
+ Aset Jaminan: @foreach ($permohonan->documents as $document) + {{ $document->jenisJaminan->name }} @endforeach + Lokasi Jaminan: @foreach ($permohonan->documents as $document) + {{ $document->address }}, Kel. @foreach ($villages as $village) + {{ $village->name }} + @endforeach, Kec. @foreach ($districts as $district) + {{ $district->name }} + @endforeach,@foreach ($cities as $city) + {{ ucwords(strtolower($city->name)) }} + @endforeach,@foreach ($provinces as $province) + {{ $province->name }} + @endforeach + @endforeach - Luas Tanah / Luas Bangunan: - @php - $luas_tanah = null; - $luas_bangunan = null; - @endphp +
Dokumen Jaminan:
+ @php + $n = 1; + @endphp - @foreach ($permohonan->debiture->documents as $document) - @foreach ($document->detail as $detail) - @php - $details = json_decode($detail->details); - @endphp + @foreach ($permohonan->documents as $document) + @foreach ($document->detail as $detail) + @php + $details = json_decode($detail->details); + @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->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 - - @if(isset($details->luas_bangunan) && is_numeric($details->luas_bangunan)) - ) - @php - $luas_bangunan = $details->luas_bangunan; - @endphp - @endif - @endif + @endforeach @endforeach - @endforeach +
- @if ($luas_tanah !== null && $luas_bangunan !== null) - {{ $luas_tanah }} m2 / {{ $luas_bangunan }} m2 - @elseif ($luas_tanah !== null) - {{ $luas_tanah }} m2 - @elseif ($luas_bangunan !== null) - {{ $luas_bangunan }} m2 - @endif -
+
+ Harap proposal dibuat dengan harga yang minimal sehingga tidak perlu tawar menawar lagi.
+ Mohon proposal dapat saya terima segera, sebelum {{ formatTanggalIndonesia($penawaran->end_date, true) }} +
-
- Harap proposal dibuat dengan harga yang minimal sehingga tidak perlu tawar menawar lagi.
- Mohon proposal dapat saya terima segera, sebelum {{ formatTanggalIndonesia($penawaran->end_date, true) }} -
+
+ Best Regards,
+ {{ $user->name }} +

+ {{ $user->name }} +

+
-
- Best Regards,
- {{ $user->name }} -

- {{ $user->name }} -

+
- - -
diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php index c60b6be..3f452b0 100644 --- a/resources/views/penawaran/kirimEmailKJPP.blade.php +++ b/resources/views/penawaran/kirimEmailKJPP.blade.php @@ -104,10 +104,10 @@
- Aset Jaminan: @foreach ($permohonan->debiture->documents as $document) + Aset Jaminan: @foreach ($permohonan->documents as $document) {{ $document->jenisJaminan->name }} @endforeach - Lokasi Jaminan: @foreach ($permohonan->debiture->documents as $document) + Lokasi Jaminan: @foreach ($permohonan->documents as $document) {{ $document->address }}, Kel. @foreach ($villages as $village) {{ $village->name }} @endforeach, Kec. @foreach ($districts as $district) @@ -120,41 +120,44 @@ @endforeach - Luas Tanah / Luas Bangunan: +
Dokumen Jaminan:
@php - $luas_tanah = null; - $luas_bangunan = null; + $n = 1; @endphp - @foreach ($permohonan->debiture->documents as $document) + @foreach ($permohonan->documents as $document) @foreach ($document->detail as $detail) @php $details = json_decode($detail->details); @endphp - @if (is_object($details)) - @if(isset($details->luas_tanah) && is_numeric($details->luas_tanah))) - @php - $luas_tanah = $details->luas_tanah; - @endphp - @endif - - @if(isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))) - @php - $luas_bangunan = $details->luas_bangunan; - @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 - - @if ($luas_tanah !== null && $luas_bangunan !== null) - {{ $luas_tanah }} m2 / {{ $luas_bangunan }} m2 - @elseif ($luas_tanah !== null) - {{ $luas_tanah }} m2 - @elseif ($luas_bangunan !== null) - {{ $luas_bangunan }} m2 - @endif
@@ -165,8 +168,8 @@
Best Regards,
- {{ $user->name }} + {{ $user->name }}

{{ $user->name }}

diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php index ae704d6..fe651cd 100644 --- a/resources/views/penawaran/surat_tender.blade.php +++ b/resources/views/penawaran/surat_tender.blade.php @@ -72,14 +72,14 @@ @@ -147,10 +150,10 @@

Best Regards,

- {{ $permohonan->user->name }} + {{ auth()->user()->name }}

- {{ $permohonan->user->name }} + {{ auth()->user()->name }}

Sub Direktorat Appraisal diff --git a/resources/views/penawaran/surat_tender_download.blade.php b/resources/views/penawaran/surat_tender_download.blade.php index 800ebcb..42180b1 100644 --- a/resources/views/penawaran/surat_tender_download.blade.php +++ b/resources/views/penawaran/surat_tender_download.blade.php @@ -102,10 +102,10 @@
- Aset Jaminan: @foreach ($permohonan->debiture->documents as $document) + Aset Jaminan: @foreach ($permohonan->documents as $document) {{ $document->jenisJaminan->name }} @endforeach - Lokasi Jaminan: @foreach ($permohonan->debiture->documents as $document) + Lokasi Jaminan: @foreach ($permohonan->documents as $document) {{ $document->address }}, Kel. @foreach ($villages as $village) {{ $village->name }} @endforeach, Kec. @foreach ($districts as $district) @@ -118,41 +118,44 @@ @endforeach - Luas Tanah / Luas Bangunan: +
Dokumen Jaminan:
@php - $luas_tanah = null; - $luas_bangunan = null; + $n = 1; @endphp - @foreach ($permohonan->debiture->documents as $document) + @foreach ($permohonan->documents as $document) @foreach ($document->detail as $detail) @php $details = json_decode($detail->details); @endphp - @if (is_object($details)) - @if(isset($details->luas_tanah) && is_numeric($details->luas_tanah))) - @php - $luas_tanah = $details->luas_tanah; - @endphp - @endif - - @if(isset($details->luas_bangunan) && is_numeric($details->luas_bangunan))) - @php - $luas_bangunan = $details->luas_bangunan; - @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 - - @if ($luas_tanah !== null && $luas_bangunan !== null) - {{ $luas_tanah }} m2 / {{ $luas_bangunan }} m2 - @elseif ($luas_tanah !== null) - {{ $luas_tanah }} m2 - @elseif ($luas_bangunan !== null) - {{ $luas_bangunan }} m2 - @endif
@@ -163,10 +166,10 @@
Best Regards,
- {{ $permohonan->user->name }} + {{ auth()->user()->name }}

- {{ $permohonan->user->name }} + {{ auth()->user()->name }}

diff --git a/resources/views/penawaran/surat_tender_kjpp.blade.php b/resources/views/penawaran/surat_tender_kjpp.blade.php index 4370fa8..37e54f0 100644 --- a/resources/views/penawaran/surat_tender_kjpp.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp.blade.php @@ -13,7 +13,7 @@
+ class="btn btn-xs btn-light"> pdfDownload
  • Aset Jaminan: - @foreach ($permohonan->debiture->documents as $document) + @foreach ($permohonan->documents as $document) {{ $document->jenisJaminan->name }} @endforeach
  • Lokasi Jaminan: - @foreach ($permohonan->debiture->documents as $document) + @foreach ($permohonan->documents as $document) {{ $document->address }} @if (isset($document->jenisJaminan)) , Kel. @@ -100,44 +100,45 @@ @endforeach
  • -
  • Luas Tanah / Luas Bangunan: +
  • Dokumen Jaminan:
    @php - $luas_tanah = null; - $luas_bangunan = null; + $n = 1; @endphp - @foreach ($permohonan->debiture->documents as $document) + @foreach ($permohonan->documents as $document) @foreach ($document->detail as $detail) @php $details = json_decode($detail->details); @endphp - @if (is_object($details)) - @if(isset($details->luas_tanah) && is_numeric($details->luas_tanah)) - ) - @php - $luas_tanah = $details->luas_tanah; - @endphp - @endif - - @if(isset($details->luas_bangunan) && is_numeric($details->luas_bangunan)) - ) - @php - $luas_bangunan = $details->luas_bangunan; - @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 - - @if ($luas_tanah !== null && $luas_bangunan !== null) - {{ $luas_tanah }} m2 / {{ $luas_bangunan }} m2 - @elseif ($luas_tanah !== null) - {{ $luas_tanah }} m2 - @elseif ($luas_bangunan !== null) - {{ $luas_bangunan }} m2 - @endif
  • @@ -147,10 +148,10 @@

    Best Regards,

    - {{ $permohonan->user->name }} + {{ auth()->user()->name }}

    - {{ $permohonan->user->name }} + {{ auth()->user()->name }}

    Sub Direktorat Appraisal diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php index 81f1981..0c14894 100644 --- a/resources/views/penawaran/surat_tender_kjpp_download.blade.php +++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php @@ -56,8 +56,8 @@ -
    - Dear +
    + Dear @php $allPeople = []; @@ -87,100 +87,101 @@ $allPeople = array_filter(array_unique($allPeople)); $totalPeople = count($allPeople); @endphp - @if ($totalPeople > 0) - @foreach ($allPeople as $index => $person) - {{ $person }}{{ $index === $totalPeople - 2 ? ' dan ' : ($index < $totalPeople - 2 ? ' , ' : '') }} - @endforeach - @else - Tidak Ada - @endif + @if ($totalPeople > 0) + @foreach ($allPeople as $index => $person) + {{ $person }}{{ $index === $totalPeople - 2 ? ' dan ' : ($index < $totalPeople - 2 ? ' , ' : '') }} + @endforeach + @else + Tidak Ada + @endif -
    - Mohon untuk dibuatkan proposal jasa appraisal atas nama {{ $permohonan->debiture->name }}, tujuan penilaian untuk {{ $penawaran->tujuanPenilaianKJPP->name }}, laporan dalam bentuk {{ $penawaran->jenisLaporan->name }}, dengan data-data sebagai berikut: -
    +
    + Mohon untuk dibuatkan proposal jasa appraisal atas nama {{ $permohonan->debiture->name }}, tujuan penilaian untuk {{ $penawaran->tujuanPenilaianKJPP->name }}, laporan dalam bentuk {{ $penawaran->jenisLaporan->name }}, dengan data-data sebagai berikut: +
    -
    - Aset Jaminan: @foreach ($permohonan->debiture->documents as $document) - {{ $document->jenisJaminan->name }} - @endforeach - Lokasi Jaminan: @foreach ($permohonan->debiture->documents as $document) - {{ $document->address }}, Kel. @foreach ($villages as $village) - {{ $village->name }} - @endforeach, Kec. @foreach ($districts as $district) - {{ $district->name }} - @endforeach,@foreach ($cities as $city) - {{ ucwords(strtolower($city->name)) }} - @endforeach,@foreach ($provinces as $province) - {{ $province->name }} - @endforeach +
    + Aset Jaminan: @foreach ($permohonan->documents as $document) + {{ $document->jenisJaminan->name }} @endforeach + Lokasi Jaminan: @foreach ($permohonan->documents as $document) + {{ $document->address }}, Kel. @foreach ($villages as $village) + {{ $village->name }} + @endforeach, Kec. @foreach ($districts as $district) + {{ $district->name }} + @endforeach,@foreach ($cities as $city) + {{ ucwords(strtolower($city->name)) }} + @endforeach,@foreach ($provinces as $province) + {{ $province->name }} + @endforeach + @endforeach - Luas Tanah / Luas Bangunan: - @php - $luas_tanah = null; - $luas_bangunan = null; - @endphp +
    Dokumen Jaminan:
    + @php + $n = 1; + @endphp - @foreach ($permohonan->debiture->documents as $document) - @foreach ($document->detail as $detail) - @php - $details = json_decode($detail->details); - @endphp + @foreach ($permohonan->documents as $document) + @foreach ($document->detail as $detail) + @php + $details = json_decode($detail->details); + @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->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 - - @if(isset($details->luas_bangunan) && is_numeric($details->luas_bangunan)) - ) - @php - $luas_bangunan = $details->luas_bangunan; - @endphp - @endif - @endif + @endforeach @endforeach - @endforeach +
    - @if ($luas_tanah !== null && $luas_bangunan !== null) - {{ $luas_tanah }} m2 / {{ $luas_bangunan }} m2 - @elseif ($luas_tanah !== null) - {{ $luas_tanah }} m2 - @elseif ($luas_bangunan !== null) - {{ $luas_bangunan }} m2 - @endif -
    +
    + Harap proposal dibuat dengan harga yang minimal sehingga tidak perlu tawar menawar lagi.
    + Mohon proposal dapat saya terima segera, sebelum {{ formatTanggalIndonesia($penawaran->end_date, true) }} +
    -
    - Harap proposal dibuat dengan harga yang minimal sehingga tidak perlu tawar menawar lagi.
    - Mohon proposal dapat saya terima segera, sebelum {{ formatTanggalIndonesia($penawaran->end_date, true) }} -
    +
    + Best Regards,
    + {{ auth()->user()->name }} +

    + {{ auth()->user()->name }} +

    +
    -
    - Best Regards,
    - {{ $permohonan->user->name }} -

    - {{ $permohonan->user->name }} -

    +
    - - -