diff --git a/app/Emails/SendPenawaranKJPPEmail.php b/app/Emails/SendPenawaranKJPPEmail.php
new file mode 100644
index 0000000..c779b90
--- /dev/null
+++ b/app/Emails/SendPenawaranKJPPEmail.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Modules\Lpj\Emails;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+// use Illuminate\Contracts\Queue\ShouldQueue;
+
+class SendPenawaranKJPPEmail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    // Tambahkan properti untuk data yang akan dikirimkan ke view
+    public $dp1;
+    public $penawaran;
+    public $permohonan;
+    public $villages;
+    public $districts;
+    public $cities;
+    public $provinces;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct($dp1, $penawaran, $permohonan, $villages, $districts, $cities, $provinces)
+    {
+        // Assign data yang diterima ke properti
+        $this->dp1 = $dp1;
+        $this->penawaran = $penawaran;
+        $this->permohonan = $permohonan;
+        $this->villages = $villages;
+        $this->districts = $districts;
+        $this->cities = $cities;
+        $this->provinces = $provinces;
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        // Kirim data ke view
+        return $this->view('lpj::penawaran.kirimEmailKJPP')
+            ->with([
+                'dp1' => $this->dp1,
+                'penawaran' => $this->penawaran,
+                'permohonan' => $this->permohonan,
+                'villages' => $this->villages,
+                'districts' => $this->districts,
+                'cities' => $this->cities,
+                'provinces' => $this->provinces,
+            ]);
+    }
+}
diff --git a/app/Emails/SendPenawaranTenderEmail.php b/app/Emails/SendPenawaranTenderEmail.php
new file mode 100644
index 0000000..95930a4
--- /dev/null
+++ b/app/Emails/SendPenawaranTenderEmail.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Lpj\Emails;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+// use Illuminate\Contracts\Queue\ShouldQueue;
+
+class SendPenawaranTenderEmail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Build the message.
+     */
+    public function build(): self
+    {
+        return $this->view('lpj::penawaran.kirimEmail');
+    }
+}
diff --git a/app/Helpers/Lpj.php b/app/Helpers/Lpj.php
index 69bb2c2..970fcc7 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -6,32 +6,13 @@ use Modules\Lpj\Models\HolidayCalendar;
     use Modules\Lpj\Models\PenawaranDetailTender;
     use Modules\Lpj\Models\PenawaranTender;
 
-
-    function formatTanggalIndonesia($date)
-    {
-        $carbonDate       = Carbon::parse($date);
-        $indonesianMonths = [
-            'Januari',
-            'Februari',
-            'Maret',
-            'April',
-            'Mei',
-            'Juni',
-            'Juli',
-            'Agustus',
-            'September',
-            'Oktober',
-            'November',
-            'Desember',
-        ];
-        $month            = $indonesianMonths[$carbonDate->month - 1];
-        return $carbonDate->format('d') . ' ' . $month . ' ' . $carbonDate->format('Y');
-    }
-
-    function formatTanggalIndonesia2($date)
+    function formatTanggalIndonesia($date,$time=false)
     {
         Carbon::setLocale('id');
         $waktu = Carbon::parse($date);
+        if(!$time){
+            return $waktu->translatedFormat('d F Y');
+        }
         return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB';
     }
 
diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index 3a0956d..20a379b 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -147,30 +147,8 @@
                     if ($permohonan->status == 'revisi') {
                         $validate['status'] = 'order';
                     }
-
                     $permohonan->update($validate);
 
