From 81f95d8a4272e6c1eb33e1ea91c9b5fb4e54cd4d Mon Sep 17 00:00:00 2001
From: mikhailkusuma <whatxwrong@gmail.com>
Date: Thu, 25 Jan 2024 15:31:05 +0700
Subject: [PATCH 1/3] updae: _blank on js.blade

---
 resources/views/pages/Kasir/js.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/pages/Kasir/js.blade.php b/resources/views/pages/Kasir/js.blade.php
index 8e4e8da..9b648a6 100644
--- a/resources/views/pages/Kasir/js.blade.php
+++ b/resources/views/pages/Kasir/js.blade.php
@@ -70,19 +70,19 @@
     <script>
         function printDapurTigaKali(id) {
             var url = "{{ route('transaksi.printDapurTigaKali', '') }}/" + id + '?print=true'
-            window.open(url, '_blank');
+            window.open(url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
             location.reload(true);
         }
 
         function printDapurDuaKali(id) {
             var url = "{{ route('transaksi.printDapurDuaKali', '') }}/" + id + '?print=true'
-            window.open(url, '_blank');
+            window.open(url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
             location.reload(true);
         }
 
         function printDapurSatuKali(id) {
             var url = "{{ route('transaksi.printDapurSatuKali', '') }}/" + id + '?print=true'
-            window.open(url, '_blank');
+            window.open(url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
             location.reload(true);
         }
     </script>
@@ -702,7 +702,7 @@
                         toastr.success(result.message, 'Success', {
                             timeOut: 2000
                         });
-                        window.open(result.url, '_blank');
+                        window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
 
                         setTimeout(function() {
                             window.location.reload(1);
@@ -829,7 +829,7 @@
                         toastr.success(result.message, 'Success', {
                             timeOut: 2000
                         });
-                        window.open(result.url, '_blank');
+                        window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
 
                         setTimeout(function() {
                             window.location.reload(1);

From 00628de08567441d26db79176b3ef87c52e00bcb Mon Sep 17 00:00:00 2001
From: mikhailkusuma <whatxwrong@gmail.com>
Date: Fri, 26 Jan 2024 20:01:03 +0700
Subject: [PATCH 2/3] Add: menu

---
 app/Http/Controllers/Kasir/Menu.php           |  15 ++-
 resources/views/layouts/base.blade.php        |   1 +
 resources/views/pages/History/js.blade.php    |   3 +-
 resources/views/pages/Kasir/js.blade.php      |  38 ++++---
 .../views/pages/Kasir/transaksi.blade.php     |  12 +-
 resources/views/pages/Menu/index.blade.php    | 107 ++++++++++++++++--
 routes/web.php                                |   4 +-
 7 files changed, 142 insertions(+), 38 deletions(-)

diff --git a/app/Http/Controllers/Kasir/Menu.php b/app/Http/Controllers/Kasir/Menu.php
index eb105ab..3ad368b 100644
--- a/app/Http/Controllers/Kasir/Menu.php
+++ b/app/Http/Controllers/Kasir/Menu.php
@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Kasir;
 
 use App\Http\Controllers\Controller;
+use App\Models\KategoriProduk;
+use App\Models\KelompokKategori;
 use App\Models\Pesanan;
 use App\Models\Produk;
 use Illuminate\Http\Request;
@@ -11,7 +13,15 @@ class Menu extends Controller
 {
     public function index()
     {
-        return view('pages.Menu.index');
+        $kategori_produks = KategoriProduk::get();
+
+        return view('pages.Menu.index', compact('kategori_produks'));
+    }
+
+    public function kelompokKategori($id) {
+        $kelompok_kategoris = KelompokKategori::where('kategori_produk_id', $id)->first();
+        
+        return $kelompok_kategoris;
     }
 
     public function getDataMenu()
@@ -35,4 +45,7 @@ class Menu extends Controller
             ->rawColumns(['nomor', 'kode_produk', 'ubah'])
             ->make(true);
     }
+    public function store() {
+
+    } 
 }
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 3cddfd8..95886fd 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -18,6 +18,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
     <link rel="stylesheet" href="{{ asset('assets/plugins/fontawesome-free/css/fontawesome.min.css') }}">
     <link rel="stylesheet" href="{{ asset('assets/plugins/fontawesome-free/css/all.min.css') }}">
     <link rel="stylesheet" href="{{ asset('assets/plugins/fontawesome-free/css/solid.min.css') }}">
+    @stack('style2')
     <!-- Theme style -->
     <link rel="stylesheet" href="{{ asset('assets/dist/css/adminlte.min.css') }}">
 
diff --git a/resources/views/pages/History/js.blade.php b/resources/views/pages/History/js.blade.php
index 008230b..d52ad3a 100644
--- a/resources/views/pages/History/js.blade.php
+++ b/resources/views/pages/History/js.blade.php
@@ -133,7 +133,8 @@
     <script>
         function print(id) {
             var url = "{{ route('history.print', '') }}/" + id + '?print=true'
-            window.open(url, '_blank');
+            // window.open(url, '_blank');
+            window.open(url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
         }
     </script>
     <script>
diff --git a/resources/views/pages/Kasir/js.blade.php b/resources/views/pages/Kasir/js.blade.php
index 9b648a6..2e4860b 100644
--- a/resources/views/pages/Kasir/js.blade.php
+++ b/resources/views/pages/Kasir/js.blade.php
@@ -70,19 +70,22 @@
     <script>
         function printDapurTigaKali(id) {
             var url = "{{ route('transaksi.printDapurTigaKali', '') }}/" + id + '?print=true'
-            window.open(url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
+            window.open(url, '_blank');
+            // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
             location.reload(true);
         }
 
         function printDapurDuaKali(id) {
             var url = "{{ route('transaksi.printDapurDuaKali', '') }}/" + id + '?print=true'
-            window.open(url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
+            window.open(url, '_blank');
+            // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
             location.reload(true);
         }
 
         function printDapurSatuKali(id) {
             var url = "{{ route('transaksi.printDapurSatuKali', '') }}/" + id + '?print=true'
-            window.open(url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
+            window.open(url, '_blank');
+            // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
             location.reload(true);
         }
     </script>
@@ -379,8 +382,7 @@
             var diskonSatuan = table.rows[index].getAttribute('data-diskon-satuan');
             var total = table.rows[index].getAttribute('data-total');
             var harga = table.rows[index].getAttribute('data-harga');
-            var valueKeterangan = table.rows[index].cells[0].getElementsByTagName('input')[0].getAttribute(
-                'data-keterangan');
+            var valueKeterangan = table.rows[index].cells[0].getElementsByTagName('input')[0].getAttribute('data-keterangan');
 
             qty = parseInt(qty) + 1;
             var totalLama = parseInt(total) + parseInt(harga);
@@ -392,15 +394,14 @@
             table.rows[index].setAttribute('data-total', totalLama);
 
             table.rows[index].cells[0].innerHTML = `
-            <td>
-                ${nama_produk}
-                <br>
-                ${(diskonSatuan > 0) ? '<small class="text-primary"><s>Rp. ' + (harga * qty) + '</s></small> | <small class="text-danger">Rp. ' + total + '</small>' : '<small class="text-primary">Rp. ' + totalLama + '</small>'}
-                <div class="input-group input-group-sm mt-1">
-                    <input type="text" name="keterangan_satuan" data-keterangan="${valueKeterangan}" value="${valueKeterangan}" class="form-control rounded-0" placeholder="Keterangan..">
-                </div>
-            </td>
-        `;
+                <td>
+                    ${nama_produk}
+                    <br>
+                    ${(diskonSatuan > 0) ? '<small class="text-primary"><s>Rp. ' + (harga * qty) + '</s></small> | <small class="text-danger">Rp. ' + total + '</small>' : '<small class="text-primary">Rp. ' + totalLama + '</small>'}
+                    <div class="input-group input-group-sm mt-1">
+                        <input type="text" name="keterangan_satuan" data-keterangan="${valueKeterangan}" value="${valueKeterangan}" class="form-control rounded-0" placeholder="Keterangan..">
+                    </div>
+                </td>`;
 
             table.rows[index].cells[1].innerHTML = `
                 <td class="text-center">
@@ -413,8 +414,7 @@
                             <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${params}, '${nama_produk}')">+</button>
                         </span>
                     </div>
-                </td>
-            `;
+                </td>`;
 
             calculateTotal();
         }
@@ -702,7 +702,8 @@
                         toastr.success(result.message, 'Success', {
                             timeOut: 2000
                         });
-                        window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
+                        window.open(result.url, '_blank');
+                        // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
 
                         setTimeout(function() {
                             window.location.reload(1);
@@ -829,7 +830,8 @@
                         toastr.success(result.message, 'Success', {
                             timeOut: 2000
                         });
-                        window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=400,height=400");
+                        window.open(result.url, '_blank');
+                        // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
 
                         setTimeout(function() {
                             window.location.reload(1);
diff --git a/resources/views/pages/Kasir/transaksi.blade.php b/resources/views/pages/Kasir/transaksi.blade.php
index 742c8a4..6c03cb1 100644
--- a/resources/views/pages/Kasir/transaksi.blade.php
+++ b/resources/views/pages/Kasir/transaksi.blade.php
@@ -46,7 +46,7 @@
                                     aria-labelledby="custom-tabs-four-{{ $item->kode_kelompok_kategori }}-tab">
                                     <div class="row">
                                         @if ($item->kode_kelompok_kategori == 'PAK-SKOM')
-                                            <div class="col-lg-12 col-md-6 col-sm-6" style="padding: 0px">
+                                            <div class="col-lg-12 col-md-12 col-sm-12" style="padding: 0px">
                                                 <div class="row" style="padding: 0px">
                                                     <div class="col-xl-3 col-lg-4 col-md-4 col-sm-3"
                                                         style="margin-left: 0px;padding-left: 0px;">
@@ -105,7 +105,7 @@
                                                                         @foreach ($item->kelompokKategoriPivot as $key2 => $kelompokKategoriPivot)
                                                                             @if ($kelompokKategoriPivot->produk->urutan == 1)
                                                                                 <div
-                                                                                    class="col-xl-4 col-lg-6 col-md-4 col-sm-4">
+                                                                                    class="col-xl-4 col-lg-6 col-md-12 col-sm-6">
                                                                                     <div onclick="selectPaket( {{ $kelompokKategoriPivot->produk }} );changeTab('vert-tabs-telur')"
                                                                                         class="card card-warning card-outline btn">
                                                                                         <div class="card-header">
@@ -135,7 +135,7 @@
                                                                         @foreach ($item->kelompokKategoriPivot as $key2 => $kelompokKategoriPivot)
                                                                             @if ($kelompokKategoriPivot->produk->urutan == 2)
                                                                                 <div
-                                                                                    class="col-xl-4 col-lg-6 col-md-4 col-sm-4">
+                                                                                    class="col-xl-4 col-lg-6 col-md-12 col-sm-6">
                                                                                     <div onclick="selectPaket( {{ $kelompokKategoriPivot->produk }} );changeTab('vert-tabs-sambel')"
                                                                                         class="card card-warning card-outline btn">
                                                                                         <div class="card-header">
@@ -165,7 +165,7 @@
                                                                         @foreach ($item->kelompokKategoriPivot as $key2 => $kelompokKategoriPivot)
                                                                             @if ($kelompokKategoriPivot->produk->urutan == 3)
                                                                                 <div
-                                                                                    class="col-xl-4 col-lg-6 col-md-4 col-sm-4">
+                                                                                    class="col-xl-4 col-lg-6 col-md-12 col-sm-6">
                                                                                     <div onclick="selectPaket( {{ $kelompokKategoriPivot->produk }} );changeTab('vert-tabs-topping')"
                                                                                         class="card card-warning card-outline btn">
                                                                                         <div class="card-header">
@@ -195,7 +195,7 @@
                                                                         @foreach ($item->kelompokKategoriPivot as $key2 => $kelompokKategoriPivot)
                                                                             @if ($kelompokKategoriPivot->produk->urutan == 4)
                                                                                 <div
-                                                                                    class="col-xl-4 col-lg-6 col-md-4 col-sm-4">
+                                                                                    class="col-xl-4 col-lg-6 col-md-12 col-sm-6">
                                                                                     <div onclick="selectPaket( {{ $kelompokKategoriPivot->produk }} );changeTab('vert-tabs-free')"
                                                                                         class="card card-warning card-outline btn">
                                                                                         <div class="card-header">
@@ -224,7 +224,7 @@
                                                                         @foreach ($item->kelompokKategoriPivot as $key2 => $kelompokKategoriPivot)
                                                                             @if ($kelompokKategoriPivot->produk->urutan == 5)
                                                                                 <div
-                                                                                    class="col-xl-4 col-lg-6 col-md-4 col-sm-4">
+                                                                                    class="col-xl-4 col-lg-6 col-md-12 col-sm-6">
                                                                                     <div onclick="selectPaket( {{ $kelompokKategoriPivot->produk }} )"
                                                                                         class="card card-warning card-outline btn">
                                                                                         <div class="card-header">
diff --git a/resources/views/pages/Menu/index.blade.php b/resources/views/pages/Menu/index.blade.php
index 522032d..de80739 100644
--- a/resources/views/pages/Menu/index.blade.php
+++ b/resources/views/pages/Menu/index.blade.php
@@ -57,30 +57,61 @@
 </div>
 
 <!-- Modal Tambah Menu -->
-<div class="modal fade" id="modal-default">
-    <div class="modal-dialog modal-lg">
+<div class="modal fade" id="modal-default" data-backdrop="static">
+    <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Default Modal</h4>
+                <h4 class="modal-title">Tambah Menu</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
                 <form>
-                    <div class="form-group">
-                        <label for="recipient-name" class="col-form-label">Recipient:</label>
-                        <input type="text" class="form-control" id="recipient-name">
+                    <div class="form-group row">
+                        <div class="col-md-6">
+                            <label for="kategori_produk" class="col-form-label">Kategori Produk:</label>
+                            <select type="text" class="form-control select2" id="kategori_produk" name="kategori_produk" onchange="kelompokKategori(this.value)">
+                                <option value="">Pilih Kategori</option>
+                                @foreach ($kategori_produks as $kategori)
+                                <option value="{{ $kategori->id }}">{{ $kategori->nama_kategori_produk }}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                        <div class="col-md-6">
+                            <label for="kelompok_produk" class="col-form-label">Kelompok Produk:</label>
+                            <input type="text" class="form-control" id="kelompok_produk" name="kelompok_produk" value="">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-6">
+                            <label for="kode_produk" class="col-form-label">Kode Produk:</label>
+                            <input type="text" class="form-control" id="kode_produk" name="kode_produk" value="">
+                        </div>
+                        <div class="col-md-6">
+                            <label for="nama_produk" class="col-form-label">Nama Produk:</label>
+                            <input type="text" class="form-control" id="nama_produk" name="nama_produk" value="">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-6">
+                            <label for="harga_produk" class="col-form-label">Harga Produk:</label>
+                            <input type="number" class="form-control" id="harga_produk" name="harga_produk" value="">
+                        </div>
+                        <div class="col-md-6">
+                            <label for="stok_produk" class="col-form-label">Stok Produk:</label>
+                            <input type="text" class="form-control" id="stok_produk" name="stok_produk" value="">
+                        </div>
                     </div>
                     <div class="form-group">
-                        <label for="message-text" class="col-form-label">Message:</label>
-                        <textarea class="form-control" id="message-text"></textarea>
+                        <label for="deskripsi_produk" class="col-form-label">Deskripsi Produk:</label>
+                        <textarea class="form-control" id="deskripsi_produk" name="deskripsi_produk"></textarea>
                     </div>
                 </form>
             </div>
-            <div class="modal-footer justify-content-between">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button type="button" class="btn btn-primary">Save changes</button>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Tutup</button>
+                <button type="button" class="btn btn-primary">Simpan</button>
             </div>
         </div>
     </div>
@@ -106,8 +137,15 @@
 <link rel="stylesheet" href="{{asset('assets/datatables/datatables.min.css')}}">
 @endpush
 
+@push('style2')
+<link rel="stylesheet" href="{{ asset('assets/plugins/select2/css/select2.min.css') }}">
+<link rel="stylesheet" href="{{ asset('assets/plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css') }}">
+@endpush
+
 @push('scripts')
 <script src="{{ asset('assets/datatables/datatables.min.js') }}"></script>
+<script src="{{ asset('assets/plugins/select2/js/select2.full.min.js') }}"></script>
+<script src="{{ asset('assets/plugins/toastr/toastr.min.js') }}"></script>
 <script>
     $(document).ready(function() {
         $('#tabelku').DataTable({
@@ -145,4 +183,51 @@
         })
     })
 </script>
+<script>
+    $('.select2').select2();
+
+    function kelompokKategori(id) {
+        $.ajax({
+            url: "{{ route('menu.kelompok-kategori', '') }}/" + id,
+            method: "GET",
+            success: function(result) {
+                console.log(result);
+            },
+            error: function(xhr, status, error) {
+                toastr.error(xhr.responseJSON.message, 'Error', {
+                    timeOut: 3000
+                });
+            }
+        })
+    }
+
+    // function tambah() {
+    //     var data = {
+    //         _token: "{{ csrf_token() }}",
+    //         orderMenus: orderMenus,
+    //     };
+
+    //     $.ajax({
+    //         url: "{{ route('menu.store') }}",
+    //         method: "POST",
+    //         data: data,
+    //         success: function(result) {
+    //             toastr.success(result.message, 'Success', {
+    //                 timeOut: 2000
+    //             });
+    //             window.open(result.url, '_blank');
+    //             // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
+
+    //             setTimeout(function() {
+    //                 window.location.reload(1);
+    //             }, 1000);
+    //         },
+    //         error: function(xhr, status, error) {
+    //             toastr.error(xhr.responseJSON.message, 'Error', {
+    //                 timeOut: 3000
+    //             });
+    //         }
+    //     });
+    // }
+</script>
 @endpush
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index b5775e5..21f05e4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -54,7 +54,9 @@ Route::group(['middleware' => ['auth', 'permission']], function () {
     });
 
     Route::group(['prefix' => 'menu'], function () {
-        Route::get('/', [Menu::class, 'index'])->name('menu.index')->comment("Halaman Menu");
+        Route::resource('menu', Menu::class);
+        // Route::get('/', [Menu::class, 'index'])->name('menu.index')->comment("Halaman Menu");
+        Route::get('/kelompok-kategori/{id}', [Menu::class, 'kelompokKategori'])->name('menu.kelompok-kategori')->comment("Ambil Data Kelompok Kategori");
         Route::get('/getDataMenu', [Menu::class, 'getDataMenu'])->name('menu.getDataMenu')->comment("Ambil data Menu");
     });
 

From 865faec964b58b370c283bebb51c8f2eaca5460f Mon Sep 17 00:00:00 2001
From: mikhailkusuma <whatxwrong@gmail.com>
Date: Thu, 1 Feb 2024 22:07:48 +0700
Subject: [PATCH 3/3] Add: UpdateMenu Refactor: Paket Irit (Transaksi)

---
 app/Http/Controllers/Kasir/Menu.php           | 118 +++++++++++++-
 .../views/pages/Kasir/transaksi.blade.php     |  23 +++
 resources/views/pages/Menu/index.blade.php    | 152 +++++++++++++-----
 3 files changed, 251 insertions(+), 42 deletions(-)

diff --git a/app/Http/Controllers/Kasir/Menu.php b/app/Http/Controllers/Kasir/Menu.php
index 3ad368b..8842dc2 100644
--- a/app/Http/Controllers/Kasir/Menu.php
+++ b/app/Http/Controllers/Kasir/Menu.php
@@ -5,28 +5,35 @@ namespace App\Http\Controllers\Kasir;
 use App\Http\Controllers\Controller;
 use App\Models\KategoriProduk;
 use App\Models\KelompokKategori;
+use App\Models\KelompokKategoriPivot;
 use App\Models\Pesanan;
 use App\Models\Produk;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Redirect;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\Validator;
 
 class Menu extends Controller
 {
     public function index()
     {
+        // return $data = KelompokKategoriPivot::with(['kelompokKategori', 'produk'])->first();
         $kategori_produks = KategoriProduk::get();
 
         return view('pages.Menu.index', compact('kategori_produks'));
     }
 
     public function kelompokKategori($id) {
-        $kelompok_kategoris = KelompokKategori::where('kategori_produk_id', $id)->first();
+        $kelompok_kategoris = KelompokKategori::where('kategori_produk_id', $id)->get();
         
         return $kelompok_kategoris;
     }
 
     public function getDataMenu()
     {
-        $data = Produk::with(['kategori_produk'])->get();
+        // $data = Produk::with(['kategori_produk'])->get();
+        $data = KelompokKategoriPivot::with(['kelompokKategori', 'produk'])->get();
         $nomor = 1;
 
         return $datatables = datatables()
@@ -34,18 +41,117 @@ class Menu extends Controller
             ->addColumn('nomor', function ($data) use (&$nomor) {
                 return $nomor++;
             })
+            ->addColumn('kode_produk', function ($data) {
+                return $data->produk->kode_produk;
+            })
+            ->addColumn('nama_produk', function ($data) {
+                return $data->produk->nama_produk;
+            })
+            ->addColumn('harga_produk', function ($data) {
+                return $data->produk->harga_produk;
+            })
+            ->addColumn('nama_kelompok_kategori', function ($data) {
+                return $data->kelompokKategori->nama_kelompok_kategori;
+            })
             ->addColumn('kategori_produk', function ($data) {
-                return $data->kategori_produk->nama_kategori_produk;
+                return $data->produk->kategori_produk->nama_kategori_produk;
             })
             ->addColumn('ubah', function ($data) {
                 return '<div class="btn-group">
-                            <a href="javascript:void(0)" onclick="print(\'' . $data->id . '\')"><span class="btn btn-xs btn-success"><i class="fas fa-print"></i></span></a>
+                            <a href="javascript:void(0)" onclick="editMenu(\'' . $data->id . '\')">
+                                <span class="btn btn-md btn-warning"><i class="fas fa-edit"></i> Edit</span>
+                            </a>
                         </div>';
             })
-            ->rawColumns(['nomor', 'kode_produk', 'ubah'])
+            ->rawColumns(['nomor', 'ubah'])
             ->make(true);
     }
-    public function store() {
 
+    // Tambah Menu
+    public function store(Request $request) {
+        // validation
+        $rules = array(
+            'kategori_produk'  => 'required',
+            'kelompok_produk'  => 'required',
+            'kode_produk'  => 'required',
+            'nama_produk'  => 'required',
+            'harga_produk'  => 'required',
+            'tersedia'  => 'required',
+            'deskripsi_produk'  => 'required',
+        );
+        $validator = Validator::make($request->all(), $rules);
+
+        // check validation
+        if ($validator->fails()) {
+            // If validation fails, return with errors
+            return response()->json(['errors' => $validator->errors()], 422);
+        } else {
+            // create product
+            $produk = Produk::create([
+                'kategori_produk_id' => $request->kategori_produk,
+                'kode_produk' => $request->kode_produk,
+                'nama_produk' => $request->nama_produk,
+                'harga_produk' => $request->harga_produk,
+                'tersedia' => $request->tersedia,
+                'deskripsi_produk' => $request->deskripsi_produk,
+                'created_at' => Carbon::now()
+            ]);
+
+            $pivot_produk = KelompokKategoriPivot::create([
+                'kelompok_kategori_id' => $request->kelompok_produk,
+                'produk_id' => $produk->id,
+                'created_at' => Carbon::now()
+            ]);
+
+            // Return a success response
+            return response()->json(['message' => 'Data created successfully']);
+        }
+    } 
+    
+    public function show($id) {
+        $data = KelompokKategoriPivot::with(['kelompokKategori', 'produk'])->findOrFail($id);
+        return response()->json($data);
+    }
+
+    // Ubah Menu
+    public function update(Request $request, $id) {
+        // validation
+        $rules = array(
+            'kategori_produk'  => 'required',
+            'kelompok_produk'  => 'required',
+            'kode_produk'  => 'required',
+            'nama_produk'  => 'required',
+            'harga_produk'  => 'required',
+            'tersedia'  => 'required',
+            'deskripsi_produk'  => 'required',
+        );
+        $validator = Validator::make($request->all(), $rules);
+
+        // check validation
+        if ($validator->fails()) {
+            // If validation fails, return with errors
+            return response()->json(['errors' => $validator->errors()], 422);
+        } else {
+            $pivot = KelompokKategoriPivot::findOrFail($id);
+            $produk = Produk::find($pivot->produk_id);
+            
+            // update pivot produk
+            $pivot->update([
+                'kelompok_ketegori_id' => $request->kelompok_produk,
+            ]);
+
+            // update produk
+            $produk->update([
+                'kategori_produk_id' => $request->kategori_produk,
+                'kode_produk' => $request->kode_produk,
+                'nama_produk' => $request->nama_produk,
+                'harga_produk' => $request->harga_produk,
+                'tersedia' => $request->tersedia,
+                'deskripsi_produk' => $request->deskripsi_produk,
+            ]);
+
+            // Return a success response
+            return response()->json(['message' => 'Data created successfully']);
+        }
     } 
 }
diff --git a/resources/views/pages/Kasir/transaksi.blade.php b/resources/views/pages/Kasir/transaksi.blade.php
index 3f1364b..6afd2ad 100644
--- a/resources/views/pages/Kasir/transaksi.blade.php
+++ b/resources/views/pages/Kasir/transaksi.blade.php
@@ -337,6 +337,28 @@
                                                         @endif
                                                     @endif
                                                 @else
+                                                    @if ($kelompokKategoriPivot->kelompok_kategori_id == 2)
+                                                    <div class="col-xl-4 col-lg-6 col-md-6 col-sm-12">
+                                                        <div class="card card-warning card-outline btn"
+                                                            onclick="aadMenu( {{ $kelompokKategoriPivot->produk }} )">
+                                                            <div class="card-header px-0">
+                                                                <h6 class="m-0 text-sm text-bold">
+                                                                    {{ $kelompokKategoriPivot->produk->nama_produk ?? '' }}
+                                                                </h6>
+                                                            </div>
+                                                            <div class="card-body px-0">
+                                                                <div class="col-md-12 px-0">
+                                                                    <div class="col-md-12 text-sm d-flex py-2 rounded bg-secondary" style="background-color: rgb(230, 230, 230)">
+                                                                        <h5 class="my-auto text-bold" style="align-items: center;">
+                                                                            {{ convert_to_rupiah($kelompokKategoriPivot->produk->harga_produk) }}
+                                                                        </h5>
+                                                                        <a class="btn btn-warning ml-auto" id="ordered-menus"><i class="fa fa-shopping-cart"></i></a>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                    @else
                                                     <div class="col-xl-4 col-lg-6 col-md-6 col-sm-12">
                                                         <div class="card card-warning card-outline btn"
                                                             onclick="aadMenu( {{ $kelompokKategoriPivot->produk }} )">
@@ -364,6 +386,7 @@
                                                             </div>
                                                         </div>
                                                     </div>
+                                                    @endif 
                                                 @endif
                                             @endforeach
                                         @endif
diff --git a/resources/views/pages/Menu/index.blade.php b/resources/views/pages/Menu/index.blade.php
index de80739..a347567 100644
--- a/resources/views/pages/Menu/index.blade.php
+++ b/resources/views/pages/Menu/index.blade.php
@@ -29,7 +29,7 @@
                     <h3>Daftar Menu</h3>
                     <!-- Button trigger modal -->
                     <div class="ml-auto">
-                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#modal-default">
+                        <button type="button" class="btn btn-primary" onclick="tambahMenu()">
                             Tambah Menu
                         </button>
                     </div>
@@ -46,6 +46,7 @@
                                 <th>Nama Produk</th>
                                 <th>Harga Produk</th>
                                 <th>Kategori Produk</th>
+                                <th>Kelompok Kategori</th>
                                 <th class="text-center"><i class="fas fa-cog"></i></th>
                             </tr>
                         </thead>
@@ -57,20 +58,21 @@
 </div>
 
 <!-- Modal Tambah Menu -->
-<div class="modal fade" id="modal-default" data-backdrop="static">
+<div class="modal fade" id="modal-produk" data-backdrop="static">
     <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title">Tambah Menu</h4>
+                <h4 class="modal-title" id="title-form-menu">Tambah Menu</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
             <div class="modal-body">
-                <form>
+                <form method="post" id="formMenu" data-url="" data-method="">
                     <div class="form-group row">
                         <div class="col-md-6">
                             <label for="kategori_produk" class="col-form-label">Kategori Produk:</label>
+                            <input type="hidden" name="pivot_id" id="pivot_id">
                             <select type="text" class="form-control select2" id="kategori_produk" name="kategori_produk" onchange="kelompokKategori(this.value)">
                                 <option value="">Pilih Kategori</option>
                                 @foreach ($kategori_produks as $kategori)
@@ -80,7 +82,9 @@
                         </div>
                         <div class="col-md-6">
                             <label for="kelompok_produk" class="col-form-label">Kelompok Produk:</label>
-                            <input type="text" class="form-control" id="kelompok_produk" name="kelompok_produk" value="">
+                            <select type="text" class="form-control select2" id="kelompok_produk" name="kelompok_produk">
+                                <option value="default" selected disabled>Pilih Kelompok Produk</option>
+                            </select>
                         </div>
                     </div>
                     <div class="form-group row">
@@ -99,8 +103,11 @@
                             <input type="number" class="form-control" id="harga_produk" name="harga_produk" value="">
                         </div>
                         <div class="col-md-6">
-                            <label for="stok_produk" class="col-form-label">Stok Produk:</label>
-                            <input type="text" class="form-control" id="stok_produk" name="stok_produk" value="">
+                            <label for="tersedia" class="col-form-label">Tersedia:</label>
+                            <select type="text" class="form-control select2" id="tersedia" name="tersedia">
+                                <option value="1">Iya</option>    
+                                <option value="0">Tidak</option>    
+                            </select>
                         </div>
                     </div>
                     <div class="form-group">
@@ -111,7 +118,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Tutup</button>
-                <button type="button" class="btn btn-primary">Simpan</button>
+                <button type="button" class="btn btn-primary" id="btn-simpan-menu" onclick="saveMenu()">Simpan</button>
             </div>
         </div>
     </div>
@@ -174,6 +181,10 @@
                     data: 'kategori_produk',
                     name: 'kategori_produk'
                 },
+                {
+                    data: 'nama_kelompok_kategori',
+                    name: 'nama_kelompok_kategori'
+                },
                 {
                     data: 'ubah',
                     name: 'ubah',
@@ -190,8 +201,13 @@
         $.ajax({
             url: "{{ route('menu.kelompok-kategori', '') }}/" + id,
             method: "GET",
-            success: function(result) {
-                console.log(result);
+            success: function(response) {
+                console.log(response);
+                $('#kelompok_produk').empty();
+                response?.forEach(function(item, index) {
+                    $('#kelompok_produk').append(
+                        `<option value="${item?.id}">${item?.nama_kelompok_kategori}</option>`)
+                })
             },
             error: function(xhr, status, error) {
                 toastr.error(xhr.responseJSON.message, 'Error', {
@@ -201,33 +217,97 @@
         })
     }
 
-    // function tambah() {
-    //     var data = {
-    //         _token: "{{ csrf_token() }}",
-    //         orderMenus: orderMenus,
-    //     };
+    function saveMenu() {
+        document.getElementById('btn-simpan-menu').disabled = true;
+        document.getElementById('btn-simpan-menu').innerText = "Loading...";
 
-    //     $.ajax({
-    //         url: "{{ route('menu.store') }}",
-    //         method: "POST",
-    //         data: data,
-    //         success: function(result) {
-    //             toastr.success(result.message, 'Success', {
-    //                 timeOut: 2000
-    //             });
-    //             window.open(result.url, '_blank');
-    //             // window.open(result.url, '_blank', "toolbar=yes,scrollbars=yes,resizable=yes,top=500,left=500,width=900,height=600");
+        var url = $('#formMenu').data('url');
+        var method = $('#formMenu').data('method');
+        var data = {
+            _token: "{{ csrf_token() }}",
+            kategori_produk: $('#kategori_produk').val(),
+            kelompok_produk: $('#kelompok_produk').val(),
+            kode_produk: $('#kode_produk').val(),
+            nama_produk: $('#nama_produk').val(),
+            harga_produk: $('#harga_produk').val(),
+            tersedia: $('#tersedia').val(),
+            deskripsi_produk: $('#deskripsi_produk').val(),
+        };
 
-    //             setTimeout(function() {
-    //                 window.location.reload(1);
-    //             }, 1000);
-    //         },
-    //         error: function(xhr, status, error) {
-    //             toastr.error(xhr.responseJSON.message, 'Error', {
-    //                 timeOut: 3000
-    //             });
-    //         }
-    //     });
-    // }
+        $.ajax({
+            url: url,
+            method: method,
+            data: data,
+            success: function(result) {
+                if (result.errors) {
+                    toastr.error(result.errors, 'Gagal', {
+                        timeOut: 2000
+                    });
+                    document.getElementById('btn-simpan-menu').disabled = false;
+                    document.getElementById('btn-simpan-menu').innerText = "Simpan";
+                } else {
+                    toastr.success(result.message, 'Berhasil', {
+                        timeOut: 2000
+                    });
+
+                    $('#modal-produk').modal('hide');
+                    $('#formMenu')[0].reset();
+                    document.getElementById('btn-simpan-menu').disabled = false;
+                    document.getElementById('btn-simpan-menu').innerText = "Simpan";
+
+                    // console.log(result);
+                    setTimeout(function() {
+                        window.location.reload(1);
+                    }, 1000);
+                }
+            },
+            error: function(xhr, status, error) {
+                toastr.error(xhr.responseJSON.message, 'Error', {
+                    timeOut: 3000
+                });
+                document.getElementById('btn-simpan-menu').disabled = false;
+                document.getElementById('btn-simpan-menu').innerText = "Simpan";
+            }
+        });
+    }
+
+    function tambahMenu() {
+        $('#formMenu')[0].reset();
+        // $('#kategori_produk').val('').trigger('change');
+        $('#modal-produk').modal('show');
+        $('#title-form-menu').text("Tambah Menu");
+        
+        let formMenu = document.getElementById('formMenu');
+        formMenu.setAttribute('data-url', "{{ route('menu.store') }}");
+        formMenu.setAttribute('data-method', "post");
+    }
+    function editMenu(id) {
+        $('#modal-produk').modal('show');
+        $('#title-form-menu').text("Ubah Menu");
+        let formMenu = document.getElementById('formMenu');
+        formMenu.setAttribute('data-url', "{{ route('menu.update', '') }}/" + id);
+        formMenu.setAttribute('data-method', "put");
+        
+        $.ajax({
+            url: "{{ route('menu.show', '') }}/" + id,
+            method: "GET",
+            success: function(response) {
+                console.log(response);
+
+                $('#kategori_produk').val(response.produk.kategori_produk_id).trigger('change');
+                $('#kelompok_produk').val(response.kelompok_kategori_id);
+                $('#kode_produk').val(response.produk.kode_produk);
+                $('#nama_produk').val(response.produk.nama_produk);
+                $('#harga_produk').val(response.produk.harga_produk);
+                $('#tersedia').val(response.produk.tersedia);
+                $('#deskripsi_produk').val(response.produk.deskripsi_produk);
+            },
+            error: function(xhr, status, error) {
+                toastr.error(xhr.responseJSON.message, 'Error', {
+                    timeOut: 3000
+                });
+            }
+        })
+    }
 </script>
 @endpush
\ No newline at end of file