diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php
index 2d998ff..6cdb056 100644
--- a/app/Http/Controllers/CustomerController.php
+++ b/app/Http/Controllers/CustomerController.php
@@ -7,6 +7,7 @@ use App\Models\OrderDetail;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 class CustomerController extends Controller
 {
@@ -185,7 +186,7 @@ class CustomerController extends Controller
         $today = now()->toDateString();
         $jumlahHariIni  = Order::whereDate('entry_at', $today)->count();
         $urutan = $jumlahHariIni + 1;
-        $noOrder = 'TX/CT/GIZI/' . now()->year .'/'. now()->month .'/' . now()->day .'/' . str_pad($urutan, 4, '0', STR_PAD_LEFT);
+        $noOrder = 'TX/CT/GIZI/' . now()->year .'/'. now()->month .'/' . now()->day .'/' . Str::random(6) .'/' . str_pad($urutan, 4, '0', STR_PAD_LEFT);
         $payloadOrder = [
             'no_order' => $noOrder,
             'jenis_customer' => $jenisCustomer,
diff --git a/app/Http/Controllers/MenuController.php b/app/Http/Controllers/MenuController.php
index 2239ec5..9c0ed77 100644
--- a/app/Http/Controllers/MenuController.php
+++ b/app/Http/Controllers/MenuController.php
@@ -2,8 +2,14 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\KategoriKlasifikasiPaketMenu;
 use App\Models\Menu;
+use App\Models\TanggalMenuTersedia;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 
 class MenuController extends Controller
 {
@@ -31,7 +37,77 @@ class MenuController extends Controller
      */
     public function store(Request $request)
     {
-       //
+        DB::connection('dbOrderGizi')->beginTransaction();
+        try {
+            $allData = request('data');
+            // dd($allData);
+            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;
+                $payload = [
+                    'pegawai_id_entry' => auth()->user()->id,
+                    'pegawai_nama_entry' => auth()->user()->full_name,
+                    'nama_menu' => $data['nama'],
+                    'jenis_menu' => $data['jenis_makanan'],
+                    'harga_public' => $hargaPublic,
+                    'harga_karyawan' => $hargaKaryawan,
+                    'harga_keluarga_pasien' => $hargaKeluargaPasien,
+                    'deskripsi' => $data['deskripsi'],
+                    'status' => true,
+                    'apakah_someday' => $data['kategori_menu'] === "Menu Normal" ? false : true,
+                    'apakah_menu_siang' => (isset($data['apakah_menu_siang']) && $data['apakah_menu_siang'] === "iya") ? true : false,
+                    'apakah_menu_sore' => (isset($data['apakah_menu_sore']) && $data['apakah_menu_sore'] === "iya") ? true : false,
+                ];
+
+                if($data['foto']){
+                    $imageName = Str::random(15) . '.' . $data['foto']->getClientOriginalExtension();
+                    Storage::disk('img_menu')->put($imageName, file_get_contents($data['foto']));
+                    $payload['foto'] =$imageName;
+                }
+
+                $menu = Menu::create($payload);
+                if(isset($data['kategori_diet_id'])){
+                    $categories = $data['kategori_diet_id'];
+                    foreach ($categories 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($data['tanggal']) && ($data['kategori_menu'] === "Menu Normal")){
+                    $tanggal = $data['tanggal'];
+                    foreach ($tanggal 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);
+                    }
+                }
+            }
+            //code...
+            DB::connection('dbOrderGizi')->commit();
+            return response()->json([
+                'status' => true,
+                'message' => 'Menu berhasil ditambahkan!'
+            ]);
+        } catch (\Throwable $th) {
+            dd($th);
+            DB::connection('dbOrderGizi')->rollBack();
+
+            return response()->json([
+                    'status' => false,
+                    'message' => 'Menu gagal ditambahkan!',
+                    'errors' => $th->getMessage()
+                ]);
+        }
     }
 
     /**
@@ -63,10 +139,87 @@ class MenuController extends Controller
      */
     public function destroy(string $id)
     {
-        //
+         $data = Menu::where(['statusenabled' => true, 'master_menu_id' => $id])->first();
+          $payload = [
+                'statusenabled' => false,
+                'pegawai_id_entry' => auth()->user()->id,
+                'pegawai_nama_entry' => 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 Menu::where('statusenabled', true)->get();
+        $data = DB::connection('dbOrderGizi')
+        ->table('public.master_menu as mn')
+        ->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')
+        ->where('mn.statusenabled', true)
+        ->select(
+            'mn.master_menu_id',
+            'mn.nama_menu',
+            'mn.foto',
+            'mn.jenis_menu',
+            'mn.harga_public',
+            'mn.harga_karyawan',
+            'mn.harga_keluarga_pasien',
+            'mn.deskripsi',
+            'mn.status',
+            'mn.apakah_someday',
+            'mn.apakah_menu_siang',
+            'mn.apakah_menu_sore',
+            'kmd.klasifikasi_menu_diet_id',
+            'kmd.kategori_diet_id',
+            'kd.nama_kategori_diet',
+            'dmph.detail_menu_paket_harian_id',
+            'dmph.tgl_harian'
+            )
+        ->get()->groupBy('master_menu_id');
+        $grouped = $data->map(function($items){
+            $first = $items->first();
+            $tglAvailable = $items->filter(fn($tgl) => $tgl->tgl_harian !== null)
+                            ->unique('detail_menu_paket_harian_id')
+                            ->map(function($item){
+                                return [
+                                    'detail_menu_paket_harian_id' => $item->detail_menu_paket_harian_id,
+                                    'tgl_harian' => $item->tgl_harian,
+                                ];
+                            })->values();
+            $kategoriDiet = $items->filter(fn($kd) => $kd->klasifikasi_menu_diet_id !== null)
+                            ->unique('klasifikasi_menu_diet_id')
+                            ->map(function($item){
+                                return [
+                                    'klasifikasi_menu_diet_id' => $item->klasifikasi_menu_diet_id,
+                                    'nama_kategori_diet' => $item->nama_kategori_diet,
+                                ];
+                            });
+            return [
+                'master_menu_id' => $first->master_menu_id,
+                'nama_menu' => $first->nama_menu,
+                'foto' => $first->foto,
+                'jenis_menu' => $first->jenis_menu,
+                'harga_public' => $first->harga_public,
+                'harga_karyawan' => $first->harga_karyawan,
+                'harga_keluarga_pasien' => $first->harga_keluarga_pasien,
+                'deskripsi' => $first->deskripsi,
+                'status' => $first->status,
+                'apakah_someday' => $first->apakah_someday,
+                'apakah_menu_siang' => $first->apakah_menu_siang,
+                'apakah_menu_sore' => $first->apakah_menu_sore,
+                'tgl' => $tglAvailable,
+                'kategoriDiet' => $kategoriDiet,
+            ];
+
+        });
+        return response()->json([
+            'status' => true,
+            'rows' => $grouped->values(),
+            'total' => $grouped->count()
+        ]);
     }
 }
diff --git a/app/Http/Controllers/PesananController.php b/app/Http/Controllers/PesananController.php
index 47311bb..08cd52e 100644
--- a/app/Http/Controllers/PesananController.php
+++ b/app/Http/Controllers/PesananController.php
@@ -56,6 +56,40 @@ class PesananController extends Controller
         }
     }
 
