diff --git a/app/Http/Controllers/TenderController.php b/app/Http/Controllers/TenderController.php
index 5231544..f4edb45 100644
--- a/app/Http/Controllers/TenderController.php
+++ b/app/Http/Controllers/TenderController.php
@@ -631,6 +631,10 @@ class TenderController extends Controller
                 $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);
@@ -810,16 +814,20 @@ class TenderController extends Controller
         $cities = City::where('code', $city_permohonan)->get();
         $provinces = Province::where('code', $province_permohonan)->get();
 
-        SendPenawaranKJPPTenderJob::dispatch(
-            $kjpps,
-            $dp1,
-            $penawaran,
-            $permohonan,
-            $villages,
-            $districts,
-            $cities,
-            $provinces
-        );
+        try {
+            $balikan = SendPenawaranKJPPTenderJob::dispatch(
+                $kjpps,
+                $dp1,
+                $penawaran,
+                $permohonan,
+                $villages,
+                $districts,
+                $cities,
+                $provinces
+            );
+        } catch (\Exception $e) {
+            return redirect()->route('tender.penawaran.ulang.index')->with('error', 'Email Penawaran Gagal Terkirim!');
+        }
 
         return redirect()->route('tender.penawaran.ulang.index')->with('success', 'Email Penawaran Berhasil Terkirim!');
     }
diff --git a/app/Jobs/SendPenawaranKJPPTenderJob.php b/app/Jobs/SendPenawaranKJPPTenderJob.php
index b85b8ce..52045a2 100644
--- a/app/Jobs/SendPenawaranKJPPTenderJob.php
+++ b/app/Jobs/SendPenawaranKJPPTenderJob.php
@@ -52,6 +52,7 @@ class SendPenawaranKJPPTenderJob implements ShouldQueue
             $this->cities,
             $this->provinces
         );
+
         $email->with([
             'dp1' => $this->dp1, // Kirim seluruh array dp1 ke email
             'penawaran' => $this->penawaran,
@@ -62,6 +63,6 @@ class SendPenawaranKJPPTenderJob implements ShouldQueue
             'provinces' => $this->provinces,
         ]);
 
-        Mail::to($this->kjpps)->send($email);
+        $send = Mail::to($this->kjpps)->send($email);
     }
 }
diff --git a/resources/views/penawaran/layouts/scripts.blade.php b/resources/views/penawaran/layouts/scripts.blade.php
index dca85b3..9b70607 100644
--- a/resources/views/penawaran/layouts/scripts.blade.php
+++ b/resources/views/penawaran/layouts/scripts.blade.php
@@ -32,6 +32,12 @@
                         return data.numbernya;
                     }
                 },
+                nomor_kjpp: {
+                    title: 'Nomor KJPP',
+                    render: (item, data) => {
+                        return `${data.kjpp.code}`
+                    }
+                },
                 nama_kjpp: {
                     title: 'Nama KJPP',
                     render: (item, data) => {
diff --git a/resources/views/penawaran/showKirimEmail.blade.php b/resources/views/penawaran/showKirimEmail.blade.php
index a9b006f..1bdf893 100644
--- a/resources/views/penawaran/showKirimEmail.blade.php
+++ b/resources/views/penawaran/showKirimEmail.blade.php
@@ -52,6 +52,14 @@
                                                 <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">