progress menu

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,114 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\Kalori\RequestKalori;
+use App\Http\Requests\Kalori\RequestUpdateKalori;
+use App\Models\Kalori;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class KaloriController extends Controller
+{
+    public function index(){
+        $payload = [
+            'title' => 'Master Kalori'
+        ];
+        return view('dashboard.kalori.index', $payload);
+    }
+
+    public function create(){
+        //
+    }
+
+    public function store(RequestKalori $request){
+           DB::connection('dbOrderGizi')->beginTransaction();
+       try {
+            $request->validated();
+            $datas = $request->input('data');
+            foreach ($datas as $data) {
+               $payload = [
+                'pegawai_id_entry' => auth()->user()->id,
+                'pegawai_nama_entry' => auth()->user()->full_name,
+                'nilai_kalori' => $data['nilai_kalori']
+               ];
+               Kalori::create($payload);
+            };
+            DB::connection('dbOrderGizi')->commit();
+            return response()->json([
+                'status' => true,
+                'message' => 'Berhasil menambahkan data'
+            ], 201);
+        } catch (\Throwable $th) {
+            DB::connection('dbOrderGizi')->rollBack();
+            return response()->json([
+                'status' => false,
+                'message' => 'Gagal menambahkan data'
+            ], 500);
+       }
+    }
+
+    public function edit(){
+        //
+    }
+
+    public function update(RequestUpdateKalori $request, string $id){
+        $request->validated();
+       try {
+            $kalori = Kalori::where('kalori_id', $id)->first();
+            $payload = [
+                'nilai_kalori' => $request->input('nilai_kalori'),
+                'pegawai_id_modified' => auth()->user()->id,
+                'pegawai_nama_modified' => auth()->user()->full_name,
+                'modified_at' => Carbon::now()
+            ];
+            $kalori->update($payload);
+            return response()->json([
+                'status' => true,
+                'message' => 'Berhasil memperbarui data'
+            ], 200);
+       } catch (\Throwable $th) {
+            return response()->json([
+                    'status' => false,
+                    'message' => 'Gagal memperbarui data'
+                ], 500);
+       }
+    }
+
+    public function destroy(string $id){
+
+        $data = Kalori::where(['statusenabled' => true, 'kalori_id' => $id])->first();
+          $payload = [
+                'statusenabled' => false,
+                'pegawai_id_modified' => auth()->user()->id,
+                'pegawai_nama_modified' => auth()->user()->full_name,
+                'modified_at' => Carbon::now()
+            ];
+       $data->update($payload);
+       return response()->json([
+            'status' => true,
+            'message' => 'Berhasil menghapus data'
+        ], 200);
+    }
+
+    public function datatable(){
+        return Kalori::where('statusenabled', true)->get();
+    }
+
+    public function option(){
+        $search =  request('search');
+        $query = Kalori::where('statusenabled', true);
+
+        if(!empty($search)){
+            $query->where('nilai_kalori', 'ILIKE', '%' . $search . '%');
+        }else{
+            $query->take(30);
+        }
+        $data = $query->select('kalori_id', 'nilai_kalori')->get();
+        return response()->json([
+            'error' => 0,
+            'data' => $data
+        ]);
+    }
+}

app/Http/Controllers/KarbohidratController.php

@@ -87,8 +87,8 @@ class KarbohidratController extends Controller
             $karbohidrat = Karbohidrat::where('karbohidrat_id', $id)->first();
             $payload = [
                 'nama_karbohidrat' => $request->input('nama_karbohidrat'),
-                'pegawai_id_entry' => auth()->user()->id,
-                'pegawai_nama_entry' => auth()->user()->full_name,
+                'pegawai_id_modified' => auth()->user()->id,
+                'pegawai_nama_modified' => auth()->user()->full_name,
                 'modified_at' => Carbon::now()
             ];
             $karbohidrat->update($payload);
@@ -112,8 +112,8 @@ class KarbohidratController extends Controller
         $data = Karbohidrat::where(['statusenabled' => true, 'karbohidrat_id' => $id])->first();
           $payload = [
                 'statusenabled' => false,
-                'pegawai_id_entry' => auth()->user()->id,
-                'pegawai_nama_entry' => auth()->user()->full_name,
+                'pegawai_id_modified' => auth()->user()->id,
+                'pegawai_nama_modified' => auth()->user()->full_name,
                 'modified_at' => Carbon::now()
             ];
        $data->update($payload);

app/Http/Controllers/MenuController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\KategoriKlasifikasiPaketMenu;
+use App\Models\KlasifikasiMenuKalori;
 use App\Models\Menu;
 use App\Models\TanggalMenuTersedia;
 use Carbon\Carbon;