+    public function actionOrderViaBilling(Request $request, string $order_id){
+        DB::connection('dbOrderGizi')->beginTransaction();
+        try {
+            $order = Order::where('order_id', $order_id)->first();
+            $payload = [
+                'pegawai_id_confirm_order' => auth()->user()->id,
+                'pegawai_name_confirm_order' => auth()->user()->full_name,
+                'pegawai_at_confirm_order' => Carbon::now(),
+                'status_order' => 'Lunas',
+                'cara_pembayaran' => 'Billing'
+            ];
+            $order->update($payload);
+            DB::connection('dbOrderGizi')->commit();
+            return response()->json([
+                'status' => true,
+                'message' =>'Konfirmasi Order Gizi telah disetujui!'
+            ]);
+        } catch (\Throwable $th) {
+            DB::connection('dbOrderGizi')->rollBack();
+             return response()->json([
+                'status' => false,
+                'message' => 'Gagal melakukan Konfirmasi Order Gizi'
+            ]);
+            //throw $th;
+        }
+    }
+
+    public function getDataOrderDetail($order_id){
+        $data = Order::with('orderDetail')->where('order_id', $order_id)->first();
+        return response()->json($data);
+    }
+
+
+
     /**
      * Show the form for creating a new resource.
      */
diff --git a/app/Models/Menu.php b/app/Models/Menu.php
index 3a9c34e..8b5f8df 100644
--- a/app/Models/Menu.php
+++ b/app/Models/Menu.php
@@ -23,8 +23,12 @@ class Menu extends Model
         'jenis_menu',
         'harga_public',
         'harga_karyawan',
+        'harga_keluarga_pasien',
         'deskripsi',
-        'status'
+        'status',
+        'apakah_someday',
+        'apakah_menu_siang',
+        'apakah_menu_sore'
     ];
 
 }
diff --git a/app/Models/Order.php b/app/Models/Order.php
index 0cd63a0..d825f2f 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -36,4 +36,9 @@ class Order extends Model
         'bagian_instalasi',
         'note_dibatalkan'
     ];
+
+
+    public function orderDetail(){
+        return $this->hasMany(OrderDetail::class, 'order_id')->with('paketMenu', 'menu');
+    }
 }
diff --git a/app/Models/OrderDetail.php b/app/Models/OrderDetail.php
index 750d861..b2b2a68 100644
--- a/app/Models/OrderDetail.php
+++ b/app/Models/OrderDetail.php
@@ -23,4 +23,13 @@ class OrderDetail extends Model
         'order_id',
         'status_order'
     ];
+
+
+    public function menu(){
+        return $this->belongsTo(Menu::class, 'master_menu_id', 'master_menu_id')->select('master_menu_id', 'nama_menu', 'foto');
+    }
+
+    public function paketMenu(){
+        return $this->belongsTo(PaketMenu::class, 'master_paket_menu_id', 'master_paket_menu_id')->select('master_paket_menu_id', 'nama_paket', 'foto');
+    }
 }
diff --git a/app/Models/TanggalMenuTersedia.php b/app/Models/TanggalMenuTersedia.php
new file mode 100644
index 0000000..13f7e72
--- /dev/null
+++ b/app/Models/TanggalMenuTersedia.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TanggalMenuTersedia extends Model
+{
+    protected $connection = 'dbOrderGizi';
+    protected $table = 'public.detail_menu_paket_harian';
+    public $timestamps = false;
+    protected $primaryKey = "detail_menu_paket_harian_id";
+    protected $fillable =[
+        'entry_at',
+        'pegawai_id_entry',
+        'pegawai_nama_entry',
+        'modified_at',
+        'pegawai_id_modified',
+        'pegawai_nama_modified',
+        'statusenabled',
+        'tgl_harian',
+        'master_paket_menu_id',
+        'master_menu_id'
+    ];
+}
diff --git a/config/filesystems.php b/config/filesystems.php
index 3d671bd..dedb207 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -59,6 +59,12 @@ return [
             'throw' => false,
             'report' => false,
         ],
