cetak

app/Http/Controllers/Admins/Penjualan/PenjualanController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admins\Penjualan;
 use App\Http\Controllers\Controller;
 use App\Models\DetailPesanan;
 use App\Models\Pesanan;
+use App\Models\RekeningCoa;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -13,7 +14,9 @@ class PenjualanController extends Controller
 {
     public function index()
     {
-        return view('pages.admin.penjualan.index');
+        $aba = RekeningCoa::where('kode_coa', 1)->where('sub_kode_coa', 200)->get();
+
+        return view('pages.admin.penjualan.index', compact('aba'));
     }
 
     public function getDataPenjualan(Request $request)
@@ -21,7 +24,9 @@ class PenjualanController extends Controller
         $nomor = 1;
         $filter_tanggal_1 = $request->filter_tanggal_1;
         $filter_tanggal_2 = $request->filter_tanggal_2;
-        $data = Pesanan::with(['detailPesanan', 'user'])
+        $akun_coa = $request->akun_coa;
+        if ($request->akun_coa == null) {
+            $data = Pesanan::with(['detailPesanan', 'user', 'rekening_coa'])
                 ->when($filter_tanggal_1, function ($query) use ($filter_tanggal_1) {
                     return $query->whereDate('tanggal_pesanan', '>=', $filter_tanggal_1);
                 })
@@ -33,6 +38,21 @@ class PenjualanController extends Controller
                 })
                 ->orderBy('tanggal_pesanan', 'desc')
                 ->get();
+        } else {
+            $data = Pesanan::with(['detailPesanan', 'user', 'rekening_coa'])
+                ->where('rekening_coa_id', $akun_coa)
+                ->when($filter_tanggal_1, function ($query) use ($filter_tanggal_1) {
+                    return $query->whereDate('tanggal_pesanan', '>=', $filter_tanggal_1);
+                })
+                ->when($filter_tanggal_2, function ($query) use ($filter_tanggal_2) {
+                    return $query->whereDate('tanggal_pesanan', '<=', $filter_tanggal_2);
+                })
+                ->when(!$filter_tanggal_1 && !$filter_tanggal_2, function ($query) {
+                    return $query->whereDate('tanggal_pesanan', Carbon::today());
+                })
+                ->orderBy('tanggal_pesanan', 'desc')
+                ->get();
+        }
 
         return datatables()
             ->of($data)
@@ -55,9 +75,11 @@ class PenjualanController extends Controller
             ->addColumn('grand_total_rp', function ($data) {
                 return 'Rp ' . number_format($data->grand_total, 0, ',', '.');
             })
+            ->addColumn('jenis_pembayarannya', function ($data) {
+                return $data->jenis_pembayaran == 1 ? 'Tunai' : 'Non-Tunai' . ' (' . $data->rekening_coa->keterangan_coa . ')';
+            })
             ->addColumn('ubah', function ($data) {
                 return '<div class="btn-group">
-                    <button href="javascript:void(0)" class="btn btn-xs btn-danger mr-1 cancelOrderBtn" data-id="' . $data->id . '" data-kode_pesanan="' . $data->kode_pesanan . '" data-nama_pemesan="' . $data->nama_pemesan . '">cancel</button>
                     <a class="btn btn-xs btn-warning mr-1" href="javascript:void(0)" onclick="detail(\'' . $data->id . '\')"><i class="fas fa-eye"></i></a>
                     <a class="btn btn-xs btn-success" href="javascript:void(0)" onclick="print(\'' . $data->id . '\')"><i class="fas fa-print"></i></a></div>';
             })
@@ -74,7 +96,7 @@ class PenjualanController extends Controller
 
     public function getDataDetailPenjualan(Request $request)
     {
-        $data = DetailPesanan::with('pesanan')->where('pesanan_id', $request->id_pesanan)->get();
+        $data = DetailPesanan::with('pesanan')->where('pesanan_id', $request->id_pesanan)->withTrashed()->get();
         $pesanan = Pesanan::find($request->id_pesanan);
         return response()->json(['status' => true, 'data' => $data, 'pesanan' => $pesanan]);
     }
@@ -95,13 +117,25 @@ class PenjualanController extends Controller
         $mpdf->AddPage();
         $mpdf->setFooter('{PAGENO}');
 
-        $data = Pesanan::with(['user', 'bukuBesar'])->whereDate('tanggal_pesanan', '>=', $request->filter_tanggal_1)
+        $filter_tanggal_1 = $request->filter_tanggal_1;
+        $filter_tanggal_2 = $request->filter_tanggal_2;
+        if ($request->jenis_coa == null) {
+            $keterangan_coa = 'Semua';
+            $data = Pesanan::with(['user', 'bukuBesar', 'rekening_coa'])->whereDate('tanggal_pesanan', '>=', $request->filter_tanggal_1)
                 ->whereDate('tanggal_pesanan', '<=', $request->filter_tanggal_2)
                 ->get();
+        } else {
+            $keterangan_coa = RekeningCoa::find($request->jenis_coa)->keterangan_coa;
+            $data = Pesanan::with(['user', 'bukuBesar', 'rekening_coa'])->where('rekening_coa_id', $request->jenis_coa)->whereDate('tanggal_pesanan', '>=', $request->filter_tanggal_1)
+                ->whereDate('tanggal_pesanan', '<=', $request->filter_tanggal_2)
+                ->get();
+        }
+
         $html = view('pages.admin.penjualan.laporan', [
             'data' => $data,
-            'filter_tanggal_1' => $request->filter_tanggal_1,
+            'filter_tanggal_1' => $filter_tanggal_1,
-            'filter_tanggal_2' => $request->filter_tanggal_2,
+            'filter_tanggal_2' => $filter_tanggal_2,
+            'keterangan_coa' => $keterangan_coa
         ]);
         $mpdf->writeHTML($html);
 
@@ -130,6 +164,33 @@ class PenjualanController extends Controller
         }
     }
 
