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 044c3f6..970fcc7 100644
--- a/app/Helpers/Lpj.php
+++ b/app/Helpers/Lpj.php
@@ -1,36 +1,18 @@
 <?php
 
     use Carbon\Carbon;
-    use Modules\Lpj\Models\HolidayCalendar;
+use Illuminate\Support\Facades\DB;
+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';
     }
 
@@ -120,6 +102,28 @@
         return implode(' ', $words);
     }
 
+    // generate last penawaran.code 
+    function onLastnumberCodePenawaran(): string
+    {
+        // chek data penawaran terakhir --> mengurutkan data berdasarkan kolom `created_at` secara DESC
+        $maxCode = PenawaranTender::max('code');
+        // $penawaran = PenawaranTender::latest()->first();
+        $penawaran = PenawaranTender::where('code','=',$maxCode)->first();
+        $code_penawaran_last='';
+        $noUrutAkhirString = sprintf("%04s", 1);
+        if($penawaran)
+        {
+            $code_penawaran_last = substr ($maxCode, -4);
+            $year_penawaran_last = Carbon::parse($penawaran->created_at)->year;
+            $year_now = Carbon::now()->year;
+            if($year_now == $year_penawaran_last)
+            {
+                $noUrutAkhirString = sprintf("%04s", abs($code_penawaran_last + 1));  
+            }
+        }
+        
+        return 'NP'.Carbon::now()->format('y').$noUrutAkhirString;    
+    }
     // andy add
 
 
diff --git a/app/Http/Controllers/OtorisasiPenawaranController.php b/app/Http/Controllers/OtorisasiPenawaranController.php
index 66180ed..82f6fff 100644
--- a/app/Http/Controllers/OtorisasiPenawaranController.php
+++ b/app/Http/Controllers/OtorisasiPenawaranController.php
@@ -5,6 +5,7 @@ namespace Modules\Lpj\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
+use Carbon\Carbon;
 use Exception;
 use Maatwebsite\Excel\Facades\Excel;
 use Illuminate\Http\JsonResponse;
@@ -40,7 +41,18 @@ class OtorisasiPenawaranController extends Controller
 
         // Retrieve data from the database
         $query =PenawaranTender::query()
