progress kalori

app/Http/Controllers/CustomerController.php

@@ -230,6 +230,7 @@ class CustomerController extends Controller
             'total_harga' => $totalHarga,
             'status_order' => "Belum Bayar",
             'email' => $biodataResult['email'],
+            'alamat' => $biodataResult['alamat'],
         ];
         $order = Order::create($payloadOrder);
         foreach ($dataCart as $cart) {

app/Http/Controllers/KaloriController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Kalori;
+use Illuminate\Http\Request;
+
+class KaloriController extends Controller
+{
+    public function index(){
+        $payload = [
+            'title' => 'Master Kalori'
+        ];
+        return view('dashboard.kalori.index', $payload);
+    }
+
+    public function create(){
+        //
+    }
+
+    public function store(){
+        //
+    }
+
+    public function update(){
+        //
+    }
+
+    public function destroy(){
+        //
+    }
+
+    public function datatable(){
+        return Kalori::where('statusenabled', true)->get();
+    }
+
+    public function option(){
+        return Kalori::where('statusenabled', true)->select('kalori_id', 'nilai_kalori')->get();
+    }
+}

app/Http/Controllers/PesananController.php

@@ -6,6 +6,7 @@ use App\Models\Order;
 use App\Models\OrderDetail;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\DB;
 
 class PesananController extends Controller
@@ -212,12 +213,29 @@ class PesananController extends Controller
     }
 
     public function getPekerjaan(){
-        $data = OrderDetail::get();
+        $data = OrderDetail::with(['menu', 'paketMenu', 'order'])->whereHas('order', function($q){
+            $q->where('status_order', 'Lunas');
+        });
+        $tanggal = request('tanggal');
+        if(!empty($tanggal)){
+            $flattened  = is_array($tanggal[0]) ? Arr::flatten($tanggal) : $tanggal;
+            $data->whereIn('tgl_antar', $flattened);
+        }
+        $data = $data->get();
+
         return response()->json([
             'rows' => $data->values(),
             'total' => $data->count()
         ]);
     }
+
+    public function getPekerjaanDetail($order_detail_id){
+        $data = OrderDetail::where('order_detail_id', $order_detail_id)->with(['order', 'menu', 'paketMenu'])->first();
+        return response()->json([
+            'status' => true,
+            'data' => $data
+        ]);
+    }
     /**
      * Show the form for creating a new resource.
      */

app/Models/Kalori.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Kalori extends Model
+{
+    protected $connection = 'dbOrderGizi';
+    protected $table = 'public.kalori';
+    public $timestamps = false;
+    protected $primaryKey = "kalori_id";
+    protected $fillable =[
+        'entry_at',
+        'pegawai_id_entry',
+        'pegawai_nama_entry',
+        'modified_at',
+        'pegawai_id_modified',
+        'pegawai_nama_modified',
+        'statusenabled',
+        'nilai_kalori'
+    ];
+}

app/Models/Order.php

@@ -35,7 +35,8 @@ class Order extends Model
         'ruang_perawatan',
         'bagian_instalasi',
         'note_dibatalkan',
-        'email'
+        'email',
+        'alamat'
     ];
 
     protected $cast = [

app/Models/OrderDetail.php

@@ -34,4 +34,8 @@ class OrderDetail extends Model
     public function paketMenu(){
         return $this->belongsTo(PaketMenu::class, 'master_paket_menu_id', 'master_paket_menu_id')->select('master_paket_menu_id', 'nama_paket', 'foto');
     }
+
+    public function order(){
+        return $this->belongsTo(Order::class, 'order_id', 'order_id');
+    }
 }

public/js/checkout/index.js

@@ -147,11 +147,12 @@ function toggleCustomerFields() {
     const selected = $('input[name="jenis_customer"]:checked').val();
     if (selected === 'Karyawan RSAB Harapan Kita') {
         $('.karyawan').show();
-        $('.pasien').hide();
+        $('.pasien, .umum').hide();
     } else if (selected === 'Keluarga Pasien / Penunggu Pasien') {
         $('.pasien').show();
-        $('.karyawan').hide();
+        $('.karyawan, .umum').hide();
     } else {
+        $('.umum').show();
         $('.karyawan, .pasien').hide();
     }
 }
@@ -178,6 +179,7 @@ if (typeof checkout_biodata === 'object') {
     $('#bagian_instalasi').val(checkout_biodata.bagian_instalasi);
     $('#no_ekstensien').val(checkout_biodata.no_ekstensien);
     $('#email').val(checkout_biodata.email);
+    $('#alamat').val(checkout_biodata.alamat);
 }
 
 function isiKonfirmasi() {
@@ -196,6 +198,7 @@ function isiKonfirmasi() {
         bagian_instalasi: $('#bagian_instalasi').val(),
         no_ekstensien: $('#no_ekstensien').val(),
         email: $('#email').val(),
+        alamat: $('#alamat').val(),
     };
 
     sessionStorage.setItem('checkout_biodata', JSON.stringify(biodata));
@@ -514,6 +517,12 @@ function validateStepOne() {
             alert('Silakan lengkapi data pasien.');
             return false;
         }
+    }else if(selected === "Masyarakat Umum"){
+        const alamat = document.getElementById('alamat').value;
+        if(!alamat){
+            alert('Silahkan lengkapi alamat')
+            return false
+        }
     }
 
     return true;