+    public function cancelDetail(Request $request)
+    {
+        try {
+
+            DB::beginTransaction();
+            $detailPesanan = DetailPesanan::find($request->id);
+
+            $pesanan = Pesanan::find($detailPesanan->pesanan_id);
+            $pesanan->total_bayar = $pesanan->total_bayar - $detailPesanan->total_harga_produk;
+            // check the diskon in pesanan
+            $pesanan->grand_total = $pesanan->total_bayar - $pesanan->diskon_rupiah;
+            $pesanan->total_pesanan = $pesanan->total_pesanan - $detailPesanan->jumlah_produk;
+            $pesanan->save();
+
+            $detailPesanan->status_pesanan = '3';
+            $detailPesanan->delete();
+            $detailPesanan->save();
+
+            DB::commit();
+            return response()->json(['status' => true, 'message' => 'Pesanan berhasil di cancel']);
+        } catch (\Throwable $th) {
+            DB::rollBack();
+            return response()->json(['status' => false, 'message' => 'Pesanan gagal di cancel']);
+            //throw $th;
+        }
+    }
+
     public function dibatalkan()
     {
         if (request()->ajax()) {

app/Http/Controllers/Kasir/History.php

@@ -72,7 +72,7 @@ class History extends Controller
 
     public function getDataDetailHistory(Request $request)
     {
-        $data = DetailPesanan::with('pesanan')->where('pesanan_id', $request->id_pesanan)->get();
+        $data = Pesanan::with('detailPesanan')->find($request->id_pesanan);
 
         return response()->json(['status' => true, 'data' => $data]);
     }

app/Http/Controllers/Kasir/Transaksi.php

@@ -23,7 +23,9 @@ class Transaksi extends Controller
 
     public function index()
     {
-        $orderCode =  "ORD-" . strtoupper(random_str(6, random_str()));
+        // count pesanan by date now and add 1 for next count pesanan today
+        $lastCountPesanan = Pesanan::whereDate('created_at', date('Y-m-d'))->count() + 1;
+        $orderCode =  "ORD-" . date('ym') . strtoupper(random_str(3, random_str())) . date('d')  . '-' . $lastCountPesanan;
         $KelompokKategori = KelompokKategori::with('kelompokKategoriPivot.produk')->get();
         $aba = RekeningCoa::where('kode_coa', 1)->where('sub_kode_coa', 200)->get();
 
@@ -105,7 +107,6 @@ class Transaksi extends Controller
 
     public function store(Request $request)
     {
-
         $request->validate([
             'orderCode' => 'required',
             'namaPemesan' => 'required',
@@ -134,9 +135,16 @@ class Transaksi extends Controller
             // calculate nomor antrian
             $nomorAntrian = $lastCountPesanan;
 
+            $kodenya = substr($request->orderCode, 0, -3); // Menghapus tiga karakter terakhir,
+
+            // check antrian pesanan jika sudah ada di database maka tambahkan 1 untuk nomor antrian selanjutnya
+            $lastCountPesanan = Pesanan::whereDate('created_at', date('Y-m-d'))->count() + 1;
+
+            $kodenya = $kodenya . $lastCountPesanan;
+
             if ($request->jenis_pembayaran == "1") {
                 $pesananDatas = [
-                    'kode_pesanan' => $request->orderCode,
+                    'kode_pesanan' => $kodenya,
                     'nama_pemesan' => $request->namaPemesan,
                     'nomor_pemesan' => $request->nomorPemesan,
                     'nomor_meja' => $request->nomorMeja,
@@ -157,7 +165,7 @@ class Transaksi extends Controller
                 $pesananModels = \App\Models\Pesanan::create($pesananDatas);
             } else {
                 $pesananDatas = [
-                    'kode_pesanan' => $request->orderCode,
+                    'kode_pesanan' => $kodenya,
                     'nama_pemesan' => $request->namaPemesan,
                     'nomor_pemesan' => $request->nomorPemesan,
                     'nomor_meja' => $request->nomorMeja,
@@ -174,6 +182,7 @@ class Transaksi extends Controller
                     'status_bayar' => '1',
                     'user_id' => $user->id,
                     'jenis_pembayaran' => $request->jenis_pembayaran,
+                    'rekening_coa_id' => $request->id_rekening_coa,
                 ];
                 $pesananModels = \App\Models\Pesanan::create($pesananDatas);
             }
@@ -200,6 +209,7 @@ class Transaksi extends Controller
                     'total_harga_produk' => $value['total'],
                     'diskon_persen' => $value['diskonSatuan'] ?? null,
                     'keterangan_produk' => $value['keterangan'] ?? null,
+                    'status_pesanan' => $value['status_pesanan_dinein'] ?? null,
                 ];
                 $detailPesananModels = \App\Models\DetailPesanan::create($oderDatas);
             }

app/Models/DetailPesanan.php

@@ -19,6 +19,7 @@ class DetailPesanan extends Model
         'nama_produk',
         'harga_produk',
         'jumlah_produk',
+        'status_pesanan', // 0=takeaway,1=default,2=dinein,3=cancel
         'total_harga_produk',
         'keterangan_produk',
         'diskon_id',

app/Models/Pesanan.php

@@ -34,7 +34,7 @@ class Pesanan extends Model
         'diskon_rupiah',
         'user_id',
         'jenis_pembayaran',
-        'coa_kas',
+        'rekening_coa_id',
     ];
 
     public function detailPesanan()
@@ -62,4 +62,9 @@ class Pesanan extends Model
     {
         return $this->hasMany(BukuBesar::class, 'pesanans_id');
     }
+
+    public function rekening_coa()
+    {
+        return $this->belongsTo(RekeningCoa::class, 'rekening_coa_id');
+    }
 }

database/migrations/2024_02_07_150544_add_status_pesanan_in_detail_pesanan_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('detail_pesanans', function (Blueprint $table) {
+            $table->enum('status_pesanan', [0, 1, 2, 3])->default(1)->comment('0=takeaway,1=default,2=dinein,3=cancel')->after('jumlah_produk');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('detail_pesanans', function (Blueprint $table) {
+            $table->dropColumn('status_pesanan');
+        });
+    }
+};

database/migrations/2024_02_19_165439_change_comment_in_coa_kas_column_in_pesanans_table.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('pesanans', function (Blueprint $table) {
+            $table->dropForeign(['coa_kas']);
+            $table->dropColumn('coa_kas');
+            $table->foreignId('rekening_coa_id')->nullable()->after('jenis_pembayaran')->comment('relation in id coa kas')->references('id')->on('rekening_coa')->onUpdate('cascade')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('pesanans', function (Blueprint $table) {
+            $table->dropColumn('coa_kas');
+        });
+    }
+};

resources/views/pages/History/index.blade.php

@@ -50,6 +50,7 @@
                                         <th>Kode Pesanan</th>
                                         <th>Pemesan</th>
                                         <th>Nomor Meja</th>
+                                        <th>Urutan Pesanan</th>
                                         <th>Tanggal & Jam</th>
                                         <th>Total Pesanan</th>
                                         <th>Sub Total</th>
@@ -62,6 +63,7 @@
                                     <tr>
                                         <th class="text-right" colspan="5">Total</th>
                                         <th></th>
+                                        <th></th>
                                         <th class="text-right"></th>
                                         <th></th>
                                         <th class="text-right"></th>

resources/views/pages/History/js.blade.php

@@ -34,6 +34,10 @@
                         data: 'nomor_meja',
                         name: 'nomor_meja'
                     },
+                    {
+                        data: 'nomor_antrian',
+                        name: 'nomor_antrian'
+                    },
                     {
                         data: 'created_at',
                         name: 'created_at'
@@ -88,7 +92,7 @@
 
                     // GrandTotal over all pages
                     totalAll = api
-                        .column(8)
+                        .column(9)
                         .data()
                         .reduce((a, b) => intVal(a) + intVal(b), 0);
 
@@ -97,7 +101,7 @@
 
                     // Total over this page
                     pageTotal = api
-                        .column(6, {
+                        .column(7, {
                             page: 'current'
                         })
                         .data()
@@ -105,15 +109,15 @@
 
                     // total pesanan
                     totalPesanan = api
-                        .column(5)
+                        .column(6)
                         .data()
                         .reduce((a, b) => intVal(a) + intVal(b), 0);
 
                     // Update footer
-                    api.column(5).footer().innerHTML = totalPesanan + ' Item';
+                    api.column(6).footer().innerHTML = totalPesanan + ' Item';
-                    api.column(6).footer().innerHTML =
+                    api.column(7).footer().innerHTML =
                         'Rp. ' + pageTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.');
-                    api.column(8).footer().innerHTML =
+                    api.column(9).footer().innerHTML =
                         'Rp. ' + totalAll.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.');
                 }
             })
@@ -147,13 +151,23 @@
                 success: function(result) {
                     $('#view_history_detail').empty()
                     if (result.status) {
-                        const data = result.data
+                        const data = result.data.detail_pesanan
                         let nomor = 1
                         // console.log(data);
                         data.forEach(x => {
+                            if (x.status_pesanan == 0) {
+                                statusnya = '<span class="badge badge-warning">TAKEAWAY</span>';
+                            } else if (x.status_pesanan == 1) {
+                                statusnya = '<span class="badge badge-info">DINEIN</span>';
+                            } else if (x.status_pesanan == 2) {
+                                statusnya = '<span class="badge badge-info">DINEIN</span>';
+                            } else if (x.status_pesanan == 3) {
+                                statusnya = '<span class="badge badge-danger">CANCEL</span>';
+                            }
                             let tr = $('<tr></tr>')
                             tr.append('<td class="text-center">' + nomor + '</td>')
-                            tr.append('<td>' + x.nama_produk + '</td>')
+                            tr.append('<td>' + x.nama_produk +
+                                statusnya + '</td>')
                             tr.append('<td>' + formatRupiah(x.harga_produk) + '</td>')
                             tr.append('<td class="text-center">' + x.jumlah_produk + '</td>')
                             tr.append('<td>' + formatRupiah(x.total_harga_produk) + '</td>')
@@ -163,11 +177,34 @@
                             $('#view_history_detail').append(tr)
                             nomor++
                         })
+                        $('#kode_pesanan').val(result.data.kode_pesanan)
+                        $('#nama_pemesan').val(result.data.nama_pemesan)
+                        $('#tanggal_jam').val(tanggal_jam(result.data.created_at))
+                        $('#nomor_meja').val(result.data.nomor_meja)
+                        $('#nomor_antrian').val(result.data.nomor_antrian)
+                        $('#total_pesanan').val(result.data.total_pesanan + ' Item')
+                        $('#sub_total').val(formatRupiah(result.data.total_bayar))
+                        if (result.data.diskon_persen == null) {
+                            result.data.diskon_persen = 0
+                        }
+                        $('#diskon_persen').val(result.data.diskon_persen + '%')
+                        $('#grand_total').val(formatRupiah(result.data.grand_total))
                     }
                 }
             })
             $('#modal_detail_history').modal('show')
         }
