diff --git a/app/Http/Controllers/Kasir/Transaksi.php b/app/Http/Controllers/Kasir/Transaksi.php index ed71847..79d4df3 100644 --- a/app/Http/Controllers/Kasir/Transaksi.php +++ b/app/Http/Controllers/Kasir/Transaksi.php @@ -18,10 +18,9 @@ class Transaksi extends Controller $KelompokKategori = KelompokKategori::with('kelompokKategoriPivot.produk')->get(); foreach ($KelompokKategori as $item) { - foreach ($item->kelompokKategoriPivot as $kelompokKategoriPivot) { + foreach ($item->kelompokKategoriPivot as $kelompokKategoriPivot) { // Query tambahan untuk mendapatkan total pembelian berdasarkan produk - $totalPembelianByProduk[$kelompokKategoriPivot->produk->id] = DetailPesanan:: - select('detail_pesanans.produk_id', DB::raw('SUM(detail_pesanans.jumlah_produk) as total_beli')) + $totalPembelianByProduk[$kelompokKategoriPivot->produk->id] = DetailPesanan::select('detail_pesanans.produk_id', DB::raw('SUM(detail_pesanans.jumlah_produk) as total_beli')) ->where('detail_pesanans.produk_id', '=', $kelompokKategoriPivot->produk->id) ->groupBy('detail_pesanans.produk_id') ->first(); @@ -81,6 +80,7 @@ class Transaksi extends Controller 'jumlah_produk' => $value['qty'], 'harga_produk' => $value['harga'], 'total_harga_produk' => $value['total'], + 'keterangan_produk' => $value['keterangan'] ?? null, ]; $detailPesananModels = \App\Models\DetailPesanan::create($oderDatas); } diff --git a/app/Models/DetailPesanan.php b/app/Models/DetailPesanan.php index 81743f6..e0a9753 100644 --- a/app/Models/DetailPesanan.php +++ b/app/Models/DetailPesanan.php @@ -20,6 +20,7 @@ class DetailPesanan extends Model 'harga_produk', 'jumlah_produk', 'total_harga_produk', + 'keterangan_produk', 'diskon_id', 'nama_diskon', 'kode_diskon', diff --git a/app/Models/Produk.php b/app/Models/Produk.php index 32d3309..b643c25 100644 --- a/app/Models/Produk.php +++ b/app/Models/Produk.php @@ -17,13 +17,25 @@ class Produk extends Model 'kategori_produk_id', 'kode_produk', 'nama_produk', - 'gambar_produk', + 'varian_produk', 'deskripsi_produk', 'harga_produk', 'stok_produk', 'tersedia', + 'gambar_produk', + 'urutan', ]; + // full path to reach image from storage folder and check if image exists or not + public function getGambarProdukAttribute($value) + { + $storage = storage_path('app/public/produk/' . $this->kategori_produk_id . '/' . $value); + if (file_exists($storage)) { + return asset('storage/produk/' . $this->kategori_produk_id . '/' . $value); + } else { + return asset('assets/images/menu_image.jpeg'); + } + } public function kategori_produk() { diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 88039fc..17033a5 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -18,6 +18,20 @@ scratch. This page gets rid of all links and provides the needed markup only. + + @stack('styles') diff --git a/resources/views/pages/Kasir/print.blade.php b/resources/views/pages/Kasir/print.blade.php index 181925f..855d164 100644 --- a/resources/views/pages/Kasir/print.blade.php +++ b/resources/views/pages/Kasir/print.blade.php @@ -33,11 +33,11 @@ } /* .literely-table td, - th, - tr { - border-collapse: collapse; - border: 0.1px solid rgb(85, 85, 85); - } */ + th, + tr { + border-collapse: collapse; + border: 0.1px solid rgb(85, 85, 85); + } */ .rotate90 { -webkit-transform: rotate(90deg); @@ -64,6 +64,10 @@ hr.style2 { border-top: 1px solid #8c8b8b; } + + .dashed-line { + border: 1.5px dashed black; + }
@@ -87,7 +91,6 @@{{ $loop->iteration }} | {{ $item->nama_produk }} | @@ -96,7 +99,9 @@{{ $item->jumlah_produk }} | {{ convert_to_rupiah($item->harga_produk) }} | -{{ convert_to_rupiah($item->total_harga_produk) }} | ++ {{ $item->diskon_persen != '' ? $item->diskon_persen . '%' : '' }} | +{{ convert_to_rupiah($item->total_harga_produk) }} |
+ {{ $loop->iteration }}. {{ $item->nama_produk }}
+ + + {{ $item->keterangan_produk }} + + |
+
Keterangan Pesanan Keseluruhan
++ {{ $pesanan->keterangan_pesanan != '' ? $pesanan->keterangan_pesanan : '-' }} | +
{{ $pesanan->total_pesanan }} | +Total : | +{{ convert_to_rupiah($pesanan->total_bayar) }} | +
---|---|---|
+ | Diskon : | +{{ $pesanan->diskon_persen ?? 0 }} % | +
+ | Grand Total : | +{{ convert_to_rupiah($pesanan->grand_total) }} | +
+ | Bayar : | +{{ convert_to_rupiah($pesanan->nominal_bayar) }} | +
+ | Kembali : | +{{ convert_to_rupiah($pesanan->nominal_kembali) }} | +
Terima Kasih, Selamat Datang Kembali
+@sepiringtelurkeriting
+untuk dapur
+{{ tanggal_indonesia($pesanan->tanggal_pesanan) }}
+{{ date('H:i', strtotime($pesanan->tanggal_pesanan)) }}
+Meja: {{ $pesanan->nomor_meja }}
+ + +{{ $pesanan->kode_pesanan }}
+Kasir: {{ $pesanan->user->name }}
+Order: {{ $pesanan->nama_pemesan }}
+ + + +Menu Order
+
+ {{ $loop->iteration }}. {{ $item->nama_produk }}
+ + + {{ $item->keterangan_produk }} + + |
+
Keterangan Pesanan Keseluruhan
++ {{ $pesanan->keterangan_pesanan != '' ? $pesanan->keterangan_pesanan : '-' }} | +