before merging

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

@@ -3,10 +3,14 @@
     <script>
         $(document).ready(function() {
             let dataTable = $('#tabelku').DataTable({
+                aLengthMenu: [
+                    [25, 50, 100, 200, -1],
+                    [25, 50, 100, 200, "All"]
+                ],
                 processing: true,
                 serverSide: true,
                 ajax: {
-                url: '{{ route('history.getDataHistory') }}',
+                    url: '{{ route('history.getDataHistory') }}',
                     data: function(d) {
                         d.filter_tanggal_1 = $("#filter_tanggal_1").val();
                         d.filter_tanggal_2 = $("#filter_tanggal_2").val();
@@ -118,9 +122,9 @@
                 }
             })
             $('#btn_filter').on('click', function() {
-                if($("#filter_tanggal_1").val() == "" || $("#filter_tanggal_2").val() == ""){
+                if ($("#filter_tanggal_1").val() == "" || $("#filter_tanggal_2").val() == "") {
                     alert("Input pencarian tidak boleh kosong")
-                }else{
+                } else {
                     dataTable.ajax.reload();
                 }
             });
@@ -133,7 +137,7 @@
         }
     </script>
     <script>
-        function detail(id_pesanan){
+        function detail(id_pesanan) {
             $.ajax({
                 headers: {
                     'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -145,24 +149,25 @@
                 },
                 success: function(result) {
                     $('#view_history_detail').empty()
-                    if(result.status){
+                    if (result.status) {
                         const data = result.data
                         let nomor = 1
                         // console.log(data);
                         data.forEach(x => {
                             let tr = $('<tr></tr>')
-                            tr.append('<td class="text-center">'+nomor+'</td>')
-                            tr.append('<td>'+x.nama_produk+'</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>')
-                            tr.append('<td class="text-center">'+x.diskon_persen+'%</td>')
-                            tr.append('<td class="text-center">'+(x.keterangan_produk ?? '-')+'</td>')
+                            tr.append('<td class="text-center">' + nomor + '</td>')
+                            tr.append('<td>' + x.nama_produk + '</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>')
+                            tr.append('<td class="text-center">' + x.diskon_persen + '%</td>')
+                            tr.append('<td class="text-center">' + (x.keterangan_produk ?? '-') +
+                                '</td>')
                             $('#view_history_detail').append(tr)
                             nomor++
                         })
                     }
-                } 
+                }
             })
             $('#modal_detail_history').modal('show')
         }
@@ -199,4 +204,4 @@
             return rupiah;
         }
     </script>
-@endpush
+@endpush

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

@@ -1147,6 +1147,7 @@
         // select paket
         var selectedMenus = [];
         var menu_terpilih = document.getElementById('menu-terpilih');
+        var itemFree = [];
         // pilih paket menu terlebih dahulu kemudian cocokkan dengan menu yang ada di menu terpilih jika ada maka tidak bisa memilih paket menu yang sama
         function selectPaket(params) {
             var isExist = false;
@@ -1159,7 +1160,7 @@
                         changeOrderedMenus(selectedMenus[i].id, 'pilih');
                         isExist = true;
                         index = i;
-                    } 
+                    }
                     changeOrderedMenus(selectedMenus[i].id, 'batal');
                 } else if (selectedMenus[i].urutan == params.urutan) {
                     changeOrderedMenus(selectedMenus[i].id, 'batal');

routes/web.php

@@ -27,7 +27,7 @@ Route::group(['middleware' => 'guest'], function () {
     Route::post('login', [AuthController::class, 'login_proses'])->name('login.process')->comment("Login Action");
 });
 
-Route::group(['middleware' => ['auth', 'role:Admin|Manager|Kasir|Karyawan']], function () {
+Route::group(['middleware' => ['auth']], function () {
     // Logout
     Route::get('logout', [AuthController::class, 'logout'])->name('logout')->comment("Logout Action");
 
@@ -49,6 +49,7 @@ Route::group(['middleware' => ['auth', 'role:Admin|Manager|Kasir|Karyawan']], fu
         Route::get('/print/{id}', [History::class, 'print'])->name('history.print')->comment("Print Riwayat Transaksi");
         Route::post('/getDataDetailHistory', [History::class, 'getDataDetailHistory'])->name('history.getDataDetailHistory')->comment("Ambil data Detail Riwayat Transaksi");
     });
+
     Route::group(['prefix' => 'menu'], function () {
         Route::get('/', [Menu::class, 'index'])->name('menu.index')->comment("Halaman Menu");
         Route::get('/getDataMenu', [Menu::class, 'getDataMenu'])->name('menu.getDataMenu')->comment("Ambil data Menu");