+
+        function tanggal_jam(tanggal) {
+            let date = new Date(tanggal)
+            let tahun = date.getFullYear()
+            let bulan = date.getMonth() + 1
+            let tanggalnya = date.getDate()
+            let jam = date.getHours()
+            let menit = date.getMinutes()
+            let detik = date.getSeconds()
+            return `${tanggalnya}-${bulan}-${tahun} ${jam}:${menit}:${detik}`
+        }
     </script>
     {{-- <script>
         $(document).ready( function () {

resources/views/pages/History/modal.blade.php

@@ -8,6 +8,61 @@
                 </button>
             </div>
             <div class="modal-body">
+                <div class="col-md-12" id="data-pesanan">
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="form-group row">
+                                <label class="col-md-4 col-form-label">Kode Pesanan</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="kode_pesanan"
+                                        readonly>
+                                </div>
+                                <label class="col-md-4 col-form-label">Pemesan</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="nama_pemesan"
+                                        readonly>
+                                </div>
+                                <label class="col-md-4 col-form-label">Tanggal & Jam</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="tanggal_jam"
+                                        readonly>
+                                </div>
+                                <label class="col-md-4 col-form-label">Nomor Meja</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="nomor_meja" readonly>
+                                </div>
+                                <label class="col-md-4 col-form-label">Urutan Pesanan</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="nomor_antrian"
+                                        readonly>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-6">
+                            <div class="form-group row">
+                                <label class="col-md-4 col-form-label">Total Pesanan</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="total_pesanan"
+                                        readonly>
+                                </div>
+                                <label class="col-md-4 col-form-label">Sub Total</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="sub_total" readonly>
+                                </div>
+                                <label class="col-md-4 col-form-label">Diskon(%)</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="diskon_persen"
+                                        readonly>
+                                </div>
+                                <label class="col-md-4 col-form-label">Grand Total</label>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control form-control-sm" id="grand_total"
+                                        readonly>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="table-responsive mt-3">
                     <table id="tabelku" class="table table-hover display" style="width: 100%; font-size: 14px;">
                         <thead>

resources/views/pages/Kasir/js.blade.php

@@ -16,57 +16,61 @@
         })
     </script>
     <script src="{{ asset('assets/datatables/datatables.min.js') }}"></script>
+
+    <!-- Action for a table -->
     <script>
         $(document).ready(function() {
-            $('#tabelku').DataTable({
+            // $('#tabelku').DataTable({
-                processing: true,
+            //     processing: true,
-                serverSide: true,
+            //     serverSide: true,
-                ajax: '{{ route('transaksi.getCetakTigaKali') }}',
+            //     ajax: '{{ route('transaksi.getCetakTigaKali') }}',
-                columns: [{
+            //     columns: [{
-                        data: 'nomor',
+            //             data: 'nomor',
-                        name: 'nomor',
+            //             name: 'nomor',
-                        orderable: false,
+            //             orderable: false,
-                        className: 'text-center'
+            //             className: 'text-center'
-                    },
+            //         },
-                    {
+            //         {
-                        data: 'kode_pesanan',
+            //             data: 'kode_pesanan',
-                        name: 'kode_pesanan'
+            //             name: 'kode_pesanan'
-                    },
+            //         },
-                    {
+            //         {
-                        data: 'nama_user',
+            //             data: 'nama_user',
-                        name: 'nama_user'
+            //             name: 'nama_user'
-                    },
+            //         },
-                    {
+            //         {
-                        data: 'created_at',
+            //             data: 'created_at',
-                        name: 'created_at',
+            //             name: 'created_at',
-                        className: 'text-center'
+            //             className: 'text-center'
-                    },
+            //         },
-                    {
+            //         {
-                        data: 'total_pesanan',
+            //             data: 'total_pesanan',
-                        name: 'total_pesanan',
+            //             name: 'total_pesanan',
-                        className: 'text-center'
+            //             className: 'text-center'
-                    },
+            //         },
-                    {
+            //         {
-                        data: 'diskon_persen',
+            //             data: 'diskon_persen',
-                        name: 'diskon_persen',
+            //             name: 'diskon_persen',
-                        className: 'text-center',
+            //             className: 'text-center',
-                        render: function(data) {
+            //             render: function(data) {
-                            return data ?? 0;
+            //                 return data ?? 0;
-                        }
+            //             }
-                    },
+            //         },
-                    {
+            //         {
-                        data: 'grand_total',
+            //             data: 'grand_total',
-                        name: 'grand_total'
+            //             name: 'grand_total'
-                    },
+            //         },
-                    {
+            //         {
-                        data: 'ubah',
+            //             data: 'ubah',
-                        name: 'ubah',
+            //             name: 'ubah',
-                        className: 'text-center'
+            //             className: 'text-center'
-                    },
+            //         },
-                ]
+            //     ]
-            })
+            // })
         })
     </script>
+
+    <!-- Action Print -->
     <script>
         function printDapurTigaKali(id) {
             var url = "{{ route('transaksi.printDapurTigaKali', '') }}/" + id + '?print=true'
@@ -89,6 +93,7 @@
             location.reload(true);
         }
     </script>
+
     <script>
         //  set interval waktu pesanan
         function showTime() {
@@ -154,7 +159,8 @@
                     index = i;
                 } else {
                     if (id == menuId) {
-                        isExist = true;
+                        // isExist = true;
+                        // isExist = false;
                         index = i;
                     }
                 }
@@ -219,6 +225,10 @@
                             <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${row_id}, '${params.nama_produk}')">+</button>
                         </span>
                     </div>
+                    <select name="status_pesanan_dinein" id="status_pesanan_dinein" class="custom-select-mystyle form-control-border">
+                        <option value="2" selected>Dine In</option>
+                        <option value="0">Take Away</option>
+                    </select>
                 </td>
                 `;
                 table.rows[index].cells[2].innerHTML = `
@@ -266,6 +276,10 @@
                                         <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${globalId}, '${params.nama_produk}')">+</button>
                                     </span>
                                 </div>
+                            <select name="status_pesanan_dinein" id="status_pesanan_dinein" class="custom-select-mystyle form-control-border">
+                                <option value="2" selected>Dine In</option>
+                                <option value="0">Take Away</option>
+                            </select>
                             </td>
                             <td class="text-center">
                                 <div class="input-group input-group-sm">
@@ -300,6 +314,10 @@
                                         <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${globalId}, '${params.nama_produk}')">+</button>
                                     </span>
                                 </div>