-                    $afterRequest = $permohonan->fresh()->toArray();
-                    // Process file upload
-                    $file = null;
-                    if ($request->hasFile('attachment')) {
-                        $file = $request->file('attachment');
-                    }
-
-                    // Get keterangan if provided
-                    $keterangan = $request->input('keterangan') ?? null;
-
-                    $status =$validate['status'] ?? $permohonan->status;
-
-                    $this->historyService->createHistory(
-                        $permohonan,
-                        $status,
-                        $keterangan,
-                        $beforeRequest,
-                        $afterRequest,
-                        $file
-                    );
-
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan updated successfully');
                 } catch (Exception $e) {
diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php
index 8f2c7d2..f4edb45 100644
--- a/app/Http/Controllers/TenderController.php
+++ b/app/Http/Controllers/TenderController.php
@@ -3,7 +3,6 @@
 namespace Modules\Lpj\Http\Controllers;
 
 use Exception;
-use Barryvdh\DomPDF\PDF;
 use Illuminate\Http\Request;
 use Modules\Lpj\Models\KJPP;
 use Modules\Location\Models\City;
@@ -16,13 +15,14 @@ use Modules\Location\Models\Village;
 use Modules\Lpj\Models\JenisLaporan;
 use Modules\Location\Models\District;
 use Modules\Location\Models\Province;
-use Illuminate\Support\Facades\Storage;
 use Modules\Lpj\Models\PenawaranTender;
 use Modules\Lpj\Models\StatusPermohonan;
 use Modules\Lpj\Models\TujuanPenilaianKJPP;
 use Modules\Lpj\Models\PenawaranDetailTender;
 use Modules\Lpj\Exports\PenawaranTenderExport;
 use Modules\Lpj\Http\Requests\TenderPenawaranRequest;
+use Modules\Lpj\Jobs\SendPenawaranKJPPTenderJob;
+use Modules\Lpj\Jobs\SendPenawaranTenderJob;
 
 class TenderController extends Controller
 {
@@ -321,6 +321,57 @@ class TenderController extends Controller
         return view('lpj::penawaran.surat_tender', compact('penawaran', 'noreg', 'permohonan', 'villages', 'districts', 'cities', 'provinces'));
     }
 
+    public function suratTenderKJPP($noreg, $id)
+    {
+        $kjpp = KJPP::find($id);
+        $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+
+        if (!$penawaran) {
+            return redirect()->route('tender.penawaran.createPenawaran', ['noreg' => $penawaran->nomor_registrasi])
+                ->with('error', 'Anda Belum Membuat Penawaran. Silahkan isi terlebih dahulu!');
+        }
+
+        if ($penawaran->status != 'tender') {
+            return redirect()->route('spk.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk SPK tidak bisa masuk penawaran lagi!');
+        }
+
+        // Kalau tidak ada dokumen jaminan maka di arahkan ke halaman dokumen jaminan
+        if ($permohonan->debiture->documents->isEmpty()) {
+            return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id])
+                ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!');
+        }
+
+        foreach ($permohonan->debiture->documents as $document) {
+            $village_permohonan = $document->village_code;
+            $district_permohonan = $document->district_code;
+            $city_permohonan = $document->city_code;
+            $province_permohonan = $document->province_code;
+        }
+
+        $villages = Village::where('code', $village_permohonan)->get();
+        $districts = District::where('code', $district_permohonan)->get();
+        $cities = City::where('code', $city_permohonan)->get();
+        $provinces = Province::where('code', $province_permohonan)->get();
+
+        date_default_timezone_set('Asia/Jakarta');
+
+        $now = date('Y-m-d H:i:s');
+        // Jika batas tanggal penawaran sudah lewat
+        if ($penawaran->end_date < $now) {
+            return redirect()->route('tender.penawaran.editPenawaran', ['noreg' => $noreg])
+                ->with('error', 'Sudah Kadaluarsa. Silahkan perpanjang tanggal penawaran terlebih dahulu!');
+        }
+
+        $detail_penawaran = PenawaranDetailTender::with('kjpp')->where('kjpp_rekanan_id', '=', $kjpp->id)->get();
+
+        foreach ($detail_penawaran as $detail) {
+            $detail_penawaran_1 = $detail->kjpp;
+        }
+
+        return view('lpj::penawaran.surat_tender_kjpp', compact('penawaran', 'noreg', 'permohonan', 'villages', 'districts', 'cities', 'provinces', 'detail_penawaran_1', 'id'));
+    }
+
     public function datatablesPenawaran(Request $request)
     {
         if (is_null($this->user) || !$this->user->can('penawaran.view')) {
@@ -500,4 +551,284 @@ class TenderController extends Controller
 
         return $pdf->download('surat_tender' . time() . '.pdf');
     }
+
+    public function downloadSuratTenderKJPP($noreg, $id)
+    {
+        $kjpp = KJPP::find($id);
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+
+        if ($penawaran->status != 'tender') {
+            return redirect()->route('spk.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk SPK tidak bisa masuk penawaran lagi!');
+        }
+
+        foreach ($permohonan->debiture->documents as $document) {
+            $village_permohonan = $document->village_code;
+            $district_permohonan = $document->district_code;
+            $city_permohonan = $document->city_code;
+            $province_permohonan = $document->province_code;
+        }
+
+        $villages = Village::where('code', $village_permohonan)->get();
+        $districts = District::where('code', $district_permohonan)->get();
+        $cities = City::where('code', $city_permohonan)->get();
+        $provinces = Province::where('code', $province_permohonan)->get();
+
+        $detail_penawaran = PenawaranDetailTender::with('kjpp')->where('kjpp_rekanan_id', '=', $kjpp->id)->get();
+
+        foreach ($detail_penawaran as $detail) {
+            $detail_penawaran_1 = $detail->kjpp;
+        }
+
+        $pdf = app('dompdf.wrapper'); // create an instance of the PDF class
+        $pdf->loadView('lpj::penawaran.surat_tender_kjpp_download', compact('penawaran', 'permohonan', 'villages', 'districts', 'cities', 'provinces', 'detail_penawaran_1'));
+
+        return $pdf->download('surat_tender_kjpp' . time() . '.pdf');
+    }
+
+    // Kirim Email
+    public function showKirimEmail($noreg)
+    {
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+
+        if (!$penawaran) {
+            return redirect()->route('tender.penawaran.createPenawaran', ['noreg' => $noreg])
+                ->with('error', 'Anda Belum Membuat Penawaran. Silahkan isi terlebih dahulu!');
+        }
+
+        if ($penawaran->status != 'tender') {
+            return redirect()->route('spk.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk SPK tidak bisa masuk penawaran lagi!');
+        }
+
+        if ($permohonan->debiture->documents->isEmpty()) {
+            return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id])
+                ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!');
+        }
+
+        return view('lpj::penawaran.showKirimEmail', compact('penawaran', 'permohonan', 'noreg'));
+    }
+
+    public function dataTablesShowKirimSurat(Request $request, $noreg)
+    {
+        if (is_null($this->user) || !$this->user->can('penawaran.view')) {
+            // abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+
+        // Retrieve data from the database
+        $query = PenawaranDetailTender::query()->where('penawaran_id', '=', $penawaran->id)->with(['kjpp', 'penawaran', 'emailTenderLog']);
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order = $request->get('sortOrder');
+            $column = $request->get('sortField');
+
+            // Handle sorting for related table columns
+            if ($column === 'nama_kjpp') {
+                // Join with the KJPP table and sort by the name column
+                $query->join('kjpp', 'detail_penawaran.kjpp_rekanan_id', '=', 'kjpp.id')
+                    ->orderBy('kjpp.name', $order)
+                    ->select('detail_penawaran.*'); // Select only the main table columns to avoid conflicts
+            } else if ($column === 'nomor_kjpp') {
+                $query->join('kjpp', 'detail_penawaran.kjpp_rekanan_id', '=', 'kjpp.id')
+                    ->orderBy('kjpp.code', $order)
+                    ->select('detail_penawaran.*');
+            } else {
+                // Sort by columns in the main table
+                $query->orderBy($column, $order);
+            }
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['kjpp', 'penawaran', 'emailTenderLog'])->get();
+
+        // add column "No"
+        $i = 0;
+        $j = 1;
+        foreach ($data as $obj) {
+
+            // tanggal_permohonan
+            $data[$i]->numbernya = $j;
+            $i++;
+            $j++;
+        }
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+
+    public function kirimEmailAll($noreg)
+    {
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+
+        if (!$penawaran) {
+            return redirect()->route('tender.penawaran.createPenawaran', ['noreg' => $noreg])
+                ->with('error', 'Anda Belum Membuat Penawaran. Silahkan isi terlebih dahulu!');
+        }
+
+        if ($penawaran->status != 'tender') {
+            return redirect()->route('spk.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk SPK tidak bisa masuk penawaran lagi!');
+        }
+
+        if ($permohonan->debiture->documents->isEmpty()) {
+            return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id])
+                ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!');
+        }
+
+        $detail_penawaran = PenawaranDetailTender::where('penawaran_id', '=', $penawaran->id)->where('status', '=', 1)->pluck('kjpp_rekanan_id')->toArray();
+        $kjpps = KJPP::whereIn('id', $detail_penawaran)
+            ->get()
+            ->map(function ($item) {
+                $emails = [$item->email_kantor];
+
+                // Parse JSON string jika ada dan tidak kosong
+                if (!empty($item->detail_email_kantor) && $item->detail_email_kantor !== '[]') {
+                    $detail_emails = json_decode($item->detail_email_kantor, true);
+                    if (is_array($detail_emails)) {
+                        foreach ($detail_emails as $detail) {
+                            if (isset($detail['email_kantor'])) {
+                                $emails[] = $detail['email_kantor'];
+                            }
+                        }
+                    }
+                }
+
+                return array_filter($emails);
+            })
+            ->flatten()
+            ->toArray();
+
+        foreach ($permohonan->debiture->documents as $document) {
+            $village_permohonan = $document->village_code;
+            $district_permohonan = $document->district_code;
+            $city_permohonan = $document->city_code;
+            $province_permohonan = $document->province_code;
+        }
+
+        $villages = Village::where('code', $village_permohonan)->get();
+        $districts = District::where('code', $district_permohonan)->get();
+        $cities = City::where('code', $city_permohonan)->get();
+        $provinces = Province::where('code', $province_permohonan)->get();
+
+
+        SendPenawaranTenderJob::dispatch(
+            $kjpps,
+            $penawaran,
+            $permohonan,
+            $villages,
+            $districts,
+            $cities,
+            $provinces
+        );
+
+        return redirect()->route('tender.penawaran.ulang.index')->with('success', 'Email Penawaran Berhasil Terkirim!');
+    }
+
+    public function kirimEmailKJPP($noreg, $id)
+    {
+        $penawaran = PenawaranTender::where('nomor_registrasi', '=', $noreg)->first();
+        $permohonan = Permohonan::where('nomor_registrasi', '=', $noreg)->first();
+
+        if (!$penawaran) {
+            return redirect()->route('tender.penawaran.createPenawaran', ['noreg' => $noreg])
+                ->with('error', 'Anda Belum Membuat Penawaran. Silahkan isi terlebih dahulu!');
+        }
+
+        if ($penawaran->status != 'tender') {
+            return redirect()->route('spk.index')->with('error', 'Penawaran dengan nomor registrasi ini sudah masuk SPK tidak bisa masuk penawaran lagi!');
+        }
+
+        if ($permohonan->debiture->documents->isEmpty()) {
+            return redirect()->route('debitur.jaminan.create', ['id' => $permohonan->debiture->id])
+                ->with('error', 'Anda Belum Membuat Dokumen Jaminan. Silahkan isi terlebih dahulu!');
+        }
+
+        $detail_penawaran = PenawaranDetailTender::with('kjpp')->where('kjpp_rekanan_id', '=', $id)->pluck('kjpp_rekanan_id')->toArray();
+        $kjpps = KJPP::whereIn('id', $detail_penawaran)
+            ->get()
+            ->map(function ($item) {
+                $emails = [$item->email_kantor];
+
+                // Parse JSON string jika ada dan tidak kosong
+                if (!empty($item->detail_email_kantor) && $item->detail_email_kantor !== '[]') {
+                    $detail_emails = json_decode($item->detail_email_kantor, true);
+                    if (is_array($detail_emails)) {
+                        foreach ($detail_emails as $detail) {
+                            if (isset($detail['email_kantor'])) {
+                                $emails[] = $detail['email_kantor'];
+                            }
+                        }
+                    }
+                }
+
+                return array_filter($emails);
+            })
+            ->flatten()
+            ->toArray();
+
+        $dp1 = PenawaranDetailTender::with('kjpp')->where('kjpp_rekanan_id', '=', $id)->first();
+
+        // dd($dp1->kjpp);
+
+        foreach ($permohonan->debiture->documents as $document) {
+            $village_permohonan = $document->village_code;
+            $district_permohonan = $document->district_code;
+            $city_permohonan = $document->city_code;
+            $province_permohonan = $document->province_code;
+        }
+
+        $villages = Village::where('code', $village_permohonan)->get();
+        $districts = District::where('code', $district_permohonan)->get();
+        $cities = City::where('code', $city_permohonan)->get();
+        $provinces = Province::where('code', $province_permohonan)->get();
+
+        try {
+            $balikan = SendPenawaranKJPPTenderJob::dispatch(
+                $kjpps,
+                $dp1,
+                $penawaran,
+                $permohonan,
+                $villages,
+                $districts,
+                $cities,
+                $provinces
+            );
+        } catch (\Exception $e) {
+            return redirect()->route('tender.penawaran.ulang.index')->with('error', 'Email Penawaran Gagal Terkirim!');
+        }
+
+        return redirect()->route('tender.penawaran.ulang.index')->with('success', 'Email Penawaran Berhasil Terkirim!');
+    }
 }
