diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index f7f013e..e9f8636 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -252,10 +252,12 @@ class CustomerController extends Controller
                 }
         }
         //code...
+
         DB::commit();
         return response()->json([
             'status' => true,
             'data' => $order,
+            'entry_at' => Carbon::now(),
             'message' => 'Data berhasil disimpan'
         ]);
        } catch (\Throwable $th) {
@@ -270,16 +272,29 @@ class CustomerController extends Controller
     public function finishCheckout(){
         DB::beginTransaction();
         try {
+
             $noOrder = request('no_order_result');
             $evidence = request()->file('bukti_pembayaran');
 
             $caraPembayaran = request('cara_pembayaran');
             $order = Order::where('no_order', $noOrder)->first();
             // Simpan file ke storage
+            if (!$order) {
+                return response()->json(['status' => false, 'message' => 'Nomor order tidak ditemukan'], 404);
+            }
+
+            $entryAt = Carbon::parse($order->entry_at)->copy()->addMinutes(10);
+            if(Carbon::now()->gt($entryAt)){
+                return response()->json(['status' => false, 'message' => 'Waktu pembayaran sudah habis, lakukan pemesanan ulang'],403);
+            }
+
             $payload = [
                 'tgl_pembayaran' => Carbon::now()
             ];
             if($caraPembayaran === "transfer"){
+                if (!$evidence) {
+                    return response()->json(['status' => false, 'message' => 'Bukti pembayaran wajib diunggah'], 422);
+                }
                 $path = $evidence->store('bukti_pembayaran', 'public');
                 $payload['bukti_pembayaran'] = $path;
                 $payload['cara_pembayaran'] = 'Transfer';
@@ -300,6 +315,7 @@ class CustomerController extends Controller
             ], 200);
             return back()->with('success', 'Bukti pembayaran berhasil diunggah.');
         } catch (\Throwable $th) {
+            dd($th);
             DB::rollBack();
             return response([
                 'status' => false,
diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php
index 113afae..329f80f 100644
--- a/app/Http/Controllers/DashboardController.php
+++ b/app/Http/Controllers/DashboardController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -15,6 +16,84 @@ class DashboardController extends Controller
     }
 
     public function dataDashboard(){
-        $data = DB::connection('dbOrderGizi')->table('public.order');
+        $startDate = request()->filled('start_date')
+                    ? Carbon::parse(request('start_date'))->startOfDay()
+                    : Carbon::now()->startOfDay();
+
+        $endDate = request()->filled('end_date')
+                    ? Carbon::parse(request('end_date'))->endOfDay()
+                    : Carbon::now()->endOfDay();
+        $data = DB::connection('dbOrderGizi')->table('public.order as o')
+                ->leftJoin('public.order_detail as od', 'od.order_id', '=', 'o.order_id')
+                ->where('o.statusenabled', true)
+                ->whereBetween('o.entry_at', [$startDate, $endDate])
+                ->select(
+                    'o.order_id',
+                    'o.entry_at',
+                    'o.no_order',
+                    'o.nama_pemesan',
+                    'o.jenis_customer',
+                    'o.total_harga',
+                    'o.status_order',
+                    'o.cara_pembayaran',
+                    'o.bukti_pembayaran',
+                    'o.note_dibatalkan',
+                    'od.status_order as detail_status_order')
+                ->get()->groupBy('order_id');
+
+
+
+                 $grouped = $data->map(function($items){
+                        $first = $items->first();
+                        $totalDetail = $items->count();
+                        $selesaiDetail = $items->where('detail_status_order', 'Selesai')->count();
+                        $progress = $totalDetail > 0 ? round(($selesaiDetail / $totalDetail) * 100) : 0;
+                        return [
+                            'order_id' => $first->order_id,
+                            'entry_at' => $first->entry_at,
+                            'no_order' => $first->no_order,
+                            'nama_pemesan' => $first->nama_pemesan,
+                            'jenis_customer' => $first->jenis_customer,
+                            'total_harga' => $first->total_harga,
+                            'status_order' => $first->status_order,
+                            'bukti_pembayaran' => $first->bukti_pembayaran,
+                            'cara_pembayaran' => $first->cara_pembayaran,
+                            'progress' => $progress,
+                            'total_detail' => $totalDetail,
+                            'selesai_detail' => $selesaiDetail,
+                            'note_dibatalkan' => $first->note_dibatalkan,
+                        ];
+                    })->values();
+                    $totalPemasukan = $grouped->sum('total_harga');
+                    $pesananPending = $grouped->whereNotIn('status_order', ['Lunas', 'Dibatalkan'])->count();
+                    $pesananLunas = $grouped->where('status_order', 'Lunas')->count();
+                    $pesananBatal = $grouped->where('status_order', 'Dibatalkan')->count();
+                    $totalPesanan = $grouped->count();
+
+                    $pesananSelesai = DB::connection('dbOrderGizi')->table('public.order as o')
+                    ->where('o.statusenabled', true)
+                    ->whereBetween('o.entry_at', [$startDate, $endDate])
+                    ->whereNotExists(function($query){
+                        $query->select(DB::raw(1))
+                        ->from('public.order_detail as od')
+                        ->whereColumn('od.order_id', 'o.order_id')
+                        ->where('od.status_order', '!=', 'Selesai');
+                    })->count();
+
+
+            return response()->json([
+                'status' => true,
+                'message' => 'Berhasil mendapatkan data',
+                'data' => [
+                    'totalPesanan' => $totalPesanan,
+                    'totalPemasukan' => $totalPemasukan,
+                    'pesananPending' => $pesananPending,
+                    'pesananBatal' => $pesananBatal,
+                    'pesananLunas' => $pesananLunas,
+                    'pesananSelesai' => $pesananSelesai,
+                ],
+                'rows' => $grouped->values(),
+                'total' => $grouped->count(),
+                ],200);
     }
 }
diff --git a/app/Http/Controllers/PesananController.php b/app/Http/Controllers/PesananController.php
index 342597b..400cf96 100644
--- a/app/Http/Controllers/PesananController.php
+++ b/app/Http/Controllers/PesananController.php
@@ -32,13 +32,13 @@ class PesananController extends Controller
         'o.no_order',
         'o.nama_pemesan',
         'o.jenis_customer',
-        'o.total_harga',
+        'o.cara_pembayaran',
         'o.status_order',
+        'o.total_harga',
         'o.bukti_pembayaran',
         'o.note_dibatalkan',
         'od.status_order as detail_status_order'
     )->get()->groupBy('order_id');
-
         $grouped = $orders->map(function($items){
             $first = $items->first();
             $totalDetail = $items->count();
@@ -52,6 +52,7 @@ class PesananController extends Controller
                 'jenis_customer' => $first->jenis_customer,
                 'total_harga' => $first->total_harga,
                 'status_order' => $first->status_order,
+                'cara_pembayaran' => $first->cara_pembayaran,
                 'bukti_pembayaran' => $first->bukti_pembayaran,
                 'progress' => $progress,
                 'total_detail' => $totalDetail,
@@ -163,6 +164,7 @@ class PesananController extends Controller
             'o.nama_pemesan',
             'o.jenis_customer',
             'o.total_harga',
+            'o.cara_pembayaran',
             'o.status_order',
             'o.bukti_pembayaran',
             'o.note_dibatalkan',
@@ -183,6 +185,7 @@ class PesananController extends Controller
                 'total_harga' => $first->total_harga,
                 'status_order' => $first->status_order,
                 'bukti_pembayaran' => $first->bukti_pembayaran,
+                'cara_pembayaran' => $first->cara_pembayaran,
                 'progress' => $progress,
                 'total_detail' => $totalDetail,
                 'selesai_detail' => $selesaiDetail,
@@ -200,6 +203,21 @@ class PesananController extends Controller
             'total' => $grouped->count()
         ]);
     }