+                            <select name="status_pesanan_dinein" id="status_pesanan_dinein" class="custom-select-mystyle form-control-border">
+                                <option value="2" selected>Dine In</option>
+                                <option value="0">Take Away</option>
+                            </select>
                             </td>
                             <td class="text-center">
                                 <div class="input-group input-group-sm">
@@ -385,6 +403,12 @@
             var harga = table.rows[index].getAttribute('data-harga');
             var valueKeterangan = table.rows[index].cells[0].getElementsByTagName('input')[0].getAttribute(
                 'data-keterangan');
+            var realValueKeterangan = table.rows[index].cells[0].getElementsByTagName('input')[0].value;
+            if (valueKeterangan != realValueKeterangan) {
+                valueKeterangan = realValueKeterangan;
+            }
+
+            var selectNya = table.rows[index].cells[1].getElementsByTagName('select')[0].value;
 
             qty = parseInt(qty) + 1;
             var totalLama = parseInt(total) + parseInt(harga);
@@ -417,6 +441,10 @@
                             <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${params}, '${nama_produk}')">+</button>
                         </span>
                     </div>
+                    <select name="status_pesanan_dinein" id="status_pesanan_dinein" class="custom-select-mystyle form-control-border">
+                        <option value="2" ${selectNya == 2 ? 'selected' : ''}>Dine In</option>
+                        <option value="0" ${selectNya == 0 ? 'selected' : ''}>Take Away</option>
+                    </select>
                 </td>`;
 
             calculateTotal();
@@ -441,6 +469,9 @@
             var harga = table.rows[index].getAttribute('data-harga');
             var valueKeterangan = table.rows[index].cells[0].getElementsByTagName('input')[0].getAttribute(
                 'data-keterangan');
+
+            var selectNya = table.rows[index].cells[1].getElementsByTagName('select')[0].value;
+
             if (qty > 1) {
                 qty = parseInt(qty) - 1;
                 var totalLama = parseInt(total) - parseInt(harga);
@@ -473,6 +504,10 @@
                                 <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${params}, '${nama_produk}')">+</button>
                             </span>
                         </div>
+                        <select name="status_pesanan_dinein" id="status_pesanan_dinein" class="custom-select-mystyle form-control-border">
+                            <option value="2" ${selectNya == 2 ? 'selected' : ''}>Dine In</option>
+                        <option value="0" ${selectNya == 0 ? 'selected' : ''}>Take Away</option>
+                        </select>
                     </td>
                 `;
 
@@ -646,7 +681,10 @@
                             diskonSatuan: diskonSatuan,
                             harga: harga,
                             total: total,
-                            keterangan: document.getElementsByName('keterangan_satuan')[i - 1].value
+                            keterangan: document.getElementsByName('keterangan_satuan')[i - 1]
+                                .value,
+                            status_pesanan_dinein: document.getElementsByName(
+                                'status_pesanan_dinein')[i - 1].value,
                         });
                     }
                 }
@@ -743,6 +781,7 @@
 
             // pembayaran non tunai
             $('#pembayaran-nontunai').on('click', function() {
+                document.getElementById('pembayaran-nontunai').disabled = true;
                 let jenis_pembayaran = "2"
                 // return console.log(jenis_pembayaran);
                 var table = document.getElementById("order-menus");
@@ -769,7 +808,10 @@
                             diskonSatuan: diskonSatuan,
                             harga: harga,
                             total: total,
-                            keterangan: document.getElementsByName('keterangan_satuan')[i - 1].value
+                            keterangan: document.getElementsByName('keterangan_satuan')[i - 1]
+                                .value,
+                            status_pesanan_dinein: document.getElementsByName(
+                                'status_pesanan_dinein')[i - 1].value,
                         });
                     }
                 }
@@ -782,11 +824,11 @@
                 var namaPemesan = document.getElementsByName('nama-pemesan')[0].value;
                 var nomorPemesan = document.getElementsByName('nomor-pemesan')[0].value;
                 var nomorMeja = document.getElementsByName('nomor-meja')[0].value;
-                var rekening_coa_aba_penarikan = $("#rekening_coa_aba_penarikan").val()
+                var rekening_coa_aba_penarikan = $("#rekening_coa_aba_penarikan").val();
-                var split_rekening_coa_aba_penarikan = rekening_coa_aba_penarikan.split("|")
+                var split_rekening_coa_aba_penarikan = rekening_coa_aba_penarikan.split("|");
-                var id_rekening_coa = split_rekening_coa_aba_penarikan[0]
+                var id_rekening_coa = split_rekening_coa_aba_penarikan[0];
-                var kode_coa = split_rekening_coa_aba_penarikan[1]
+                var kode_coa = split_rekening_coa_aba_penarikan[1];
-                var keterangan_coa = split_rekening_coa_aba_penarikan[2]
+                var keterangan_coa = split_rekening_coa_aba_penarikan[2];
 
                 if (rekening_coa_aba_penarikan == '') {
                     alert('Pilih kas tujuan');
@@ -795,7 +837,7 @@
 
                 if (orderMenus.length == 0) {
                     alert('Menu tidak boleh kosong');
-                    document.getElementById('pesan-bayar-tunai').disabled = false;
+                    document.getElementById('pembayaran-nontunai').disabled = false;
                     return false;
                 }
                 // if (totalDiskon != 0) {
@@ -812,12 +854,12 @@
                 // }
                 if (namaPemesan == '' || namaPemesan == null || namaPemesan == undefined) {
                     alert('Nama pemesan tidak boleh kosong');
-                    document.getElementById('pesan-bayar-tunai').disabled = false;
+                    document.getElementById('pembayaran-nontunai').disabled = false;
                     return false;
                 }
                 if (nomorMeja == '' || nomorMeja == null || nomorMeja == undefined) {
                     alert('Nomor meja tidak boleh kosong');
-                    document.getElementById('pesan-bayar-tunai').disabled = false;
+                    document.getElementById('pembayaran-nontunai').disabled = false;
                     return false;
                 }
 
@@ -844,7 +886,7 @@
                     method: "POST",
                     data: data,
                     success: function(result) {
-                        document.getElementById('pesan-bayar-tunai').disabled = false;
+                        document.getElementById('pembayaran-nontunai').disabled = false;
                         toastr.success(result.message, 'Success', {
                             timeOut: 2000
                         });
@@ -856,7 +898,7 @@
                         }, 1000);
                     },
                     error: function(xhr, status, error) {
-                        document.getElementById('pesan-bayar-tunai').disabled = false;
+                        document.getElementById('pembayaran-nontunai').disabled = false;
                         toastr.error(xhr.responseJSON.message, 'Error', {
                             timeOut: 3000
                         });
@@ -1080,3 +1122,112 @@
             }
         }
     </script>