+        'img_menu' => [
+            'driver' => 'local',
+            'root' => public_path('gambar') . '/',
+            'url' => env('APP_URL') . '/',
+            'visibility' => 'public',
+        ],
 
     ],
 
diff --git a/public/gambar/0nPf8iahGkDGVzz.jpg b/public/gambar/0nPf8iahGkDGVzz.jpg
new file mode 100644
index 0000000..5d7ca39
Binary files /dev/null and b/public/gambar/0nPf8iahGkDGVzz.jpg differ
diff --git a/public/gambar/366IIPTOPZ3eG6q.jpg b/public/gambar/366IIPTOPZ3eG6q.jpg
new file mode 100644
index 0000000..304d8dd
Binary files /dev/null and b/public/gambar/366IIPTOPZ3eG6q.jpg differ
diff --git a/public/gambar/3GrLB8JZuk8eUPh.jpg b/public/gambar/3GrLB8JZuk8eUPh.jpg
new file mode 100644
index 0000000..5d7ca39
Binary files /dev/null and b/public/gambar/3GrLB8JZuk8eUPh.jpg differ
diff --git a/public/gambar/3Wlf6uqCVXBuq7j.jpg b/public/gambar/3Wlf6uqCVXBuq7j.jpg
new file mode 100644
index 0000000..e11002a
Binary files /dev/null and b/public/gambar/3Wlf6uqCVXBuq7j.jpg differ
diff --git a/public/gambar/4BE9dey8gxhN8xH.jpg b/public/gambar/4BE9dey8gxhN8xH.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/4BE9dey8gxhN8xH.jpg differ
diff --git a/public/gambar/55LVp2DbK6Vkun4.jpg b/public/gambar/55LVp2DbK6Vkun4.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/55LVp2DbK6Vkun4.jpg differ
diff --git a/public/gambar/5b7Ll3ZDbTBuW89.jpg b/public/gambar/5b7Ll3ZDbTBuW89.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/5b7Ll3ZDbTBuW89.jpg differ
diff --git a/public/gambar/ANMM9vnlnyScqA4.jpg b/public/gambar/ANMM9vnlnyScqA4.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/ANMM9vnlnyScqA4.jpg differ
diff --git a/public/gambar/E5WaUyqNIbCUdsX.jpg b/public/gambar/E5WaUyqNIbCUdsX.jpg
new file mode 100644
index 0000000..5d7ca39
Binary files /dev/null and b/public/gambar/E5WaUyqNIbCUdsX.jpg differ
diff --git a/public/gambar/G5DOHrJXNd3uKJa.jpg b/public/gambar/G5DOHrJXNd3uKJa.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/G5DOHrJXNd3uKJa.jpg differ
diff --git a/public/gambar/KDpVnP60nGKBeeG.jpg b/public/gambar/KDpVnP60nGKBeeG.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/KDpVnP60nGKBeeG.jpg differ
diff --git a/public/gambar/PHKUy9ewQmKoEkg.jpg b/public/gambar/PHKUy9ewQmKoEkg.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/PHKUy9ewQmKoEkg.jpg differ
diff --git a/public/gambar/R0UEWFPG2hGXgvL.jpg b/public/gambar/R0UEWFPG2hGXgvL.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/R0UEWFPG2hGXgvL.jpg differ
diff --git a/public/gambar/SxEdMfjq4LUHejU.jpg b/public/gambar/SxEdMfjq4LUHejU.jpg
new file mode 100644
index 0000000..5d7ca39
Binary files /dev/null and b/public/gambar/SxEdMfjq4LUHejU.jpg differ
diff --git a/public/gambar/W8nilrgkP1tQins.jpg b/public/gambar/W8nilrgkP1tQins.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/W8nilrgkP1tQins.jpg differ
diff --git a/public/gambar/Wqxt3TQAZKRmQoM.jpg b/public/gambar/Wqxt3TQAZKRmQoM.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/Wqxt3TQAZKRmQoM.jpg differ
diff --git a/public/gambar/YZm0fSxGwMnWSZ6.jpg b/public/gambar/YZm0fSxGwMnWSZ6.jpg
new file mode 100644
index 0000000..304d8dd
Binary files /dev/null and b/public/gambar/YZm0fSxGwMnWSZ6.jpg differ
diff --git a/public/gambar/Z4vauaI826mYM9t.jpg b/public/gambar/Z4vauaI826mYM9t.jpg
new file mode 100644
index 0000000..5d7ca39
Binary files /dev/null and b/public/gambar/Z4vauaI826mYM9t.jpg differ
diff --git a/public/gambar/b3AqxThqPYPWujP.jpg b/public/gambar/b3AqxThqPYPWujP.jpg
new file mode 100644
index 0000000..e11002a
Binary files /dev/null and b/public/gambar/b3AqxThqPYPWujP.jpg differ
diff --git a/public/gambar/csfPSN9hY2KPxkD.jpg b/public/gambar/csfPSN9hY2KPxkD.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/csfPSN9hY2KPxkD.jpg differ
diff --git a/public/gambar/ddOV7vgiLGpRCH0.jpg b/public/gambar/ddOV7vgiLGpRCH0.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/ddOV7vgiLGpRCH0.jpg differ
diff --git a/public/gambar/eO4vj9alfbYSOlE.jpg b/public/gambar/eO4vj9alfbYSOlE.jpg
new file mode 100644
index 0000000..e11002a
Binary files /dev/null and b/public/gambar/eO4vj9alfbYSOlE.jpg differ
diff --git a/public/gambar/erNx0n6yMkgvx1F.jpg b/public/gambar/erNx0n6yMkgvx1F.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/erNx0n6yMkgvx1F.jpg differ
diff --git a/public/gambar/lHTpoXb4R82fsn3.jpg b/public/gambar/lHTpoXb4R82fsn3.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/lHTpoXb4R82fsn3.jpg differ
diff --git a/public/gambar/mL8fczclfHqy9yl.jpg b/public/gambar/mL8fczclfHqy9yl.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/mL8fczclfHqy9yl.jpg differ
diff --git a/public/gambar/n6ftLkc8jQJoV2Y.jpg b/public/gambar/n6ftLkc8jQJoV2Y.jpg
new file mode 100644
index 0000000..e11002a
Binary files /dev/null and b/public/gambar/n6ftLkc8jQJoV2Y.jpg differ
diff --git a/public/gambar/oNSP6SQjnHWgor8.jpg b/public/gambar/oNSP6SQjnHWgor8.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/oNSP6SQjnHWgor8.jpg differ
diff --git a/public/gambar/paOiagvnedoJjAl.jpg b/public/gambar/paOiagvnedoJjAl.jpg
new file mode 100644
index 0000000..aa18b69
Binary files /dev/null and b/public/gambar/paOiagvnedoJjAl.jpg differ
diff --git a/public/gambar/pzlEiLY8pwZPJUd.jpg b/public/gambar/pzlEiLY8pwZPJUd.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/pzlEiLY8pwZPJUd.jpg differ
diff --git a/public/gambar/vEnLRD4PE8dtKfs.jpg b/public/gambar/vEnLRD4PE8dtKfs.jpg
new file mode 100644
index 0000000..304d8dd
Binary files /dev/null and b/public/gambar/vEnLRD4PE8dtKfs.jpg differ
diff --git a/public/gambar/xEMioySb0ZQBWHy.jpg b/public/gambar/xEMioySb0ZQBWHy.jpg
new file mode 100644
index 0000000..6897d2b
Binary files /dev/null and b/public/gambar/xEMioySb0ZQBWHy.jpg differ
diff --git a/public/gambar/xIz939F1BhzMtXR.jpg b/public/gambar/xIz939F1BhzMtXR.jpg
new file mode 100644
index 0000000..5d7ca39
Binary files /dev/null and b/public/gambar/xIz939F1BhzMtXR.jpg differ
diff --git a/public/gambar/xM93AVsWRwugbHi.jpg b/public/gambar/xM93AVsWRwugbHi.jpg
new file mode 100644
index 0000000..e11002a
Binary files /dev/null and b/public/gambar/xM93AVsWRwugbHi.jpg differ
diff --git a/public/js/menu/_init.js b/public/js/menu/_init.js
index b3dec0d..8e9102e 100644
--- a/public/js/menu/_init.js
+++ b/public/js/menu/_init.js
@@ -1 +1,4 @@
 const datatableMasterMenu = $("#datatableMasterMenu")