-                        ->select('penawaran.*',DB::raw("CONCAT(DATE_FORMAT(penawaran.start_date, '%d %M %Y'), ' -  ', DATE_FORMAT(penawaran.end_date, '%d %M %Y')) AS date_range"), 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                        ->select('penawaran.*', 
+                                'debitures.name as debitures_name', 
+                                'permohonan.tanggal_permohonan',
+                                'users.name as user_pemohon',
+                                'branches.name as branches_name',  
+                                'tujuan_penilaian.name as tujuan_penilaian_name',
+                                'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
+                        ->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi')
+                        ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id')
+                        ->leftJoin('users', 'users.id', '=', 'permohonan.user_id')
+                        ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id')
+                        ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id')
                         ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
                         ->where('penawaran.status','=','proposal-tender')
                         ->withCount('penawarandetails');
@@ -82,6 +94,27 @@ class OtorisasiPenawaranController extends Controller
         //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
         $data = $query->get();
 
+        // format date
+        $i = 0;
+        foreach ($data as $obj) {
+            
+            // tanggal_permohonan
+            if ($obj->tanggal_permohonan) {
+                $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y');
+            }
+
+            // date_range
+            $data[$i]->date_range = "-";
+            if ($obj->start_date && $obj->end_date) 
+            {
+                $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . 
+                                        Carbon::parse($obj->end_date)->format('d M Y');
+            }
+
+            $i++;
+        }
+        // format date
+
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
 
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/ProsesPenawaranController.php b/app/Http/Controllers/ProsesPenawaranController.php
index 05b199c..f457660 100644
--- a/app/Http/Controllers/ProsesPenawaranController.php
+++ b/app/Http/Controllers/ProsesPenawaranController.php
@@ -13,12 +13,16 @@ use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\DB;
+use Modules\Lpj\Http\Requests\ProsesPenawaranRequest;
+use Modules\Lpj\Models\JenisLaporan;
 use Modules\Lpj\Models\KJPP;
 use Modules\Lpj\Models\PenawaranDetailTender;
 use Modules\Lpj\Models\PenawaranDetailTenderLog;
 use Modules\Lpj\Models\PenawaranTender;
 
 use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\StatusPermohonan;
+use Modules\Lpj\Models\TujuanPenilaianKJPP;
 
 class ProsesPenawaranController extends Controller
 {
@@ -40,7 +44,51 @@ class ProsesPenawaranController extends Controller
         }
 
         // Retrieve data from the database
-        $query = PenawaranTender::query()->whereIn('status', ['tender', 'proposal-tender'])->withCount('penawarandetails');
+        // $query = PenawaranTender::query()->whereIn('status', ['tender', 'proposal-tender'])->withCount('penawarandetails');
+
+        // penawaran need union with permohonan
+        $query = PenawaranTender::query()->whereIn('penawaran.status', ['tender', 'proposal-tender'])
+                    ->select('penawaran.id',
+                             'penawaran.nomor_registrasi', 
+                             'penawaran.code as penawaran_code', 
+                             'penawaran.start_date', 
+                             'penawaran.end_date', 
+                             'penawaran.status as statusnya',
+                             'debitures.name as debitures_name', 
+                             'permohonan.tanggal_permohonan',
+                             'users.name as user_pemohon',
+                             'branches.name as branches_name',                             
+                             'tujuan_penilaian.name as tujuan_penilaian_name',
+                             'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name' 
+                             )
+                    ->withCount('penawarandetails')
+                    ->leftJoin('permohonan', 'permohonan.nomor_registrasi', '=', 'penawaran.nomor_registrasi')
+                    ->leftJoin('users', 'users.id', '=', 'permohonan.user_id')
+                    ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id')
+                    ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id')
+                    ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id')
+                    ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id', '=', 'penawaran.tujuan_penilaian_kjpp_id');
+
+        $permohonanQuery = Permohonan::whereIn('permohonan.status', ['registered'])->where('permohonan.jenis_penilaian_id', '=', 2)
+                    ->select('permohonan.id',
+                            'permohonan.nomor_registrasi', 
+                             DB::raw('"" as penawaran_code'), 
+                             DB::raw('"" as start_date'), 
+                             DB::raw('"" as end_date'), 
+                             'permohonan.status as statusnya',
+                            'debitures.name as debitures_name', 
+                            'permohonan.tanggal_permohonan',
+                            'users.name as user_pemohon',
+                            'branches.name as branches_name',                             
+                            'tujuan_penilaian.name as tujuan_penilaian_name',
+                            DB::raw('"" as tujuan_penilaian_kjpp_name'),                             
+                            DB::raw('"-" as penawarandetails_count'))
+                    ->leftJoin('users', 'users.id', '=', 'permohonan.user_id')
+                    ->leftJoin('branches', 'branches.id', '=', 'permohonan.branch_id')
+                    ->leftJoin('debitures', 'debitures.id', '=', 'permohonan.debiture_id')
+                    ->leftJoin('tujuan_penilaian', 'tujuan_penilaian.id','=','permohonan.tujuan_penilaian_id'); 
+        $query->union($permohonanQuery);
+        // penawaran need union with permohonan
 
         // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
@@ -76,8 +124,29 @@ class ProsesPenawaranController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        //$data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
-        $data = $query->with(['tujuanPenilaianKjpp','permohonan','permohonan.debiture'])->get();
+        // $data = $query->with(['tujuanPenilaianKjpp','permohonan','permohonan.debiture'])->get();
+        $data = $query->get();
+
+        // format date
+        $i = 0;
+        foreach ($data as $obj) {
+            
+            // tanggal_permohonan
+            if ($obj->tanggal_permohonan) {
+                $data[$i]->tanggal_permohonan = Carbon::parse($obj->tanggal_permohonan)->format('d M Y');
+            }
+
+            // date_range
+            $data[$i]->date_range = "-";
+            if ($obj->start_date && $obj->end_date) 
+            {
+                $data[$i]->date_range = Carbon::parse($obj->start_date)->format('d M Y') . ' - ' . 
+                                        Carbon::parse($obj->end_date)->format('d M Y');
+            }
+
+            $i++;
+        }
+        // format date
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
@@ -826,4 +895,77 @@ class ProsesPenawaranController extends Controller
 
         return response()->json($data);
     }
+
+    // merger permohonan
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function createPenawaran($id)
+    {
+        // id ==> permohonan.id
+        $permohonan = Permohonan::find($id);
+        // dd($permohonan);
+        $status = StatusPermohonan::all();
+        $tujuan_penilaian_kjpp = TujuanPenilaianKJPP::all();
+        $jenis_laporan = JenisLaporan::all();
+        $kjpp = KJPP::all();
+
+        return view('lpj::prosespenawaran.createPenawaran', compact('id', 'status', 'tujuan_penilaian_kjpp', 'jenis_laporan', 'kjpp', 'permohonan'));
+    }
+
+    public function storePenawaran(ProsesPenawaranRequest $request, $id)
+    {
+        $validated = $request->validated();
+
+        DB::beginTransaction();
+
+        try {
+
+            $permohonan = Permohonan::find($id);
+
+            $userId = Auth::user()->id;
+            $validated['nomor_registrasi'] = $permohonan->nomor_registrasi;
+            $validated['status'] = 'tender';
+            $validated['updated_by'] = $userId; // Updating the record
+            $validated['end_date'] = $request->input('end_date') . ' 23:59:59';
+
+            $permohonan->update($validated);
+
+            // Adding created_by for the new penawaran record
+            $validated['created_by'] = $userId;
+            $validated['code'] = onLastnumberCodePenawaran();
+            $penawaran = PenawaranTender::create($validated);
+
+            $kjpps = $request->input('kjpp', []);
+
+            foreach ($kjpps as $kjpp) {
+                PenawaranDetailTender::create([
+                    'penawaran_id' => $penawaran->id,
+                    'kjpp_rekanan_id' => $kjpp,
+                    'created_by' => $userId, // Set created_by for details
+                    'updated_by' => $userId
+                ]);
+            }
+
+             // Commit the transaction
+             DB::commit();
+
+             return redirect()
+                 ->route('tender.prosespenawaran.index')
+                 ->with('success', 'Data Penawaran created successfully');
+        } catch (Exception $e) {
+            DB::rollBack();
+
+            return redirect()
+                ->route('tender.prosespenawaran.createPenawaran', $id)
+                ->with('error', 'Validation failed: ' . $e);
+        }
+    }
+
+    public function showPermohonan($id)
+    {
+        $permohonan  = Permohonan::find($id);
+        return view('lpj::prosespenawaran.showPermohonan', compact('id', 'permohonan'));
+    }
+    // merger permohonan
 }
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/Http/Requests/ProsesPenawaranRequest.php b/app/Http/Requests/ProsesPenawaranRequest.php
new file mode 100644
index 0000000..9b31000
--- /dev/null
+++ b/app/Http/Requests/ProsesPenawaranRequest.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace Modules\Lpj\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ProsesPenawaranRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'kjpp.*' => 'exists:kjpp,id',
+            'tujuan_penilaian_kjpp_id' => 'required',
+            'jenis_laporan_id' => 'required',
+            'start_date' => 'required',
+            'end_date' => 'required',
+            'catatan' => 'nullable'
+        ];
+
+        // if ($this->method() == 'PUT') {
+        //    $rules['code'] = 'required|max:50';
+        // } else {
+        //    $rules['code'] = 'required|max:50|unique:penawaran,code';
+        // }
+
+        return $rules;
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    public function messages(): array
+    {
+        return [
+            'code.required' => 'Kode Penawaran Wajib diisi!',
+            'code.max' => 'Kode Penawaran maksimal 255 huruf!',
+            'code.unique' => 'Kode Penawaran tidak boleh sama!',
+            'tujuan_penilaian_kjpp_id.required' => 'Tujuan Penilaian KJPP Wajib diisi!',
+            'jenis_laporan_id.required' => 'Jenis Laporan Wajib diisi!',
+            'start_date.required' => 'Tanggal Awal Wajib diisi!',
+            'end_date.required' => 'Tanggal Akhir Wajib diisi!',
+        ];
+    }
+
+    public function withValidator($validator)
+    {
+        $validator->after(function ($validator) {
+            $startDate = strtotime($this->input('start_date'));
+            $endDate = strtotime($this->input('end_date'));
+            $today = strtotime(date('Y-m-d'));
+
+            // Jika dalam keadaan tambah penawaran maka munculkan pesan ini
+            // if ($this->method() !== 'PUT') {
+            //    if ($startDate < $today) {
+            //        $validator->errors()->add('start_date', 'Tanggal Awal tidak boleh sebelum hari ini.');
+            //    }
+            // }
+
+            if ($endDate < $startDate) {
+                $validator->errors()->add('end_date', 'Tanggal Akhir tidak boleh lebih awal dari Tanggal Awal.');
+            }
+
+
+            // Validasi minimal 3 pilihan pada nama_kjpp
+            $namaKjpp = $this->input('kjpp', []);
+
+            // jika nama KJPP itu kosong
+            if (empty($namaKjpp)) {
+                $validator->errors()->add('kjpp', 'Nama KJPP wajib diisi.');
+            }
+            // jika terisi kurang dari 3 item
+            elseif (is_array($namaKjpp) && count($namaKjpp) < 3) {
+                $validator->errors()->add('kjpp', 'Nama KJPP minimal 3 pilihan.');
+            }
+        });
+    }
+}
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 a3b35c1..0255e63 100644
--- a/app/Models/Permohonan.php
+++ b/app/Models/Permohonan.php
@@ -1,150 +1,156 @@
 <?php
 