+
+    <!-- Action save to storage -->
+    <script>
+        function OrderStorage() {
+            var table = document.getElementById("order-menus");
+            var orderMenus = [];
+
+            for (var i = 1, row; row = table.rows[i]; i++) {
+                var id = row.getAttribute('data-id');
+                var nama = row.getAttribute('data-nama');
+                var qty = row.getAttribute('data-qty');
+                var diskonSatuan = row.getAttribute('data-diskon-satuan');
+                var harga = row.getAttribute('data-harga');
+                var total = row.getAttribute('data-total');
+                if (diskonSatuan != 0 && diskonSatuan != null && diskonSatuan != undefined) {
+                    total = total - (total * (diskonSatuan / 100));
+                } else {
+                    total = total
+                }
+
+                if (id != null || qty != null || total != null) {
+                    orderMenus.push({
+                        id: id,
+                        nama: nama,
+                        qty: qty,
+                        diskonSatuan: diskonSatuan,
+                        harga: harga,
+                        total: total,
+                        keterangan: document.getElementsByName('keterangan_satuan')[i - 1].value,
+                        status_pesanan_dinein: document.getElementsByName('status_pesanan_dinein')[i - 1].value
+                    });
+                }
+            }
+
+            let json = JSON.stringify({
+                name: 'Data Pesanan',
+                nama_pemesan: document.getElementsByName('nama-pemesan')[0].value,
+                nomor_pemesan: document.getElementsByName('nomor-pemesan')[0].value,
+                nomor_meja: document.getElementsByName('nomor-meja')[0].value,
+                keterangan_pesanan: document.getElementsByName('keterangan-pesanan')[0].value,
+                orderMenus
+            });
+
+            localStorage.setItem('OrderStorage', json);
+        }
+
+        function showOrderStorage() {
+            if (localStorage.OrderStorage === undefined || localStorage.OrderStorage === null) {
+                return false;
+            }
+            let data = JSON.parse(localStorage.OrderStorage);
+            document.getElementsByName('nama-pemesan')[0].value = data.nama_pemesan ?? '',
+                document.getElementsByName('nomor-pemesan')[0].value = data.nomor_pemesan,
+                document.getElementsByName('nomor-meja')[0].value = data.nomor_meja,
+                document.getElementsByName('keterangan-pesanan')[0].value = data.keterangan_pesanan,
+
+                // console.log(data);
+
+                data.orderMenus.forEach((i, key) => {
+                    globalId++;
+
+                    $('#tbody-order-menus').append(`
+                    <tr id="row-${i.id}" data-id="${i.id}" data-row-id="${globalId}" data-nama="${i.nama}" data-harga="${i.harga}" data-qty="${i.qty}" data-diskon-satuan="${i.diskonSatuan}" data-total="${i.harga * i.qty}">
+                        <td>
+                            ${i.nama}
+                            <br>
+                            ${(parseInt(i.diskonSatuan) > 0) ? '<small class="text-primary"><s>Rp. ' + (i.harga * i.qty) + '</s></small> | <small class="text-danger">Rp. ' + ((i.harga * i.qty) - ((i.harga * i.qty) * (i.diskonSatuan / 100))) + '</small>' : '<small class="text-primary">Rp. ' + (i.harga * i.qty) + '</small>'}
+                            <div class="input-group input-group-sm mt-1">
+                                <input type="text" name="keterangan_satuan" class="form-control rounded-3" data-keterangan="${i.keterangan}" placeholder="Keterangan.." value="${i.keterangan}">
+                            </div>
+                        </td>
+                        <td class="text-center">
+                            <div class="input-group input-group-sm">
+                                <span class="input-group-append">
+                                    <button type="button" class="btn btn-default btn-xs btn-flat" onclick="decrementMenu(${globalId}, '${i.nama}')"><b>-</b></button>
+                                </span>
+                                <input type="text" name="bayar" class="form-control rounded-3" readonly value="${i.qty}">
+                                <span class="input-group-append">
+                                    <button type="button" class="btn btn-default btn-xs btn-flat" onclick="incrementMenu(${globalId}, '${i.nama}')">+</button>
+                                </span>
+                            </div>
+                        <select name="status_pesanan_dinein" id="status_pesanan_dinein" class="custom-select-mystyle form-control-border">
+                            <option value="2" ${(i.status_pesanan_dinein == 2) ? 'selected' : ''}>Dine In</option>
+                            <option value="0" ${(i.status_pesanan_dinein == 0) ? 'selected' : ''}>Take Away</option>
+                        </select>
+                        </td>
+                        <td class="text-center">
+                            <div class="input-group input-group-sm">
+                                <input type="number" name="diskon_satuan" oninput="inputNum(this)" class="form-control rounded-3" value="${i.diskonSatuan}" onkeyup="diskonSatuanMenu(${globalId}, '${i.nama}', this.value)">
+                            </div>
+                        </td>
+                        <td class="text-center">
+                            <button class="btn btn-danger btn-sm" onclick="deleteMenu(${globalId})">
+                                <i class="fas fa-trash"></i>
+                            </button>
+                        </td>
+                    </tr>
+                `);
+                });
+
+            calculateTotal();
+        }
+
+        showOrderStorage();
+
+        // show time every second
+        setInterval(OrderStorage, 1000);
+    </script>
+@endpush

resources/views/pages/Kasir/print.blade.php

@@ -77,23 +77,24 @@
 
 <body style="width: 58mm;">
     <!-- Button Print -->
-    {{-- <div class="">
+    <div class="">
         <div class="col-6 mb">
             <button class="btn btn-info btn-block hidden-print" id="print-dapur">Print</button>
         </div>
-    </div> --}}
+    </div>
     <br>
     <h2 style="text-align: center">Sepiring Telur Keriting</h2>
     <p style="text-align: center">Jln. Jawa No. 28A, Jember</p>
     <hr class="style2">
+    <h4 style="text-align: center">{{ $pesanan->kode_pesanan }}</h4>
     <span style="display: flex; justify-content: space-between">
         <span>
             <p>{{ tanggal_indonesia($pesanan->tanggal_pesanan) }}</p>
             <p>{{ date('H:i', strtotime($pesanan->tanggal_pesanan)) }}</p>
         </span>
         <span style="text-align: right">
-            <p>{{ $pesanan->kode_pesanan }}</p>
+            <p>Kasir:</p>
-            <p>Kasir: {{ $pesanan->user->name }}</p>
+            <p>{{ $pesanan->user->name }}</p>
         </span>
     </span>
     <hr class="style2">
@@ -120,7 +121,9 @@
         <tbody>
             @foreach ($pesanan->detailPesanan as $item)
                 <tr>
-                    <td style="width: 100px;" colspan="5">{{ $item->nama_produk }}</td>
+                    <td style="width: 100px;" colspan="5">{{ $item->nama_produk }}
+                        {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }}
+                    </td>
                 </tr>
                 <tr>
                     <td></td>
@@ -170,14 +173,15 @@
     <hr class="dashed-line" style="margin-top: 15px;">
     <p style="text-align: center;font-size: 7pt">untuk dapur</p>
     <hr class="dashed-line" style="margin-top: 10px;">
+    <h4 style="text-align: center">{{ $pesanan->kode_pesanan }}</h4>
     <span style="display: flex; justify-content: space-between">
         <span>
             <p>{{ tanggal_indonesia($pesanan->tanggal_pesanan) }}</p>
             <p>{{ date('H:i', strtotime($pesanan->tanggal_pesanan)) }}</p>
         </span>
         <span style="text-align: right">
-            <p>{{ $pesanan->kode_pesanan }}</p>
+            <p>Kasir:</p>
-            <p>Kasir: {{ $pesanan->user->name }}</p>
+            <p>{{ $pesanan->user->name }}</p>
         </span>
     </span>
     <hr class="style2">
@@ -209,6 +213,7 @@
                         <h4>
                             ({{ $item->jumlah_produk }} X)
                             {{ $item->nama_produk }}
+                            {{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }}
                         </h4>
                         @if ($item->keterangan_produk != '')
                             <p>
@@ -309,7 +314,7 @@
     //     window.close();
     // });
 