@@ -44,7 +45,7 @@ class MenuController extends Controller
             foreach ($allData as $data) {
                 $hargaPublic = $data['harga_public'] ? str_replace('.', '', $data['harga_public']) : null;
                 $hargaKaryawan = $data['harga_karyawan'] ? str_replace('.', '', $data['harga_karyawan']) : null;
-                $hargaKeluargaPasien = $data['harga_keluarga_pasien'] ? str_replace('.', '', $data['harga_keluarga_pasien']) : null;
+                // $hargaKeluargaPasien = $data['harga_keluarga_pasien'] ? str_replace('.', '', $data['harga_keluarga_pasien']) : null;
                 $payload = [
                     'pegawai_id_entry' => auth()->user()->id,
                     'pegawai_nama_entry' => auth()->user()->full_name,
@@ -52,7 +53,7 @@ class MenuController extends Controller
                     'jenis_menu' => $data['jenis_makanan'],
                     'harga_public' => $hargaPublic,
                     'harga_karyawan' => $hargaKaryawan,
-                    'harga_keluarga_pasien' => $hargaKeluargaPasien,
+                    // 'harga_keluarga_pasien' => $hargaKeluargaPasien,
                     'deskripsi' => $data['deskripsi'],
                     'status' => true,
                     'apakah_someday' => $data['kategori_menu'] === "Menu Normal" ? false : true,
@@ -79,6 +80,20 @@ class MenuController extends Controller
                         KategoriKlasifikasiPaketMenu::create($payloadCategory);
                     }
                 }