+
+const formAddMenu = $("#formMasterMenu")
+const modalAddMenu = document.getElementById("modalMasterMenu")
diff --git a/public/js/menu/action.js b/public/js/menu/action.js
index a787479..04f129d 100644
--- a/public/js/menu/action.js
+++ b/public/js/menu/action.js
@@ -1,127 +1,298 @@
-document.addEventListener('DOMContentLoaded', function () {
-  const formSetsContainer = document.getElementById('form-sets-container');
-  const btnTambahForm = document.getElementById('btnTambahForm');
+let countForm = 1; // karena form pertama pakai index 0
 
-  // Auto-expand textarea
-  function autoExpand(textarea) {
+// Fungsi inisialisasi Selectize dan Auto-expand
+function initSelectize(formElement) {
+  const kategoriSelect = formElement.querySelector('.tags-menu');
+  const tanggalSelect = formElement.querySelector('.date-input');
+
+  if (kategoriSelect) {
+    $(kategoriSelect).selectize({
+      valueField: 'kategori_diet_id',
+      labelField: 'nama_kategori_diet',
+      searchField: ['nama_kategori_diet', 'kategori_diet_id'],
+      create: false,
+      placeholder: "Kualifikasi Menu...",
+      maxItems: null,
+      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();
+          }
+        });
+      },
+      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>`;
+        }
+      }
+    });
+  }
+
+  if (tanggalSelect) {
+    $(tanggalSelect).selectize({
+      valueField: 'tanggal',
+      labelField: 'tgl',
+      create: true,
+      placeholder: "Masukkan Tanggal...",
+    });
+  }
+
+  formElement.querySelectorAll('.auto-expand').forEach(textarea => {
     textarea.addEventListener('input', function () {
       this.style.height = 'auto';
       this.style.height = this.scrollHeight + 'px';
     });
-  }
-
-  // Inisialisasi Selectize
-  function initSelectizeAll(context = document) {
-    $(context).find('.tags-menu').selectize(selectizeConfigTagsMenu);
-    $(context).find('.date-input').selectize(selectizeConfigDateInput);
-  }
-
-  // Destroy semua selectize sebelum clone
-  function destroySelectize(context) {
-    context.querySelectorAll('select').forEach(select => {
-      const instance = select.selectize;
-      if (instance) instance.destroy();
-    });
-  }
-
-  // Inisialisasi awal
-  document.querySelectorAll('.auto-expand').forEach(autoExpand);
-  initSelectizeAll();
-
-  // Tambah form-set
-  btnTambahForm.addEventListener('click', function () {
-    const lastFormSet = formSetsContainer.querySelector('.form-set:last-of-type');
-
-    // Destroy selectize sebelum clone
-    destroySelectize(lastFormSet);
-
-    const clone = lastFormSet.cloneNode(true);
-
-    // Bersihkan input dan textarea
-    clone.querySelectorAll('input, textarea').forEach(el => {
-      if (el.type === 'file') {
-        el.value = null;
-      } else {
-        el.value = '';
-      }
-    });
-
-    // Bersihkan select (hapus .selectize dan reset element <select>)
-    clone.querySelectorAll('select').forEach(select => {
-      const wrapper = select.parentElement.querySelector('.selectize-control');
-      if (wrapper) wrapper.remove();
-      select.innerHTML = ''; // Kosongkan option, bisa diisi ulang lewat AJAX
-    });
-
-    // Tampilkan tombol hapus
-    clone.querySelector('.btn-remove-form').classList.remove('d-none');
-
-    // Tambahkan ke DOM
-    formSetsContainer.appendChild(clone);
-
-    // Inisialisasi ulang textarea & Selectize untuk elemen baru
-    clone.querySelectorAll('.auto-expand').forEach(autoExpand);
-    initSelectizeAll();
   });
 
-  // Hapus form-set
-  formSetsContainer.addEventListener('click', function (e) {
-    if (e.target.closest('.btn-remove-form')) {
-      const formSets = formSetsContainer.querySelectorAll('.form-set');
-      if (formSets.length > 1) {
-        e.target.closest('.form-set').remove();
-      } else {
-        alert('Minimal satu form harus ada.');
-      }
+
+   formElement.querySelectorAll('.money').forEach(input => {
+        input.addEventListener('input', function () {
+        let angka = this.value.replace(/[^0-9]/g, '');
+        this.value = formatAngka(angka);
+        });
+    });
+
+    const radioSomeday = formElement.querySelector(`input[value="Some Day"]`);
+    const radioMenuNormal = formElement.querySelector(`input[value="Menu Normal"]`);
+    const tanggalWrapper = formElement.querySelector('.date-input')?.closest('.col-md-12');
+
+    function toggleTanggalField() {
+        if (radioMenuNormal && radioMenuNormal.checked) {
+            tanggalWrapper?.classList.remove('d-none');
+            } else {
+            tanggalWrapper?.classList.add('d-none');
+        }
     }
-  });
+
+    if (radioSomeday && radioMenuNormal) {
+        radioSomeday.addEventListener('change', toggleTanggalField);
+        radioMenuNormal.addEventListener('change', toggleTanggalField);
+        toggleTanggalField(); // jalankan di awal
+    }
+}
+
+// Jalankan saat halaman dimuat untuk form pertama
+document.addEventListener('DOMContentLoaded', function () {
+  const firstForm = document.querySelector('.form-set');
+  initSelectize(firstForm);
+
+  const money = document.querySelectorAll('.money')
+
+  money.forEach(input => {
+    input.addEventListener('input', function(){
+        console.log();
+        let angka = this.value.replace(/[^0-9]/g, '');
+        this.value = formatAngka(angka)
+    })
+  })
+
+
 });
 
-// CONFIG SELECTIZE
+// Fungsi untuk menambah form baru
+function addFormMenu() {
+  const container = document.getElementById('form-sets-container');
+  const original = container.querySelector('.form-set');
 
-const selectizeConfigTagsMenu = {
-  valueField: 'kategori_diet_id',
-  labelField: 'nama_kategori_diet',
-  searchField: ['nama_kategori_diet', 'kategori_diet_id'],
-  create: false,
-  placeholder: "Cari item kalibrasi...",
-  maxItems: null,
-  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();
-      }
-    });
-  },
-  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>`;
+  const html = original.outerHTML
+    .replace(/\[0\]/g, `[${countForm}]`)
+    .replace(/name="jenis_customer"/g, `name="jenis_customer_${countForm}"`)
+    .replace(/id="radio_karyawan"/g, `id="radio_karyawan_${countForm}"`)
+    .replace(/id="radio_kp"/g, `id="radio_kp_${countForm}"`)
+    .replace(/for="radio_karyawan"/g, `for="radio_karyawan_${countForm}"`)
+    .replace(/for="radio_kp"/g, `for="radio_kp_${countForm}"`);
+
+  const wrapper = document.createElement('div');
+  wrapper.innerHTML = html.trim();
+  const newForm = wrapper.firstChild;
+
+  // Kosongkan semua input
+  newForm.querySelectorAll('input, textarea').forEach(el => {
+    if (el.type === 'file') el.value = null;
+    else if (el.type === 'radio' || el.type === 'checkbox') el.checked = false;
+    else el.value = '';
+  });
+
+  // Hapus Selectize wrapper jika ada
+  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) {
+      // Untuk multiple select, pastikan semua opsi tidak terseleksi
+      Array.from(select.options).forEach(option => option.selected = false);
+    }
+  });
+
+
+
+
+  container.appendChild(newForm);
+  initSelectize(newForm);
+  countForm++;
+}
+
+// Hapus form-set (kecuali jika hanya 1)
+document.addEventListener('click', function (e) {
+  if (e.target.closest('.btn-remove-form')) {
+    const targetForm = e.target.closest('.form-set');
+    const total = document.querySelectorAll('.form-set').length;
+    if (total > 1) {
+      targetForm.remove();
+    } else {
+      alert('Minimal satu form harus ada.');
     }
   }
-};
+});
 