-    window.print();
+    // window.print();
 
     const $btnPrint = document.querySelector("#print-dapur");
     $btnPrint.addEventListener("click", () => {

resources/views/pages/Kasir/print_dapur.blade.php

@@ -77,7 +77,7 @@
 
 <body style="width: 56mm;">
     <!-- Button Print -->
-    {{-- <div class="">
+    <div class="">
         <div class="col-6 mb">
             <button class="btn btn-info btn-block hidden-print" id="print-dapur">Print</button>
         </div>
@@ -87,19 +87,20 @@
         <div class="col-6 mb">
             <button class="btn btn-danger btn-block hidden-print" id="close">Tutup</button>
         </div>
-    </div> --}}
+    </div>
     <br>
     <h2 style="text-align: center">Sepiring Telur Keriting</h2>
     <p style="text-align: center">Jln. Jawa No. 28A, Jember</p>
     <hr class="style2">
+    <h4 style="text-align: center">{{ $pesanan->kode_pesanan }}</h4>
     <span style="display: flex; justify-content: space-between">
         <span>
             <p>{{ tanggal_indonesia($pesanan->tanggal_pesanan) }}</p>
             <p>{{ date('H:i', strtotime($pesanan->tanggal_pesanan)) }}</p>
         </span>
         <span style="text-align: right">
-            <p>{{ $pesanan->kode_pesanan }}</p>
+            <p>Kasir:</p>
-            <p>Kasir: {{ $pesanan->user->name }}</p>
+            <p>{{ $pesanan->user->name }}</p>
         </span>
     </span>
     <hr class="style2">
@@ -126,7 +127,9 @@
         <tbody>
             @foreach ($pesanan->detailPesanan as $item)
                 <tr>
-                    <td style="width: 100px;" colspan="5">{{ $item->nama_produk }}</td>
+                    <td style="width: 100px;" colspan="5">
+                        {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }}
+                    </td>
                 </tr>
                 <tr>
                     <td></td>
@@ -176,14 +179,15 @@
     <hr class="dashed-line" style="margin-top: 15px;">
     <p style="text-align: center;font-size: 7pt">untuk dapur</p>
     <hr class="dashed-line" style="margin-top: 10px;">
+    <h4 style="text-align: center">{{ $pesanan->kode_pesanan }}</h4>
     <span style="display: flex; justify-content: space-between">
         <span>
             <p>{{ tanggal_indonesia($pesanan->tanggal_pesanan) }}</p>
             <p>{{ date('H:i', strtotime($pesanan->tanggal_pesanan)) }}</p>
         </span>
         <span style="text-align: right">
-            <p>{{ $pesanan->kode_pesanan }}</p>
+            <p>Kasir:</p>
-            <p>Kasir: {{ $pesanan->user->name }}</p>
+            <p>{{ $pesanan->user->name }}</p>
         </span>
     </span>
     <hr class="style2">
@@ -214,7 +218,7 @@
                     <td style="width: 80px;" colspan="3">
                         <h4>
                             ({{ $item->jumlah_produk }} X)
-                            {{ $item->nama_produk }}
+                            {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }}
                         </h4>
                         @if ($item->keterangan_produk != '')
                             <p>
@@ -322,7 +326,7 @@
     //     window.close();
     // });
 