@@ -591,7 +600,9 @@ function initFlatpickrTersedia(item, i) {
     const totalMenitFlatSekarang = jamFlat * 60 + menitFlat;
 
     const menitBatasFlat = 13 * 60;
+
     const lewatBatasNormal = totalMenitFlatSekarang >= menitBatasFlat;
+
     // Ambil string tgl_tersedia dan ubah jadi array tanggal lengkap
     const dayNumbers = (item.tgl_tersedia || "")
         .split(',')
@@ -599,6 +610,8 @@ function initFlatpickrTersedia(item, i) {
         .filter(s => s !== '' && !isNaN(s))
         .map(s => parseInt(s));
 
+
+
     // Generate tanggal dalam format YYYY-MM-DD untuk 3 bulan ke depan
     let availableDates = [];
     const bulanKeDepan = 3;
@@ -611,13 +624,14 @@ function initFlatpickrTersedia(item, i) {
         dayNumbers.forEach(day => {
             const dayStr = String(day).padStart(2, '0');
             const fullDateStr = `${year}-${month}-${dayStr}`;
-            const fullDate = new Date(`${fullDateStr}T00:00:00`);
+            const fullDate = new Date(`${fullDateStr}T23:00:00`);
 
             // Jika bukan menu someday, cek aturan H-1 dan jam batas
             if (item.apakah_someday) {
                 availableDates.push(fullDateStr);
             } else {
                 const selisihHari = Math.floor((fullDate - now) / (1000 * 60 * 60 * 24));
+
                 if (selisihHari >= 1 || (selisihHari === 1 && !lewatBatasNormal)) {
                     availableDates.push(fullDateStr);
                 }

public/js/dashboard/index.js

@@ -29,27 +29,6 @@ $("#filterDashboard").on('click', function(){
             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',

public/js/kalori/_init.js

@@ -0,0 +1,6 @@
+const datatableKalori = $("#datatableKalori")
+
+const modalKalori = document.getElementById("modalKalori")
+const formKalori = $("#formKalori")
+const modalKaloriEdit = document.getElementById("modalKaloriEdit")
+const formKaloriEdit = $("#formKaloriEdit")

public/js/kalori/action.js

@@ -0,0 +1,194 @@
+function addKalori(){
+    new bootstrap.Modal(modalKalori).show();
+    formKalori.attr('action', `/dashboard/karbohidrat`)
+}
+
+formKalori.on('submit', function(e){
+    e.preventDefault();
+
+    const form = this;
+    const actionUrl = formKalori.attr('action');
+    const formData = new FormData(form);
+
+    fetch(actionUrl, {
+        method: 'POST',
+        headers: {
+            'X-CSRF-TOKEN': document.querySelector('input[name="_token"]').value,
+        },
+        body: formData
+    }).then(async(res) => {
+        const responseData = await res.json();
+
+        if (res.status === 422) {
+            // Tampilkan semua error ke swal
+            const errors = responseData.errors || {};
+            let htmlList = '<ul class="text-start">';
+            for (const key in errors) {
+                errors[key].forEach(message => {
+                    htmlList += `<li>${message}</li>`;
+                });
+            }
+            htmlList += '</ul>';
+
+            Swal.fire({
+                icon: 'error',
+                title: 'Validasi Gagal',
+                html: htmlList,
+            });
+
+            throw new Error(); // Supaya masuk ke catch, tapi tidak tampil swal lagi
+        }
+
+        if (responseData.status) {
+            const handler = function () {
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berhasil',
+                    text: responseData.message || 'Berhasil melakukan aksi!',
+                    timer: 2000,
+                    showConfirmButton: false,
+                    backdrop: true,
+                });
+                $("#col_add_karbohidrat").html('');
+                colCount = 0; // reset counter
+                formKalori[0].reset();
+                datatableKarbohidrat.bootstrapTable('refresh');
+                modalKalori.removeEventListener('hidden.bs.modal', handler);
+            };
+            modalKalori.addEventListener('hidden.bs.modal', handler);
+            bootstrap.Modal.getInstance(modalKalori).hide();
+        } else {
+            throw new Error(responseData.message || 'Terjadi kesalahan saat menyimpan data.');
+        }
+
+    }).catch(err => {
+        if (err.message) {
+            Swal.fire({
+                icon: 'error',
+                title: 'Gagal',
+                text: err.message
+            });
+        }
+    });
+});
+
+
+function deleteKalori(e){
+    let id =$(e).data('karbohidrat_id')
+    Swal.fire({
+        title: "Apakah kamu yakin ingin menghapus data ini?",
+        text : $(e).data('nama'),
+        icon: "warning",
+        showCancelButton: true,
+        backdrop: true,
+    }).then((result) => {
+        if(result.isConfirmed){
+            fetch(`/dashboard/kalori/${id}`, {
+                method:'DELETE',
+                headers: {
+                    "X-CSRF-TOKEN": document.querySelector('input[name="_token"]').value,
+                    "Content-Type": "application/json"
+                }
+            }).then((response) => {
+                if(!response.ok){
+                    throw new Error("Network response was not ok");
+                }
+                return response.json();
+            })
+            .then((data) => {
+                if(data.status){
+                    Swal.fire({
+                        title: "Success",
+                        text: "Data berhasil dihapus",
+                        icon:"success",
+                        showConfirmButton: false,
+                        timer: 1000
+                    }).then(() => {
+                        datatableKalori.bootstrapTable("refresh")
+                    })
+                }else{
+                    Swal.fire({
+                        title: "Error!",
+                        text: data.message || "Failed to delete Item.",
+                        icon: "error"
+                    });
+                }
+            })
+            .catch(error => {
+                Swal.fire({
+                    title: "Error!",
+                    text: "Something went wrong. Please try again later.",
+                    icon: "error"
+                });
+            });
+        }
+    })
+}
+
+function editKalori(e){
+    const data = $(e).data();
+    new bootstrap.Modal(modalKaloriEdit).show();
+    formKaloriEdit.attr('action', `/dashboard/kalori/${data?.kalori_id}`)
+    $("#nilai_kalori_edit").val(data.nama)
+}
+
+formKaloriEdit.on('submit', function(e){
+    e.preventDefault();
+
+    const form = this;
+    const actionUrl = formKaloriEdit.attr('action');
+    const formData = new FormData(form);
+    formData.append('_method', 'PUT')
+    fetch(actionUrl, {
+        method: 'POST',
+        headers: {
+            'X-CSRF-TOKEN': document.querySelector('input[name="_token"]').value,
+        },
+        body: formData
+    }).then(async(res) => {
+        const responseData = await res.json();
+
+        if (res.status === 422) {
+            // Tampilkan semua error ke swal
+            const errors = responseData.errors || {};
+            Swal.fire({
+                icon: 'error',
+                title: 'Validasi Gagal',
+                html: errors.nilai_kalori[0],
+            });
+
+            throw new Error(); // Supaya masuk ke catch, tapi tidak tampil swal lagi
+        }
+
+        if (responseData.status) {
+            const handler = function () {
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berhasil',
+                    text: responseData.message || 'Berhasil melakukan aksi!',
+                    timer: 2000,
+                    showConfirmButton: false,
+                    backdrop: true,
+                });
+                $("#nama_kategori_diet").val('');
+                colCount = 0; // reset counter
+                formKaloriEdit[0].reset();
+                datatableKalori.bootstrapTable('refresh');
+                modalKaloriEdit.removeEventListener('hidden.bs.modal', handler);
+            };
+            modalKaloriEdit.addEventListener('hidden.bs.modal', handler);
+            bootstrap.Modal.getInstance(modalKaloriEdit).hide();
+        } else {
+            throw new Error(responseData.message || 'Terjadi kesalahan saat menyimpan data.');
+        }
+
+    }).catch(err => {
+        if (err.message) {
+            Swal.fire({
+                icon: 'error',
+                title: 'Gagal',
+                text: err.message
+            });
+        }
+    });
+});

public/js/kalori/dt.js

@@ -0,0 +1,51 @@
+
+    datatableKalori.bootstrapTable({
+        url: "/dashboard/datatable/kalori",
+        showColumns: true,
+        showColumnsToggleAll: true,
+        showRefresh: true,
+        sortable: true,
+        search: true,
+        searchOnEnterKey: false,
+        searchHighlight: true,
+        pagination: true,
+        serverSide:true,
+        pageSize: 10,
+        pageList: [10, 20, 30],
+        cookie: true,
+        cookieIdTable: "datatableKalori",
+        icons: {
+            refresh: "fas fa-sync-alt",   // atau ganti ke icon lain
+            columns: "fas fa-th-large"
+        },
+
+        columns: [
+            {
+                title: "Action",
+                field: 'kalori_id',
+                  formatter: function(value, row) {
+                    let buttons = ''
+                        buttons += `
+                            <button class="btn btn-sm btn-primary me-2" onclick="editKalori(this)" data-kalori_id="${row.kalori_id}" data-nilai_kalori="${row?.nilai_kalori}">
+                                <i class="fa-solid fa-pencil"></i>
+                            </button>
+                        `
+                        buttons += `
+                            <button class="btn btn-sm btn-danger me-2" onclick="deleteKalori(this)" data-kalori_id="${row.kalori_id}" data-nilai_kalori="${row?.nilai_kalori}">
+                                <i class="fa-solid fa-trash"></i>
+                            </button>
+                        `
+                    return `
+                        <div class="d-flex space-x">
+                        ${buttons}
+                        </div>
+                    `;
+                },
+                width: 120
+            },
+            {
+                title:"Nilai Kalori",
+                field:"nilai_kalori"
+            }
+        ],
+    });

public/js/kalori/function.js

@@ -0,0 +1,29 @@
+let colCount = 1;
+function addForm(){
+    console.log('et');
+
+    let col = $("#col_add_Kalori")
+
+    let html = '';
+
+        html += `
+            <div class="col mt-2 d-flex align-items-start gap-2" id="col-${colCount}">
+                     <div class="form-floating flex-grow-1">
+                      <input type="text" class="form-control" name="data[${colCount}][nilai_kalori]" placeholder="exp : 1000" required>
+                      <label>Nilai Kalori</label>
+                    </div>
+                     <div class="invalid-feedback"></div>
+
+                    <button type="button" class="btn btn-danger mt-2 me-2" onclick="removeCol(${colCount})"><i class="fa-solid fa-trash"></i></button>
+             </div>
+        `
+    col.append(html)
+    colCount++;
+
+}
+
+
+function removeCol(count){
+    $(`#col-${count}`).remove()
+}
+

public/js/karbohidrat/function.js

@@ -8,7 +8,7 @@ function addForm(){
             <div class="col mt-2 d-flex align-items-start gap-2" id="col-${colCount}">
                      <div class="form-floating flex-grow-1">
                       <input type="text" class="form-control" name="data[${colCount}][nama_karbohidrat]" placeholder="exp : Nasi" required>
-                      <label>Nama Klasifikasi Menu</label>
+                      <label>Nama Karbohidrat</label>
                     </div>
                      <div class="invalid-feedback"></div>
 

public/js/pekerjaan/_init.js

@@ -1 +1,5 @@
 const datatablePekerjaan = $("#datatablePekerjaan")
+
+const modalDetailOrder = document.getElementById('modalDetailOrder');
+
+const modalActionOrder = document.getElementById('modalActionApproveOrder');

public/js/pekerjaan/action.js

@@ -0,0 +1,108 @@
+function detailOrder(id){
+     new bootstrap.Modal(modalDetailOrder).show();
+     fetch(`/dashboard/pekerjaan/detail/${id}`)
+     .then(res => res.json())
+     .then(res => {
+        const data = res.data;
+        document.getElementById('pesanan_container').innerHTML = '';
+        document.getElementById('confirm_nama_pesanan').textContent = data?.order?.nama_pemesan;
+        let html = '';
+        html += `
+            <div class="col-md-12 mb-3">
+                    <div class="card shadow-sm border-0">
+                        <div class="row g-0">
+                            <div class="col-md-5 d-flex align-items-center p-2">
+                            <img src="/gambar/${data?.menu?.foto || data?.paket_menu?.foto}" alt="Foto Menu" class="img-fluid rounded shadow m-auto" style="max-height: 220px; width: auto;">
+                            </div>
+                            <div class="col-md-7 p-1">
+                            <p class="mb-1">Nama Menu: <strong>${data?.menu?.nama_menu || data?.paket_menu?.nama_menu}</strong></p>
+                            <p class="mb-1">Tanggal Antar: <span>${data?.tgl_antar || 0}</span></p>
+                            <p class="mb-1">Jumlah: <span>${data?.jumlah || 0}</span></p>
+                            <p class="mb-1">Harga Satuan: <strong>Rp ${parseInt(data?.harga_satuan || 0).toLocaleString('id-ID')}</strong></p>
+                            <p class="mb-1">Status Pesanan:
+                            <span class="badge text-dark ${data?.status_order === 'Selesai' ? 'bg-success' : 'bg-warning'}">
+                                ${data?.status_order}
+                            </span>
+                            </p>
+                             <hr class="my-2">
+                                    <p class="mb-1">Pemesan: <strong>${data?.order?.nama_pemesan || '-'}</strong></p>
+                                    <p class="mb-1">Jenis Kelamin: <strong>${data?.order?.jenis_kelamin || '-'}</strong></p>
+                                    <p class="mb-1">Jenis Customer: <strong>${data?.order?.jenis_customer || '-'}</strong></p>
+                                    ${data?.order?.jenis_customer === "Masyarakat Umum" ?
+                                        `<p class="mb-1">Alamat: <strong>${data?.order?.alamat || '-'}</strong></p>
+                                        ` : data?.order?.jenis_customer === "Karyawan RSAB Harapan Kita" ? `
+                                        <p class="mb-1">Bagian /Instalasi: <strong>${data?.order?.bagian_instalasi || '-'}</strong></p>
+                                        <p class="mb-1">No Ekstensien: <strong>${data?.order?.no_ekstensien || '-'}</strong></p>
+                                        ` :`
+                                        <p class="mb-1">Nama Pasien: <strong>${data?.order?.nama_pasien || '-'}</strong></p>
+                                        <p class="mb-1">Ruang Perawatan: <strong>${data?.order?.ruang_perawatan || '-'}</strong></p>
+                                        <p class="mb-1">Nomor Kamar Perawatan: <strong>${data?.order?.no_kamar_perawatan || '-'}</strong></p>
+                                        <p class="mb-1">Kelas Perawatan: <strong>${data?.order?.kelas_perawatan || '-'}</strong></p>
+                                        `
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+        `
+
+        document.getElementById('pesanan_container').innerHTML = html;
+
+     })
+     .catch(error => {
+        console.error(error);
+
+     })
+}
+
+
+function approve(e){
+    const data = $(e).data();
+    new bootstrap.Modal(modalActionOrder).show();
+    $("#confirmActionApproveOrder").text(data?.menu + ' (' +  data?.type +')')
+    $("#confirmNoOrder").text(data?.no_order + ' (' + data?.nama_pemesan  +')')
+    document.getElementById('formActionApproveOrder').setAttribute(`action`, `/dashboard/pending/update-detail-status/${data.id}`)
+}
+
+
+document.getElementById('formActionApproveOrder').addEventListener('submit', function (e) {
+    e.preventDefault();
+    const form = this;
+    const actionUrl = form.getAttribute('action');
+    fetch(actionUrl, {
+        method: 'POST',
+        headers: {
+            'X-CSRF-TOKEN': document.querySelector('input[name="_token"]').value,
+        }
+    }).then(async (res) => {
+        const data = await res.json();
+        if (res.status) {
+            const handler = function () {
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berhasil',
+                    text: 'Pesanan berhasil diselesaikan!',
+                    timer: 2000,
+                    showConfirmButton: false,
+                    backdrop: true,
+                });
+                datatablePekerjaan.bootstrapTable('refresh');
+                modalActionOrder.removeEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            };
+
+            modalActionOrder.addEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            bootstrap.Modal.getInstance(modalActionOrder).hide(); // ✅ pakai instance
+        } else {
+            throw new Error(data.message || 'Terjadi kesalahan saat mengubah status.');
+        }
+    }).catch(err => {
+        console.error(err);
+        Swal.fire({
+            icon: 'error',
+            title: 'Gagal',
+            text: err.message || 'Terjadi kesalahan pada server.',
+        });
+    });
+});

public/js/pekerjaan/dt.js

@@ -1,6 +1,13 @@
 
-    datatablePekerjaan.bootstrapTable({
-        url: "/dashboard/datatable/selesai",
+   function initDt(selectDate = []){
+        datatablePekerjaan.bootstrapTable('destroy');
+        datatablePekerjaan.bootstrapTable({
+        url: "/dashboard/datatable/pekerjaan",
+        method:'get',
+        queryParams: function(params) {
+            params.tanggal = selectDate;
+            return params;
+        },
         showColumns: true,
         showColumnsToggleAll: true,
         showRefresh: true,
@@ -25,14 +32,21 @@
                 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>
+
+                    if(row?.status_order !== "Selesai"){
+                          buttons += `
+                        <button class="btn btn-sm btn-success me-2" onclick="approve(this)" data-id="${row.order_detail_id}" data-nama_pemesan="${row?.order?.nama_pemesan}" data-no_order="${row?.order?.no_order}" data-menu="${row?.menu?.nama_menu || row?.paket_menu?.nama_paket}" data-jenis_customer="${row?.order?.jenis_customer}"  data-type="${row?.type}">
+                                        <i class="fa fa-check me-1"></i>
+                            </button>
                         `
                     }
 
+                     buttons += `
+                        <button class="btn btn-sm btn-primary me-2" onclick="detailOrder(${row?.order_detail_id})">
+                                <i class="fa-solid fa-circle-info"></i>
+                        </button>
+                        `
+
                     return `
                         <div class="d-flex space-x">
                         ${buttons}
@@ -43,97 +57,57 @@
 
             {
                 title: "No.Order",
-                field: 'no_order',
+                field: 'order.no_order',
                 sortable: true,
             },
             {
-                title: "Cara Pembayaran",
-                field: 'cara_pembayaran',
-                sortable: true,
-            },
-             {
-                title: "Status Pembayaran",
-                field: 'status_order',
+                title: "Status",
+                field: 'order_detail_id',
                 sortable: true,
                 formatter: function(value, row) {
-                    const status = value;
+                    const status = row?.status_order;
                     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") {
+                    if (status === "Selesai") {
                         badgeClass = 'bg-success text-dark';
-                    } else if(status === "Dibatalkan"){
-                        badgeClass = 'bg-danger';
+                    } else{
+                        badgeClass = 'bg-primary';
                     }
                    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>
-                `;
-            },
+                title: "Menu",
+                field: 'order_detail_id',
+                formatter:function(value, row){
+                    return row?.menu?.nama_menu || row?.paket_menu?.nama_paket
+                },
                 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',
+                field:'order.nama_pemesan',
                 formatter: function(value, row){
-                    return 'Rp ' + parseInt(row.total_harga).toLocaleString('id-ID')
-                }
-            }
+                      return `<ul class="list-unstyled mb-0 text-nowrap;">
+                                <li><i class="fa fa-user me-1 text-muted"></i> <strong> ${row?.order.nama_pemesan ?? '-'} </strong></li>
+                                  <li><i class="fa fa-tag me-1 text-muted"></i> ${row?.order?.jenis_customer ?? '-'}</li>
+                            </ul>`
+                },
+                sortable: true,
+            },
+            {
+                title: "Tgl Antar",
+                field: 'tgl_antar',
+            },
+            {
+                title: "Waktu Pemesanan",
+                field: 'type',
+                sortable: true,
+            },
 
         ],
     });
+   }
+
+

