before merging

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

@@ -3,6 +3,10 @@
     <script>
         $(document).ready(function() {
             let dataTable = $('#tabelku').DataTable({
+                aLengthMenu: [
+                    [25, 50, 100, 200, -1],
+                    [25, 50, 100, 200, "All"]
+                ],
                 processing: true,
                 serverSide: true,
                 ajax: {
@@ -157,7 +161,8 @@
                             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">' + (x.keterangan_produk ?? '-') +
+                                '</td>')
                             $('#view_history_detail').append(tr)
                             nomor++
                         })

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;

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");