diff --git a/app/Jobs/SendPenawaranKJPPTenderJob.php b/app/Jobs/SendPenawaranKJPPTenderJob.php
new file mode 100644
index 0000000..52045a2
--- /dev/null
+++ b/app/Jobs/SendPenawaranKJPPTenderJob.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Modules\Lpj\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Support\Facades\Mail;
+use Modules\Lpj\Emails\SendPenawaranKJPPEmail;
+
+class SendPenawaranKJPPTenderJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $kjpps;
+    protected $dp1; // Tidak perlu array [0] lagi
+    protected $penawaran;
+    protected $permohonan;
+    protected $villages;
+    protected $districts;
+    protected $cities;
+    protected $provinces;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($kjpps, $dp1, $penawaran, $permohonan, $villages, $districts, $cities, $provinces)
+    {
+        $this->kjpps = $kjpps;
+        $this->dp1 = $dp1; // Simpan keseluruhan array dp1, bukan dp1[0]
+        $this->penawaran = $penawaran;
+        $this->permohonan = $permohonan;
+        $this->villages = $villages;
+        $this->districts = $districts;
+        $this->cities = $cities;
+        $this->provinces = $provinces;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $email = new SendPenawaranKJPPEmail(
+            $this->dp1,
+            $this->penawaran,
+            $this->permohonan,
+            $this->villages,
+            $this->districts,
+            $this->cities,
+            $this->provinces
+        );
+
+        $email->with([
+            'dp1' => $this->dp1, // Kirim seluruh array dp1 ke email
+            'penawaran' => $this->penawaran,
+            'permohonan' => $this->permohonan,
+            'villages' => $this->villages,
+            'districts' => $this->districts,
+            'cities' => $this->cities,
+            'provinces' => $this->provinces,
+        ]);
+
+        $send = Mail::to($this->kjpps)->send($email);
+    }
+}
diff --git a/app/Jobs/SendPenawaranTenderJob.php b/app/Jobs/SendPenawaranTenderJob.php
new file mode 100644
index 0000000..6a37f6c
--- /dev/null
+++ b/app/Jobs/SendPenawaranTenderJob.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Modules\Lpj\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Support\Facades\Mail;
+use Modules\Lpj\Emails\SendPenawaranTenderEmail;
+
+class SendPenawaranTenderJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected $kjpps;
+    protected $penawaran;
+    protected $permohonan;
+    protected $villages;
+    protected $districts;
+    protected $cities;
+    protected $provinces;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct($kjpps, $penawaran, $permohonan, $villages, $districts, $cities, $provinces)
+    {
+        $this->kjpps = $kjpps;
+        $this->penawaran = $penawaran;
+        $this->permohonan = $permohonan;
+        $this->villages = $villages;
+        $this->districts = $districts;
+        $this->cities = $cities;
+        $this->provinces = $provinces;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        $email = new SendPenawaranTenderEmail();
+        $email->with([
+            'penawaran' => $this->penawaran,
+            'permohonan' => $this->permohonan,
+            'villages' => $this->villages,
+            'districts' => $this->districts,
+            'cities' => $this->cities,
+            'provinces' => $this->provinces,
+        ]);
+
+        Mail::to($this->kjpps)->send($email);
+    }
+}
diff --git a/app/Models/KJPP.php b/app/Models/KJPP.php
index b9f2e34..a558797 100644
--- a/app/Models/KJPP.php
+++ b/app/Models/KJPP.php
@@ -2,9 +2,10 @@
 
 namespace Modules\Lpj\Models;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Location\Models\Province;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\KJPPFactory;
 
@@ -19,4 +20,9 @@ class KJPP extends Model
      * The attributes that are mass assignable.
      */
     protected $guarded = ['id'];
+
+    public function PenawaranDetailTender(): HasMany
+    {
+        return $this->hasMany(PenawaranDetailTender::class, 'kjpp_rekanan_id', 'id');
+    }
 }
diff --git a/app/Models/PenawaranDetailTender.php b/app/Models/PenawaranDetailTender.php
index 619f9e2..cbe3286 100644
--- a/app/Models/PenawaranDetailTender.php
+++ b/app/Models/PenawaranDetailTender.php
@@ -27,4 +27,9 @@ class PenawaranDetailTender extends Model
     {
         return $this->belongsTo(KJPP::class, 'kjpp_rekanan_id', 'id');
     }
+
+    public function emailTenderLog(): BelongsTo
+    {
+        return $this->belongsTo(PenawaranEmailTenderLog::class, 'penawaran_id', 'id', PenawaranTender::class);
+    }
 }
diff --git a/app/Models/PenawaranEmailTenderLog.php b/app/Models/PenawaranEmailTenderLog.php
new file mode 100644
index 0000000..9048405
--- /dev/null
+++ b/app/Models/PenawaranEmailTenderLog.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\PenawaranEmailTenderLogFactory;
+
+class PenawaranEmailTenderLog extends Model
+{
+    use HasFactory;
+
+    protected $table = 'penawaran_email_tender_log';
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $guarded = ['id'];
+}
diff --git a/app/Models/Permohonan.php b/app/Models/Permohonan.php
index 60c9303..0255e63 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -1,155 +1,156 @@
 <?php
 
-namespace Modules\Lpj\Models;
+    namespace Modules\Lpj\Models;
 
-use Modules\Lpj\Database\Factories\PermohonanFactory;
-use Modules\Lpj\Services\PermohonanHistoryService;
-use Modules\Usermanagement\Models\User;
+    use Illuminate\Support\Facades\Storage;
+    use Modules\Lpj\Database\Factories\PermohonanFactory;
+    use Modules\Lpj\Services\PermohonanHistoryService;
+    use Modules\Usermanagement\Models\User;
 