public/js/pesanan_pending/dt.js

@@ -1,5 +1,5 @@
 
-    datatablePending.bootstrapTable({
+   datatablePending.bootstrapTable({
         url: "/dashboard/datatable/pending",
         showColumns: true,
         showColumnsToggleAll: true,

resources/views/dashboard/kalori/index.blade.php

@@ -0,0 +1,30 @@
+@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> Master Kalori
+    </h4>
+
+    <!-- Card Master Menu -->
+    <div class="card">
+        <div class="card-header d-flex justify-content-between align-items-center">
+            <h5 class="mb-0">Kalori</h5>
+              <button type="button" class="btn btn-primary" onclick="addKalori()">
+                Tambah
+             </button>
+        </div>
+        <div class="card-body">
+            <table class="table" id="datatableKalori"></table>
+        </div>
+    </div>
+</div>
+    @include('dashboard.kalori.modal.create')
+    @include('dashboard.kalori.modal.edit')
+
+    <script src="{{ ver('/js/kalori/_init.js') }}"></script>
+    <script src="{{ ver('/js/kalori/dt.js') }}"></script>
+    <script src="{{ ver('/js/kalori/action.js') }}"></script>
+    <script src="{{ ver('/js/kalori/function.js') }}"></script>
+@endsection

resources/views/dashboard/kalori/modal/create.blade.php

@@ -0,0 +1,41 @@
+<!-- Modal -->
+<div class="modal fade" id="modalKalori" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-lg modal-dialog-centered">
+    <div class="modal-content">
+
+      <!-- Modal Header -->
+      <div class="modal-header">
+        <h1 class="modal-title fs-5">Aksi Master Kalori</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Modal Form -->
+      <form enctype="multipart/form-data" method="POST" id="formKalori">
+        @csrf
+        <div class="modal-body">
+          <div class="container" id="container_create">
+            <div class="row">
+                <div class="col">
+                     <div class="form-floating">
+                      <input type="text" class="form-control" name="data[0][nili_kalori]" placeholder="exp : 1000" required>
+                      <label>Niali Kalori</label>
+                    </div>
+                </div>
+                <div id="col_add_Kalori"></div>
+            </div>
+              <button type="button" class="btn btn-outline-primary btn-sm mt-2" onclick="addForm()">
+              + Tambah Kalori
+            </button>
+          </div>
+        </div>
+
+        <!-- Modal Footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
+          <button type="submit" class="btn btn-primary">Simpan</button>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</div>

resources/views/dashboard/kalori/modal/edit.blade.php

@@ -0,0 +1,40 @@
+<!-- Modal -->
+<div class="modal fade" id="modalKaloriEdit" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-lg modal-dialog-centered">
+    <div class="modal-content">
+
+      <!-- Modal Header -->
+      <div class="modal-header">
+        <h1 class="modal-title fs-5">Aksi Master Kalori</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Modal Form -->
+      <form enctype="multipart/form-data" method="PUT" id="formKaloriEdit">
+        @method('put')
+        @csrf
+        <div class="modal-body">
+
+          <div class="container">
+            <div class="row">
+                <div class="col">
+                     <div class="form-floating">
+                      <input type="text" class="form-control" name="nilai_kalori" id="nilai_kalori_edit" placeholder="Nasi" required>
+                      <label>Nilai Kalori</label>
+                    </div>
+                </div>
+            </div>
+          </div>
+
+        </div>
+
+        <!-- Modal Footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
+          <button type="submit" class="btn btn-primary">Simpan</button>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</div>

resources/views/dashboard/layouts/main.blade.php

@@ -42,7 +42,8 @@
     <!-- fontawosome CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css" integrity="sha512-Evv84Mr4kqVGRNSgIGL/F/aIDqQb7xQ2vcrdIwxfjThSH8CSR7PBEakCr51Ck+w+/U6swU2Im1vVX0SVk9ABhg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
-
+    {{-- flatcpicker css --}}
+     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <!-- Helpers -->
     <script src="{{ ver('/assets/vendor/js/helpers.js') }}"></script>
@@ -72,6 +73,8 @@
     referrerpolicy="no-referrer"
     />
 
+    {{-- flatcpicker --}}
+    <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
   </head>
 
   <body>

resources/views/dashboard/master/menu/modal/add.blade.php

@@ -30,21 +30,21 @@
                     </div>
                   </div>
 
-                  <div class="col-md-4">
+                  <div class="col-md-4 d-none">
                     <div class="form-floating">
                       <input type="text" class="form-control money" name="data[0][harga_public]" placeholder="Harga" required>
                       <label>Harga Publik</label>
                     </div>
                   </div>
 
-                  <div class="col-md-4">
+                  <div class="col-md-6">
                     <div class="form-floating">
                       <input type="text" step="0.01" class="form-control money" name="data[0][harga_karyawan]" placeholder="Harga" required>
                       <label>Harga Karyawan</label>
                     </div>
                   </div>
 
-                  <div class="col-md-4">
+                  <div class="col-md-6">
                     <div class="form-floating">
                       <input type="text" step="0.01" class="form-control money" name="data[0][harga_keluarga_pasien]" placeholder="Harga" required>
                       <label>Harga Keluarga Pasien / Pasien</label>

resources/views/dashboard/partials/sidenav.blade.php

@@ -34,6 +34,12 @@
                 <div data-i18n="Account Settings">Klasifikasi Menu</div>
               </a>
             </li>
+            <li class="menu-item {{ Request::is('dashboard/kalori') ? 'active' : '' }}">
+              <a href="/dashboard/kalori" class="menu-link">
+                <i class="menu-icon tf-icons bx bx-dock-top"></i>
+                <div data-i18n="Account Settings">Kalori</div>
+              </a>
+            </li>
             <li class="menu-item {{ Request::is('dashboard/karbohidrat') ? 'active' : '' }}">
               <a href="/dashboard/karbohidrat" class="menu-link">
                 <i class="menu-icon tf-icons bx bx-dock-top"></i>

resources/views/dashboard/pesanan/pekerjaan/index.blade.php

@@ -1,24 +1,63 @@
 @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>
+    <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>
+        <!-- Card Master Menu -->
+        <div class="card">
+            <div class="card-header d-flex justify-content-between align-items-center">
+                <h5 class="mb-0">Pekerjaan <strong id="confirm_pekerjaan_time"></strong></h5>
+                    <div class="input-group input-group-sm" style="width: 240px;">
+                        <span class="input-group-text bg-white">
+                            <i class="fa fa-calendar-alt"></i>
+                        </span>
+                        <input
+                            type="text"
+                            class="form-control tanggal-input"
+                            id="tanggal"
+                            placeholder="Pilih tanggal"
+                            readonly>
+                    </div>
+            </div>
+            <div class="card-body">
+                <table class="table" id="datatablePekerjaan"></table>
+            </div>
         </div>
     </div>
-</div>
 
+    @include('dashboard.pesanan.pekerjaan.modal.detail')
+    @include('dashboard.pesanan.pekerjaan.modal.action')
 
-<script src="{{ ver('/js/pekerjaan/_init.js') }}"></script>
-<script src="{{ ver('/js/pekerjaan/dt.js') }}"></script>
+    <script src="{{ ver('/js/pekerjaan/_init.js') }}"></script>
+    <script src="{{ ver('/js/pekerjaan/dt.js') }}"></script>
+    <script src="{{ ver('/js/pekerjaan/action.js') }}"></script>
+
+    <script>
+        document.addEventListener('DOMContentLoaded', function () {
+            flatpickr('#tanggal', {
+                dateFormat: "Y-m-d",
+                mode: "multiple",
+                locale: "id", // opsional: agar hari/bulan dalam Bahasa Indonesia
+                onValueUpdate: function(selectedDates, dateStr, instance) {
+                    const selectedFormattedDates = selectedDates.map(d => {
+                            const year = d.getFullYear();
+                            const month = String(d.getMonth() + 1).padStart(2, '0');
+                            const day = String(d.getDate()).padStart(2, '0');
+                            return `${year}-${month}-${day}`;
+                    })
+                    initDt(selectedFormattedDates);
+                    if(selectedFormattedDates.length > 0){
+                        $("#confirm_pekerjaan_time").text('Pada Tanggal : ' + selectedFormattedDates)
+                    }else{
+                        $("#confirm_pekerjaan_time").text('');
+                    }
+                }
+            });
+        initDt();
+    });
+    </script>
 @endsection

resources/views/dashboard/pesanan/pekerjaan/modal/action.blade.php

@@ -0,0 +1,29 @@
+<!-- Modal -->
+<div class="modal fade" id="modalActionApproveOrder" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-lg modal-dialog-centered">
+    <div class="modal-content">
+
+      <!-- Modal Header -->
+      <div class="modal-header">
+        <h5 class="modal-title fs-5">Aksi <strong id="confirmNoOrder"></strong></h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Modal Form -->
+      <form method="POST" id="formActionApproveOrder">
+        @csrf
+        @method('put')
+        <div class="modal-body ">
+            Apakah kamu yakin melakukan persetujuan pada order ini ? <strong id="confirmActionApproveOrder"></strong>
+        </div>
+
+        <!-- Modal Footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
+          <button type="submit" class="btn btn-primary">Setujui</button>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</div>

resources/views/dashboard/pesanan/pekerjaan/modal/detail.blade.php

@@ -0,0 +1,30 @@
+<!-- Modal -->
+<div class="modal fade" id="modalDetailOrder" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-lg modal-dialog-centered">
+    <div class="modal-content">
+
+      <!-- Modal Header -->
+      <div class="modal-header">
+        <h5 class="modal-title fs-5">Data Pesanan <strong id="confirm_nama_pesanan"></strong></h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Modal Form -->
+        @csrf
+        @method('put')
+      <div class="modal-body">
+        <div class="container" id="pesanan_container"></div>
+        <!-- Tempatkan ini di layout HTML -->
+
+
+      </div>
+
+
+        <!-- Modal Footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
+        </div>
+
+    </div>
+  </div>
+</div>

resources/views/dashboard/pesanan/pending/index.blade.php

@@ -10,7 +10,18 @@
     <!-- Card Master Menu -->
     <div class="card">
         <div class="card-header d-flex justify-content-between align-items-center">
-            <h5 class="mb-0">Pesanan Pending</h5>
+            <h5 class="mb-0">Pesanan Pending <strong id="confirm_date_pesanan_pending"></strong></h5>
+                    <div class="input-group input-group-sm" style="width: 240px;">
+                        <span class="input-group-text bg-white">
+                            <i class="fa fa-calendar-alt"></i>
+                        </span>
+                        <input
+                            type="text"
+                            class="form-control tanggal-input"
+                            id="tanggal"
+                            placeholder="Pilih tanggal"
+                            readonly>
+                    </div>
         </div>
         <div class="card-body">
             <table class="table" id="datatablePesananPending"></table>
@@ -26,4 +37,26 @@
 <script src="{{ ver('/js/pesanan_pending/dt.js') }}"></script>
 <script src="{{ ver('/js/pesanan_pending/action.js') }}"></script>
 <script src="{{ ver('/js/pesanan_pending/action_progres_order.js') }}"></script>
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+            flatpickr('#tanggal', {
+                dateFormat: "Y-m-d",
+                mode: "multiple",
+                locale: "id", // opsional: agar hari/bulan dalam Bahasa Indonesia
+                onValueUpdate: function(selectedDates, dateStr, instance) {
+                    const selectedFormattedDates = selectedDates.map(d => {
+                            const year = d.getFullYear();
+                            const month = String(d.getMonth() + 1).padStart(2, '0');
+                            const day = String(d.getDate()).padStart(2, '0');
+                            return `${year}-${month}-${day}`;
+                    })
+                    if(selectedFormattedDates.length > 0){
+                        $("#confirm_date_pesanan_pending").text('Pada Tanggal : ' + selectedFormattedDates)
+                    }else{
+                        $("#confirm_date_pesanan_pending").text('');
+                    }
+                }
+            });
+    });
+</script>
 @endsection

resources/views/dashboard/pesanan/selesai/index.blade.php

@@ -11,6 +11,17 @@
     <div class="card">
         <div class="card-header d-flex justify-content-between align-items-center">
             <h5 class="mb-0">Pesanan Selesai</h5>
+                    <div class="input-group input-group-sm" style="width: 240px;">
+                        <span class="input-group-text bg-white">
+                            <i class="fa fa-calendar-alt"></i>
+                        </span>
+                        <input
+                            type="text"
+                            class="form-control tanggal-input"
+                            id="tanggal"
+                            placeholder="Pilih tanggal"
+                            readonly>
+                    </div>
         </div>
         <div class="card-body">
             <table class="table" id="datatablePesananSelesai"></table>
@@ -23,4 +34,26 @@
 <script src="{{ ver('/js/pesanan_selesai/_init.js') }}"></script>
 <script src="{{ ver('/js/pesanan_selesai/dt.js') }}"></script>
 <script src="{{ ver('/js/pesanan_selesai/detail_order.js') }}"></script>
+<script>
+     document.addEventListener('DOMContentLoaded', function () {
+            flatpickr('#tanggal', {
+                dateFormat: "Y-m-d",
+                mode: "multiple",
+                locale: "id", // opsional: agar hari/bulan dalam Bahasa Indonesia
+                onValueUpdate: function(selectedDates, dateStr, instance) {
+                    const selectedFormattedDates = selectedDates.map(d => {
+                            const year = d.getFullYear();
+                            const month = String(d.getMonth() + 1).padStart(2, '0');
+                            const day = String(d.getDate()).padStart(2, '0');
+                            return `${year}-${month}-${day}`;
+                    })
+                    if(selectedFormattedDates.length > 0){
+                        $("#confirm_date_pesanan_pending").text('Pada Tanggal : ' + selectedFormattedDates)
+                    }else{
+                        $("#confirm_date_pesanan_pending").text('');
+                    }
+                }
+            });
+    });
+</script>
 @endsection

resources/views/guest/checkout/step/step1.blade.php

@@ -111,6 +111,17 @@
                             <input type="text" class="form-control karyawan-field" name="no_ekstensien" id="no_ekstensien">
                         </div>
                         {{-- End Karyawan --}}
+
+
+                        {{-- Umum --}}
+
+                        <div class="col-md-12 umum">
+                            <label class="form-label">Alamat</label>
+                            <textarea class="form-control umum-field" name="alamat" id="alamat"></textarea>
+                        </div>
+                        {{-- End Umum --}}
+
+
                     </div>
                     <button type="button" class="btn btn-success w-100 next-step">Lanjutkan</button>
             </div>

routes/web.php

@@ -3,6 +3,7 @@
 use App\Http\Controllers\AuthController;
 use App\Http\Controllers\CustomerController;
 use App\Http\Controllers\DashboardController;
+use App\Http\Controllers\KaloriController;
 use App\Http\Controllers\KarbohidratController;
 use App\Http\Controllers\KlasifikasiMenuController;
 use App\Http\Controllers\MenuController;
@@ -31,6 +32,9 @@ Route::group(['middleware' => ['auth']], function(){
         Route::resource('/karbohidrat', KarbohidratController::class);
         Route::get('/datatable/karbohidrat', [KarbohidratController::class, 'datatable']);
         Route::get('/option/karbohidrat', [KarbohidratController::class, 'option']);
+        Route::resource('/kalori', KaloriController::class);
+        Route::get('/datatable/kalori', [KaloriController::class, 'datatable']);
+        Route::get('/option/kalori', [KaloriController::class, 'option']);
 
         Route::resource('/menu', MenuController::class);
         Route::get('/datatable/menu', [MenuController::class, 'datatable']);
@@ -47,6 +51,7 @@ Route::group(['middleware' => ['auth']], function(){
 
         Route::get('/pekerjaan', [PesananController::class, 'pekerjaan']);
         Route::get('datatable/pekerjaan', [PesananController::class, 'getPekerjaan']);
+        Route::get('/pekerjaan/detail/{id}', [PesananController::class, 'getPekerjaanDetail']);
     });
 
     Route::post('/logout', [AuthController::class, 'logout']);