-const selectizeConfigDateInput = {
-  valueField: 'tgl',
-  labelField: 'tgl',
-  searchField: 'tgl',
-  create: true,
-  placeholder: "Masukkan Tanggal...",
-};
+function formatAngka(angka) {
+    return angka.replace(/\B(?=(\d{3})+(?!\d))/g, '.');
+}
+
+
+document.getElementById('formMasterMenu').addEventListener('submit', function(e){
+    e.preventDefault();
+      const allFormSets = 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]"]`);
+
+        if (!checkSiang.checked && !checkSore.checked) {
+            e.preventDefault();
+            alert(`Form ke-${i + 1}: Pilih minimal Siang atau Sore`);
+            return;
+        }
+    }
+
+
+    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');
+                modalAddMenu.removeEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            };
+            modalAddMenu.addEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            bootstrap.Modal.getInstance(modalAddMenu).hide(); // ✅ pakai instance
+
+             document.querySelectorAll('.form-set').forEach((formSet, index) => {
+                formSet.querySelectorAll('input, textarea, select').forEach(el => {
+                    if (el.type === 'file') {
+                        el.value = null;
+                    } else if (el.type === 'checkbox' || el.type === 'radio') {
+                        el.checked = false;
+                    } else {
+                        el.value = '';
+                    }
+
+                    // Reset Selectize jika ada
+                    if (el.classList.contains('selectized')) {
+                        const selectize = el.selectize;
+                        if (selectize) {
+                            selectize.clear();
+                        }
+                    }
+                });
+            });
+        } 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.',
+        });
+    });
+})
+
+
+function deleteMasterMenu(e){
+    let id = $(e).data('master_menu_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/menu/${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(() => {
+                        datatableMasterMenu.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"
+                });
+            });
+        }
+    })
+}
diff --git a/public/js/menu/dt.js b/public/js/menu/dt.js
index 60474ff..cf5cc28 100644
--- a/public/js/menu/dt.js
+++ b/public/js/menu/dt.js
@@ -1,6 +1,6 @@
 
     datatableMasterMenu.bootstrapTable({
-        url: "/",
+        url: "/dashboard/datatable/menu",
         showColumns: true,
         showColumnsToggleAll: true,
         showRefresh: true,
@@ -13,7 +13,7 @@
         pageSize: 10,
         pageList: [10, 20, 30, 40, 50, 100, 200],
         cookie: true,
-        cookieIdTable: "table_rma_ssc_id",
+        cookieIdTable: "datatableMasterMenu",
         icons: {
             refresh: "fas fa-sync-alt",   // atau ganti ke icon lain
             columns: "fas fa-th-large"
@@ -22,18 +22,96 @@
         columns: [
             {
                 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}">
+                                <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}">
+                                <i class="fa-solid fa-trash"></i>
+                            </button>
+                        `
+                    return `
+                        <div class="d-flex space-x">
+                        ${buttons}
+                        </div>
+                    `;
+                },
+                width: 120
             },
             {
-                title: "Nama Menu",
+                title:"Nama Menu",
+                field:"nama_menu",
+                width: 300
             },
             {
-                title: "Jenis Menu",
+                title:"Harga",
+                field:"master_menu_id",
+                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>`
+                },
+                width: 200
             },
             {
-                title: "Harga",
+                title:"Kategori",
+                field:"jenis_menu",
             },
             {
-                title: "Deskripsi",
+                title: "Kategori Menu",
+                field: "master_menu_id",
+                formatter: function (value, row) {
+                    if (row?.apakah_someday) {
+                        return `<span class="badge bg-warning text-dark">Someday</span>`;
+                    }
+                    return `<span class="badge bg-success text-dark">Menu Normal</span>`;
+                }
+            },
+            {
+                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) {
+                        return `Makan Siang`;
+                    } else if (row?.apakah_menu_sore) {
+                        return `Makan Sore`;
+                    } else {
+                        return `-`;
+                    }
+                },
+                width: 250
+            },
+            {
+                title:"Tanggal Tersedia",
+                field:"master_menu_id",
+                formatter: function(value, row){
+                    if(row.apakah_someday) return 'Senin - Minggu'
+                    let tglAvlb = '';
+                    tglAvlb = row?.tgl ? row?.tgl.map(item => item?.tgl_harian).join(', ') : '-';
+                    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;
+                }
             },
 
         ],