-class Permohonan extends Base
-{
-    protected $table    = 'permohonan';
-    protected $fillable = [
-        'nomor_registrasi',
-        'tanggal_permohonan',
-        'user_id',
-        'branch_id',
-        'tujuan_penilaian_id',
-        'debiture_id',
-        'keterangan',
-        'dokumen',
-        'jenis_fasilitas_kredit_id',
-        'nilai_plafond_id',
-        'status',
-        'authorized_at',
-        'authorized_status',
-        'authorized_by',
-        // andy add
-        'registrasi_catatan',
-        'registrasi_by',
-        'registrasi_at',
-        'jenis_penilaian_id',
-        'region_id',
-        // andy add
-        'status_bayar',
-        'nilai_njop',
-        // andy add
-        'registrasi_catatan',
-        'registrasi_by',
-        'registrasi_at',
-        'jenis_penilaian_id',
-        'region_id',
-        'attachment'
-    ];
-
-    protected static function boot()
+    class Permohonan extends Base
     {
-        parent::boot();
+        protected $table    = 'permohonan';
+        protected $fillable = [
+            'nomor_registrasi',
+            'tanggal_permohonan',
+            'user_id',
+            'branch_id',
+            'tujuan_penilaian_id',
+            'debiture_id',
+            'keterangan',
+            'dokumen',
+            'jenis_fasilitas_kredit_id',
+            'nilai_plafond_id',
+            'status',
+            'authorized_at',
+            'authorized_status',
+            'authorized_by',
+            // andy add
+            'registrasi_catatan',
+            'registrasi_by',
+            'registrasi_at',
+            'jenis_penilaian_id',
+            'region_id',
+            // andy add
+            'status_bayar',
+            'nilai_njop',
+            // andy add
+            'registrasi_catatan',
+            'registrasi_by',
+            'registrasi_at',
+            'jenis_penilaian_id',
+            'region_id',
+        ];
 
-        static::creating(function ($permohonan) {
-            static::handleFileUpload($permohonan);
-        });
+        protected static function boot()
+        {
+            parent::boot();
 
-        static::updating(function ($permohonan) {
-            static::handleFileUpload($permohonan);
-        });
+            static::creating(function ($permohonan) {
+                static::handleFileUpload($permohonan);
+            });
 
-        static::created(function ($permohonan) {
-            static::createHistory($permohonan, 'created');
-        });
+            static::updating(function ($permohonan) {
+                static::handleFileUpload($permohonan);
+            });
 
-        static::updated(function ($permohonan) {
-            static::createHistory($permohonan, 'updated');
-        });
-    }
+            static::created(function ($permohonan) {
+                static::createHistory($permohonan, 'created');
+            });
 
-    protected static function handleFileUpload($permohonan)
-    {
-        if (request()->hasFile('attachment')) {
-            $file = request()->file('attachment');
-            $fileName = time() . '_' . $file->getClientOriginalName();
-            $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
+            static::updated(function ($permohonan) {
+                static::createHistory($permohonan, 'updated');
+            });
+        }
 
-            // Delete old file if it exists
-            if ($permohonan->attachment) {
-                Storage::disk('public')->delete($permohonan->attachment);
+        protected static function handleFileUpload($permohonan)
+        {
+            if (request()->hasFile('attachment')) {
+                $file     = request()->file('attachment');
+                $fileName = time() . '_' . $file->getClientOriginalName();
+                $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
+
+                $permohonan->dokumen = $filePath;
             }
+        }
 
-            $permohonan->attachment = $filePath;
+        protected static function createHistory($permohonan, $action)
+        {
+            $historyService = app(PermohonanHistoryService::class);
+
+            $status        = $permohonan->status;
+            $keterangan    = request()->input('keterangan'); // Get keterangan from request
+            $beforeRequest = $action === 'updated' ? $permohonan->getOriginal() : [];
+            $afterRequest  = $permohonan->toArray();
+            $file          = $permohonan->dokumen ?? null;
+
+            $historyService->createHistory(
+                $permohonan,
+                $status,
+                $keterangan,
+                $beforeRequest,
+                $afterRequest,
+                $file,
+            );
+        }
+
+        public function user()
+        {
+            return $this->belongsTo(User::class);
+        }
+
+        public function branch()
+        {
+            return $this->belongsTo(Branch::class);
+        }
+
+        public function tujuanPenilaian()
+        {
+            return $this->belongsTo(TujuanPenilaian::class);
+        }
+
+        public function debiture()
+        {
+            return $this->belongsTo(Debiture::class);
+        }
+
+        public function documents()
+        {
+            return $this->hasMany(DokumenJaminan::class);
+        }
+
+        public function nilaiPlafond()
+        {
+            return $this->belongsTo(NilaiPlafond::class);
+        }
+
+        public function jenisFasilitasKredit()
+        {
+            return $this->belongsTo(JenisFasilitasKredit::class);
+        }
+
+        public function penilaian()
+        {
+            return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
+        }
+
+        public function penawaranTender()
+        {
+            return $this->hasMany(PenawaranTender::class, 'nomor_registrasi');
+        }
+
+        public function region()
+        {
+            return $this->belongsTo(Regions::class, 'region_id');
+        }
+
+        public function penawaran()
+        {
+            return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
+        }
+
+        public function histories()
+        {
+            return $this->hasMany(PermohonanHistory::class, 'permohonan_id', 'id')->orderBy('created_at', 'desc');
         }
     }
-
-    protected static function createHistory($permohonan, $action)
-    {
-        $historyService = app(PermohonanHistoryService::class);
-
-        $status = $permohonan->status;
-        $keterangan = request()->input('keterangan'); // Get keterangan from request
-        $beforeRequest = $action === 'updated' ? $permohonan->getOriginal() : [];
-        $afterRequest = $permohonan->toArray();
-        $file = $permohonan->attachment ? Storage::disk('public')->path($permohonan->attachment) : null;
-
-        $historyService->createHistory(
-            $permohonan,
-            $status,
-            $keterangan,
-            $beforeRequest,
-            $afterRequest,
-            $file
-        );
-    }
-
-    public function user()
-    {
-        return $this->belongsTo(User::class);
-    }
-
-    public function branch()
-    {
-        return $this->belongsTo(Branch::class);
-    }
-
-    public function tujuanPenilaian()
-    {
-        return $this->belongsTo(TujuanPenilaian::class);
-    }
-
-    public function debiture()
-    {
-        return $this->belongsTo(Debiture::class);
-    }
-
-    public function documents()
-    {
-        return $this->hasMany(DokumenJaminan::class);
-    }
-
-    public function nilaiPlafond()
-    {
-        return $this->belongsTo(NilaiPlafond::class);
-    }
-
-    public function jenisFasilitasKredit()
-    {
-        return $this->belongsTo(JenisFasilitasKredit::class);
-    }
-
-    public function penilaian()
-    {
-        return $this->belongsTo(Penilaian::class, 'nomor_registrasi', 'nomor_registrasi');
-    }
-
-    public function penawaranTender()
-    {
-        return $this->hasMany(PenawaranTender::class, 'nomor_registrasi');
-    }
-
-    public function region()
-    {
-        return $this->belongsTo(Regions::class,  'region_id');
-    }
-
-    public function penawaran(){
-        return $this->belongsTo(PenawaranTender::class, 'nomor_registrasi', 'nomor_registrasi');
-    }
-}
diff --git a/app/Models/PermohonanHistory.php b/app/Models/PermohonanHistory.php
index 2b58a8f..a0f7d34 100644
--- a/app/Models/PermohonanHistory.php
+++ b/app/Models/PermohonanHistory.php
@@ -4,6 +4,8 @@ namespace Modules\Lpj\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Usermanagement\Models\User;
+
 // use Modules\Lpj\Database\Factories\PermohonanHistoryFactory;
 
 class PermohonanHistory extends Base
diff --git a/app/Services/PermohonanHistoryService.php b/app/Services/PermohonanHistoryService.php
index 783d41b..3b9e60c 100644
--- a/app/Services/PermohonanHistoryService.php
+++ b/app/Services/PermohonanHistoryService.php
@@ -7,15 +7,8 @@ use Modules\Lpj\Models\PermohonanHistory;
 
 class PermohonanHistoryService
 {
-    public function createHistory(Permohonan $permohonan, string $status, ?string $keterangan, array $beforeRequest, array $afterRequest, ?string $file = null)
+    public function createHistory(Permohonan $permohonan, string $status, ?string $keterangan, array $beforeRequest, array $afterRequest, ?string $filePath = null)
     {
-
-        $filePath = null;
-        if ($file) {
-            $filePath = $file->store('permohonan_history_files', 'public');
-        }
-
-
         try {
             $history = PermohonanHistory::create([
                 'permohonan_id' => $permohonan->id,
diff --git a/database/migrations/2024_11_18_045428_create_penawaran_email_tender_log.php b/database/migrations/2024_11_18_045428_create_penawaran_email_tender_log.php
new file mode 100644
index 0000000..7fa040a
--- /dev/null
+++ b/database/migrations/2024_11_18_045428_create_penawaran_email_tender_log.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('penawaran_email_tender_log', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('penawaran_id');
+            $table->foreign('penawaran_id')->references('id')->on('penawaran')->onDelete('cascade');
+            $table->string('kjpp');
+            $table->string('to_email');
+            $table->string('subject');
+            $table->text('body_pdf');
+            $table->string('status');
+            $table->text('error_message');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('penawaran_email_tender_log');
+    }
+};
diff --git a/resources/views/component/detail-jaminan.blade.php b/resources/views/component/detail-jaminan.blade.php
index 63b2817..4d5266e 100644
--- a/resources/views/component/detail-jaminan.blade.php
+++ b/resources/views/component/detail-jaminan.blade.php
@@ -277,4 +277,5 @@
     </div>
 </div>
 
+@include('lpj::component.history-permohonan')
 @include('lpj::component.pdfviewer')
diff --git a/resources/views/component/history-permohonan.blade.php b/resources/views/component/history-permohonan.blade.php
new file mode 100644
index 0000000..85ed489
--- /dev/null
+++ b/resources/views/component/history-permohonan.blade.php
@@ -0,0 +1,78 @@
+<div class="card min-w-full">
+    <div class="card-header">
+        <h3 class="card-title">
+            Activity
+        </h3>
+    </div>
+    <div class="card-body">
+        <div class="flex flex-col">
+            @foreach($permohonan->histories as $activity)
+                <div class="flex items-start relative">
+                    @if($loop->first)
+                        <div
+                            class="w-9 left-0 top-9 absolute bottom-0 translate-x-1/2 border-l border-l-primary">
+                        </div>
+                    @endif
+                    @if(!$loop->last && !$loop->first)
+                        <div
+                            class="w-9 left-0 top-9 absolute bottom-0 translate-x-1/2 border-l border-l-gray-300">
+                        </div>
+                    @endif
+                    <div
+                        class="flex items-center justify-center shrink-0 rounded-full
+                                {{ $loop->first ? 'btn-outline btn-primary' : 'bg-gray-100 border-gray-300 text-gray-600' }}
+                                size-9">
+                        @switch(strtolower($activity->status))
+                            @case('preregister')
+                                <i class="ki-filled ki-note-2 text-base"></i>
+                                @break
+                            @case('order')
+                                <i class="ki-filled ki-handcart text-base"></i>
+                                @break
+
+                            @case('revisi')
+                                <i class="ki-filled ki-notepad-edit text-base"></i>
+                                @break
+
+                            @case('register')
+                                <i class="ki-filled ki-note-2 text-base"></i>
+                                @break
+
+                            @case('assign')
+                                <i class="ki-filled ki-file-added"></i>
+                                @break
+
+                            @case('survey')
+                                <i class="ki-filled ki-map text-base"></i>
+                                @break
+                            @case('proses laporan')
+                                <i class="ki-filled ki-paper-plane text-base"></i>
+                                @break
+                            @case('approved')
+                                <i class="ki-filled ki-check text-base"></i>
+                                @break
+                            @case('delivered')
+                                <i class="ki-filled ki-delivery-3 text-base"></i>
+                                @break
+                            @default
+                                <i class="ki-filled ki-information text-base"></i>
+                        @endswitch
+                    </div>
+                    <div class="ml-3 mb-5">
+                        <span class="text-sm text-gray-700 capitalize font-medium">{{ $activity->status }}</span>
+                        <p class="text-xs text-gray-500 mt-1">{{ $activity->keterangan }}</p>
+                        <div class="flex items-center mt-2">
+                            <span class="text-xs text-gray-400">{{ $activity->created_by ? $activity->creator->name : 'System' }}</span>
+                            <span class="text-xs text-gray-400 ml-2">{{ $activity->created_at->format('d M Y H:i') }}</span>
+                        </div>
+                        @if($activity->file_path)
+                            <a href="{{ route('activity.download', $activity->permohonan_id) }}" class="text-xs text-blue-600 hover:underline mt-2 inline-block">
+                                <i class="ki-outline ki-attachment"></i> Attachment
+                            </a>
+                        @endif
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    </div>
+</div>
diff --git a/resources/views/penawaran/kirimEmail.blade.php b/resources/views/penawaran/kirimEmail.blade.php
new file mode 100644
index 0000000..3c6efac
--- /dev/null
+++ b/resources/views/penawaran/kirimEmail.blade.php
@@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Surat Tender | {{ formatTanggalIndonesia(now()) }}</title>
+    <style>
+        body {
+            font-family: Calibri;
+            margin: 20px;
+            color: #333;
+        }
+
+        .container {
+            max-width: 800px;
+            margin: auto;
+            line-height: 1.6;
+        }
+
+        .content {
+            margin-top: 20px;
+            white-space: pre-line;
+            /* To handle line breaks in text */
+        }
+
+        .content-max {
+            margin-top: 20px;
+            max-width: 800px;
+        }
+
+        .flex-wrap {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 10px;
+        }
+
+        .important {
+            font-weight: bold;
+            color: black;
+        }
+
+        .signature {
+            margin-top: 40px;
+            font-family: 'Brush Script MT', cursive;
+            font-size: 1.2em;
+        }
+
+        .footer {
+            margin-top: 20px;
+            font-size: 0.9em;
+            color: #555;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="container">
+        Dear <span class="important">
+            @php
+                $allPeople = [];
+
+                foreach ($penawaran->penawaranKjpp as $kjpp) {
+                    if ($kjpp->kjpp->nama_pic_admin) {
+                        $allPeople[] = ucwords($kjpp->kjpp->nama_pic_admin);
+                    }
+
+                    if ($kjpp->kjpp->detail_nama_pic_admin) {
+                        try {
+                            $decoded = json_decode($kjpp->kjpp->detail_nama_pic_admin);
+                            if ($decoded) {
+                                foreach ($decoded as $admin) {
+                                    if (isset($admin->nama_pic_admin)) {
+                                        $allPeople[] = ucwords($admin->nama_pic_admin);
+                                    }
+                                }
+                            }
+                        } catch (\Exception $e) {
+                            // Handle invalid JSON silently
+                        }
+                    }
+                }
+
+                $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
+        </span>
+
+        <div class="content">
+            Mohon untuk dibuatkan proposal jasa appraisal atas nama <span
+                class="important">{{ $permohonan->debiture->name }}</span>, tujuan penilaian untuk <span
+                class="important">{{ $penawaran->tujuanPenilaianKJPP->name }}</span>, laporan dalam bentuk <span
+                class="important">{{ $penawaran->jenisLaporan->name }}</span>, dengan data-data sebagai berikut:
+        </div>
+
+        <div class="content-max">
+            Aset Jaminan: @foreach ($permohonan->debiture->documents as $document)
+                {{ $document->jenisJaminan->name }}
+            @endforeach
+            <span class="flex-wrap">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
+                            @endforeach
+            </span>
+
+            Luas Tanah / Luas Bangunan:
+            @php
+                $luas_tanah = null;
+                $luas_bangunan = null;
+            @endphp
+
+            @foreach ($permohonan->debiture->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
+                    @endif
+                @endforeach
+            @endforeach
+
+            @if ($luas_tanah !== null && $luas_bangunan !== null)
+                {{ $luas_tanah }} m<sup>2</sup> / {{ $luas_bangunan }} m<sup>2</sup>
+            @elseif ($luas_tanah !== null)
+                {{ $luas_tanah }} m<sup>2</sup>
+            @elseif ($luas_bangunan !== null)
+                {{ $luas_bangunan }} m<sup>2</sup>
+            @endif
+        </div>
+
+        <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>
+        </div>
+
+        <div class="signature">
+            Best Regards,<br />
+            <img src="{{ asset('storage/signatures/' . $permohonan->user->id . '/' . $permohonan->user->sign) }}"
+                alt="{{ $permohonan->user->name }}" width="200">
+            <p>
+                {{ $permohonan->user->name }}
+            </p>
+        </div>
+
+        <div class="footer">
+            PT. Bank Artha Graha Internasional, Tbk.<br>
+            Gedung Bank Artha Graha, Lantai 3<br>
+            Jl. Kwitang Raya No 24-26, Jakarta Pusat - 10420.<br>
+            Telp. 021 - 3903040 (H)
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/resources/views/penawaran/kirimEmailKJPP.blade.php b/resources/views/penawaran/kirimEmailKJPP.blade.php
new file mode 100644
index 0000000..fd4745a
--- /dev/null
+++ b/resources/views/penawaran/kirimEmailKJPP.blade.php
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Surat Tender | {{ formatTanggalIndonesia(now()) }}</title>
+    <style>
+        body {
+            font-family: Calibri;
+            margin: 20px;
+            color: #333;
+        }
+
+        .container {
+            max-width: 800px;
+            margin: auto;
+            line-height: 1.6;
+        }
+
+        .content {
+            margin-top: 20px;
+            white-space: pre-line;
+            /* To handle line breaks in text */
+        }
+
+        .content-max {
+            margin-top: 20px;
+            max-width: 800px;
+        }
+
+        .flex-wrap {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 10px;
+        }
+
+        .important {
+            font-weight: bold;
+            color: black;
+        }
+
+        .signature {
+            margin-top: 40px;
+            font-family: 'Brush Script MT', cursive;
+            font-size: 1.2em;
+        }
+
+        .footer {
+            margin-top: 20px;
+            font-size: 0.9em;
+            color: #555;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="container">
+        Dear <span class="important">
+            @php
+                $allPeople = [];
+
+                foreach ($dp1->kjpp as $dp) {
+                    if ($dp1->kjpp->nama_pic_admin) {
+                        $allPeople[] = ucwords($dp1->kjpp->nama_pic_admin);
+                    }
+
+                    if ($dp1->kjpp->detail_nama_pic_admin) {
+                        try {
+                            $decoded = json_decode($dp1->kjpp->detail_nama_pic_admin);
+                            if (is_array($decoded) && !empty($decoded)) {
+                                foreach ($decoded as $value) {
+                                    // Check if the value has nama_pic_admin and it's not empty
+                                    if (isset($value->nama_pic_admin) && !empty($value->nama_pic_admin)) {
+                                        $allPeople[] = ucwords($value->nama_pic_admin);
+                                    }
+                                }
+                            }
+                        } catch (\Exception $e) {
+                            // Handle invalid JSON silently
+                        }
+                    }
+                }
+
+                // Remove empty values and duplicates
+                $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
+        </span>
+
+        <div class="content">
+            Mohon untuk dibuatkan proposal jasa appraisal atas nama <span
+                class="important">{{ $permohonan->debiture->name }}</span>, tujuan penilaian untuk <span
+                class="important">{{ $penawaran->tujuanPenilaianKJPP->name }}</span>, laporan dalam bentuk <span
+                class="important">{{ $penawaran->jenisLaporan->name }}</span>, dengan data-data sebagai berikut:
+        </div>
+
+        <div class="content-max">
+            Aset Jaminan: @foreach ($permohonan->debiture->documents as $document)
+                {{ $document->jenisJaminan->name }}
+            @endforeach
+            <span class="flex-wrap">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
+                            @endforeach
+            </span>
+
+            Luas Tanah / Luas Bangunan:
+            @php
+                $luas_tanah = null;
+                $luas_bangunan = null;
+            @endphp
+
+            @foreach ($permohonan->debiture->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
+                    @endif
+                @endforeach
+            @endforeach
+
+            @if ($luas_tanah !== null && $luas_bangunan !== null)
+                {{ $luas_tanah }} m<sup>2</sup> / {{ $luas_bangunan }} m<sup>2</sup>
+            @elseif ($luas_tanah !== null)
+                {{ $luas_tanah }} m<sup>2</sup>
+            @elseif ($luas_bangunan !== null)
+                {{ $luas_bangunan }} m<sup>2</sup>
+            @endif
+        </div>
+
+        <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>
+        </div>
+
+        <div class="signature">
+            Best Regards,<br />
+            <img src="{{ asset('storage/signatures/' . $permohonan->user->id . '/' . $permohonan->user->sign) }}"
+                alt="{{ $permohonan->user->name }}" width="200">
+            <p>
+                {{ $permohonan->user->name }}
+            </p>
+        </div>
+
+        <div class="footer">
+            PT. Bank Artha Graha Internasional, Tbk.<br>
+            Gedung Bank Artha Graha, Lantai 3<br>
+            Jl. Kwitang Raya No 24-26, Jakarta Pusat - 10420.<br>
+            Telp. 021 - 3903040 (H)
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/resources/views/penawaran/layouts/scripts.blade.php b/resources/views/penawaran/layouts/scripts.blade.php
new file mode 100644
index 0000000..9b70607
--- /dev/null
+++ b/resources/views/penawaran/layouts/scripts.blade.php
@@ -0,0 +1,111 @@
+@push('styles')
+    <style>
+        input.input-custom:focus {
+            outline: none;
+            box-shadow: none;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            input.input-custom {
+                background: none;
+                color: var(--tw-gray-600);
+            }
+        }
+
+        .status-custom {
+            display: none
+        }
+    </style>
+@endpush
+
+@push('scripts')
+    <script type="module">
+        const element = document.querySelector('#kjpp-table');
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                no: {
+                    title: 'No',
+                    render: (item, data) => {
+                        return data.numbernya;
+                    }
+                },
+                nomor_kjpp: {
+                    title: 'Nomor KJPP',
+                    render: (item, data) => {
+                        return `${data.kjpp.code}`
+                    }
+                },
+                nama_kjpp: {
+                    title: 'Nama KJPP',
+                    render: (item, data) => {
+                        return `${data.kjpp.name}`
+                    }
+                },
+                email_kantor: {
+                    title: 'Email Kantor',
+                    render: (item, data) => {
+                        let emails = [data.kjpp.email_kantor]; // Always include the main email
+
+                        // Check if there's a detail_email_kantor and try to parse it
+                        if (data.kjpp.detail_email_kantor) {
+                            try {
+                                const detailEmails = JSON.parse(data.kjpp.detail_email_kantor);
+
+                                // If the parsed result is an array, extract emails from each object and concatenate
+                                if (Array.isArray(detailEmails)) {
+                                    detailEmails.forEach(item => {
+                                        if (item.email_kantor) {
+                                            emails.push(item
+                                                .email_kantor); // Add the email from each object
+                                        }
+                                    });
+                                } else {
+                                    // If it's a single object (not an array), just add the email
+                                    if (detailEmails.email_kantor) {
+                                        emails.push(detailEmails.email_kantor);
+                                    }
+                                }
+                            } catch (e) {
+                                console.error('Failed to parse detail_email_kantor:', e);
+                                // Fallback to treating detail_email_kantor as a plain string
+                                emails.push(data.kjpp.detail_email_kantor);
+                            }
+                        }
+
+                        // Helper function for basic email validation (regex pattern)
+                        const isValidEmail = (email) => {
+                            const emailRegex = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$/;
+                            return emailRegex.test(email);
+                        };
+
+                        // Filter out invalid emails and join with line breaks
+                        return emails
+                            .filter(email => email && String(email).trim() && isValidEmail(email))
+                            .map(email => String(email)
+                                .trim()) // Ensure there are no accidental leading/trailing spaces
+                            .join('<br>'); // Join the emails with line breaks for rendering
+                    }
+                },
+                status: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `${data.emailTenderLog?.status ?? '-'}`
+                    }
+                },
+                actions: {
+                    title: 'Action',
+                    render: (item, data) => {
+                        return `<div class="flex justify-center items-center">
+                        <a href="tender/penawaran/${data.penawaran.nomor_registrasi}/suratTenderKJPP/${data.kjpp.id}" title="Show Surat Tender" class="btn btn-sm btn-icon btn-clear btn-warning"><i class="ki-outline ki-eye"></i></a>
+                        <a href="tender/penawaran/${data.penawaran.nomor_registrasi}/suratTenderKJPP/${data.kjpp.id}/kirimEmailKJPP" title="Kirim Email KJPP" class="btn btn-sm btn-icon btn-clear btn-primary"><i class="ki-outline ki-paper-plane"></i></a></div>`
+                    }
+                }
+            }
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+    </script>
+@endpush
diff --git a/resources/views/penawaran/showKirimEmail.blade.php b/resources/views/penawaran/showKirimEmail.blade.php
new file mode 100644
index 0000000..1bdf893
--- /dev/null
+++ b/resources/views/penawaran/showKirimEmail.blade.php
@@ -0,0 +1,122 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg')) }}
+@endsection
+
+@section('content')
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+
+        <div class="card pb-2.5">
+            <div class="card-header" id="basic_settings">
+                <h3 class="card-title">
+                    Show Kirim Email Penawaran
+                </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('tender.penawaran.ulang.index') }}" class="btn btn-xs btn-info"><i
+                            class="ki-filled ki-exit-left"></i> Back</a>
+                </div>
+            </div>
+            <div class="card-body grid gap-5">
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">Nomor Registrasi</label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                            name="nomor_registrasi" readonly value="{{ $permohonan->nomor_registrasi ?? '-' }}">
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">Nama Debitur</label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <input class="flex w-full text-gray-600 font-medium text-sm input-custom" type="text"
+                            name="nama_debitur" readonly value="{{ $permohonan->debiture->name ?? '-' }}">
+                    </div>
+                </div>
+                <div class="card-body grid gap-5">
+                    <div class="grid">
+                        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5"
+                            id="kjpp-table"
+                            data-api-url="{{ route('tender.penawaran.showKirimSurat.datatables', $noreg) }}">
+                            <div class="card-header py-5 flex-wrap">
+                                <div class="card-title">
+                                    Data KJPP
+                                </div>
+                            </div>
+                            <div class="card-body">
+                                <div class="scrollable-x-auto">
+                                    <table
+                                        class="table table-auto table-border align-middle text-gray-700 font-medium text-sm"
+                                        data-datatable-table="true">
+                                        <thead>
+                                            <tr>
+                                                <th class="w-14" data-datatable-column="no">
+                                                    No
+                                                </th>
+                                                <th class="min-w-[150px]" data-datatable-column="nomor_kjpp">
+                                                    <span class="sort">
+                                                        <span class="sort-label">
+                                                            Nomor KJPP
+                                                        </span>
+                                                        <span class="sort-icon"> </span>
+                                                    </span>
+                                                </th>
+                                                <th class="min-w-[150px]" data-datatable-column="nama_kjpp">
+                                                    <span class="sort">
+                                                        <span class="sort-label">
+                                                            Nama KJPP
+                                                        </span>
+                                                        <span class="sort-icon"> </span>
+                                                    </span>
+                                                </th>
+                                                <th class="min-w-[150px]" data-datatable-column="email_kantor">
+                                                    <span class="sort">
+                                                        <span class="sort-label">
+                                                            Email Kantor
+                                                        </span>
+                                                    </span>
+                                                </th>
+                                                <th class="min-w-[150px]" data-datatable-column="status">
+                                                    <span class="sort">
+                                                        <span class="sort-label">
+                                                            Status Kirim
+                                                        </span>
+                                                    </span>
+                                                </th>
+                                                <th class="min-w-[50px] text-center" data-datatable-column="actions">Action
+                                                </th>
+                                            </tr>
+                                        </thead>
+                                    </table>
+                                </div>
+
+                                <div
+                                    class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                                    <div class="flex items-center gap-2">
+                                        Show
+                                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage">
+                                        </select>
+                                        per page
+                                    </div>
+                                    <div class="flex items-center gap-4">
+                                        <span data-datatable-info="true"> </span>
+                                        <div class="pagination" data-datatable-pagination="true">
+                                        </div>
+                                    </div>
+                                </div>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="flex justify-end">
+                    <a href="{{ route('tender.penawaran.kirimEmailAll', $noreg) }}" class="btn btn-primary">
+                        <i class="ki-filled ki-paper-plane"></i> Kirim
+                    </a>
+                </div>
+            </div>
+
+        </div>
+    </div>
+@endsection
+
+@include('lpj::penawaran.layouts.scripts')
diff --git a/resources/views/penawaran/surat_tender.blade.php b/resources/views/penawaran/surat_tender.blade.php
index 7db7b5c..06996a2 100644
--- a/resources/views/penawaran/surat_tender.blade.php
+++ b/resources/views/penawaran/surat_tender.blade.php
@@ -139,7 +139,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">{{ formatTanggalIndonesia2($penawaran->end_date) }}</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 0f058bc..a5b269a 100644
--- a/resources/views/penawaran/surat_tender_download.blade.php
+++ b/resources/views/penawaran/surat_tender_download.blade.php
@@ -154,7 +154,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">{{ formatTanggalIndonesia2($penawaran->end_date) }}</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
new file mode 100644
index 0000000..1bdd19b
--- /dev/null
+++ b/resources/views/penawaran/surat_tender_kjpp.blade.php
@@ -0,0 +1,159 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName(), request()->route('noreg'), request()->route('id')) }}
+@endsection
+
+@section('content')
+    <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
+        <div class="card pb-2.5">
+            <div class="card-header" id="basic_settings">
+                <h3 class="card-title">
+                    Surat Tender
+                </h3>
+                <div class="flex items-center gap-2">
+                    <a href="{{ route('tender.penawaran.downloadSuratTenderKJPP', ['noreg' => $noreg, 'id' => $id]) }}"
+                        class="btn btn-xs btn-light">
+                        <img src="{{ asset('img/pdf.png') }}" width="25" alt="pdf"></img>Download
+                    </a>
+                    <a href="{{ route('tender.penawaran.showKirimEmail', $noreg) }}" class="btn btn-xs btn-info"><i
+                            class="ki-filled ki-exit-left"></i> Back</a>
+                </div>
+            </div>
+            <div class="card-body grid gap-5">
+                <p>Dear
+                    <span class="font-bold">
+                        @php
+                            $allPeople = [];
+
+                            foreach ($detail_penawaran_1 as $dp1) {
+                                if ($detail_penawaran_1->nama_pic_admin) {
+                                    $allPeople[] = ucwords($detail_penawaran_1->nama_pic_admin);
+                                }
+
+                                if ($detail_penawaran_1->detail_nama_pic_admin) {
+                                    try {
+                                        $decoded = json_decode($detail_penawaran_1->detail_nama_pic_admin);
+                                        if (is_array($decoded) && !empty($decoded)) {
+                                            foreach ($decoded as $value) {
+                                                // Check if the value has nama_pic_admin and it's not empty
+                                                if (isset($value->nama_pic_admin) && !empty($value->nama_pic_admin)) {
+                                                    $allPeople[] = ucwords($value->nama_pic_admin);
+                                                }
+                                            }
+                                        }
+                                    } catch (\Exception $e) {
+                                        // Handle invalid JSON silently
+                                    }
+                                }
+                            }
+
+                            // Remove empty values and duplicates
+                            $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
+                    </span>
+                </p>
+                <p>Mohon untuk dibuatkan proposal jasa appraisal atas nama <span
+                        class="font-bold">{{ ucwords($permohonan->debiture->name) }}</span>, tujuan penilaian
+                    untuk <span class="font-bold">
+                        {{ $penawaran->tujuanPenilaianKJPP->name }}
+                    </span>, laporan dalam bentuk <span class="font-bold">{{ $penawaran->jenisLaporan->name }}</span>,
+                    dengan data-data sebagai berikut :</p>
+                <ul>
+                    <li>Aset Jaminan:
+                        <span class="font-bold">
+                            @foreach ($permohonan->debiture->documents as $document)
+                                {{ $document->jenisJaminan->name }}
+                            @endforeach
+                        </span>
+                    </li>
+                    <li>Lokasi Jaminan:
+                        <span class="font-bold">
+                            @foreach ($permohonan->debiture->documents as $document)
+                                {{ $document->address }}
+                                @if (isset($document->jenisJaminan))
+                                    , 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
+                                @endif
+                            @endforeach
+                        </span>
+                    </li>
+                    <li>Luas Tanah / Luas Bangunan:
+                        <span class="font-bold">
+                            @php
+                                $luas_tanah = null;
+                                $luas_bangunan = null;
+                            @endphp
+
+                            @foreach ($permohonan->debiture->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
+                                    @endif
+                                @endforeach
+                            @endforeach
+
+                            @if ($luas_tanah !== null && $luas_bangunan !== null)
+                                {{ $luas_tanah }} m<sup>2</sup> / {{ $luas_bangunan }} m<sup>2</sup>
+                            @elseif ($luas_tanah !== null)
+                                {{ $luas_tanah }} m<sup>2</sup>
+                            @elseif ($luas_bangunan !== null)
+                                {{ $luas_bangunan }} m<sup>2</sup>
+                            @endif
+                        </span>
+                    </li>
+                </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>
+                </p>
+                <p>Best Regards,
+                <div class="font-bold">
+                    <img src="{{ asset('storage/signatures/' . $permohonan->user->id . '/' . $permohonan->user->sign) }}"
+                        alt="{{ $permohonan->user->name }}" width="200">
+                    <p>
+                        {{ $permohonan->user->name }}
+                    </p>
+                </div>
+                Sub Direktorat Appraisal
+                </p>
+                <p>PT. Bank Artha Graha Internasional, Tbk.<br>
+                    Gedung Bank Artha Graha, Lantai 3<br>
+                    Jl. Kwitang Raya No 24-26, Jakarta Pusat - 10420.<br>
+                    Telp. 021 - 3903040 (H)</p>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/penawaran/surat_tender_kjpp_download.blade.php b/resources/views/penawaran/surat_tender_kjpp_download.blade.php
new file mode 100644
index 0000000..183e4a6
--- /dev/null
+++ b/resources/views/penawaran/surat_tender_kjpp_download.blade.php
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Surat Tender | {{ formatTanggalIndonesia(now()) }}</title>
+    <style>
+        body {
+            font-family: Calibri;
+            margin: 20px;
+            color: #333;
+        }
+
+        .container {
+            max-width: 800px;
+            margin: auto;
+            line-height: 1.6;
+        }
+
+        .content {
+            margin-top: 20px;
+            white-space: pre-line;
+            /* To handle line breaks in text */
+        }
+
+        .content-max {
+            margin-top: 20px;
+            max-width: 800px;
+        }
+
+        .flex-wrap {
+            display: flex;
+            flex-wrap: wrap;
+            gap: 10px;
+        }
+
+        .important {
+            font-weight: bold;
+            color: black;
+        }
+
+        .signature {
+            margin-top: 40px;
+            font-family: 'Brush Script MT', cursive;
+            font-size: 1.2em;
+        }
+
+        .footer {
+            margin-top: 20px;
+            font-size: 0.9em;
+            color: #555;
+        }
+    </style>
+</head>
+
+<body>
+    <div class="container">
+        Dear <span class="important">
+            @php
+                $allPeople = [];
+
+                foreach ($detail_penawaran_1 as $dp1) {
+                    if ($detail_penawaran_1->nama_pic_admin) {
+                        $allPeople[] = ucwords($detail_penawaran_1->nama_pic_admin);
+                    }
+
+                    if ($detail_penawaran_1->detail_nama_pic_admin) {
+                        try {
+                            $decoded = json_decode($detail_penawaran_1->detail_nama_pic_admin);
+                            if (is_array($decoded) && !empty($decoded)) {
+                                foreach ($decoded as $value) {
+                                    // Check if the value has nama_pic_admin and it's not empty
+                                    if (isset($value->nama_pic_admin) && !empty($value->nama_pic_admin)) {
+                                        $allPeople[] = ucwords($value->nama_pic_admin);
+                                    }
+                                }
+                            }
+                        } catch (\Exception $e) {
+                            // Handle invalid JSON silently
+                        }
+                    }
+                }
+
+                // Remove empty values and duplicates
+                $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
+        </span>
+
+        <div class="content">
+            Mohon untuk dibuatkan proposal jasa appraisal atas nama <span
+                class="important">{{ $permohonan->debiture->name }}</span>, tujuan penilaian untuk <span
+                class="important">{{ $penawaran->tujuanPenilaianKJPP->name }}</span>, laporan dalam bentuk <span
+                class="important">{{ $penawaran->jenisLaporan->name }}</span>, dengan data-data sebagai berikut:
+        </div>
+
+        <div class="content-max">
+            Aset Jaminan: @foreach ($permohonan->debiture->documents as $document)
+                {{ $document->jenisJaminan->name }}
+            @endforeach
+            <span class="flex-wrap">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
+                            @endforeach
+            </span>
+
+            Luas Tanah / Luas Bangunan:
+            @php
+                $luas_tanah = null;
+                $luas_bangunan = null;
+            @endphp
+
+            @foreach ($permohonan->debiture->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
+                    @endif
+                @endforeach
+            @endforeach
+
+            @if ($luas_tanah !== null && $luas_bangunan !== null)
+                {{ $luas_tanah }} m<sup>2</sup> / {{ $luas_bangunan }} m<sup>2</sup>
+            @elseif ($luas_tanah !== null)
+                {{ $luas_tanah }} m<sup>2</sup>
+            @elseif ($luas_bangunan !== null)
+                {{ $luas_bangunan }} m<sup>2</sup>
+            @endif
+        </div>
+
+        <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>
+        </div>
+
+        <div class="signature">
+            Best Regards,<br />
+            <img src="{{ public_path('storage/signatures/' . $permohonan->user->id . '/' . $permohonan->user->sign) }}"
+                alt="{{ $permohonan->user->name }}" width="200">
+            <p>
+                {{ $permohonan->user->name }}
+            </p>
+        </div>
+
+        <div class="footer">
+            PT. Bank Artha Graha Internasional, Tbk.<br>
+            Gedung Bank Artha Graha, Lantai 3<br>
+            Jl. Kwitang Raya No 24-26, Jakarta Pusat - 10420.<br>
+            Telp. 021 - 3903040 (H)
+        </div>
+    </div>
+</body>
+
+</html>
diff --git a/resources/views/penawaran_ulang/index.blade.php b/resources/views/penawaran_ulang/index.blade.php
index d880650..988bf71 100644
--- a/resources/views/penawaran_ulang/index.blade.php
+++ b/resources/views/penawaran_ulang/index.blade.php
@@ -131,13 +131,13 @@
                     <a href="/tender/penawaran/${nomor_registrasi}/edit" class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran">
                         <i class="ki-outline ki-arrow-circle-right"></i>
                     </a>
+                    <a href="/tender/penawaran/${nomor_registrasi}/showKirimEmail" class="btn btn-sm btn-icon btn-clear btn-success" title="Kirim Email">
+                        <i class="ki-filled ki-paper-plane"></i>
+                    </a>
                 `;
                     } else {
                         // Jika tidak ada, tampilkan tombol "Tambah Penawaran"
                         actionDiv.innerHTML = `
-                        <a class="btn btn-sm btn-icon btn-clear btn-warning" title="Detail" href="/tender/penawaran/${nomor_registrasi}/show">
-                    <i class="ki-outline ki-abstract-26"></i>
-                </a>
                     <a href="/tender/penawaran/${nomor_registrasi}/create" class="btn btn-sm btn-icon btn-clear btn-primary" title="Penawaran">
                         <i class="ki-outline ki-arrow-circle-right"></i>
                     </a>
diff --git a/resources/views/permohonan/authorization/show.blade.php b/resources/views/permohonan/authorization/show.blade.php
index bd40825..193999a 100644
--- a/resources/views/permohonan/authorization/show.blade.php
+++ b/resources/views/permohonan/authorization/show.blade.php
@@ -9,7 +9,7 @@
         @include('lpj::component.detail-jaminan',['backLink' => 'authorization.index'])
 
         <div class="card">
-            <form action="{{ route('authorization.update', $permohonan->id) }}" method="POST" id="authorizationForm">
+            <form action="{{ route('authorization.update', $permohonan->id) }}" method="POST" id="authorizationForm" enctype="multipart/form-data">
                 <input type="hidden" name="_method" value="PUT">
                 @csrf
                 <div class="card-body lg:py-7.5">
@@ -27,7 +27,7 @@
                             Upload File Revisi
                         </label>
                         <div class="flex flex-wrap items-baseline w-full">
-                            <input type="file" class="file-input" id="revisionFile" name="revisionFile">
+                            <input type="file" class="file-input" id="revisionFile" name="attachment">
                             <em class="alert text-danger text-sm hidden" id="file-message"></em>
                         </div>
                     </div>
diff --git a/resources/views/permohonan/show.blade.php b/resources/views/permohonan/show.blade.php
index 3ccb967..69b2018 100644
--- a/resources/views/permohonan/show.blade.php
+++ b/resources/views/permohonan/show.blade.php
@@ -6,7 +6,7 @@
 
 @section('content')
     <div class="w-full grid gap-5 lg:gap-7.5 mx-auto">
-        @include('lpj::component.detail-jaminan',['backLink' => 'prmohonan.index'])
+        @include('lpj::component.detail-jaminan', ['backLink' => 'permohonan.index'])
 
         <div class="card">
             <form action="{{ route('permohonan.print', $permohonan->id) }}" method="GET">
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 370ecc3..ff7ab8a 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -399,6 +399,16 @@ Breadcrumbs::for('tender.penawaran.showSuratTender', function (BreadcrumbTrail $
     $trail->push('Surat Tender', route('tender.penawaran.showSuratTender', $noreg));
 });
 
+Breadcrumbs::for('tender.penawaran.suratTenderKJPP', function (BreadcrumbTrail $trail, $noreg, $id) {
+    $trail->parent('tender.penawaran');
+    $trail->push('Surat Tender KJPP', route('tender.penawaran.suratTenderKJPP', ['noreg' => $noreg, 'id' => $id]));
+});
+
+Breadcrumbs::for('tender.penawaran.showKirimEmail', function (BreadcrumbTrail $trail, $noreg) {
+    $trail->parent('tender.penawaran');
+    $trail->push('Show Kirim Email Penawaran', route('tender.penawaran.showKirimEmail', $noreg));
+});
+
 
 Breadcrumbs::for('tender.penawaran.ulang', function (BreadcrumbTrail $trail) {
     $trail->parent('tender');
@@ -442,24 +452,24 @@ Breadcrumbs::for('otorisator.pelaporan.index', function (BreadcrumbTrail $trail)
 
 // basic data surveyor
 $basicDataRoutes = [
-            'bentuk-tanah' => 'Bentuk Tanah',
-            'kontur-tanah' => 'Kontur Tanah',
-            'posisi-kavling' => 'Posisi Kavling',
-            'ketinggian-tanah' => 'Ketinggian Tanah',
-            'kondisi-fisik-tanah' => 'Kondisi Fisik Tanah',
-            'jenis-bangunan' => 'Jenis Bangunan',
-            'kondisi-bangunan' => 'Kondisi Bangunan',
-            'sifat-bangunan' => 'Sifat Bangunan',
-            'spek-bangunan' => 'Speksifikasi Bangunan',
-            'spek-kategori-bangunan' => 'Speksifikasi Kategori Bangunan',
-            'sarana-pelengkap' => 'Sarana Pelengkap',
-            'lalu-lintas-lokasi' => 'Lalu Lintas',
-            'tingkat-keramaian' => 'Tingkat Keramaian',
-            'gol-mas-sekitar' => 'Golongan Masyarakat Sekitar',
-            'lantai-unit' => 'Lantai Unit',
-            'view-unit' => 'View Unit',
-            'bentuk-unit' => 'Bentuk unit',
-            'perkerasan-jalan' => 'Perkerasan jalan'
+    'bentuk-tanah' => 'Bentuk Tanah',
+    'kontur-tanah' => 'Kontur Tanah',
+    'posisi-kavling' => 'Posisi Kavling',
+    'ketinggian-tanah' => 'Ketinggian Tanah',
+    'kondisi-fisik-tanah' => 'Kondisi Fisik Tanah',
+    'jenis-bangunan' => 'Jenis Bangunan',
+    'kondisi-bangunan' => 'Kondisi Bangunan',
+    'sifat-bangunan' => 'Sifat Bangunan',
+    'spek-bangunan' => 'Speksifikasi Bangunan',
+    'spek-kategori-bangunan' => 'Speksifikasi Kategori Bangunan',
+    'sarana-pelengkap' => 'Sarana Pelengkap',
+    'lalu-lintas-lokasi' => 'Lalu Lintas',
+    'tingkat-keramaian' => 'Tingkat Keramaian',
+    'gol-mas-sekitar' => 'Golongan Masyarakat Sekitar',
+    'lantai-unit' => 'Lantai Unit',
+    'view-unit' => 'View Unit',
+    'bentuk-unit' => 'Bentuk unit',
+    'perkerasan-jalan' => 'Perkerasan jalan'
 ];
 
 
diff --git a/routes/web.php b/routes/web.php
index 1ad699b..53eb02a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -394,6 +394,15 @@ Route::middleware(['auth'])->group(function () {
             'penawaran.showSuratTender'
         );
         Route::get('penawaran/{noreg}/suratTender/downloadpdf', [TenderController::class, 'downloadSuratTender'])->name('penawaran.downloadSuratTender');
+        // Kirim Email Penawaran
+        Route::get('penawaran/{noreg}/showKirimEmail', [TenderController::class, 'showKirimEmail'])->name('penawaran.showKirimEmail');
+        Route::get('penawaran/{noreg}/kirimEmailAll', [TenderController::class, 'kirimEmailAll'])->name('penawaran.kirimEmailAll');
+        Route::get('penawaran/{noreg}/suratTenderKJPP/{id}', [TenderController::class, 'suratTenderKJPP'])->name('penawaran.suratTenderKJPP');
+        Route::get('penawaran/{noreg}/suratTenderKJPP/{id}/kirimEmailKJPP', [TenderController::class, 'kirimEmailKJPP'])->name('penawaran.kirimEmailKJPP');
+        Route::get('penawaran/suratTenderShow/{noreg}/datatables', [TenderController::class, 'dataTablesShowKirimSurat'])->name('penawaran.showKirimSurat.datatables');
+        // Download Surat Tender KJPP
+        Route::get('penawaran/{noreg}/suratTenderKJPP/{id}/downloadSuratTenderKJPP', [TenderController::class, 'downloadSuratTenderKJPP'])
+            ->name('penawaran.downloadSuratTenderKJPP');
 
         // Penawaran Ulang
         Route::get('penawaran/ulang', [TenderController::class, 'penawaran_ulang_index'])->name(