+
+                if(isset($data['kalori_id'])){
+                    $kalories = $data['kalori_id'];
+                       foreach ($kalories as $kalori) {
+                        $payloadKalori = [
+                        'pegawai_id_entry' => auth()->user()->id,
+                        'pegawai_nama_entry' => auth()->user()->full_name,
+                        'kalori_id' => $kalori,
+                        'master_menu_id' => $menu->master_menu_id,
+                        ];
+                        KlasifikasiMenuKalori::create($payloadKalori);
+                    }
+                }
+
                 if(isset($data['tanggal']) && ($data['kategori_menu'] === "Menu Normal")){
                     $tanggal = $data['tanggal'];
                     foreach ($tanggal as $tgl) {
@@ -99,7 +114,6 @@ class MenuController extends Controller
                 'message' => 'Menu berhasil ditambahkan!'
             ]);
         } catch (\Throwable $th) {
-            dd($th);
             DB::connection('dbOrderGizi')->rollBack();
 
             return response()->json([
@@ -131,7 +145,89 @@ class MenuController extends Controller
      */
     public function update(Request $request, string $id)
     {
-        //
+        try {
+            DB::connection('dbOrderGizi')->beginTransaction();
+                KlasifikasiMenuKalori::where('master_menu_id', $id)->delete();
+                TanggalMenuTersedia::where('master_menu_id', $id)->delete();
+                KategoriKlasifikasiPaketMenu::where('master_menu_id', $id)->delete();
+
+
+                $menu = Menu::where('master_menu_id', $id)->first();
+                $menuKategoriDiet = request('kategori_diet_id');
+                $menuKalori = request('kalori_id');
+                $menuTanggal = request('tanggal');
+                $hargaPublic = request('harga_public') ? str_replace('.', '', request('harga_public')) : null;
+                $hargaKaryawan = request('harga_karyawan') ? str_replace('.', '', request('harga_karyawan')) : null;
+                $payload = [
+                    'pegawai_id_modified' => auth()->user()->id,
+                    'pegawai_nama_modified' => auth()->user()->full_name,
+                    'nama_menu' => request('nama'),
+                    'jenis_menu' => request('jenis_makanan'),
+                    'harga_public' => $hargaPublic,
+                    'harga_karyawan' => $hargaKaryawan,
+                    'deskripsi' => request('deskripsi'),
+                    'status' => true,
+                    'apakah_someday' => request('kategori_menu') === "Menu Normal" ? false : true,
+                    'apakah_menu_siang' => (request('apakah_menu_siang') && request('apakah_menu_siang') === "iya") ? true : false,
+                    'apakah_menu_sore' => (request('apakah_menu_sore') && request('apakah_menu_sore') === "iya") ? true : false,
+                ];
+                if(request()->hasFile('foto')){
+                    $imageName = Str::random(15) . '.' . request('foto')->getClientOriginalExtension();
+                    Storage::disk('img_menu')->put($imageName, file_get_contents(request('foto')));
+                    $payload['foto'] =$imageName;
+                }
+                $menu->update($payload);
+
+                 if(isset($menuKategoriDiet)){
+                    foreach ($menuKategoriDiet as $category) {
+                        $payloadCategory = [
+                            'pegawai_id_entry' => auth()->user()->id,
+                            'pegawai_nama_entry' => auth()->user()->full_name,
+                            'kategori_diet_id' => $category,
+                            'master_menu_id' => $menu->master_menu_id,
+                        ];
+                        KategoriKlasifikasiPaketMenu::create($payloadCategory);
+                    }
+                }
+
+                if(isset($menuKalori)){
+                       foreach ($menuKalori as $kalori) {
+                        $payloadKalori = [
+                        'pegawai_id_entry' => auth()->user()->id,
+                        'pegawai_nama_entry' => auth()->user()->full_name,
+                        'kalori_id' => $kalori,
+                        'master_menu_id' => $menu->master_menu_id,
+                        ];
+                        KlasifikasiMenuKalori::create($payloadKalori);
+                    }
+                }
+
+                if(isset($menuTanggal) && (request('kategori_menu') === "Menu Normal")){
+                    foreach ($menuTanggal as $tgl) {
+                        $payloadTgl = [
+                            'pegawai_id_entry' => auth()->user()->id,
+                            'pegawai_nama_entry' => auth()->user()->full_name,
+                            'tgl_harian' => $tgl,
+                            'master_menu_id' => $menu->master_menu_id,
+                        ];
+                        TanggalMenuTersedia::create($payloadTgl);
+                    }
+                }
+
+            DB::connection('dbOrderGizi')->commit();
+
+            return response()->json([
+                'status' => true,
+                'message' => 'Menu berhasil diperbarui!'
+            ]);
+        } catch (\Throwable $th) {
+            DB::connection('dbOrderGizi')->rollBack();
+            return response()->json([
+                    'status' => false,
+                    'message' => 'Menu gagal ditambahkan!',
+                    'errors' => $th->getMessage()
+            ]);
+        }
     }
 
     /**
@@ -159,6 +255,8 @@ class MenuController extends Controller
         ->leftJoin('public.klasifikasi_menu_diet as kmd', 'kmd.master_menu_id', '=', 'mn.master_menu_id')
         ->leftJoin('public.kategori_diet as kd', 'kd.kategori_diet_id', '=', 'kmd.kategori_diet_id')
         ->leftJoin('public.detail_menu_paket_harian as dmph', 'dmph.master_menu_id', '=', 'mn.master_menu_id')
+        ->leftJoin('public.klasifikasi_menu_kalori as kmk', 'kmk.master_menu_id', '=', 'mn.master_menu_id')
+        ->leftJoin('public.kalori as k', 'k.kalori_id', '=', 'kmk.kalori_id')
         ->where('mn.statusenabled', true)
         ->select(
             'mn.master_menu_id',
@@ -177,9 +275,13 @@ class MenuController extends Controller
             'kmd.kategori_diet_id',
             'kd.nama_kategori_diet',
             'dmph.detail_menu_paket_harian_id',
-            'dmph.tgl_harian'
+            'dmph.tgl_harian',
+            'kmk.klasifikasi_menu_kalori_id',
+            'kmk.kalori_id',
+            'k.nilai_kalori'
             )
         ->get()->groupBy('master_menu_id');
+
         $grouped = $data->map(function($items){
             $first = $items->first();
             $tglAvailable = $items->filter(fn($tgl) => $tgl->tgl_harian !== null)
@@ -195,9 +297,18 @@ class MenuController extends Controller
                             ->map(function($item){
                                 return [
                                     'klasifikasi_menu_diet_id' => $item->klasifikasi_menu_diet_id,
+                                    'kategori_diet_id' => $item->kategori_diet_id,
                                     'nama_kategori_diet' => $item->nama_kategori_diet,
                                 ];
-                            });
+                            })->values();
+            $kalori = $items->filter(fn($kal) => $kal->klasifikasi_menu_kalori_id !== null)
+                            ->unique('klasifikasi_menu_kalori_id')
+                            ->map(function($item){
+                                return [
+                                    'kalori_id' => $item->kalori_id,
+                                    'nilai_kalori' => $item->nilai_kalori,
+                                ];
+                            })->values();
             return [
                 'master_menu_id' => $first->master_menu_id,
                 'nama_menu' => $first->nama_menu,
@@ -213,6 +324,7 @@ class MenuController extends Controller
                 'apakah_menu_sore' => $first->apakah_menu_sore,
                 'tgl' => $tglAvailable,
                 'kategoriDiet' => $kategoriDiet,
+                'kalori' => $kalori,
             ];
 
         });
@@ -222,4 +334,12 @@ class MenuController extends Controller
             'total' => $grouped->count()
         ]);
     }
+
+    public function getDataDetail(string $id){
+        $data = Menu::with(['klasifikasiMenuDiet', 'klasifikasiMenuKalori', 'tglAvailable'])->where('master_menu_id', $id)->first();
+        return response()->json([
+            'data' => $data ?? null,
+            'message' => 'berhasil mendapatkan data'
+        ]);
+    }
 }

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,32 @@ 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);
+        }else{
+            $now = Carbon::now()->format('Y-m-d');
+            $data->where('tgl_antar', $now);
+        }
+        $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/Http/Requests/Kalori/RequestKalori.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Http\Requests\Kalori;
+
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Support\Facades\DB;
+
+class RequestKalori extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+      public function rules(): array
+    {
+        return [
+            'data' => 'required|array|min:1',
+            'data.*.nilai_kalori' => 'required'
+        ];
+    }
+
+    public function messages(){
+       return [
+            'data.array' => 'Format data harus berupa array',
+            'data.min' => 'Minimal harus ada satu data klasifikasi menu',
+            'data.*.nilai_kalori.required' => 'Nilai Kalori Menu wajib diisi',
+        ];
+    }
+
+    protected function failedValidation(Validator $validator){
+        throw new HttpResponseException(
+            response()->json([
+                'status'    => 'VALIDATION_FAILED',
+                'message'   => 'Validasi Gagal',
+                'errors'    => $validator->errors()->messages(),
+            ], 422)
+        );
+    }
+
+     public function withValidator($validator){
+        $validator->after(function ($validator){
+            $namaListAsli = collect($this->input('data'))->pluck('nilai_kalori')->filter();
+                $namaListLower = $namaListAsli->map(fn($n) => strtolower(trim($n)));
+                $duplicates = $namaListLower->duplicates();
+
+                    if ($duplicates->isNotEmpty()) {
+                        foreach ($namaListAsli as $index => $nama) {
+                            if ($duplicates->contains(strtolower(trim($nama)))) {
+                                $validator->errors()->add("data.$index.nilai_kalori", "Nama '$nama' duplikat dalam input.");
+                            }
+                        }
+                    }
+                $namaList = $namaListAsli->map(fn($n) => strtolower(trim($n)));
+
+                if($namaList->isEmpty()) return;
+
+                $exists = DB::connection('dbOrderGizi')
+                    ->table('public.kalori')
+                    ->where('statusenabled', true)
+                    ->whereIn(DB::raw('LOWER(nilai_kalori)'), $namaList->toArray())
+                    ->selectRaw('LOWER(nilai_kalori) as kalori')
+                    ->pluck('kalori')
+                    ->toArray();
+
+                foreach ($namaListAsli as $index => $nama) {
+                    $lowerNama = strtolower(trim($nama));
+                    if(in_array($lowerNama, $exists)){
+                        $validator->errors()->add("data.$index.nama_karbohidrat", "Nama '$nama' Sudah digunakan.");
+                    }
+                }
+        });
+    }
+}

app/Http/Requests/Kalori/RequestUpdateKalori.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Requests\Kalori;
+
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Support\Facades\DB;
+
+class RequestUpdateKalori extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function rules(): array
+    {
+       return [
+            'nilai_kalori' => 'required|string'
+        ];
+    }
+
+    public function messages(){
+       return [
+            'nilai_kalori.required' => 'Nama Karbohidrat wajib diisi'
+        ];
+    }
+
+     protected function failedValidation(Validator $validator){
+        throw new HttpResponseException(
+            response()->json([
+                'status'    => 'VALIDATION_FAILED',
+                'message'   => 'Validasi Gagal',
+                'errors'    => $validator->errors()->messages(),
+            ], 422)
+        );
+    }
+
+    public function withValidator($validator){
+        $validator->after(function($validator){
+            $id = $this->route('kalori') ?? $this->kalori_id ?? null;
+            $exists = DB::connection('dbOrderGizi')
+                ->table('public.kalori')
+                ->where('statusenabled', true)
+                ->where('nilai_kalori', 'ILIKE', $this->input('nilai_kalori'));
+
+            if($id) $exists->where('kalori_id', '!=', $id);
+
+            if($exists->exists()){
+                $validator->errors()->add(
+                    'Nilai Kalori',
+                    'Nilai Kalori sudah digunakan'
+                );
+            }
+        });
+    }
+}

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/KategoriKlasifikasiPaketMenu.php

@@ -9,7 +9,7 @@ class KategoriKlasifikasiPaketMenu extends Model
     protected $connection = 'dbOrderGizi';
     protected $table = 'public.klasifikasi_menu_diet';
     public $timestamps = false;
-    protected $primaryKey = "klasifikasi_menu_diet";
+    protected $primaryKey = "klasifikasi_menu_diet_id";
     protected $fillable =[
         'entry_at',
         'pegawai_id_entry',

app/Models/KlasifikasiMenuKalori.php

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

app/Models/Menu.php

@@ -31,4 +31,16 @@ class Menu extends Model
         'apakah_menu_sore'
     ];
 
+    public function klasifikasiMenuKalori(){
+        return $this->hasMany(KlasifikasiMenuKalori::class, 'master_menu_id', 'master_menu_id');
+    }
+
+    public function klasifikasiMenuDiet(){
+        return $this->hasMany(KategoriKlasifikasiPaketMenu::class, 'master_menu_id', 'master_menu_id');
+    }
+
+    public function tglAvailable(){
+        return $this->hasMany(TanggalMenuTersedia::class, 'master_menu_id', 'master_menu_id');
+    }
+
 }

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/kalori`)
+}
+
+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_kalori").html('');
+                colCount = 0; // reset counter
+                formKalori[0].reset();
+                datatableKalori.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('kalori_id')
+    Swal.fire({
+        title: "Apakah kamu yakin ingin menghapus data ini?",
+        text : $(e).data('nilai_kalori'),
+        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.nilai_kalori)
+}
+
+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,27 @@
+let colCount = 1;
+function addForm(){
+    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/menu/_init.js

@@ -2,3 +2,7 @@ const datatableMasterMenu = $("#datatableMasterMenu")
 
 const formAddMenu = $("#formMasterMenu")
 const modalAddMenu = document.getElementById("modalMasterMenu")
+
+
+const modalEditMenu = document.getElementById('modalMasterMenuEdit');
+const formEditMenu = document.getElementById('formMasterMenuEdit')

public/js/menu/action.js

@@ -1,8 +1,7 @@
-let countForm = 1; // karena form pertama pakai index 0
-
 // Fungsi inisialisasi Selectize dan Auto-expand
 function initSelectize(formElement) {
   const kategoriSelect = formElement.querySelector('.tags-menu');
+  const kaloriSelect = formElement.querySelector('.kalori-menu');
   const tanggalSelect = formElement.querySelector('.date-input');
 
   if (kategoriSelect) {
@@ -13,6 +12,7 @@ function initSelectize(formElement) {
       create: false,
       placeholder: "Kualifikasi Menu...",
       maxItems: null,
+    preload: true,
       load: function (query, callback) {
         if (!query.length) return callback();
         $.ajax({
@@ -43,6 +43,45 @@ function initSelectize(formElement) {
     });
   }
 
+  if (kaloriSelect) {
+    $(kaloriSelect).selectize({
+      valueField: 'kalori_id',
+      labelField: 'nilai_kalori',
+      searchField: ['nilai_kalori', 'kalori_id'],
+      create: false,
+      placeholder: "Kualifikasi kalori...",
+      maxItems: null,
+      preload: true,
+      load: function (query, callback) {
+        if (!query.length) return callback();
+        $.ajax({
+          url: '/dashboard/option/kalori',
+          data: { search: query },
+          success: function (response) {
+            if (response.error === 0 && Array.isArray(response.data)) {
+              callback(response.data);
+            } else {
+              callback();
+            }
+          },
+          error: function () {
+            callback();
+          }
+        });
+      },
+      render: {
+        option: function (item, escape) {
+          return `<div class="p-1">
+            <div class="fw-semibold" style="font-size: 0.85rem;">${escape(item.nilai_kalori)}</div>
+          </div>`;
+        },
+        item: function (item, escape) {
+          return `<div>${escape(item.nilai_kalori)}</div>`;
+        }
+      }
+    });
+  }
+
   if (tanggalSelect) {
     $(tanggalSelect).selectize({
       valueField: 'tanggal',
@@ -67,7 +106,7 @@ function initSelectize(formElement) {
         });
     });
 
-    const radioSomeday = formElement.querySelector(`input[value="Some Day"]`);
+    const radioSomeday = formElement.querySelector(`input[value="Someday"]`);
     const radioMenuNormal = formElement.querySelector(`input[value="Menu Normal"]`);
     const tanggalWrapper = formElement.querySelector('.date-input')?.closest('.col-md-12');
 
@@ -95,7 +134,6 @@ document.addEventListener('DOMContentLoaded', function () {
 
   money.forEach(input => {
     input.addEventListener('input', function(){
-        console.log();
         let angka = this.value.replace(/[^0-9]/g, '');
         this.value = formatAngka(angka)
     })
@@ -105,6 +143,7 @@ document.addEventListener('DOMContentLoaded', function () {
 });
 
 // Fungsi untuk menambah form baru
+let countForm = 1; // karena form pertama pakai index 0
 function addFormMenu() {
   const container = document.getElementById('form-sets-container');
   const original = container.querySelector('.form-set');
@@ -132,7 +171,6 @@ function addFormMenu() {
   newForm.querySelectorAll('select').forEach(select => {
     const wrapper = select.nextElementSibling;
     if (wrapper?.classList.contains('selectize-control')) wrapper.remove();
-    console.log(select);
 
       select.value = '';
     if (select.multiple) {
@@ -169,13 +207,13 @@ function formatAngka(angka) {
 
 document.getElementById('formMasterMenu').addEventListener('submit', function(e){
     e.preventDefault();
-      const allFormSets = document.querySelectorAll('.form-set');
+      const allFormSetsBeforSubmit = document.querySelectorAll('.form-set');
 
-    for (let i = 0; i < allFormSets.length; i++) {
-        const checkSiang = allFormSets[i].querySelector(`input[name="data[${i}][apakah_menu_siang]"]`);
-        const checkSore = allFormSets[i].querySelector(`input[name="data[${i}][apakah_menu_sore]"]`);
+    for (let i = 0; i < allFormSetsBeforSubmit.length; i++) {
+        const checkSiang = allFormSetsBeforSubmit[i].querySelector(`input[name="data[${i}][apakah_menu_siang]"]`);
+        const checkSore = allFormSetsBeforSubmit[i].querySelector(`input[name="data[${i}][apakah_menu_sore]"]`);
 
-        if (!checkSiang.checked && !checkSore.checked) {
+        if (!checkSiang?.checked && !checkSore?.checked) {
             e.preventDefault();
             alert(`Form ke-${i + 1}: Pilih minimal Siang atau Sore`);
             return;
@@ -211,7 +249,11 @@ document.getElementById('formMasterMenu').addEventListener('submit', function(e)
             };
             modalAddMenu.addEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
             bootstrap.Modal.getInstance(modalAddMenu).hide(); // ✅ pakai instance
+            const allFormSets = document.querySelectorAll('.form-set');
 
+            for(let i = 1; i < allFormSets.length; i++){
+                allFormSets[i].remove();
+            }
              document.querySelectorAll('.form-set').forEach((formSet, index) => {
                 formSet.querySelectorAll('input, textarea, select').forEach(el => {
                     if (el.type === 'file') {
@@ -296,3 +338,243 @@ function deleteMasterMenu(e){
         }
     })
 }
+
+let tanggalSelectizeInstance = null;
+let klasifikasiMenuSelectizeInstance = null;
+let kaloriSelectizeInstance = null;
+
+function editMasterMenu(e) {
+    const el = $(e);
+    const modal = new bootstrap.Modal(modalEditMenu);
+    formEditMenu.setAttribute('action', `/dashboard/menu/${el.data('master_menu_id')}`)
+    modal.show();
+
+    // Ambil data
+    let dataOld = {
+        master_menu_id: el.data('master_menu_id'),
+        nama_menu: el.data('nama'),
+        harga_public: el.data('harga_public'),
+        harga_karyawan: el.data('harga_karyawan'),
+        jenis_menu: el.data('jenis_menu'),
+        apakah_someday: el.data('apakah_someday') == 1,
+        apakah_menu_siang: el.data('apakah_menu_siang') == 1,
+        apakah_menu_sore: el.data('apakah_menu_sore') == 1,
+        deskripsi: el.data('deskripsi') || '',
+        tgl: JSON.parse(decodeURIComponent(el.data('tgl') || '[]')),
+        kalori: JSON.parse(decodeURIComponent(el.data('kalori') || '[]')),
+        kategori_diet: JSON.parse(decodeURIComponent(el.data('kategori_diet') || '[]')),
+    };
+    console.log(dataOld);
+
+
+    // Set value ke input form
+    $("#nama_edit").val(dataOld.nama_menu);
+    $("#harga_public_edit").val(dataOld.harga_public);
+    $("#harga_karyawan_edit").val(dataOld.harga_karyawan);
+    $("#jenis_makanan_edit").val(dataOld.jenis_menu);
+    $("#deskripsi_edit").val(dataOld.deskripsi);
+
+    $(`input[name="kategori_menu"][value="${dataOld.apakah_someday ? 'Someday' : 'Menu Normal'}"]`).prop('checked', true);
+    $(`input[name="apakah_menu_siang"][value="${dataOld.apakah_menu_siang ? 'iya' : ''}"]`).prop('checked', true);
+    $(`input[name="apakah_menu_sore"][value="${dataOld.apakah_menu_sore ? 'iya' : ''}"]`).prop('checked', true);
+
+    const tanggalWrapper = document.querySelector('.tgl-part');
+    const tanggalField = document.getElementById('tanggal_edit');
+
+    if(tanggalSelectizeInstance){
+        tanggalSelectizeInstance.destroy();
+        tanggalSelectizeInstance = null
+    }
+
+    if (!dataOld.apakah_someday) {
+        tanggalWrapper.classList.remove('d-none');
+        tanggalField.style.display = 'block';
+        tanggalSelectizeInstance =$('#tanggal_edit').selectize({
+            valueField: 'tanggal',
+            labelField: 'tgl',
+            create: true,
+            placeholder: 'Masukkan Tanggal...',
+            onInitialize: function () {
+                    const s = this;
+                    dataOld.tgl.forEach(item => {
+                    const tglValue = item?.tgl_harian || item?.tanggal || item;
+                    s.addOption({ tanggal: tglValue, tgl: tglValue });
+                    s.addItem(tglValue);
+                    });
+                }
+            })[0].selectize;
+    } else {
+        tanggalWrapper.classList.add('d-none');
+        tanggalField.style.display = 'none';
+    }
+
+
+    $('input[name="kategori_menu"]').on('change', function(){
+        const selected = $(this).val();
+        const isSomeday = selected === 'Someday';
+        if(isSomeday){
+            tanggalWrapper.classList.add('d-none');
+              if (tanggalSelectizeInstance) {
+                tanggalSelectizeInstance.destroy();
+                tanggalSelectizeInstance = null;
+            }
+        }else{
+            tanggalWrapper.classList.remove('d-none');
+            tanggalSelectizeInstance =$('#tanggal_edit').selectize({
+                valueField: 'tanggal',
+                labelField: 'tgl',
+                create: true,
+                placeholder: 'Masukkan Tanggal...'
+            })[0].selectize;
+        }
+    })
+
+
+   if (klasifikasiMenuSelectizeInstance) {
+    klasifikasiMenuSelectizeInstance.destroy();
+    klasifikasiMenuSelectizeInstance = null;
+    }
+
+    klasifikasiMenuSelectizeInstance = $('#kategori_diet_id_edit').selectize({
+        valueField: 'kategori_diet_id',
+        labelField: 'nama_kategori_diet',
+        searchField: ['nama_kategori_diet'],
+        create: false,
+        placeholder: "Klasifikasi Diet...",
+        maxItems: null,
+        preload: true,
+        load: function (query, callback) {
+            if (!query.length) return callback();
+            $.ajax({
+            url: '/dashboard/option/klasifikasi-menu',
+            data: { search: query },
+            success: function (response) {
+                if (response.error === 0 && Array.isArray(response.data)) {
+                callback(response.data);
+                } else {
+                callback();
+                }
+            },
+            error: function () {
+                callback();
+            }
+            });
+        },
+        onInitialize: function () {
+            const s = this;
+            dataOld.kategori_diet.forEach(item => {
+            // Manual tambahkan ke Selectize
+            s.addOption(item);                // agar bisa dipilih
+            s.addItem(item.kategori_diet_id); // agar muncul sebagai selected
+            });
+        },
+        render: {
+            option: function (item, escape) {
+
+            return `<div class="p-1">
+                <div class="fw-semibold" style="font-size: 0.85rem;">${escape(item.nama_kategori_diet)}</div>
+            </div>`;
+            },
+            item: function (item, escape) {
+            return `<div>${escape(item.nama_kategori_diet)}</div>`;
+            }
+        }
+        })[0].selectize;
+
+    if (kaloriSelectizeInstance) {
+        kaloriSelectizeInstance.destroy();
+        kaloriSelectizeInstance = null;
+        }
+
+        kaloriSelectizeInstance = $('#kalori_id_edit').selectize({
+        valueField: 'kalori_id',
+        labelField: 'nilai_kalori',
+        searchField: ['nilai_kalori'],
+        create: false,
+        placeholder: "Kalori...",
+        maxItems: null,
+        preload: true,
+        load: function (query, callback) {
+            if (!query.length) return callback();
+            $.ajax({
+            url: '/dashboard/option/kalori',
+            data: { search: query },
+            success: function (response) {
+                if (response.error === 0 && Array.isArray(response.data)) {
+                callback(response.data);
+                } else {
+                callback();
+                }
+            },
+            error: function () {
+                callback();
+            }
+            });
+        },
+        onInitialize: function () {
+            const s = this;
+            dataOld?.kalori.forEach(item => {
+                // Manual tambahkan ke Selectize
+                s.addOption(item);                // agar bisa dipilih
+                s.addItem(item.kalori_id); // agar muncul sebagai selected
+            });
+        },
+        render: {
+            option: function (item, escape) {
+            return `<div class="p-1">
+                <div class="fw-semibold" style="font-size: 0.85rem;">${escape(item.nilai_kalori)}</div>
+            </div>`;
+            },
+            item: function (item, escape) {
+            return `<div>${escape(item.nilai_kalori)}</div>`;
+            }
+        }
+        })[0].selectize;
+
+
+}
+
+
+document.getElementById('formMasterMenuEdit').addEventListener('submit', function(e){
+    e.preventDefault();
+
+    const form = this;
+    const actionUrl = form.getAttribute('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 data = await res.json();
+
+        if (data.status) {
+            const handler = function () {
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berhasil',
+                    text: data.message,
+                    timer: 2000,
+                    showConfirmButton: false,
+                    backdrop: true,
+                });
+                datatableMasterMenu.bootstrapTable('refresh');
+                modalEditMenu.removeEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            };
+            modalEditMenu.addEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            bootstrap.Modal.getInstance(modalEditMenu).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/menu/dt.js

@@ -24,14 +24,31 @@
                 title: "Action",
                 field: 'master_menu_id',
                 formatter: function(value, row) {
+
                     let buttons = ''
                         buttons += `
-                            <button class="btn btn-sm btn-primary me-2" onclick="editMasterMenu(this)" data-master_menu_id="${row.master_menu_id}">
+                            <button class="btn btn-sm btn-primary me-2" onclick="editMasterMenu(this)" data-master_menu_id="${row.master_menu_id}"
+                            data-nama="${row?.nama_menu}"
+                            data-harga_public="${row?.harga_public}"
+                            data-harga_karyawan="${row?.harga_karyawan}"
+                            data-jenis_menu="${row?.jenis_menu}"
+                            data-apakah_someday="${row?.apakah_someday ? 1 : 0}"
+                            data-apakah_menu_siang="${row?.apakah_menu_siang ? 1 : 0}"
+                            data-apakah_menu_sore="${row?.apakah_menu_sore ? 1 : 0}"
+                            data-deskripsi="${row?.deskripsi}"
+                            data-tgl="${encodeURIComponent(JSON.stringify(row?.tgl || []))}"
+                            data-kalori="${encodeURIComponent(JSON.stringify(row?.kalori || []))}"
+                            data-kategori_diet="${encodeURIComponent(JSON.stringify(row?.kategoriDiet || []))}"
+
+                            >
                                 <i class="fa-solid fa-pencil"></i>
                             </button>
                         `
                         buttons += `
-                            <button class="btn btn-sm btn-danger me-2" onclick="deleteMasterMenu(this)" data-master_menu_id="${row.master_menu_id}" data-nama="${row?.nama_menu}">
+                            <button class="btn btn-sm btn-danger me-2" onclick="deleteMasterMenu(this)"
+                            data-master_menu_id="${row.master_menu_id}"
+                            data-nama="${row?.nama_menu}"
+                            >
                                 <i class="fa-solid fa-trash"></i>
                             </button>
                         `
@@ -54,7 +71,6 @@
                 formatter: function(value, row) {
                     return `<ul style="white-space: nowrap;">
                                 <li>Public : <strong>Rp ${parseInt(row.harga_public).toLocaleString('id-ID')}</strong></li>
-                                <li>Keluarga Pasien/Pasien : <strong>Rp ${parseInt(row.harga_keluarga_pasien).toLocaleString('id-ID')}</strong></li>
                                 <li>Karyawan : <strong>Rp ${parseInt(row.harga_karyawan).toLocaleString('id-ID')}</strong></li>
                             </ul>`
                 },
@@ -78,6 +94,7 @@
                 title: "Waktu Makan",
                 field: "master_menu_id",
                 formatter: function (value, row) {
+
                      if (row?.apakah_menu_siang && row?.apakah_menu_sore) {
                         return `Makan Siang & Sore`;
                     } else if (row?.apakah_menu_siang) {
@@ -100,19 +117,6 @@
                     return tglAvlb;
                 }
             },
-            {
-                title:"Deskripsi",
-                field:"deskripsi",
-            },
-            {
-                title:"Klasifikasi Menu",
-                field:"master_menu_id",
-                formatter: function(value, row){
-                    let km = '';
-                    km = row?.kategoriDiet ? row?.kategoriDiet.map(item => item?.nama_kategori_diet).join(', ') : '-';
-                    return km;
-                }
-            },
 
         ],
     });

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][nilai_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>