diff --git a/public/js/pesanan_pending/_init.js b/public/js/pesanan_pending/_init.js
index 54470ed..d82324a 100644
--- a/public/js/pesanan_pending/_init.js
+++ b/public/js/pesanan_pending/_init.js
@@ -4,3 +4,9 @@ const modalActionOrder = document.getElementById("modalActionOrder")
 const formActionOrder = $("#formActionOrder")
 const containerCancel = document.getElementById("note_dibatalkan")
 const noteCancelTextArea = document.getElementById("textarea_note_dibatalkan")
+
+const modalActionApproveBillingnOrder = document.getElementById("modalActionApproveBillingOrder")
+const formActionApproveBillingOrder = $("#formActionApproveBillingOrder")
+
+const modalActionProgressOrder = document.getElementById('modalActionProgressOrder')
+const formActionProgressOrder = $("#formActionProgressOrder")
diff --git a/public/js/pesanan_pending/action.js b/public/js/pesanan_pending/action.js
index 580dc78..921b7ab 100644
--- a/public/js/pesanan_pending/action.js
+++ b/public/js/pesanan_pending/action.js
@@ -83,3 +83,62 @@ noteCancelTextArea.addEventListener('input', function () {
   this.style.height = 'auto';       // Reset height dulu
   this.style.height = this.scrollHeight + 'px'; // Set height sesuai isi
 });
