diff --git a/app/Http/Controllers/Kasir/History.php b/app/Http/Controllers/Kasir/History.php index 5a115db..578e70a 100644 --- a/app/Http/Controllers/Kasir/History.php +++ b/app/Http/Controllers/Kasir/History.php @@ -16,7 +16,7 @@ class History extends Controller public function getDataHistory() { - $data = Pesanan::with(['detailPesanan', 'user'])->get(); + $data = Pesanan::with(['detailPesanan', 'user'])->orderBy('created_at', 'desc')->get(); $nomor = 1; return $datatables = datatables() diff --git a/app/Http/Controllers/Kasir/Transaksi.php b/app/Http/Controllers/Kasir/Transaksi.php index 3c037fd..c23c801 100644 --- a/app/Http/Controllers/Kasir/Transaksi.php +++ b/app/Http/Controllers/Kasir/Transaksi.php @@ -56,6 +56,7 @@ class Transaksi extends Controller $pesananDatas = [ 'kode_pesanan' => $request->orderCode, 'nama_pemesan' => $request->namaPemesan, + 'nomor_pemesan' => $request->nomorPemesan, 'nomor_meja' => $request->nomorMeja, 'status_pesanan' => '1', 'tanggal_pesanan' => date('Y-m-d H:i:s'), diff --git a/app/Models/Pesanan.php b/app/Models/Pesanan.php index a7d584a..c6a7199 100644 --- a/app/Models/Pesanan.php +++ b/app/Models/Pesanan.php @@ -16,6 +16,7 @@ class Pesanan extends Model protected $fillable = [ 'kode_pesanan', 'nama_pemesan', + 'nomor_pemesan', 'status_pesanan', 'tanggal_pesanan', 'nomor_meja', diff --git a/resources/views/pages/Kasir/transaksi.blade.php b/resources/views/pages/Kasir/transaksi.blade.php index 4803b48..43d5a76 100644 --- a/resources/views/pages/Kasir/transaksi.blade.php +++ b/resources/views/pages/Kasir/transaksi.blade.php @@ -20,517 +20,442 @@ @endsection --}} @section('content') -
-
-
-
-
- -
-
-
- @foreach ($KelompokKategori as $key => $item) -
-
- @if ($item->kode_kelompok_kategori == 'PAK-SKOM') -
-
-
-