+
+    public function pekerjaan(){
+        $data = [
+            'title' => 'List Pekerjaan Order Gizi'
+        ];
+        return view('dashboard.pesanan.pekerjaan.index', $data);
+    }
+
+    public function getPekerjaan(){
+        $data = OrderDetail::get();
+        return response()->json([
+            'rows' => $data->values(),
+            'total' => $data->count()
+        ]);
+    }
     /**
      * Show the form for creating a new resource.
      */
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 4a9360b..40c8c89 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -39,7 +39,8 @@ class Order extends Model
     ];
 
     protected $cast = [
-        'tgl_pembayaran' => 'datetime'
+        'tgl_pembayaran' => 'datetime',
+        'entry_at' => 'datetime',
     ];
 
     public function orderDetail(){
diff --git a/config/app.php b/config/app.php
index 423eed5..c74a68d 100644
--- a/config/app.php
+++ b/config/app.php
@@ -65,7 +65,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'Asia/Jakarta',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/public/js/checkout/action.js b/public/js/checkout/action.js
index eeacf67..a4f1f0a 100644
--- a/public/js/checkout/action.js
+++ b/public/js/checkout/action.js
@@ -22,7 +22,9 @@ async function submitOrderToServer(){
         const result = await response.json();
         if (response.ok && result.status) {
             // Hapus sessionStorage
+
             sessionStorage.setItem('order_id', result.data.no_order);
+            sessionStorage.setItem('time_order', result.entry_at);
             currentStep = 2;
             showStep(currentStep)
             document.getElementById('no_order_display').textContent  = result.data.no_order
@@ -63,7 +65,19 @@ async function submitOrderToServer(){
 
     $("#checkoutFormFinal").on('submit', async function(e){
         e.preventDefault()
+            const cara_pembayaran = document.getElementById('cara_pembayaran').value;
+            const bukti_pembayaran = document.querySelector('input[name="bukti_pembayaran"]').value;
 
+            if(cara_pembayaran === 'transfer' && !bukti_pembayaran){
+                    Swal.fire({
+                        title: 'Bukti pembayaran kosong!',
+                        text: 'Silahkan upload bukti pembayaran jika metode yang dipakai transfer.',
+                        icon: 'warning',
+                    })
+                    return;
+            }
+
+            // }
             const form = this;
 
             const formData = new FormData(form);
@@ -78,12 +92,14 @@ async function submitOrderToServer(){
                 });
 
                 const result = await response.json();
+                console.log(result);
 
                 if (result.status) {
                     // ✅ Hapus sessionStorage di client
                     sessionStorage.removeItem('cart');
                     sessionStorage.removeItem('checkout_biodata');
                     sessionStorage.removeItem('order_id');
+                    sessionStorage.removeItem('time_order');
 
                 Swal.fire({
                         title: 'Pesanan Berhasil!',
@@ -92,12 +108,27 @@ async function submitOrderToServer(){
                         confirmButtonText: 'Berhasil!',
                         confirmButtonColor: '#28a745'
                     }).then(() => {
-                        window.location.href = "/success-page"; // kehalaman success
+                         window.location.href = "/success-page"; // kehalaman success
                     });
                 } else {
-                    alert(result.message || "Terjadi kesalahan.");
+                        sessionStorage.removeItem('cart');
+                        sessionStorage.removeItem('checkout_biodata');
+                        sessionStorage.removeItem('order_id');
+                        sessionStorage.removeItem('time_order');
+                     Swal.fire({
+                        title: 'Gagal!',
+                        text: result.message,
+                        icon: 'error',
+                        confirmButtonText: 'Tutup!'
+                    }).then(() => {
+                        window.location.href = "/";
+                    });;
                 }
             } catch (err) {
+                sessionStorage.removeItem('cart');
+                sessionStorage.removeItem('checkout_biodata');
+                sessionStorage.removeItem('order_id');
+                sessionStorage.removeItem('time_order');
                 console.error(err);
                 alert("Terjadi kesalahan saat mengirim data.");
             }
diff --git a/public/js/checkout/index.js b/public/js/checkout/index.js
index bd9bb87..56336d4 100644
--- a/public/js/checkout/index.js
+++ b/public/js/checkout/index.js
@@ -3,7 +3,6 @@
 // =======================
 let checkout_biodata = JSON.parse(sessionStorage.getItem('checkout_biodata') || '{}');
 let order_id = sessionStorage.getItem('order_id') || '[]';
-
 // =======================
 // EVENT ON LOAD
 // =======================
@@ -11,7 +10,9 @@ document.addEventListener('DOMContentLoaded', () => {
     $("#cartButton").addClass('d-none');
     $("#no_order_result").val(order_id)
     let currentStep = 0;
-
+    let orderDate=''
+    let deadline=''
+    let time_order=''
     // Setup button step
     document.querySelectorAll('.next-step').forEach(btn => {
         btn.addEventListener('click', async () => {
@@ -52,7 +53,13 @@ document.addEventListener('DOMContentLoaded', () => {
                 }
                    if (!sessionStorage.getItem('order_id')) {
                         await submitOrderToServer(); // async function simpan ke server
+
                     }
+
+                time_order = sessionStorage.getItem('time_order')
+                orderDate = new Date(time_order);
+                deadline = new Date(orderDate.getTime() + 10 * 60 * 1000)
+                updateCountdown()
                 currentStep++;
                 showStep(currentStep)
             }else if(currentStep === 2){
@@ -82,6 +89,33 @@ document.addEventListener('DOMContentLoaded', () => {
     toggleCustomerFields()
     document.getElementById('no_order_display').textContent  = order_id
 
+    const countDownPayment = document.getElementById('countdownPayment')
+
+
+
+    function updateCountdown(){
+        const now = new Date();
+        orderDate = new Date(time_order);
+        deadline = new Date(orderDate.getTime() + 10 * 60 * 1000)
+        const distance = deadline - now
+
+        if(distance <= 0){
+            countDownPayment.textContent = "Waktu Habis Lakukan Pemesanan Ulang";
+            return;
+        }
+
+        const minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60))
+        const seconds = Math.floor((distance % (1000 * 60)) / 1000)
+
+        countDownPayment.textContent = `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`
+    }
+
+    updateCountdown();
+    const interval = setInterval(() => {
+        updateCountdown()
+        if(new Date() >= deadline) clearInterval(interval)
+    }, 1000)
+
 });
 // =======================
 // FUNGSI STEP
@@ -302,6 +336,9 @@ function renderCartSummary() {
                                 <i class="fa fa-utensils me-1"></i>
                                  Menu: <strong>${item.apakah_someday ? 'Someday'  : 'Menu Normal'}</strong>
                             </div>
+                            <div class="mb-2 small text-muted">
+                                 <strong>Silakan isi tanggal pemesanan dan pilih karbohidrat yang diinginkan</strong>
+                            </div>
                             ${pesananHTML}
                             <div class="mt-3 d-flex justify-content-between align-items-center">
                                 <button type="button" class="btn btn-sm btn-outline-success"
@@ -434,6 +471,7 @@ function validateStepOne() {
     const jenisKelamin = document.querySelector('input[name="jenis_kelamin"]:checked');
     const namaPemesan = document.getElementById('nama_pemesan').value.trim();
     const noWA = document.getElementById('no_whatsapp').value.trim();
+    const email = document.getElementById('email').value.trim();
 
     if (!jenisCustomer) {
         alert('Silakan pilih jenis customer.');
@@ -454,6 +492,10 @@ function validateStepOne() {
         alert('Silakan isi nomor WhatsApp.');
         return false;
     }
+    if (!email) {
+        alert('Silakan isi email terlebih dahulu.');
+        return false;
+    }
 
     // Validasi tambahan sesuai jenis customer
     const selected = jenisCustomer.value;
@@ -619,6 +661,7 @@ function toggleBuktiPembayaran() {
     const buktiSection = document.getElementById("bukti_section");
     const buktiInput = document.getElementById("bukti_pembayaran");
 
+    buktiInput.required = true;
     if (metode === "billing") {
         buktiSection.style.display = "none";
         buktiInput.required = false;
diff --git a/public/js/dashboard/index.js b/public/js/dashboard/index.js
index 7f1a858..c5f9d12 100644
--- a/public/js/dashboard/index.js
+++ b/public/js/dashboard/index.js
@@ -1,7 +1,16 @@
 const datatable = $("#datatableRekapDashboard")
 
+
+$("#filterDashboard").on('click', function(){
+    let startDate= $("#start_date").val();
+    let endDate= $("#end_date").val();
+    fetchData(startDate, endDate)
+})
+
+
+    fetchData()
     datatable.bootstrapTable({
-        url: "/dashboard/datatable/selesai",
+        data: [],
         showColumns: true,
         showColumnsToggleAll: true,
         showRefresh: true,
@@ -19,7 +28,6 @@ const datatable = $("#datatableRekapDashboard")
             refresh: "fas fa-sync-alt",   // atau ganti ke icon lain
             columns: "fas fa-th-large"
         },
-
         columns: [
             {
                 title: "Action",
@@ -47,7 +55,12 @@ const datatable = $("#datatableRekapDashboard")
                 field: 'no_order',
                 sortable: true,
             },
-             {
+            {
+                title: "Cara Pembayaran",
+                field: 'cara_pembayaran',
+                sortable: true,
+            },
+            {
                 title: "Status Pembayaran",
                 field: 'status_order',
                 sortable: true,
@@ -133,3 +146,56 @@ const datatable = $("#datatableRekapDashboard")
 
         ],
     });
+
+
+function fetchData(startDate = null, endDate = null){
+    const params =new URLSearchParams()
+    if (startDate) params.append('start_date', startDate);
+    if (endDate) params.append('end_date', endDate);
+     fetch(`/dashboard/data${params.toString() ? '?' + params.toString() : ''}`)
+     .then(res => res.json())
+     .then(res=> {
+        $("#confirm_filter_time").text(formatTanggalRange(startDate, endDate))
+        if(startDate && endDate){
+            $("#confirm_filter_name").text('Pesanan')
+        }
+        $("#pesanan_data").text(res?.data?.totalPesanan)
+        $("#pesanan_lunas").text(res?.data?.pesananLunas)
+        $("#pesanan_waiting").text(res?.data?.pesananPending)
+        $("#pesanan_belum_diambil").text(res?.data?.pesananLunas - res?.data?.pesananSelesai)
+        $("#pesanan_diambil").text(res?.data?.pesananSelesai)
+        $("#nilai_transaksi_total").text(parseInt(res?.data?.totalPemasukan).toLocaleString('id-ID'))
+        datatable.bootstrapTable('load', res.rows)
+     })
+     .catch(error => {
+        console.error(error);
+     })
+}
+
+
+function formatTanggalRange(start, end) {
+    const options = { day: '2-digit', month: 'short', year: 'numeric' };
+
+    if (!start && !end) {
+        return `Data tanggal ${new Date().toLocaleDateString('id-ID', options)}`;
+    }
+
+    if (start && end && start === end) {
+        return `Data tanggal ${new Date(start).toLocaleDateString('id-ID', options)}`;
+    }
+
+    if (start && end) {
+        return `Data dari ${new Date(start).toLocaleDateString('id-ID', options)}
+                sampai ${new Date(end).toLocaleDateString('id-ID', options)}`;
+    }
+
+    if (start && !end) {
+        return `Data sejak ${new Date(start).toLocaleDateString('id-ID', options)}`;
+    }
+
+    if (!start && end) {
+        return `Data hingga ${new Date(end).toLocaleDateString('id-ID', options)}`;
+    }
+}
+
+
diff --git a/public/js/order_guest/index.js b/public/js/order_guest/index.js
index 518505d..17f125f 100644
--- a/public/js/order_guest/index.js
+++ b/public/js/order_guest/index.js
@@ -8,6 +8,7 @@
 
 
     function fetchMenu(filter = {}) {
+
         const containerGuest = $("#order_guest_id");
          if(filter.jenis_menu === "konsultasi"){
                 const jadwalList = [
@@ -173,7 +174,7 @@
                                        <i class="fa-solid fa-circle-info"></i> Detail
                                     </button>
                                     <button class="btn btn-success w-50"
-                                    onclick="saveItem(this)"
+                                    onclick="handleClick(this)"
                                     data-id="${menu.master_menu_id ?? menu.master_paket_menu_id}"
                                     data-nama_menu="${menu.nama}"
                                     data-harga_karyawan="${menu.harga_karyawan}"
@@ -230,25 +231,57 @@
     }
 
     const modalCheckout = $("#checkoutModal")
-    function orderMenu(e){
-        const klasifikasiStr = $(e).data('klasifikasi_menu') || '';
-        const tags = klasifikasiStr.split(',').map(tag => tag.trim()).filter(tag => tag !== '')
+    function orderMenu(e) {
+        const el = $(e);
+        const tags = (el.data('klasifikasi_menu') || '').split(',').filter(Boolean).map(tag => tag.trim());
+        const someday = el.data('apakah_someday');
+        const siang = el.data('apakah_menu_siang');
+        const sore = el.data('apakah_menu_sore');
 
-        const klasifikasiMenu =tags.map(tag => `
+        const klasifikasiMenu = tags.map(tag => `
             <span class="badge bg-secondary me-1 mb-1">${tag}</span>
-            `).join('');
+        `).join('');
 
-        modalCheckout.modal("show")
-        $('#cathering_order_photo').attr('src', `/gambar/${$(e).data('foto')}`)
-        $('#cathering_order_name').text($(e).data('nama_menu'))
-        $('#cathering_order_menu_id').text($(e).data('id'))
-        $('#cathering_order_jenis_menu').text($(e).data('jenis_menu'))
-        $('#cathering_order_deskripsi').text($(e).data('deskripsi'))
-        $('#cathering_order_price_keluarga_pasien').text("Rp " + parseInt($(e).data('harga_keluarga_pasien')).toLocaleString('id-ID'))
-        $('#cathering_order_price_karyawan').text("Rp " + parseInt($(e).data('harga_karyawan')).toLocaleString('id-ID'))
-        $("#tag_klasifikasi_menu").html(klasifikasiMenu)
+        const tglMenuTersedia = `
+            <div class="mb-1 small text-muted">
+            <i class="fa fa-calendar-check me-1"></i>
+            ${someday ? 'Tersedia setiap hari (Senin - Minggu)' :
+                el.data('tgl_tersedia') ? `Tersedia pada tanggal: ${el.data('tgl_tersedia')}` :
+                'Tidak ada info tanggal tersedia'}
+            </div>
+            <div class="mb-1 small text-muted">
+            <i class="fa fa-utensils me-1"></i> Menu: <strong>${someday ? 'Someday' : 'Menu Normal'}</strong>
+            </div>
+            <div class="mb-1 small text-muted">
+            ${
+                siang && sore
+                ? '<i class="fa fa-clock me-1 text-success"></i> Tersedia untuk makan siang dan sore'
+                : siang
+                    ? '<i class="fa fa-sun me-1 text-warning"></i> Tersedia untuk makan siang'
+                    : sore
+                    ? '<i class="fa fa-moon me-1 text-info"></i> Tersedia untuk makan sore'
+                    : '<i class="fa fa-ban me-1 text-danger"></i> Tidak tersedia untuk waktu makan apapun'
+            }
+            </div>
+        `;
+
+        $('#checkoutModal').modal('show');
+        $('#cathering_order_photo').attr('src', `/gambar/${el.data('foto') || 'default.jpg'}`);
+        $('#cathering_order_name').text(el.data('nama_menu') || '-');
+        $('#cathering_order_menu_id').val(el.data('id'));
+        $('#cathering_order_jenis_menu').val(el.data('jenis_menu'));
+        $('#cathering_order_deskripsi').text(el.data('deskripsi') || '');
+        $('#cathering_order_price_karyawan').text("Rp " + parseInt(el.data('harga_karyawan') || 0).toLocaleString('id-ID'));
+        $('#cathering_order_price_keluarga_pasien').text("Rp " + parseInt(el.data('harga_keluarga_pasien') || 0).toLocaleString('id-ID'));
+        $('#tag_klasifikasi_menu').html(klasifikasiMenu);
+        $('#tgl_menu_tersedia').html(tglMenuTersedia);
+        $('#apakah_someday').val(someday ? 1 : 0);
+        $('#apakah_menu_siang').val(siang ? 1 : 0);
+        $('#apakah_menu_sore').val(sore ? 1 : 0);
+        $('#tgl_tersedia').val(el.data('tgl_tersedia'));
     }
 
+
     function updateCartCount(count) {
         const $cartCount = $('#cartCount');
         if (count > 0) {
@@ -279,6 +312,12 @@
     $("#checkoutForm").on('submit', function(e){
              e.preventDefault();
 
+
+            let order_id = sessionStorage.getItem('order_id') || null;
+            if(order_id){
+                window.location.href = '/checkout'
+            }
+
             let cart = JSON.parse(sessionStorage.getItem('cart') || '[]');
             const now = new Date();
             const todayFormatted = now.getFullYear() + '-' + (now.getMonth() + 1).toString().padStart(2, '0') + '-' + now.getDate().toString().padStart(2, '0')
@@ -286,10 +325,11 @@
             const orders = [{
                 tgl: todayFormatted,
                 jumlah: 1,
-                kategoriPemesanan: ''
+                kategoriPemesanan: $('#apakah_menu_sore').val() === "1" ? 'Makan Sore' : 'Makan Siang'
             }];
-            let idText = $("#cathering_order_menu_id").text().trim();
+            let idText = $("#cathering_order_menu_id").val();
             let idMenu = parseInt(idText.replace(/[^\d]/g, ''), 10);
+
             let foto = $('#cathering_order_photo').attr('src')
             let resultFoto = foto.replace('/gambar', '');
 
@@ -297,25 +337,20 @@
 
             let existingItem = cart.find(item => item.id_menu === idMenu && item.nama_menu === namaMenu);
 
-                if(existingItem){
-                    orders.forEach(newOrder => {
-                        const existingOrder =existingItem.pesanan.find(p => p.tgl === newOrder.tgl)
-                        if(existingOrder){
-                            existingOrder.jumlah += newOrder.jumlah;
-                        }else{
-                            existingItem.pesanan.push(newOrder)
-                        }
-                    })
-                }else{
+                if(!existingItem){
                     const orderItem ={
                         id:Date.now(),
-                        id_menu : $("#cathering_order_menu_id").text(),
+                        id_menu :idMenu,
                         nama_menu : $("#cathering_order_name").text(),
                         harga_karyawan : parseRupiahToNumber($("#cathering_order_price_karyawan").text()),
                         harga_kp : parseRupiahToNumber($("#cathering_order_price_keluarga_pasien").text()),
                         foto: resultFoto,
                         jenis_menu: $('#cathering_order_jenis_menu').text(),
                         deskripsi:$("#cathering_order_deskripsi").text(),
+                        apakah_menu_siang: $('#apakah_menu_siang').val() === "1" ? true: false,
+                        apakah_menu_sore: $('#apakah_menu_sore').val() === "1" ? true: false,
+                        apakah_someday: $('#apakah_someday').val() === "1" ? true: false,
+                        tgl_tersedia: $('#tgl_tersedia').val(),
                         pesanan : orders
                     }
                     cart.push(orderItem)
@@ -328,9 +363,6 @@
 
     function saveItem(e){
         let cart = JSON.parse(sessionStorage.getItem('cart') || '[]');
-
-
-
         const orders = [{
             tgl: '',
             jumlah: 1,
@@ -381,6 +413,14 @@
          }
     }
 
+    function handleClick(e){
+        const order_id = sessionStorage.getItem('order_id') || null;
+        if(order_id){
+            window.location.href = '/checkout'
+        }else{
+            saveItem(e)
+        }
+    }
 
 
 
diff --git a/public/js/pekerjaan/_init.js b/public/js/pekerjaan/_init.js
new file mode 100644
index 0000000..e17ab65
--- /dev/null
+++ b/public/js/pekerjaan/_init.js
@@ -0,0 +1 @@
+const datatablePekerjaan = $("#datatablePekerjaan")
diff --git a/public/js/pekerjaan/dt.js b/public/js/pekerjaan/dt.js
new file mode 100644
index 0000000..b511b5b
--- /dev/null
+++ b/public/js/pekerjaan/dt.js
@@ -0,0 +1,139 @@
+
+    datatablePekerjaan.bootstrapTable({
+        url: "/dashboard/datatable/selesai",
+        showColumns: true,
+        showColumnsToggleAll: true,
+        showRefresh: true,
+        sortable: true,
+        search: true,
+        searchOnEnterKey: false,
+        searchHighlight: true,
+        pagination: true,
+        serverSide:true,
+        pageSize: 10,
+        pageList: [10, 20, 30, 40, 50, 100, 200],
+        cookie: true,
+        cookieIdTable: "table_rma_ssc_id",
+        icons: {
+            refresh: "fas fa-sync-alt",   // atau ganti ke icon lain
+            columns: "fas fa-th-large"
+        },
+
+        columns: [
+            {
+                title: "Action",
+                field:'order_id',
+                formatter: function(value, row) {
+                    let buttons = ''
+                    if(row?.status_order === "Lunas"){
+                        buttons += `
+                            <button class="btn btn-sm btn-warning text-dark" onclick="orderSelesai('${row.order_id}')">
+                                        <i class="fa fa-utensils me-1"></i>
+                                    </button>
+                        `
+                    }
+
+                    return `
+                        <div class="d-flex space-x">
+                        ${buttons}
+                        </div>
+                    `;
+                }
+            },
+
+            {
+                title: "No.Order",
+                field: 'no_order',
+                sortable: true,
+            },
+            {
+                title: "Cara Pembayaran",
+                field: 'cara_pembayaran',
+                sortable: true,
+            },
+             {
+                title: "Status Pembayaran",
+                field: 'status_order',
+                sortable: true,
+                formatter: function(value, row) {
+                    const status = value;
+                    let badgeClass = 'bg-secondary';
+                    if (status === "Belum Bayar") {
+                        badgeClass = 'bg-warning text-dark';
+                    } else if (status === "Menunggu Konfirmasi Pembayaran") {
+                        badgeClass = 'bg-primary';
+                    } else if (status === "Lunas" || status === "Sudah Bayar") {
+                        badgeClass = 'bg-success text-dark';
+                    } else if(status === "Dibatalkan"){
+                        badgeClass = 'bg-danger';
+                    }
+                   return `
+                    <span class="badge ${badgeClass} px-3 py-1">${status}</span>
+                    ${status === 'Dibatalkan' && row.note_dibatalkan ? `
+                        <div class="text-danger small mt-1">
+                            <i class="fa fa-info-circle"></i> ${row.note_dibatalkan}
+                        </div>
+                    ` : ''}
+                `;
+                }
+            },
+            {
+                title: "Status Pesanan",
+                formatter: function(value, row) {
+                const progress = parseInt(row.progress) || 0;
+                const total = row.total_detail || 0;
+                const selesai = row.selesai_detail || 0;
+
+                return `
+                    <div class="text-center">
+                        <div class="progress" style="height: 18px;">
+                            <div class="progress-bar bg-success" role="progressbar"
+                                style="width: ${progress}%;"
+                                aria-valuenow="${progress}" aria-valuemin="0" aria-valuemax="100">
+                                ${progress}%
+                            </div>
+                        </div>
+                        <small class="text-muted">${selesai} / ${total} selesai</small>
+                    </div>
+                `;
+            },
+                sortable: true,
+            },
+            {
+                title: "Pemesan",
+                field:'nama_pemesan',
+                sortable: true,
+            },
+            {
+                title: "Tgl Pemesanan",
+                field: 'entry_at',
+                formatter: function(value, row) {
+                        if (!row?.entry_at) return '-';
+
+                        const date = new Date(row.entry_at);
+                        return date.toLocaleString('id-ID', {
+                            day: '2-digit',
+                            month: 'short',   // Bisa diganti 'long' kalau mau 'Juli' bukan 'Jul'
+                            year: 'numeric',
+                            hour: '2-digit',
+                            minute: '2-digit',
+                            hour12: false     // pakai format 24 jam
+                        });
+                    },
+                sortable: true,
+            },
+            {
+                title: "Kategori Customer",
+                field: 'jenis_customer',
+                sortable: true,
+            },
+            {
+                title: "Total Harga Pesanan",
+                field:'total_harga',
+                formatter: function(value, row){
+                    return 'Rp ' + parseInt(row.total_harga).toLocaleString('id-ID')
+                }
+            }
+
+        ],
+    });
diff --git a/public/js/pesanan_pending/dt.js b/public/js/pesanan_pending/dt.js
index 45b64ed..c44318d 100644
--- a/public/js/pesanan_pending/dt.js
+++ b/public/js/pesanan_pending/dt.js
@@ -70,6 +70,11 @@
                 title: "No.Order",
                 field: 'no_order',
                 sortable: true,
+            },
+            {
+                title: "Cara Pembayaran",
+                field: 'cara_pembayaran',
+                sortable: true,
             },
              {
                 title: "Status Pembayaran",
diff --git a/public/js/pesanan_selesai/dt.js b/public/js/pesanan_selesai/dt.js
index 8dd1bf0..e4aa639 100644
--- a/public/js/pesanan_selesai/dt.js
+++ b/public/js/pesanan_selesai/dt.js
@@ -45,6 +45,11 @@
                 title: "No.Order",
                 field: 'no_order',
                 sortable: true,
+            },
+            {
+                title: "Cara Pembayaran",
+                field: 'cara_pembayaran',
+                sortable: true,
             },
              {
                 title: "Status Pembayaran",
diff --git a/resources/views/dashboard/index.blade.php b/resources/views/dashboard/index.blade.php
index 1b63367..eca0236 100644
--- a/resources/views/dashboard/index.blade.php
+++ b/resources/views/dashboard/index.blade.php
@@ -12,14 +12,14 @@
             <form method="GET" action="" class="d-flex flex-wrap justify-content-end align-items-end">
                 <div class="me-2">
                     <label class="form-label mb-1">Dari Tanggal</label>
-                    <input type="date" name="start_date" class="form-control" value="">
+                    <input type="date" name="start_date" id="start_date" class="form-control" value="">
                 </div>
                 <div class="me-2">
                     <label class="form-label mb-1">Sampai Tanggal</label>
-                    <input type="date" name="end_date" class="form-control" value="">
+                    <input type="date" name="end_date" id="end_date" class="form-control" value="">
                 </div>
                 <div class="mt-3 mt-md-0">
-                    <button type="submit" class="btn btn-primary">Tampilkan</button>
+                    <button type="button" class="btn btn-primary" id="filterDashboard">Tampilkan</button>
                 </div>
             </form>
         </div>
@@ -30,9 +30,9 @@
         <div class="col-md-4">
             <div class="card border-0 shadow-sm bg-light-primary text-primary">
                 <div class="card-body">
-                    <h5 class="card-title mb-1"><i class="bx bx-calendar me-1"></i> Pesanan Hari Ini</h5>
-                    <h2 class="fw-bold mb-1">23</h2>
-                    <small>Data tanggal {{ \Carbon\Carbon::now()->format('d M Y') }}</small>
+                    <h5 class="card-title mb-1" id="confirm_filter_name"><i class="bx bx-calendar me-1"></i> Pesanan Hari Ini</h5>
+                    <h2 class="fw-bold mb-1" id="pesanan_data">23</h2>
+                    <small id="confirm_filter_time">Data tanggal {{ \Carbon\Carbon::now()->format('d M Y') }}</small>
                 </div>
             </div>
         </div>
@@ -41,7 +41,7 @@
             <div class="card border-0 shadow-sm bg-light-success text-success">
                 <div class="card-body">
                     <h5 class="card-title mb-1"><i class="bx bx-check-circle me-1"></i> Pesanan Lunas</h5>
-                    <h2 class="fw-bold mb-1">15</h2>
+                    <h2 class="fw-bold mb-1" id="pesanan_lunas">15</h2>
                     <small>Status: Lunas</small>
                 </div>
             </div>
@@ -51,7 +51,7 @@
             <div class="card border-0 shadow-sm bg-light-warning text-warning">
                 <div class="card-body">
                     <h5 class="card-title mb-1"><i class="bx bx-time-five me-1"></i> Belum Selesai</h5>
-                    <h2 class="fw-bold mb-1">8</h2>
+                    <h2 class="fw-bold mb-1" id="pesanan_waiting">8</h2>
                     <small>Menunggu Konfirmasi / Pembayaran</small>
                 </div>
             </div>
@@ -64,8 +64,8 @@
             <div class="card border-0 shadow-sm bg-light-info text-info">
                 <div class="card-body">
                     <h5 class="card-title mb-1"><i class="bx bx-money me-1"></i> Total Nilai Transaksi</h5>
-                    <h2 class="fw-bold mb-1">Rp 1.240.000</h2>
-                    <small>Akumulasi dari pesanan Lunas</small>
+                    <h2 class="fw-bold mb-1" id="nilai_transaksi_total">Rp 1.240.000</h2>
+                    <small>Akumulasi dari pesanan</small>
                 </div>
             </div>
         </div>
@@ -74,7 +74,7 @@
             <div class="card border-0 shadow-sm bg-light-secondary text-secondary">
                 <div class="card-body">
                     <h5 class="card-title mb-1"><i class="bx bx-box me-1"></i> Pesanan Pending</h5>
-                    <h2 class="fw-bold mb-1">5</h2>
+                    <h2 class="fw-bold mb-1" id="pesanan_belum_diambil">5</h2>
                     <small>Lunas tapi belum diambil</small>
                 </div>
             </div>
@@ -84,7 +84,7 @@
             <div class="card border-0 shadow-sm bg-light-success text-success">
                 <div class="card-body">
                     <h5 class="card-title mb-1"><i class="bx bx-check-square me-1"></i> Pesanan Diambil</h5>
-                    <h2 class="fw-bold mb-1">10</h2>
+                    <h2 class="fw-bold mb-1" id="pesanan_diambil">10</h2>
                     <small>Pemesan sudah ambil makanannya</small>
                 </div>
             </div>
diff --git a/resources/views/dashboard/partials/sidenav.blade.php b/resources/views/dashboard/partials/sidenav.blade.php
index 066eb4b..dcb99d7 100644
--- a/resources/views/dashboard/partials/sidenav.blade.php
+++ b/resources/views/dashboard/partials/sidenav.blade.php
@@ -55,6 +55,12 @@
             <!-- Components -->
             <li class="menu-header small text-uppercase"><span class="menu-header-text">Order</span></li>
             <!-- Cards -->
+            <li class="menu-item {{ Request::is('dashboard/pekerjaan') ? 'active' : '' }}">
+              <a href="/dashboard/pekerjaan" class="menu-link">
+                <i class="menu-icon tf-icons bx bx-collection"></i>
+                <div data-i18n="Basic">Pekerjaan</div>
+              </a>
+            </li>
             <li class="menu-item {{ Request::is('dashboard/pending') ? 'active' : '' }}">
               <a href="/dashboard/pending" class="menu-link">
                 <i class="menu-icon tf-icons bx bx-collection"></i>
diff --git a/resources/views/dashboard/pesanan/pekerjaan/index.blade.php b/resources/views/dashboard/pesanan/pekerjaan/index.blade.php
new file mode 100644
index 0000000..92ab8e0
--- /dev/null
+++ b/resources/views/dashboard/pesanan/pekerjaan/index.blade.php
@@ -0,0 +1,24 @@
+@extends('dashboard.layouts.main')
+
+@section('body_main')
+<div class="container-xxl flex-grow-1 container-p-y">
+    <!-- Breadcrumb -->
+    <h4 class="fw-bold py-3 mb-4">
+        <span class="text-muted fw-light">Dashboard /</span> Pekerjaan
+    </h4>
+
+    <!-- Card Master Menu -->
+    <div class="card">
+        <div class="card-header d-flex justify-content-between align-items-center">
+            <h5 class="mb-0">Pekerjaan</h5>
+        </div>
+        <div class="card-body">
+            <table class="table" id="datatablePekerjaan"></table>
+        </div>
+    </div>
+</div>
+
+
+<script src="{{ ver('/js/pekerjaan/_init.js') }}"></script>
+<script src="{{ ver('/js/pekerjaan/dt.js') }}"></script>
+@endsection
diff --git a/resources/views/guest/checkout/step/step3.blade.php b/resources/views/guest/checkout/step/step3.blade.php
index b59408c..3b7701a 100644
--- a/resources/views/guest/checkout/step/step3.blade.php
+++ b/resources/views/guest/checkout/step/step3.blade.php
@@ -10,26 +10,29 @@
                         </div>
                     </div>
 
-
-                    <div class="row justify-content-center">
+                    <div class="row justify-content-center px-2">
                         <div class="col-12 col-md-8">
                             <div class="text-center mb-3">
                                 <h6 class="fw-bold">Detail Pembayaran</h6>
                             </div>
                             <ul class="list-group list-group-flush mb-3 shadow-sm rounded overflow-hidden">
                                 <!-- No Order -->
-                                <li class="list-group-item">
+
+                              <li class="list-group-item">
                                     <div class="d-flex flex-column flex-sm-row justify-content-between align-items-start align-items-sm-center gap-2">
                                         <span>No Order</span>
-                                        <div class="d-flex flex-column flex-sm-row align-items-start align-items-sm-center gap-2 text-end">
+                                        <div class="d-flex flex-column align-items-sm-end w-80">
+                                        <div class="d-flex justify-content-sm-end mb-1">
                                             <button type="button" class="btn btn-sm btn-outline-secondary" onclick="copyNoOrder()">
-                                                <i class="fa fa-copy me-1"></i> Salin
+                                            <i class="fa fa-copy me-1"></i> Salin
                                             </button>
-                                            <strong id="no_order_display" class="text-break"></strong>
+                                        </div>
+                                        <strong id="no_order_display" class="d-block text-break text-wrap text-start text-sm-end small"></strong>
                                         </div>
                                     </div>
                                 </li>
 
+
                                 <!-- Bank -->
                                 <li class="list-group-item d-flex justify-content-between">
                                     <span>Bank</span>
@@ -38,33 +41,35 @@
 
                                 <!-- Nama Rekening -->
                                 <li class="list-group-item d-flex justify-content-between">
-                                    <span>Nama Rekening</span>
+                                    <span>Nama Rek.</span>
                                     <strong>RSAB Harapan Kita</strong>
                                 </li>
 
                                 <!-- No Rek -->
                                 <li class="list-group-item">
                                     <div class="d-flex flex-column flex-sm-row justify-content-between align-items-start align-items-sm-center gap-2">
-                                        <span>No Rekening:</span>
-                                        <div class="d-flex flex-column flex-sm-row align-items-start align-items-sm-center gap-2 text-end">
-                                            <button type="button" class="btn btn-sm btn-outline-secondary" onclick="copyNoRek()">
-                                                <i class="fa fa-copy me-1"></i> Salin
+                                        <span>No.Rek</span>
+                                        <div class="d-flex flex-column align-items-sm-end w-80">
+                                        <div class="d-flex justify-content-sm-end mb-1">
+                                            <button type="button" class="btn btn-sm btn-outline-secondary" onclick="copyNoOrder()">
+                                            <i class="fa fa-copy me-1"></i> Salin
                                             </button>
-                                            <strong id="noRekText">1234-5678-9101</strong>
+                                        </div>
+                                        <strong id="noRekText">1234-5678-9101</strong>
                                         </div>
                                     </div>
                                 </li>
 
                                 <!-- Nominal -->
                                 <li class="list-group-item d-flex justify-content-between">
-                                    <span>Nominal yang harus dibayar</span>
-                                    <strong id="no_order_price"></strong>
+                                    <span>Nominal</span>
+                                    <strong id="no_order_price" class=""></strong>
                                 </li>
 
                                 <!-- Batas Waktu -->
                                 <li class="list-group-item d-flex justify-content-between">
-                                    <span>Batas Waktu Pembayaran</span>
-                                    <strong>12/07/2025 15:30</strong>
+                                    <span>Waktu Pembayaran</span>
+                                    <strong id="countdownPayment"></strong>
                                 </li>
                             </ul>
                             <p class="text-muted small text-center px-2">
diff --git a/resources/views/guest/checkout_order.blade.php b/resources/views/guest/checkout_order.blade.php
index 87fbff8..41fd359 100644
--- a/resources/views/guest/checkout_order.blade.php
+++ b/resources/views/guest/checkout_order.blade.php
@@ -1,42 +1,46 @@
-<div class="modal fade"
-id="checkoutModal"
-tabindex="-1"
-aria-labelledby="exampleModalLabel"
-aria-hidden="true"
->
+<div class="modal fade" id="checkoutModal" tabindex="-1" aria-labelledby="checkoutModalLabel" aria-hidden="true">
   <div class="modal-dialog modal-lg modal-dialog-centered">
     <div class="modal-content">
       <div class="modal-header">
-        <h1 class="modal-title fs-5" id="exampleModalLabel">Website Cathering RSAB Harapan Kita</h1>
+        <h5 class="modal-title fw-bold" id="checkoutModalLabel">Pesanan Catering RSAB Harapan Kita</h5>
         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
       </div>
+
       <form id="checkoutForm">
         <div class="modal-body">
-            <div class="container">
-                <div class="row mt-3">
-                    <div class="col-md-4 text-center mb-3 mb-md-0">
-                        <img alt="Foto Menu" id="cathering_order_photo" lass="img-fluid rounded shadow" style="max-height: 170px; width: auto;">
-                    </div>
-                    <div class="col-md-8">
-                         <h5 id="cathering_order_name" class="mb-2"></h5>
-                         <div class="row text-muted small mb-2">
-                                    <div class="col-6 fw-semibold">Harga Karyawan:</div>
-                                    <div class="col-6 text-end fw-semibold"><span id="cathering_order_price_karyawan"></span> </div>
-                                    <div class="col-6 fw-semibold">Harga Keluarga Pasien:</div>
-                                    <div class="col-6 text-end fw-semibold"><span id="cathering_order_price_keluarga_pasien"></span> </div>
-                                </div>
-                         <span id="cathering_order_deskripsi" class="text-muted mb-2"></span>
-
-                         <h5 class="d-none" id="cathering_order_menu_id"></h5>
-                         <h5 class="d-none" id="cathering_order_jenis_menu"></h5>
-                        <div id="tag_klasifikasi_menu" class="mt-2"></div>
-                    </div>
-                </div>
+          <div class="row g-3">
+            <div class="col-md-4 text-center">
+                <input type="hidden" id="apakah_someday">
+                <input type="hidden" id="apakah_menu_siang">
+                <input type="hidden" id="apakah_menu_sore">
+                <input type="hidden" id="tgl_tersedia">
+              <img id="cathering_order_photo" class="img-fluid rounded shadow" style="max-height: 170px;" alt="Foto Menu">
             </div>
+            <div class="col-md-8">
+              <h5 id="cathering_order_name" class="mb-2 fw-bold"></h5>
+              <div id="tgl_menu_tersedia" class="mb-2"></div>
+
+              <div class="row text-muted small mb-2">
+                <div class="col-6">Harga Karyawan:</div>
+                <div class="col-6 text-end"><span class="fw-semibold" id="cathering_order_price_karyawan"></span></div>
+                <div class="col-6">Harga Keluarga Pasien:</div>
+                <div class="col-6 text-end"><span class="fw-semibold" id="cathering_order_price_keluarga_pasien"></span></div>
+              </div>
+
+              <p id="cathering_order_deskripsi" class="text-muted small mb-2"></p>
+              <div id="tag_klasifikasi_menu" class="mb-2"></div>
+
+              <input type="hidden" id="cathering_order_menu_id">
+              <input type="hidden" id="cathering_order_jenis_menu">
+            </div>
+          </div>
         </div>
+
         <div class="modal-footer">
-             <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-            <button type="submit" class="btn btn-success"><i class="fas fa-shopping-cart me-1"></i> Order</button>
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
+          <button type="submit" class="btn btn-success">
+            <i class="fas fa-shopping-cart me-1"></i> Pesan Sekarang
+          </button>
         </div>
       </form>
     </div>
diff --git a/routes/web.php b/routes/web.php
index af6e87b..ffae6e3 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -44,6 +44,9 @@ Route::group(['middleware' => ['auth']], function(){
 
         Route::get('/selesai', [PesananController::class, 'indexSelesai']);
         Route::get('datatable/selesai', [PesananController::class, 'getDataSelesai']);
+
+        Route::get('/pekerjaan', [PesananController::class, 'pekerjaan']);
+        Route::get('datatable/pekerjaan', [PesananController::class, 'getPekerjaan']);
     });
 
     Route::post('/logout', [AuthController::class, 'logout']);