+
+
+function AdminApproved(e){
+    const data = $(e).data()
+    new bootstrap.Modal(modalActionApproveBillingnOrder).show();
+     $("#confirmActionApproveBillingOrder").text('Pembayaran Via Billing '+ data.nama_pemesan + ' / ' + data.no_order)
+    formActionApproveBillingOrder.attr(`action`, `/dashboard/pending/action-billing/${data.order_id}`)
+}
+
+
+document.getElementById('formActionApproveBillingOrder').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 (res.status) {
+            const handler = function () {
+                Swal.fire({
+                    icon: 'success',
+                    title: 'Berhasil',
+                    text: data.message || 'Status berhasil diubah!',
+                    timer: 2000,
+                    showConfirmButton: false,
+                    backdrop: true,
+                });
+                datatablePending.bootstrapTable('refresh');
+                modalActionApproveBillingnOrder.removeEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            };
+
+            modalActionApproveBillingnOrder.addEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
+            bootstrap.Modal.getInstance(modalActionApproveBillingnOrder).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.',
+        });
+    });
+});
+
+
+function approveProgress(e){
+    new bootstrap.Modal(modalActionProgressOrder).show();
+}
diff --git a/public/js/pesanan_pending/dt.js b/public/js/pesanan_pending/dt.js
index 7fa4485..120c7d5 100644
--- a/public/js/pesanan_pending/dt.js
+++ b/public/js/pesanan_pending/dt.js
@@ -32,7 +32,6 @@
                                         <i class="fa fa-check me-1"></i>
                                     </button>
                         `
-
                     }
                     if(row?.status_order !== "Lunas"){
                         buttons += `
@@ -42,6 +41,15 @@
                          </button>
                     `
                     }
+
+                    if(row?.status_order === "Menunggu Konfirmasi Pembayaran Via Billing"){
+                        buttons += `
+                             <button class="btn btn-sm btn-info me-2" onclick="AdminApproved(this)"
+                         data-order_id="${row.order_id}" data-nama_pemesan="${row?.nama_pemesan}" data-no_order="${row?.no_order}" data-jenis_customer="${row?.jenis_customer}">
+                                    <i class="fa-solid fa-person-circle-check"></i>
+                         </button>
+                        `
+                    }
                     if(row?.status_order === "Lunas"){
                         buttons += `
                             <button class="btn btn-sm btn-warning text-dark" onclick="approveProgress('${row.order_id}')">