-namespace Modules\Lpj\Models;
+    namespace Modules\Lpj\Models;
 
-use Illuminate\Support\Facades\Storage;
-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',
-    ];
-
-    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');
+            });
+        }
 
-            $permohonan->dokumen = $filePath;
+        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;
+            }
+        }
+
+        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->dokumen ? Storage::disk('public')->path($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');
-    }
-}
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/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/module.json b/module.json
index c4bd9c7..9e3a069 100644
--- a/module.json
+++ b/module.json
@@ -36,14 +36,6 @@
         "permission": "",
         "roles": ["administrator", "admin"],
         "sub": [
-          {
-            "title": "Data Penawaran",
-            "path": "tender.penawaran",
-            "classes": "",
-            "attributes": [],
-            "permission": "",
-            "roles": ["administrator", "admin"]
-          },
           {
             "title": "Data Proses Penawaran",
             "path": "tender.prosespenawaran",
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/otorisasipenawaran/edit.blade.php b/resources/views/otorisasipenawaran/edit.blade.php
index 2940e0c..e1de931 100644
--- a/resources/views/otorisasipenawaran/edit.blade.php
+++ b/resources/views/otorisasipenawaran/edit.blade.php
@@ -36,11 +36,11 @@
 
             <div class="mb-5">
                 <h3 class="text-md font-medium text-gray-900">
-                    Kode Penawaran:
+                    Nomor Penawaran:
                 </h3>
                 <span class="text-2sm text-gray-700">
                     <label class="card-title" id="textCodePenawaran">
-                        Kode Penawaran
+                        Nomor Penawaran
                     </label>
                 </span>
             </div>
@@ -69,7 +69,9 @@
                             <thead>
                                 <tr>
                                     <th class="w-14 text-center">No</th>
-                                    <th class="min-w-[250px]">KJPP</th>
+                                    <th class="min-w-[80px]">KJPP</th>
+                                    <th>No Proposal</th>
+                                    <th>Tanggal Proposal</th>
                                     <th>Biaya Penawaran</th>
                                     <th>Dokumen Penawaran</th>
                                     <th class="min-w-[50px] text-center">Action</th>
@@ -98,7 +100,9 @@
                             <thead>
                                 <tr>
                                     <th class="w-14 text-center">No</th>
-                                    <th class="min-w-[250px]">KJPP</th>
+                                    <th class="min-w-[80px]">KJPP</th>
+                                    <th>No Proposal</th>
+                                    <th>Tanggal Proposal</th>
                                     <th>Biaya Penawaran</th>
                                     <th>Dokumen Penawaran</th>
                                     <th>created_at</th>
diff --git a/resources/views/otorisasipenawaran/index.blade.php b/resources/views/otorisasipenawaran/index.blade.php
index 5156678..41b1ccd 100644
--- a/resources/views/otorisasipenawaran/index.blade.php
+++ b/resources/views/otorisasipenawaran/index.blade.php
@@ -36,17 +36,37 @@
                                     <span class="sort-icon"> </span> </span>
                             </th>
                             <th class="min-w-[150px]" data-datatable-column="code">
-                                <span class="sort"> <span class="sort-label"> Kode Penawaran </span>
+                                <span class="sort"> <span class="sort-label"> Nomor Penawaran</span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="start_date">
+                            <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="user_pemohon">
+                                <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="branches_name">
+                                <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="debiture">
+                                <span class="sort"> <span class="sort-label"> Nama Debitur </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[150px]" data-datatable-column="date_range">
                                 <span class="sort"> <span class="sort-label"> Tanggal Penawaran </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
-                            <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
+                            <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_name">
                                 <span class="sort"> <span class="sort-label"> Tujuan Penilaian </span>
                                     <span class="sort-icon"> </span> </span>
                             </th>
+                            <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
+                                <span class="sort"> <span class="sort-label"> Tujuan Penilaian KJPP </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
                             <th class="min-w-[150px]" data-datatable-column="penawarandetails_count">
                                 <span class="sort"> <span class="sort-label"> Total KJPP </span>
                                     <span class="sort-icon"> </span> </span>
@@ -107,13 +127,40 @@
                     title: 'Nomor Registrasi',
                 },
                 code: {
-                    title: 'Kode Penawaran',
+                    title: 'Nomor Penawaran',
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Permohonan',
+                },
+                user_pemohon: {
+                    title: 'User Pemohon',
+                },
+                branches_name: {
+                    title: 'Cabang Pemohon',
+                },
+                debiture: {
+                    title: 'Nama Debitur',
+                    render: (item, data) => {
+                        if(data.debitures_name) {
+                            return `${data.debitures_name}`;
+                        }
+                        return "-";
+                    }
                 },
                 date_range: {
                     title: 'Tanggal Penawaran',
                 },
-                tujuan_penilaian_kjpp_name: {
+                tujuan_penilaian_name: {
                     title: 'Tujuan Penilaian',
+                    render: (item, data) => {
+                        return data.tujuan_penilaian_name
+                    }
+                },
+                tujuan_penilaian_kjpp: {
+                    title: 'Tujuan Penilaian KJPP',
+                    render: (item, data) => {
+                        return data.tujuan_penilaian_kjpp_name
+                    }
                 },
                 penawarandetails_count: {
                     title: 'Total KJPP',
@@ -122,7 +169,10 @@
                     },
                 },
                 status: {
-                    title: 'Status'
+                    title: 'Status',
+                    render: (item, data) => {
+                        return data.status.toUpperCase()
+                    }
                 },
                 actions: {
                     title: 'Status',
diff --git a/resources/views/otorisasipenawaran/js/editjs.blade.php b/resources/views/otorisasipenawaran/js/editjs.blade.php
index cc67d20..409037d 100644
--- a/resources/views/otorisasipenawaran/js/editjs.blade.php
+++ b/resources/views/otorisasipenawaran/js/editjs.blade.php
@@ -63,6 +63,8 @@
         $.each(datas, function(key, value){
 
             var kjppName = value.kjpp_code+' - '+value.kjpp_name;
+            var no_proposal = (value.no_proposal)??'';// alert(no_proposal);
+            var tgl_proposal = (value.tgl_proposal)??'';// alert(tgl_proposal);
             var biaya_penawaran = value.biaya_penawaran;// alert(biaya_penawaran);
             var htmlDokumenPersetujuanDownload='';
             var dokumenPersetujuanDownload = value.dokumen_persetujuan;
@@ -79,6 +81,8 @@
             var markup = '<tr>';
             markup +='<td valign="top">'+i+'</td>';
             markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+kjppName+'</label></td>';
+            markup +='<td valign="top">'+no_proposal+'</td>';
+            markup +='<td valign="top">'+tgl_proposal+'</td>';
             markup +='<td valign="top" align="right">Rp.'+biaya_penawaran_format+'</td>';
             markup +='<td><em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload+'</td>';
             markup +='<td><div class="flex flex-nowrap justify-center">';
@@ -113,6 +117,8 @@
         $.each(datas, function(key, value){
 
             var kjppName = value.kjpp_code+' - '+value.kjpp_name;
+            var no_proposal = (value.no_proposal)??'';// alert(no_proposal);
+            var tgl_proposal = (value.tgl_proposal)??'';// alert(tgl_proposal);
             var biaya_penawaran = value.biaya_penawaran;// alert(biaya_penawaran);
             var htmlDokumenPersetujuanDownload='';
             var dokumenPersetujuanDownload = value.dokumen_persetujuan;
@@ -129,6 +135,8 @@
             var markup = '<tr>';
             markup +='<td valign="top">'+i+'</td>';
             markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+kjppName+'</label></td>';
+            markup +='<td valign="top">'+no_proposal+'</td>';
+            markup +='<td valign="top">'+tgl_proposal+'</td>';
             markup +='<td valign="top" align="right">Rp.'+biaya_penawaran_format+'</td>';
             markup +='<td><em id="{{$route[1]}}_dokumenPersetujuan_msg_'+value.id+'" class="alert text-danger text-sm"></em>'+htmlDokumenPersetujuanDownload+'</td>';
             markup +='<td valign="top"><label id="{{$route[1]}}_kjppName_'+value.id+'">'+value.created_at2+'</label></td>';
diff --git a/resources/views/otorisasipenawaran/show.blade.php b/resources/views/otorisasipenawaran/show.blade.php
index 0e6d2e1..8a1f7e1 100644
--- a/resources/views/otorisasipenawaran/show.blade.php
+++ b/resources/views/otorisasipenawaran/show.blade.php
@@ -29,7 +29,7 @@
             </div>
             <div class="mb-5">
                 <h3 class="text-md font-medium text-gray-900">
-                    Kode Penawaran:
+                    Nomor Penawaran:
                 </h3>
                 <span class="text-2sm text-gray-700">
                     {{ $prosespenawaran->code }}
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/prosespenawaran/createPenawaran.blade.php b/resources/views/prosespenawaran/createPenawaran.blade.php
new file mode 100644
index 0000000..df7b497
--- /dev/null
+++ b/resources/views/prosespenawaran/createPenawaran.blade.php
@@ -0,0 +1,222 @@
+@extends('layouts.main')
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+@php
+    // $route = Route::currentRouteName();
+    // dd($route); tender.prosespenawaran.create
+    $route = explode('.', Route::currentRouteName());
+@endphp
+
+@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">
+                Tambah Data Penawaran
+            </h3>
+            <div class="flex items-center gap-2">
+                <a href="{{ route('tender.prosespenawaran.showPermohonan', $id) }}" class="btn btn-xs btn-primary" title="Detail"><i class="ki-filled ki-abstract-26"></i> Detail</a>
+                <a href="{{ route('tender.prosespenawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+            </div>
+        </div><!-- $id = permohonan.id -->
+        <form action="{{ route('tender.prosespenawaran.storePenawaran', $id) }}" method="POST">
+            @csrf
+            <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 KJPP Sebelumnya
+                    </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_kjpp_sebelumnya" readonly value="">
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Biaya KJPP Sebelumnya
+                    </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="biaya_kjpp_sebelumnya" readonly value="">
+                    </div>
+                    <label class="form-label max-w-56">
+                        Tanggal Penilaian Sebelumnya
+                    </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="tanggal_penilaian_sebelumnya" readonly value="">
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Nomor Penawaran
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        -
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Data KJPP
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <select name="kjpp[]" multiple="multiple"
+                            class="input tomselect w-full @error('kjpp') border-danger @enderror" id="kjpp_select">
+                            <option value=""> - Pilih KJPP - </option>
+                            @foreach ($kjpp as $row)
+                                @if (isset($kjpp))
+                                    <option value="{{ $row->id }}"
+                                        {{ in_array($row->id, old('kjpp', [])) ? 'selected' : '' }}>
+                                        {{ $row->name }}
+                                    </option>
+                                @endif
+                            @endforeach
+                        </select>
+                        @error('kjpp')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tujuan Penilaian KJPP
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <select id="tujuan_penilaian_kjpp_id"
+                            class="select w-full @error('tujuan_penilaian_kjpp_id') border-danger  @enderror"
+                            name="tujuan_penilaian_kjpp_id">
+                            <option value=""> - Pilih Tujuan Penilaian KJPP - </option>
+                            @if (isset($tujuan_penilaian_kjpp))
+                                @foreach ($tujuan_penilaian_kjpp as $tp)
+                                    <option value="{{ $tp->id }}"
+                                        {{ old('tujuan_penilaian_kjpp_id') == $tp->id ? 'selected' : '' }}>
+                                        {{ $tp->name }}
+                                    </option>
+                                @endforeach
+                            @endif
+                        </select>
+                        @error('tujuan_penilaian_kjpp_id')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Tanggal Batas Waktu
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <input class="input  @error('start_date') border-danger  @enderror" type="date"
+                            name="start_date" value="{{ old('start_date') }}">
+                        @error('start_date')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                    -
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <input class="input  @error('end_date') border-danger  @enderror" name="end_date"
+                            value="{{ old('end_date') }}" type="date">
+                        @error('end_date')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Catatan
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <textarea class="textarea  @error('catatan') border-danger  @enderror" name="catatan" rows="3" id="address">{{ old('catatan') }}</textarea>
+                        @error('catatan')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                    <label class="form-label max-w-56">
+                        Jenis Laporan
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <select id="jenis_laporan_id"
+                            class="select w-full @error('jenis_laporan_id') border-danger  @enderror"
+                            name="jenis_laporan_id">
+                            <option value=""> - Pilih Jenis Laporan - </option>
+                            @if (isset($jenis_laporan))
+                                @foreach ($jenis_laporan as $jl)
+                                    <option value="{{ $jl->id }}"
+                                        {{ old('jenis_laporan_id') == $jl->id ? 'selected' : '' }}>
+                                        {{ $jl->name }}
+                                    </option>
+                                @endforeach
+                            @endif
+                        </select>
+                        @error('jenis_laporan_id')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                </div>
+                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5 status-custom">
+                    <label class="form-label max-w-56">
+                        Status
+                    </label>
+                    <div class="flex flex-wrap items-baseline w-full">
+                        <select class="select w-full @error('status') border-danger  @enderror" name="status">
+                            <option value="">Pilih Status</option>
+                            @if (isset($status))
+                                @foreach ($status as $s)
+                                    <option value="{{ $s->name }}"
+                                        {{ old('status') == $s->name ? 'selected' : '' }}>
+                                        {{ $s->name }}
+                                    </option>
+                                @endforeach
+                            @endif
+                        </select>
+                        @error('status')
+                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                        @enderror
+                    </div>
+                </div>
+                <div class="flex justify-end gap-1.5">
+                    @if (isset($penawaran->nomor_registrasi))
+                        <a href="{{ route('tender.penawaran.showSuratTender', $noreg) }}" class="btn btn-primary">
+                            Surat Tender
+                        </a>
+                    @endif
+                    <button type="submit" class="btn btn-primary">
+                        Save
+                    </button>
+                </div>
+            </div>
+        </form> 
+    </div>       
+</div>
+@endsection
+@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
\ No newline at end of file
diff --git a/resources/views/prosespenawaran/edit.blade.php b/resources/views/prosespenawaran/edit.blade.php
index e757972..124e9aa 100644
--- a/resources/views/prosespenawaran/edit.blade.php
+++ b/resources/views/prosespenawaran/edit.blade.php
@@ -38,11 +38,11 @@
                         </div>
                         <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                             <label class="form-label max-w-56">
-                                Kode Penawaran
+                                Nomor Penawaran
                             </label>
                             <div class="flex flex-wrap items-baseline w-full">
                                 <label class="card-title" id="textCodePenawaran">
-                                    Kode Penawaran
+                                    Nomor Penawaran
                                 </label>
                             </div>
                         </div>
diff --git a/resources/views/prosespenawaran/editulang.blade.php b/resources/views/prosespenawaran/editulang.blade.php
index 66f2125..e3b25b8 100644
--- a/resources/views/prosespenawaran/editulang.blade.php
+++ b/resources/views/prosespenawaran/editulang.blade.php
@@ -37,11 +37,11 @@
 
             <div class="mb-5">
                 <h3 class="text-md font-medium text-gray-900">
-                    Kode Penawaran:
+                    Nomor Penawaran:
                 </h3>
                 <span class="text-2sm text-gray-700">
                     <label class="card-title" id="textCodePenawaran">
-                        Kode Penawaran
+                        Nomor Penawaran
                     </label>
                 </span>
             </div>
diff --git a/resources/views/prosespenawaran/index.blade.php b/resources/views/prosespenawaran/index.blade.php
index ca0f017..8f353df 100644
--- a/resources/views/prosespenawaran/index.blade.php
+++ b/resources/views/prosespenawaran/index.blade.php
@@ -38,6 +38,23 @@
                                     <span class="sort"> <span class="sort-label"> Nomor Registrasi </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
+                                <th class="min-w-[150px]" data-datatable-column="penawaran_code">
+                                    <span class="sort"> <span class="sort-label"> Nomor Penawaran</span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                
+                                <th class="min-w-[150px]" data-datatable-column="tanggal_permohonan">
+                                    <span class="sort"> <span class="sort-label"> Tanggal Permohonan </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="user_pemohon">
+                                    <span class="sort"> <span class="sort-label"> User Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
+                                <th class="min-w-[150px]" data-datatable-column="branches_name">
+                                    <span class="sort"> <span class="sort-label"> Cabang Pemohon </span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
                                 <th class="min-w-[150px]" data-datatable-column="debiture">
                                     <span class="sort"> <span class="sort-label"> Nama Debitur </span>
                                         <span class="sort-icon"> </span> </span>
@@ -46,6 +63,10 @@
                                     <span class="sort"> <span class="sort-label"> Tanggal Penawaran </span>
                                         <span class="sort-icon"> </span> </span>
                                 </th>
+                                <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_name">
+                                    <span class="sort"> <span class="sort-label"> Tujuan Penilaian</span>
+                                        <span class="sort-icon"> </span> </span>
+                                </th>
                                 <th class="min-w-[150px]" data-datatable-column="tujuan_penilaian_kjpp_id">
                                     <span class="sort"> <span class="sort-label"> Tujuan Penilaian KJPP </span>
                                         <span class="sort-icon"> </span> </span>
@@ -82,29 +103,11 @@
 
 @push('scripts')
     <script type="text/javascript">
-        function formatDate(date) {
-            const day = date.getDate().toString().padStart(2, '0');
-            const month = (date.getMonth() + 1).toString().padStart(2, '0');
-            // Months are 0-indexed
-            const year = date.getFullYear();
-
-            return `${day} ${getIndonesianMonth(month)} ${year}`;
+        function showPermohonanData(regId) {
+            var url = "{{ url('tender/prosespenawaran') }}/" + regId + "/showPermohonan";
+            $(location).attr('href', url);
         }
-
-        function getIndonesianMonth(month) {
-            const months = ['Januari', 'Februari', 'Maret', 'April', 'Mei', 'Juni',
-                'Juli', 'Agustus', 'September', 'Oktober', 'November', 'Desember'
-            ];
-            return months[month -
-                1];
-        }
-
-        function capitalizeWords(str) {
-            return str.replace(/\b\w/g, function(char) {
-                return char.toUpperCase();
-            });
-        }
-
+        
         function showPenawaranData(regId) {
             var url = "{{ url('tender/prosespenawaran') }}/" + regId;
             $(location).attr('href', url);
@@ -132,27 +135,40 @@
                 'nomor_registrasi': {
                     title: 'Nomor Registrasi',
                 },
+                'penawaran_code': {
+                    title: 'Kode Penawaran',
+                },
+                tanggal_permohonan: {
+                    title: 'Tanggal Permohonan',
+                },
+                user_pemohon: {
+                    title: 'User Pemohon',
+                },
+                branches_name: {
+                    title: 'Cabang Pemohon',
+                },
                 debiture: {
                     title: 'Nama Debitur',
                     render: (item, data) => {
-                        if(data.permohonan) {
-                            return `${data.permohonan.debiture.name}`;
+                        if(data.debitures_name) {
+                            return `${data.debitures_name}`;
                         }
                         return "-";
                     }
-
-
                 },
-                start_date: {
+                date_range: {
                     title: 'Tanggal Penawaran',
+                },
+                tujuan_penilaian_name: {
+                    title: 'Tujuan Penilaian',
                     render: (item, data) => {
-                        return `${formatDate(new Date(data.start_date))} - ${formatDate(new Date(data.end_date))}`
+                        return data.tujuan_penilaian_name
                     }
                 },
                 tujuan_penilaian_kjpp: {
                     title: 'Tujuan Penilaian KJPP',
                     render: (item, data) => {
-                        return data.tujuan_penilaian_kjpp.name
+                        return data.tujuan_penilaian_kjpp_name
                     }
                 },
                 penawarandetails_count: {
@@ -164,32 +180,43 @@
                 status: {
                     title: 'Status',
                     render: (item, data) => {
-                        return capitalizeWords(data.status)
+                        return data.statusnya.toUpperCase()
                     }
                 },
                 actions: {
                     title: 'Status',
                     render: (item, data) => {
-                        // data.id ==> penawaran.id
+                       
                         var iconProses ='';
-                        if('tender'==data.status)
+                        var iconDetail =`<a onclick="showPenawaranData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>`;
+                        if('registered'==data.statusnya)
                         {
+                            // data.id ==> permohonan.id
+                            iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Penawaran" href="tender/prosespenawaran/${data.id}/createPenawaran">
+                                                <i class="ki-outline ki-feather"></i>
+                                            </a>`;
+                            iconDetail=`<a onclick="showPermohonanData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>`;
+                        }   
+                        else if('tender'==data.statusnya)
+                        {
+                             // data.id ==> penawaran.id
                             iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran" href="tender/prosespenawaran/${data.id}/edit">
                                                 <i class="ki-outline ki-notepad-edit"></i>
                                             </a>`;
                         }   
-                        else if('proposal-tender'==data.status)
+                        else if('proposal-tender'==data.statusnya)
                         {
+                             // data.id ==> penawaran.id
                             iconProses=`<a class="btn btn-sm btn-icon btn-clear btn-info" title="Proses Penawaran Ulang" href="tender/prosespenawaran/${data.id}/editulang">
                                                     <i class="ki-outline ki-arrow-circle-right"></i>
                                                 </a>`;
                         }
 
-                        return `<div class="flex flex-nowrap justify-center">
-                            <a onclick="showPenawaranData(${data.id})" class="btn btn-sm btn-icon btn-clear btn-primary" title="Detail">
-                                <i class="ki-outline ki-eye"></i>
-                            </a>`+iconProses+`
-                        </div>`;
+                        return `<div class="flex flex-nowrap justify-center">`+iconDetail+iconProses+`</div>`;
                     },
                 }
             },
diff --git a/resources/views/prosespenawaran/show.blade.php b/resources/views/prosespenawaran/show.blade.php
index 2629eb2..4e90af8 100644
--- a/resources/views/prosespenawaran/show.blade.php
+++ b/resources/views/prosespenawaran/show.blade.php
@@ -40,7 +40,7 @@
             </div>
             <div class="mb-5">
                 <h3 class="text-md font-medium text-gray-900">
-                    Kode Penawaran:
+                    Nomor Penawaran:
                 </h3>
                 <span class="text-2sm text-gray-700">
                     {{ $prosespenawaran->code }}
diff --git a/resources/views/prosespenawaran/showPermohonan.blade.php b/resources/views/prosespenawaran/showPermohonan.blade.php
new file mode 100644
index 0000000..388f4e8
--- /dev/null
+++ b/resources/views/prosespenawaran/showPermohonan.blade.php
@@ -0,0 +1,50 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+@php
+    $route = explode('.', Route::currentRouteName());
+@endphp
+@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">
+                Detail Data Proses Penawaran
+            </h3>
+            <div class="flex items-center gap-2">
+                @php
+                    $buttonProses='';
+                    if('registered'==$permohonan->status)
+                    {
+                        $buttonProses='<a href="'. route('tender.prosespenawaran.createPenawaran', $id) .'" class="btn btn-xs btn-primary" title="Penawaran"><i class="ki-outline ki-notepad-edit"></i>Penawaran</a>';
+                    }
+                @endphp
+                {!! $buttonProses !!}
+                <a href="{{ route('tender.prosespenawaran.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+            </div>
+        </div>
+        <div class="card-body lg:py-7.5 grid grid-cols-3">
+            <div class="mb-5">
+                <h3 class="text-md font-medium text-gray-900">
+                    Nomor Register Permohonan:
+                </h3>
+                <span class="text-2sm text-gray-700">
+                    {{ $permohonan->nomor_registrasi }}
+                </span>
+            </div>
+            <div class="mb-5">
+                <h3 class="text-md font-medium text-gray-900">
+                    Nomor Penawaran:
+                </h3>
+                <span class="text-2sm text-gray-700">
+                    -
+                </span>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+@endsection
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 814ba78..0b0b178 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');
diff --git a/routes/breadcrumbs_registrasi.php b/routes/breadcrumbs_registrasi.php
index cd89248..475e034 100644
--- a/routes/breadcrumbs_registrasi.php
+++ b/routes/breadcrumbs_registrasi.php
@@ -20,38 +20,48 @@ Breadcrumbs::for('registrasi.show', function (BreadcrumbTrail $trail) {
 // prosespenawaran
 Breadcrumbs::for('tender.prosespenawaran', function (BreadcrumbTrail $trail) {
     $trail->parent('tender');
-    $trail->push('Data Proses Penawaran', route('tender.prosespenawaran.index'));
+    $trail->push('Proses Penawaran', route('tender.prosespenawaran.index'));
 });
 
 Breadcrumbs::for('tender.prosespenawaran.edit', function (BreadcrumbTrail $trail) {
     $trail->parent('tender.prosespenawaran');
-    $trail->push('Tambah Data Proses Penawaran');
+    $trail->push('Tambah Proses Penawaran');
 });
 
 Breadcrumbs::for('tender.prosespenawaran.show', function (BreadcrumbTrail $trail) {
     $trail->parent('tender.prosespenawaran');
-    $trail->push('Detail Data Proses Penawaran');
+    $trail->push('Detail Proses Penawaran');
 });
 
 Breadcrumbs::for('tender.prosespenawaran.editulang', function (BreadcrumbTrail $trail) {
     $trail->parent('tender.prosespenawaran');
-    $trail->push('Tambah Data Proses Penawaran Ulang');
+    $trail->push('Tambah Proses Penawaran Ulang');
+});
+
+Breadcrumbs::for('tender.prosespenawaran.createPenawaran', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender.prosespenawaran');
+    $trail->push('Tambah Data Penawaran');
+});
+
+Breadcrumbs::for('tender.prosespenawaran.showPermohonan', function (BreadcrumbTrail $trail) {
+    $trail->parent('tender.prosespenawaran');
+    $trail->push('Detail Proses Penawaran');
 });
 // prosespenawaran
 // Proses Penawaran Ulang
 Breadcrumbs::for('tender.prosespenawaranulang', function (BreadcrumbTrail $trail) {
     $trail->parent('tender');
-    $trail->push('Data Proses Penawaran Ulang', route('tender.prosespenawaranulang.index'));
+    $trail->push('Proses Penawaran Ulang', route('tender.prosespenawaranulang.index'));
 });
 
 Breadcrumbs::for('tender.prosespenawaranulang.edit', function (BreadcrumbTrail $trail) {
     $trail->parent('tender.prosespenawaranulang');
-    $trail->push('Tambah Data Proses Penawaran Ulang');
+    $trail->push('Tambah Proses Penawaran Ulang');
 });
 
 Breadcrumbs::for('tender.prosespenawaranulang.show', function (BreadcrumbTrail $trail) {
     $trail->parent('tender.prosespenawaranulang');
-    $trail->push('Detail Data Proses Penawaran Ulang');
+    $trail->push('Detail Proses Penawaran Ulang');
 });
 // Proses Penawaran Ulang
 // Otorisasi Tender
diff --git a/routes/registrasi.php b/routes/registrasi.php
index f07265c..5632d20 100644
--- a/routes/registrasi.php
+++ b/routes/registrasi.php
@@ -59,6 +59,12 @@ Route::middleware(['auth'])->group(function () {
             Route::post('prosespenawaran/setDataUlang', 'setDataUlang')->name('prosespenawaran.setDataUlang');
             Route::put('/prosespenawaran2/{prosespenawaran2}', 'updateulang')->name('prosespenawaran.updateulang');
             Route::put('/prosespenawaranKJPPStatusUlang/{prosespenawaranKJPPStatusUlang}', 'updateKJPPStatusUlang')->name('prosespenawaran.updateKJPPStatusUlang');
+        
+            // merger penawaran 
+            Route::get('/prosespenawaran/{prosespenawaran}/showPermohonan', 'showPermohonan')->name('prosespenawaran.showPermohonan');
+            Route::get('prosespenawaran/{prosespenawaran}/createPenawaran', 'createPenawaran')->name('prosespenawaran.createPenawaran');
+            Route::post('prosespenawaran/{prosespenawaran}/storePenawaran', 'storePenawaran')->name('prosespenawaran.storePenawaran');
+            // merger penawaran 
         });
 
         // Proses Penawaran Ulang
diff --git a/routes/web.php b/routes/web.php
index c25e4c8..84857b7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -398,6 +398,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(