-    window.print();
+    // window.print();
 
     const $btnPrint = document.querySelector("#print-dapur");
     $btnPrint.addEventListener("click", () => {

resources/views/pages/Kasir/print_dapur_2x.blade.php

@@ -77,25 +77,26 @@
 
 <body style="width: 58mm;">
     <!-- Button Print -->
-    {{-- <div class="">
+    <div class="">
         <div class="col-6 mb">
             <button class="btn btn-info btn-block hidden-print" id="print-dapur">Print</button>
         </div>
-    </div> --}}
+    </div>
     <br>
     @for ($i = 0; $i < 2; $i++)
         <hr class="dashed-line" style="margin-top: 15px;">
         <p style="text-align: center;font-size: 7pt">Print Dapur</p>
         <hr class="dashed-line" style="margin-top: 10px;">
         <hr class="style2">
+        <h4 style="text-align: center">{{ $pesanan->kode_pesanan }}</h4>
         <span style="display: flex; justify-content: space-between">
             <span>
                 <p>{{ tanggal_indonesia($pesanan->tanggal_pesanan) }}</p>
                 <p>{{ date('H:i', strtotime($pesanan->tanggal_pesanan)) }}</p>
             </span>
             <span style="text-align: right">
-                <p>{{ $pesanan->kode_pesanan }}</p>
+                <p>Kasir:</p>
-                <p>Kasir: {{ $pesanan->user->name }}</p>
+                <p>{{ $pesanan->user->name }}</p>
             </span>
         </span>
         <hr class="style2">
@@ -125,7 +126,7 @@
                     <tr>
                         <td style="width: 80px;" colspan="3">
                             ({{ $item->jumlah_produk }} X)
-                            {{ $item->nama_produk }}
+                            {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }}
                             @if ($item->keterangan_produk != '')
                                 <p>
                                     &nbsp;&nbsp;&nbsp;&nbsp; ket: {{ $item->keterangan_produk }}
@@ -226,7 +227,7 @@
     //     window.close();
     // });
 
-    window.print();
+    // window.print();
 
     const $btnPrint = document.querySelector("#print-dapur");
     $btnPrint.addEventListener("click", () => {

resources/views/pages/Kasir/print_dapur_3x.blade.php

@@ -77,25 +77,26 @@
 
 <body style="width: 58mm;">
     <!-- Button Print -->
-    {{-- <div class="">
+    <div class="">
         <div class="col-6 mb">
             <button class="btn btn-info btn-block hidden-print" id="print-dapur">Print</button>
         </div>
-    </div> --}}
+    </div>
     <br>
     @for ($i = 0; $i < 3; $i++)
         <hr class="dashed-line" style="margin-top: 15px;">
         <p style="text-align: center;font-size: 7pt">Print Dapur</p>
         <hr class="dashed-line" style="margin-top: 10px;">
         <hr class="style2">
+        <h4 style="text-align: center">{{ $pesanan->kode_pesanan }}</h4>
         <span style="display: flex; justify-content: space-between">
             <span>
                 <p>{{ tanggal_indonesia($pesanan->tanggal_pesanan) }}</p>
                 <p>{{ date('H:i', strtotime($pesanan->tanggal_pesanan)) }}</p>
             </span>
             <span style="text-align: right">
-                <p>{{ $pesanan->kode_pesanan }}</p>
+                <p>Kasir:</p>
-                <p>Kasir: {{ $pesanan->user->name }}</p>
+                <p>{{ $pesanan->user->name }}</p>
             </span>
         </span>
         <hr class="style2">
@@ -126,7 +127,7 @@
                         <td style="width: 80px;" colspan="3">
                             <h4>
                                 ({{ $item->jumlah_produk }} X)
-                                {{ $item->nama_produk }}
+                                {{ $item->nama_produk }}{{ $item->status_pesanan == 0 ? '(TAKEAWAY)' : ($item->status_pesanan == 3 ? '(CANCEL)' : '(DINEIN)') }}
                             </h4>
                             @if ($item->keterangan_produk != '')
                                 <p>
@@ -229,7 +230,7 @@
     //     window.close();
     // });
 
-    window.print();
+    // window.print();
 
     const $btnPrint = document.querySelector("#print-dapur");
     $btnPrint.addEventListener("click", () => {

resources/views/pages/Kasir/transaksi.blade.php

@@ -422,8 +422,8 @@
                             <thead style="background-color: rgb(230, 230, 230)">
                                 <tr>
                                     <th class="text-center">Menu</th>
-                                    <th class="text-center" width="110px">Qty</th>
+                                    <th class="text-center" width="115px">Qty</th>
-                                    <th class="text-center" width="65px">(%)</th>
+                                    <th class="text-center" width="70px">(%)</th>
                                     <th class="text-center" width="30px">
                                         <i class="fas fa-cog"></i>
                                     </th>
@@ -562,8 +562,29 @@
     </style>
     <link rel="stylesheet" href="{{ asset('assets/plugins/toastr/toastr.min.css') }}">
     <link rel="stylesheet" href="{{ asset('assets/datatables/datatables.min.css') }}">
+
+    <style>
+        .custom-select-mystyle {
+            display: inline-block;
+            width: 100%;
+            height: calc(2.25rem + 2px);
+            padding: .375rem .375rem .375rem .375em;
+            font-size: 1rem;
+            font-weight: 400;
+            line-height: 1.5;
+            color: #495057;
+            vertical-align: middle;
+            background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right .175rem center/8px 10px no-repeat;
+            border: 1px solid #ced4da;
+            border-radius: .25rem;
+            box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075);
+            -webkit-appearance: none;
+            -moz-appearance: none;
+            appearance: none;
+            background-color: white;
+            margin-top: 8px;
+        }
+    </style>
 @endpush
 
 @include('pages.Kasir.js')
-
-@endpush

resources/views/pages/admin/penjualan/index.blade.php

@@ -32,14 +32,31 @@
                                 @csrf
                                 <div class="row">
                                     <div class="col-md-3">
-                                        <input type="date" class="form-control form-control-sm" id="filter_tanggal_1"
+                                        <input type="date" class="form-control" id="filter_tanggal_1"
                                             name="filter_tanggal_1" value="{{ date('Y-m-d') }}">
                                     </div>
                                     <p>s/d</p>
                                     <div class="col-md-3">
-                                        <input type="date" class="form-control form-control-sm" id="filter_tanggal_2"
+                                        <input type="date" class="form-control" id="filter_tanggal_2"
                                             name="filter_tanggal_2" value="{{ date('Y-m-d') }}">
                                     </div>
+                                    <div class="col-md-3">
+                                        <select type="text" class="form-control select2" id="jenis_coa"
+                                            style="width: 100%;" name="jenis_coa">
+                                            <option selected value="">--Pilih Rekening--</option>
+                                            @foreach ($aba as $coaAba)
+                                                @if ($coaAba->status == 0)
+                                                    <optgroup label="{{ $coaAba->coa }} | {{ $coaAba->keterangan_coa }}">
+                                                    @else
+                                                        <option
+                                                            value="{{ $coaAba->id }}|{{ $coaAba->coa }}|{{ $coaAba->keterangan_coa }}">
+                                                            {{ $coaAba->coa }} | {{ $coaAba->keterangan_coa }}</option>
+                                                @endif
+                                            @endforeach
+                                            </optgroup>
+                                            <option value=""><b>Tampilkan Semua data</b></option>
+                                        </select>
+                                    </div>
                                     <div class="col-md-4">
                                         <a href="javascript:void(0)" class="btn btn-sm btn-primary" id="btn_filter"><i
                                                 class="fas fa-search mr-1"></i>Filter data</a>
@@ -50,9 +67,9 @@
                             </form>
                         </div>
                         <div class="col-md-2" style="text-align: right">
-                            <a class="btn btn-sm btn-info mt-4" id="penjualan_cancel"
+                            {{-- <a class="btn btn-sm btn-info mt-4" id="penjualan_cancel"
                                 href="{{ route('penjualan.dibatalkan') }}"><i class="fas fa-table mr-1"></i>Penjualan
-                                Dibatalkan</a>
+                                Dibatalkan</a> --}}
                         </div>
                     </div>
                     <div class="col-md-12">
@@ -63,7 +80,7 @@
                                         <th class="text-center">No</th>
                                         <th>Kode Pesanan</th>
                                         <th>Pemesan</th>
-                                        <th>Nomor Meja</th>
+                                        <th>Status Pembayaran</th>
                                         <th>Tanggal & Jam</th>
                                         <th>Total Pesanan</th>
                                         <th>Sub Total</th>

resources/views/pages/admin/penjualan/js.blade.php

@@ -1,7 +1,10 @@
 @push('scripts')
     <script src="{{ asset('assets/datatables/datatables.min.js') }}"></script>
     <script src="{{ asset('assets/plugins/sweetalert2/sweetalert2.min.js') }}"></script>
+    <script src="{{ asset('assets/plugins/select2/js/select2.full.min.js') }}"></script>
+
     <script>
+        // $('.select2').select2();
         $(document).ready(function() {
             let dataTable = $('#tabelku').DataTable({
                 aLengthMenu: [
@@ -15,6 +18,7 @@
                     data: function(d) {
                         d.filter_tanggal_1 = $("#filter_tanggal_1").val();
                         d.filter_tanggal_2 = $("#filter_tanggal_2").val();
+                        d.akun_coa = $("#jenis_coa").val();
                     }
                 },
                 columns: [{
@@ -32,8 +36,8 @@
                         name: 'nama_pemesan'
                     },
                     {
-                        data: 'nomor_meja',
+                        data: 'jenis_pembayarannya',
-                        name: 'nomor_meja'
+                        name: 'jenis_pembayarannya'
                     },
                     {
                         data: 'created_at',
@@ -161,6 +165,19 @@
                             tr.append('<td class="text-center">' + x.jumlah_produk + '</td>')
                             tr.append('<td class="text-center">' + x.diskon_persen + '%</td>')
                             tr.append('<td>' + formatRupiah(x.total_harga_produk) + '</td>')
+                            if (x.status_pesanan != 3) {
+                                tr.append(
+                                    '<td class="text-center"><button class="btn btn-danger btn-sm cancelOrderDetailBtn" data-id="' +
+                                    x.id + '" data-produk="' + x.nama_produk +
+                                    '">cancel</button></td>')
+                            } else {
+                                tr.append(
+                                    '<td class="text-center"><button class="btn btn-warning btn-sm disabled" data-id="' +
+                                    x.id + '" data-produk="' + x.nama_produk +
+                                    '">tercancel</button></td>')
+                            }
+                            // cetakStruk
+                            $('#cetakStruk').attr('onclick', 'print(' + result.pesanan.id + ')')
                             $('#view_penjualan_detail').append(tr)
                             nomor++
                         })
@@ -171,12 +188,20 @@
                         tfoot.append('<td>' + formatRupiah(result.pesanan.grand_total) + '</td>')
                         tfoot.append('<td colspan="2"></td>')
                         $('#view_penjualan_detail_tfoot').empty().append(tfoot)
-
                         // set attribute to label
                         $('#kode_pesanan').text('Kode Pesanan: ' + result.pesanan.kode_pesanan)
                         $('#nama_pemesan').text('Nama Pemesan: ' + result.pesanan.nama_pemesan)
                         $('#nomor_meja').text('Nomor Meja: ' + result.pesanan.nomor_meja)
+                        $('#urutan_pesanan').text('Urutan Pesanan: ' + result.pesanan.nomor_antrian)
                         $('#tanggal_pesan').text('Tanggal Pesan: ' + result.pesanan.tanggal_pesanan)
+                        $('#total_pesanan').text('Total Pesanan: ' + result.pesanan.total_pesanan + ' Item')
+                        $('#sub_total_pesanan').text('Sub Total: ' + formatRupiah(result.pesanan.total_bayar))
+                        if (result.pesanan.diskon_persen == null) {
+                            result.pesanan.diskon_persen = 0
+                        }
+                        $('#diskon_persen_pesanan').text('Diskon(%): ' + result.pesanan.diskon_persen + '%')
+                        $('#grand_total_pesanan').text('Grand Total: ' + formatRupiah(result.pesanan
+                            .grand_total))
 
                         // attach attribute to button
                         $('#cancelPesanan').attr('data-id', result.pesanan.id)
@@ -263,6 +288,53 @@
             })
         })
 
+        $(document).on('click', '.cancelOrderDetailBtn', function() {
+            // get arttibute data-kode_pesanan from button
+            let id = $(this).attr('data-id');
+            let produk = $(this).attr('data-produk');
+
+            var text = "Membatalkan pesanan dengan data <br> Menu Pesanan: " + produk +
+                " ?";
+            Swal.fire({
+                title: 'Apakah anda yakin?',
+                html: text,
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Ya, Hapus!',
+                cancelButtonText: 'Batal'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    $.ajax({
+                        type: "DELETE",
+                        url: "{{ route('penjualan.cancelDetail') }}",
+                        data: {
+                            _token: "{{ csrf_token() }}",
+                            id: id
+                        },
+                        success: function(result) {
+                            console.log(result);
+                            if (result.status) {
+                                Swal.fire(
+                                    'Berhasil!',
+                                    result.message,
+                                    'success'
+                                )
+                                $('#tabelku').DataTable().ajax.reload();
+                            } else {
+                                Swal.fire(
+                                    'Gagal!',
+                                    result.message,
+                                    'error'
+                                )
+                            }
+                        }
+                    })
+                }
+            })
+        })
+
         function cancelPesanan(id, kode, nama) {
             var text = "Membatalkan pesanan dengan data Kode Pesanan: " + kode +
                 " Nama Pemesan: " +

resources/views/pages/admin/penjualan/laporan.blade.php

@@ -23,9 +23,19 @@
             <td style="text-align: center; font-size: 20px; font-weight: bold;">Laporan Transaksi Penjualan</td>
         </tr>
         <tr>
-            <td style="text-align: center;">Pencarian:
+            <td>
+                <table style="width: 100%;">
+                    <tr>
+                        <td style="text-align: left;">
+                            Pencarian:
                             {{ 'Antara Tanggal ' . toDmy($filter_tanggal_1) . ' s/d Tanggal ' . toDmy($filter_tanggal_2) . '' }}
                         </td>
+                        <td style="text-align: right;">
+                            Jenis Pembayaran: {{ $keterangan_coa }}
+                        </td>
+                    </tr>
+                </table>
+            </td>
         </tr>
     </table>
     <br>
@@ -36,7 +46,7 @@
                 <th style="border-collapse:collapse; border:1px solid black;">Kode Pesanan</th>
                 <th style="border-collapse:collapse; border:1px solid black;">Kasir</th>
                 <th style="border-collapse:collapse; border:1px solid black;">Nama Pemesan</th>
-                <th style="border-collapse:collapse; border:1px solid black;">Tanggal</th>
+                <th style="border-collapse:collapse; border:1px solid black;width: 24%">Tanggal</th>
                 <th style="border-collapse:collapse; border:1px solid black;">Jenis Pembayaran</th>
                 <th style="border-collapse:collapse; border:1px solid black;">Nominal</th>
                 {{-- <th style="border-collapse:collapse; border:1px solid black;">Keterangan</th> --}}
@@ -59,13 +69,21 @@
                         @if ($val->jenis_pembayaran == 1 || $val->jenis_pembayaran == null)
                             Tunai
                         @else
-                            Non Tunai
+                            {{ $val->rekening_coa->keterangan_coa }}
-                            <br>
-                            ({{ $val->bukuBesar[0]->keterangan_coa }})
                         @endif
                     </td>
-                    <td style="text-align: left; border-collapse:collapse; border:1px solid black;">Rp
+                    <td style="text-align: left; border-collapse:collapse; border:1px solid black;">
-                        {{ format_uang($val->grand_total) }}</td>
+                        <table style="width: 100%;">
+                            <tr>
+                                <td style="text-align:
+                            left;">Rp
+                                </td>
+                                <td style="text-align: right;">
+                                    {{ format_uang($val->grand_total) }}
+                                </td>
+                            </tr>
+                        </table>
+                    </td>
                     {{-- <td style="border-collapse:collapse; border:1px solid black;">{{ $val->keterangan }}</td> --}}
                 </tr>
             @endforeach
@@ -79,9 +97,19 @@
         <tfoot>
             <tr>
                 <th colspan="6" style="text-align: right; border-collapse:collapse; border:1px solid black;">Total
+                    &nbsp;&nbsp;&nbsp;
+                </th>
+                <th style="text-align: left; border-collapse:collapse; border:1px solid black;">
+                    <table style="width: 100%;">
+                        <tr>
+                            <td style="text-align: left;">Rp
+                            </td>
+                            <td style="text-align: right;">
+                                {{ format_uang($total) }}
+                            </td>
+                        </tr>
+                    </table>
                 </th>
-                <th style="text-align: left; border-collapse:collapse; border:1px solid black;">Rp
-                    {{ format_uang($total) }}</th>
             </tr>
         </tfoot>
     </table>

resources/views/pages/admin/penjualan/modal.blade.php

@@ -8,11 +8,20 @@
                 </button>
             </div>
             <div class="modal-body">
-                <div class="col-md-12">
+                <div class="row">
+                    <div class="col-md-6">
                         <label for="kode_pesanan" id="kode_pesanan"></label><br>
                         <label for="nama_pemesan" id="nama_pemesan"></label><br>
                         <label for="nomor_meja" id="nomor_meja"></label><br>
-                    <label for="tanggal_pesan" id="tanggal_pesan"></label>
+                        <label for="urutan_pesanan" id="urutan_pesanan"></label><br>
+                        <label for="tanggal_pesan" id="tanggal_pesan"></label><br>
+                    </div>
+                    <div class="col-md-6">
+                        <label for="total_pesanan" id="total_pesanan"></label><br>
+                        <label for="sub_total" id="sub_total_pesanan"></label><br>
+                        <label for="diskon_persen" id="diskon_persen_pesanan"></label><br>
+                        <label for="grand_total" id="grand_total_pesanan"></label><br>
+                    </div>
                 </div>
                 <div class="table-responsive mt-3">
                     <table id="tabelku" class="table table-hover display" style="width: 100%; font-size: 14px;">
@@ -25,6 +34,9 @@
                                 <th class="text-center">Jumlah Terjual</th>
                                 <th class="text-center">Diskon(%)</th>
                                 <th>Total Harga</th>
+                                <th class="text-center">
+                                    <i class="fas fa-cog"></i>
+                                </th>
                             </tr>
                         </thead>
                         <tbody id="view_penjualan_detail"></tbody>
@@ -34,8 +46,12 @@
             </div>
             <div class="modal-footer justify-content-between">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                <button href="javascript:void(0)" class="btn btn-danger mr-1" id="cancelPesanan">cancel
+
-                    pesanan</button>
+                <div class="btn-group">
+                    <button href="javascript:void(0)" class="btn btn-danger mr-1" id="cancelPesanan">Cancel Seluruh
+                        Pesanan</button>
+                    <button href="javascript:void(0)" class="btn btn-primary" id="cetakStruk">Cetak Struk</button>
+                </div>
             </div>
         </div>
     </div>

resources/views/pages/admin/penjualan/style.blade.php

@@ -16,4 +16,5 @@
     <link rel="stylesheet" href="{{ asset('assets/plugins/toastr/toastr.min.css') }}">
     <link rel="stylesheet" href="{{ asset('assets/datatables/datatables.min.css') }}">
     <link rel="stylesheet" href="{{ asset('assets/plugins/sweetalert2/sweetalert2.min.css') }}">
+    <link rel="stylesheet" href="{{ asset('assets/plugins/select2/css/select2.min.css') }}">
 @endpush

routes/web.php

@@ -133,6 +133,7 @@ Route::group(['middleware' => ['auth', 'permission']], function () {
         Route::post('/laporan', [PenjualanController::class, 'laporan'])->name('penjualan.laporan')->comment('Halaman Laporan Penjualan');
         Route::post('/getDataDetailPenjualan', [PenjualanController::class, 'getDataDetailPenjualan'])->name('penjualan.getDataDetailPenjualan')->comment("Ambil data Detail Riwayat Transaksi Penjualan");
         Route::delete('/cancel', [PenjualanController::class, 'cancel'])->name('penjualan.cancel')->comment("Cancel order transaksi penjualan");
+        Route::delete('/cancelDetail', [PenjualanController::class, 'cancelDetail'])->name('penjualan.cancelDetail')->comment("Cancel Detail order transaksi penjualan");
         Route::get('/dibatalkan', [PenjualanController::class, 'dibatalkan'])->name('penjualan.dibatalkan')->comment("Halaman Transaksi Dibatalkan");
     });