@@ -60,7 +68,7 @@
 
             {
                 title: "No.Order",
-                field:'no_order',
+                field: 'no_order',
                 sortable: true,
             },
              {
@@ -89,6 +97,10 @@
                 `;
                 }
             },
+            {
+                title: "Status Pesanan",
+                sortable: true,
+            },
             {
                 title: "Pemesan",
                 field:'nama_pemesan',
diff --git a/resources/views/dashboard/master/menu/modal/add.blade.php b/resources/views/dashboard/master/menu/modal/add.blade.php
index 08cf607..74f4b05 100644
--- a/resources/views/dashboard/master/menu/modal/add.blade.php
+++ b/resources/views/dashboard/master/menu/modal/add.blade.php
@@ -10,7 +10,7 @@
       </div>
 
       <!-- Modal Form -->
-      <form enctype="multipart/form-data" method="POST" id="formMasterMenu">
+      <form action="/dashboard/menu" enctype="multipart/form-data" method="POST" id="formMasterMenu">
         @csrf
         <div class="modal-body">
           <div class="container">
@@ -22,7 +22,7 @@
                   <i class="bx bx-trash"></i>
                 </button>
 
-                <div class="row g-3">
+                <div class="row g-3 mt-3">
                   <div class="col-md-12">
                     <div class="form-floating">
                       <input type="text" class="form-control" name="data[0][nama]" placeholder="Nama Menu" required>
@@ -32,28 +32,28 @@
 
                   <div class="col-md-4">
                     <div class="form-floating">
-                      <input type="text" class="form-control" name="data[0][harga_public]" placeholder="Harga" required>
+                      <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="form-floating">
-                      <input type="number" step="0.01" class="form-control" name="data[0][harga_karyawan]" placeholder="Harga" required>
+                      <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="form-floating">
-                      <input type="number" step="0.01" class="form-control" name="data[0][harga_keluarga_pasien]" placeholder="Harga" required>
+                      <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>
                     </div>
                   </div>
 
                   <div class="col-md-12">
                     <div class="form-floating">
-                      <select class="form-select" name="data[0][jenis_menu]" required>
+                      <select class="form-select" name="data[0][jenis_makanan]" required>
                         <option selected disabled>Pilih kategori</option>
                         <option value="Snack">Snack</option>
                         <option value="Makanan">Makanan</option>
@@ -79,34 +79,49 @@
 
                   <div class="col-md-12">
                     <label for="tags" class="form-label">Tag Menu</label>
-                    <select class="tags-menu" multiple name="kategori_diet_id[]"></select>
+                    <select class="tags-menu" multiple name="data[0][kategori_diet_id][]"></select>
                   </div>
 
-                  <div class="col-md-12">
-                        <label for="exampleInputEmail1" class="form-label">Jenis Menu</label>
+                  <div class="col-md-6">
+                        <label for="exampleInputEmail1" class="form-label">Kategori Menu</label>
                             <div class="form-check">
-                                <input class="form-check-input" type="radio" name="jenis_customer" id="radio_karyawan" value="Karyawan RSAB Harapan Kita" required>
+                                <input class="form-check-input" type="radio" name="data[0][kategori_menu]" id="radio_karyawan" value="Some Day" required>
                                 <label class="form-check-label" for="radio_karyawan" >
                                     Some Day
                                 </label>
                             </div>
                             <div class="form-check">
-                                <input class="form-check-input" type="radio" name="jenis_customer" id="radio_kp" value="Keluarga Pasien / Penunggu Pasien" required>
-                                <label class="form-check-label" for="radio_kp">
+                                <input class="form-check-input" type="radio" name="data[0][kategori_menu]" id="" value="Menu Normal" required>
+                                <label class="form-check-label" for="">
                                     Menu Normal
                                 </label>
                             </div>
                   </div>
-                    <div class="col-md-12">
+                   <div class="col-md-6">
+                        <label for="exampleInputEmail1" class="form-label">Waktu Menu Tersedia</label>
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" name="data[0][apakah_menu_siang]" id="checkSiang" value="iya">
+                                <label class="form-check-label" for="checkSiang" >
+                                    Siang
+                                </label>
+                            </div>
+                            <div class="form-check">
+                                <input class="form-check-input" type="checkbox" name="data[0][apakah_menu_sore]" id="checkSore" value="iya">
+                                <label class="form-check-label" for="checkSore">
+                                    Sore
+                                </label>
+                            </div>
+                     </div>
+                    <div class="col-md-12 d-none">
                         <label for="tags" class="form-label">Tanggal Menu Tersedia</label>
-                         <select class="date-input" multiple name="tanggal[]"></select>
+                         <select class="date-input" multiple name="data[0][tanggal][]"></select>
                     </div>
                 </div>
               </div>
             </div>
 
             <!-- Tombol tambah form-set -->
-            <button type="button" class="btn btn-outline-primary btn-sm mt-2" id="btnTambahForm">
+            <button type="button" class="btn btn-outline-primary btn-sm mt-2" onclick="addFormMenu()">
               + Tambah Data
             </button>
           </div>
diff --git a/resources/views/dashboard/pesanan/pending/index.blade.php b/resources/views/dashboard/pesanan/pending/index.blade.php
index 5184ee5..56dca61 100644
--- a/resources/views/dashboard/pesanan/pending/index.blade.php
+++ b/resources/views/dashboard/pesanan/pending/index.blade.php
@@ -19,6 +19,8 @@
 </div>
 
 @include('dashboard.pesanan.pending.modal.action')
+@include('dashboard.pesanan.pending.modal.confirmBilling')
+@include('dashboard.pesanan.pending.modal.actionProgressPesanan')
 
 <script src="{{ ver('/js/pesanan_pending/_init.js') }}"></script>
 <script src="{{ ver('/js/pesanan_pending/dt.js') }}"></script>
diff --git a/resources/views/dashboard/pesanan/pending/modal/actionProgressPesanan.blade.php b/resources/views/dashboard/pesanan/pending/modal/actionProgressPesanan.blade.php
new file mode 100644
index 0000000..ceacc34
--- /dev/null
+++ b/resources/views/dashboard/pesanan/pending/modal/actionProgressPesanan.blade.php
@@ -0,0 +1,37 @@
+<!-- Modal -->
+<div class="modal fade" id="modalActionProgressOrder" 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 Progress Pesanan</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Modal Form -->
+      <form method="POST" id="formActionProgressOrder">
+        @csrf
+        @method('put')
+        <div class="modal-body ">
+             <div class="container">
+                <div class="row mt-3">
+                    <div class="col-md-4 text-center mb-3 mb-md-0">
+                        <img alt="Foto Menu" id="cathering_order_photo" lass="img-fluid rounded shadow" style="max-height: 170px; width: auto;">
+                    </div>
+                    <div class="col-md-8">
+                    </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">Setujui</button>
+        </div>
+      </form>
+
+    </div>
+  </div>
+</div>
diff --git a/resources/views/dashboard/pesanan/pending/modal/confirmBilling.blade.php b/resources/views/dashboard/pesanan/pending/modal/confirmBilling.blade.php
new file mode 100644
index 0000000..7bc5818
--- /dev/null
+++ b/resources/views/dashboard/pesanan/pending/modal/confirmBilling.blade.php
@@ -0,0 +1,29 @@
+<!-- Modal -->
+<div class="modal fade" id="modalActionApproveBillingOrder" 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 </h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+
+      <!-- Modal Form -->
+      <form method="POST" id="formActionApproveBillingOrder">
+        @csrf
+        @method('put')
+        <div class="modal-body ">
+            Apakah kamu yakin melakukan persetujuan pada order ini ? <strong id="confirmActionApproveBillingOrder"></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>
diff --git a/routes/web.php b/routes/web.php
index 01141a2..a3844e1 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -16,7 +16,7 @@ use Illuminate\Support\Facades\Route;
 // });
 Route::get('/login', [AuthController::class, 'index'])->name('login');
 Route::post('/login', [AuthController::class, 'authanticate']);
-Route::resource('/dashboard/menu', MenuController::class);
+
 
 Route::group(['middleware' => ['auth']], function(){
     Route::group(['prefix' => 'dashboard'], function(){
@@ -30,11 +30,14 @@ Route::group(['middleware' => ['auth']], function(){
         Route::resource('/karbohidrat', KarbohidratController::class);
         Route::get('/datatable/karbohidrat', [KarbohidratController::class, 'datatable']);
 
-
+        Route::resource('/menu', MenuController::class);
+        Route::get('/datatable/menu', [MenuController::class, 'datatable']);
 
         Route::get('/pending', [PesananController::class, 'index']);
         Route::get('datatable/pending', [PesananController::class, 'getDataPending']);
         Route::put('/pending/action/{order_id}', [PesananController::class, 'actionOrder']);
+        Route::put('/pending/action-billing/{order_id}', [PesananController::class, 'actionOrderViaBilling']);
+        Route::get('/action/progress-order/{order_id}', [PesananController::class, 'getDataOrderDetail']);
 
 
     });