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. + @stack('style2') 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 @@ @@ -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 = ` -