app/Http/Controllers/PesananController.php

@@ -37,16 +37,6 @@ class PesananController extends Controller
         }else{
             $tanggalFormatted = [Carbon::now()->toDateString()];
         }
-
-        $dataPending = Order::whereIn('status_order', [
-            'Menunggu Konfirmasi Pembayaran',
-            'Menunggu Konfirmasi Pembayaran Via Billing',
-            'Menunggu Konfirmasi Pesanan MCU'
-        ])
-        ->select(DB::raw('COUNT(DISTINCT DATE(entry_at)) as total'))
-        ->value('total');
-
-
         $orders = DB::connection('dbOrderGizi')->table('public.order as o')
         ->leftJoin('public.order_detail as od', 'od.order_id', '=', 'o.order_id')
         ->where('o.statusenabled', true)
@@ -96,12 +86,10 @@ class PesananController extends Controller
         ->filter(function($item){
             return $item['total_detail'] > 0 && $item['total_detail'] != $item['selesai_detail'];
         })->values();
-
         return response()->json([
             'status' => true,
             'rows' => $grouped->values(),
-            'total' => $grouped->count(),
+            'total' => $grouped->count()
-            'dataPending'=> $dataPending
         ]);
     }
 
@@ -193,23 +181,6 @@ class PesananController extends Controller
         ]);
     }
 
-    public function dataPending(){
-        $data = Order::selectRaw('DATE(entry_at) as tgl, COUNT(*) as total')
-            ->whereIn('status_order', [
-                'Menunggu Konfirmasi Pembayaran',
-                'Menunggu Konfirmasi Pembayaran Via Billing',
-                'Menunggu Konfirmasi Pesanan MCU'
-            ])
-             ->groupBy(DB::raw('DATE(entry_at)'))
-            ->orderBy('tgl', 'asc')
-            ->get();
-        return response()->json([
-            'status' => true,
-            'rows' => $data->values(),
-            'total' => $data->count()
-        ]);
-    }
-
     public function indexSelesai()
     {
         $payload = [
@@ -311,32 +282,9 @@ class PesananController extends Controller
         // if($status !== "all"){
         //     $data->where('status_order', $status);
         // }
-        $dataPending = OrderDetail::whereHas('order', function($query) {
-            $query->where('status_order', 'Lunas');
-        })->where('status_order', 'Pending')
-        ->select(DB::raw('COUNT(DISTINCT DATE(tgl_antar)) as total'))
-        ->value('total');
-
         $data = $data->get();
 
         return response()->json([
-            'rows' => $data->values(),
-            'total' => $data->count(),
-            'dataPending' => $dataPending
-        ]);
-    }
-
-    public function dataPekerjaanPending(){
-       $data = OrderDetail::with('order')->where('status_order', 'Pending')
-            ->select(DB::raw('DATE(tgl_antar) as tgl'), DB::raw('COUNT(*) as total'))
-            ->whereHas('order', function($query) {
-                $query->where('status_order', 'Lunas'); // filter status di tabel orders
-            })
-            ->groupBy(DB::raw('DATE(tgl_antar)'))
-            ->orderBy('tgl', 'asc')
-            ->get();
-        return response()->json([
-            'status' => true,
             'rows' => $data->values(),
             'total' => $data->count()
         ]);

public/js/pekerjaan/_init.js

@@ -5,6 +5,3 @@ const modalDetailOrder = document.getElementById('modalDetailOrder');
 const modalActionOrder = document.getElementById('modalActionApproveOrder');
 
 const modalExport = document.getElementById('modalExportPekerjaan');
-
-const modalInfoPending = document.getElementById('modalActionInfoPending')
-const datatablePekerjaanPending = $("#datatableDataPending")

public/js/pekerjaan/action.js

@@ -102,7 +102,6 @@ document.getElementById('formActionApproveOrder').addEventListener('submit', fun
                     backdrop: true,
                 });
                 datatablePekerjaan.bootstrapTable('refresh');
-                
                 modalActionOrder.removeEventListener('hidden.bs.modal', handler); // ✅ pakai DOM
                 getReminderVerifikasiMakanan()
             };
@@ -125,43 +124,3 @@ document.getElementById('formActionApproveOrder').addEventListener('submit', fun
 function exportPekerjaan(){
     new bootstrap.Modal(modalExport).show()
 }
-
-   function datapending(){
-    new bootstrap.Modal(modalInfoPending).show()
-    datatablePekerjaanPending.bootstrapTable('destroy')
-     datatablePekerjaanPending.bootstrapTable({
-        url: "/dashboard/data/pending-pekerjaan",
-        showColumns: true,
-        showColumnsToggleAll: true,
-        showRefresh: true,
-        sortable: true,
-        search: true,
-        searchOnEnterKey: false,
-        searchHighlight: true,
-        pagination: true,
-        serverSide:true,
-        pageSize: 10,
-        pageList: [10, 20, 30, 40, 50, 100, 200],
-        cookie: true,
-        cookieIdTable: "datatablePesananPending",
-        icons: {
-            refresh: "fas fa-sync-alt",   // atau ganti ke icon lain
-            columns: "fas fa-th-large"
-        },
-
-        columns: [
-            {
-                title: "Tanggal",
-                field: 'tgl',
-                sortable: true,
-            },
-            {
-                title: "Total",
-                formatter: function(value, row){
-                    return row?.total
-                },
-                sortable: true,
-            },
-        ],
-    });
-   }

public/js/pekerjaan/dt.js

@@ -156,14 +156,6 @@
             },
 
         ],
-        onLoadSuccess: function (res) {
-            // res = data JSON dari server
-            if (res.dataPending && res.dataPending > 0) {
-                $("#data_pending").show();   // tampilkan tombol
-            } else {
-                $("#data_pending").hide();   // sembunyikan tombol
-            }
-        }
     });
          $(document).on('click', '#selectAll', function () {
             selectedRows = [];
@@ -201,5 +193,3 @@
         window.open(`/dashboard/pekerjaan/label?data=${order_detail_ids}`, '_blank');
         // window.open(`https://smart.rsabhk.co.id:2222/service-reporting/label-cetering/${order_detail_ids}`, '_blank');
    }
-
-

public/js/pesanan_pending/_init.js

@@ -18,7 +18,3 @@ const modalExportPekerjaan = document.getElementById('modalExportPekerjaan');
 const datatableOfPekerjaan = $("#datatableVerifikasiMakananOffcanvas")
 const modalDetailOrder = document.getElementById('modalDetailOrderOf');
 const modalActionOrderPekerjaan = document.getElementById('modalActionApproveOrder');
-
-
-const modalDataPending = document.getElementById('modalActionInfoPending')
-const datatableDataPending = $("#datatableDataPending")

public/js/pesanan_pending/action.js

@@ -158,43 +158,3 @@ function approveProgress(order_id){
 function exportPending(){
      new bootstrap.Modal(modalExport).show();
 }
-
-function datapending(){
-     new bootstrap.Modal(modalDataPending).show();
-     datatableDataPending.bootstrapTable('destroy')
-     datatableDataPending.bootstrapTable({
-        url: "/dashboard/data/pending",
-        showColumns: true,
-        showColumnsToggleAll: true,
-        showRefresh: true,
-        sortable: true,
-        search: true,
-        searchOnEnterKey: false,
-        searchHighlight: true,
-        pagination: true,
-        serverSide:true,
-        pageSize: 10,
-        pageList: [10, 20, 30, 40, 50, 100, 200],
-        cookie: true,
-        cookieIdTable: "datatablePesananPending",
-        icons: {
-            refresh: "fas fa-sync-alt",   // atau ganti ke icon lain
-            columns: "fas fa-th-large"
-        },
-
-        columns: [
-            {
-                title: "Tanggal",
-                field: 'tgl',
-                sortable: true,
-            },
-            {
-                title: "Total",
-                formatter: function(value, row){
-                    return row?.total
-                },
-                sortable: true,
-            },
-        ],
-    });
-}

public/js/pesanan_pending/dt.js

@@ -192,14 +192,6 @@
             },
 
         ],
-        onLoadSuccess: function (res) {
-            // res = data JSON dari server
-            if (res.dataPending && res.dataPending > 0) {
-                $("#data_pending").show();   // tampilkan tombol
-            } else {
-                $("#data_pending").hide();   // sembunyikan tombol
-            }
-        }
     });
     }
 

public/js/pesanan_pending/of_dt.js

@@ -336,49 +336,3 @@ document.getElementById('formActionApproveOrder').addEventListener('submit', fun
         });
     });
 });
-
-
-function dataPendingPekerjaan(){
-    const offcanvas = bootstrap.Offcanvas.getInstance(document.getElementById('offcanvasKonfirmasiPesanan')) || new bootstrap.Offcanvas(document.getElementById('offcanvasKonfirmasiPesanan'));
-    offcanvas.hide();
-    new bootstrap.Modal(modalDataPending).show();
-     datatableDataPending.bootstrapTable('destroy')
-     datatableDataPending.bootstrapTable({
-        url: "/dashboard/data/pending-pekerjaan",
-        showColumns: true,
-        showColumnsToggleAll: true,
-        showRefresh: true,
-        sortable: true,
-        search: true,
-        searchOnEnterKey: false,
-        searchHighlight: true,
-        pagination: true,
-        serverSide:true,
-        pageSize: 10,
-        pageList: [10, 20, 30, 40, 50, 100, 200],
-        cookie: true,
-        cookieIdTable: "datatablePesananPending",
-        icons: {
-            refresh: "fas fa-sync-alt",   // atau ganti ke icon lain
-            columns: "fas fa-th-large"
-        },
-
-        columns: [
-            {
-                title: "Tanggal",
-                field: 'tgl',
-                sortable: true,
-            },
-            {
-                title: "Total",
-                formatter: function(value, row){
-                    return row?.total
-                },
-                sortable: true,
-            },
-        ],
-    });
-    document.getElementById('modalActionInfoPending').addEventListener('hidden.bs.modal', () => {
-        new bootstrap.Offcanvas(document.getElementById('offcanvasKonfirmasiPesanan')).show()
-    }, { once:true});
-}

resources/views/auth/index.blade.php

@@ -17,7 +17,7 @@
     <title>{{ $title }}</title>
 
     <meta name="description" content="" />
-    <link rel="icon" href="/logo/icon.ico" type="image/x-icon">
+
     <!-- Fonts -->
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

resources/views/dashboard/layouts/main.blade.php

@@ -19,7 +19,7 @@
     <meta name="description" content="" />
 
     <!-- Favicon -->
-    <link rel="icon" href="/logo/icon.ico" type="image/x-icon">
+
     <!-- Fonts -->
     <link rel="preconnect" href="https://fonts.googleapis.com" />
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />

resources/views/dashboard/partials/sidenav.blade.php

@@ -77,7 +77,7 @@
             <li class="menu-item {{ Request::is('dashboard/pending') ? 'active' : '' }}">
               <a href="/dashboard/pending" class="menu-link">
                 <i class="menu-icon tf-icons bx bx-collection"></i>
-                <div data-i18n="Basic">Konfirmasi Pesanan <span class="badge badge-canter rounded-circle bg-danger ms-1 mb-1 fs-6" id="konfirmasi_pesanan"></span>
+                <div data-i18n="Basic">Konfirmasi Pesanan<span class="badge badge-canter rounded-circle bg-danger ms-1 mb-1 fs-6" id="konfirmasi_pesanan"></span>
                 </div>
               </a>
             </li>

resources/views/dashboard/pesanan/pekerjaan/index.blade.php

@@ -18,9 +18,6 @@
             <!-- Kanan: Tombol Export + Input Tanggal -->
             <div class="d-flex align-items-center gap-2">
                 <!-- Tombol Export -->
-                <button type="button" class="btn btn-sm btn-info" id="data_pending" onclick="datapending()">
-                       <i class="fa-solid fa-circle-info"></i> Info Data Pending
-                    </button>
                 <button type="button" class="btn btn-sm btn-primary" id="buttonLabel" onclick="labelDownload()" disabled>
                     <i class="fa-solid fa-qrcode"></i> Cetak Label
                 </button>
@@ -51,8 +48,6 @@
 
     @include('dashboard.pesanan.pekerjaan.modal.detail')
     @include('dashboard.pesanan.pekerjaan.modal.action')
-    @include('dashboard.pesanan.pekerjaan.modal.infoDataPending')
-    
     <x-modalExport modalId="modalExportPekerjaan" form="/dashboard/pekerjaan/export" confirm="Verifikasi Makanan"/>
     <script src="{{ ver('/js/pekerjaan/_init.js') }}"></script>
     <script src="{{ ver('/js/pekerjaan/dt.js') }}"></script>

resources/views/dashboard/pesanan/pekerjaan/modal/infoDataPending.blade.php

@@ -1,23 +0,0 @@
-<!-- Modal -->
-<div class="modal fade" id="modalActionInfoPending" tabindex="-1" aria-hidden="true">
-  <div class="modal-dialog modal-lg modal-dialog-centered">
-    <div class="modal-content">
-
-      <!-- Modal Header -->
-      <div class="modal-header">
-        <h5 class="modal-title fs-5">Data Pending</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-
-      <!-- Modal Body -->
-        <div class="modal-body">
-              <table class="table" id="datatableDataPending"></table>
-        </div>
-
-        <!-- Modal Footer -->
-        <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
-        </div>
-    </div>
-  </div>
-</div>

resources/views/dashboard/pesanan/pending/index.blade.php

@@ -12,16 +12,12 @@
         <div class="card-header d-flex justify-content-between align-items-center">
             <h5 class="mb-0">Konfirmasi Pesanan <strong id="confirm_date_pesanan_pending"></strong></h5>
                 <div class="d-flex align-items-center gap-2">
-                    <button type="button" class="btn btn-sm btn-info" id="data_pending" onclick="datapending()">
-                       <i class="fa-solid fa-circle-info"></i> Info Data Pending
-                    </button>
                     <button class="btn btn-sm btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasKonfirmasiPesanan" aria-controls="offcanvasKonfirmasiPesanan">
                         Verifikasi Makanan <span class="badge badge-canter rounded-circle bg-danger ms-2 mb-1" id="konfirmasi_pesanan_offcanvas"></span>
                     </button>
                     <button type="button" class="btn btn-sm btn-outline-secondary" onclick="exportPending()">
                         <i class="fa fa-download me-1"></i> Export
                     </button>
-
                     <div class="input-group input-group-sm" style="width: 240px;">
                         <span class="input-group-text bg-white">
                             <i class="fa fa-calendar-alt"></i>
@@ -52,7 +48,6 @@
 {{-- @include('dashboard.pesanan.pending.modal.export') --}}
 @include('dashboard.pesanan.pending.offcanvas.konfirmasiPesanan')
 @include('dashboard.pesanan.pending.modal.actionPekerjaan')
-@include('dashboard.pesanan.pending.modal.infoDataPending')
 
 
 <script src="{{ ver('/js/pesanan_pending/_init.js') }}"></script>

resources/views/dashboard/pesanan/pending/modal/infoDataPending.blade.php

@@ -1,23 +0,0 @@
-<!-- Modal -->
-<div class="modal fade" id="modalActionInfoPending" tabindex="-1" aria-hidden="true">
-  <div class="modal-dialog modal-lg modal-dialog-centered">
-    <div class="modal-content">
-
-      <!-- Modal Header -->
-      <div class="modal-header">
-        <h5 class="modal-title fs-5">Data Pending</h5>
-        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-      </div>
-
-      <!-- Modal Body -->
-        <div class="modal-body">
-              <table class="table" id="datatableDataPending"></table>
-        </div>
-
-        <!-- Modal Footer -->
-        <div class="modal-footer">
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Tutup</button>
-        </div>
-    </div>
-  </div>
-</div>

resources/views/dashboard/pesanan/pending/offcanvas/konfirmasiPesanan.blade.php

@@ -14,9 +14,6 @@
     <div class="offcanvas-body">
         <!-- Toolbar -->
         <div class="d-flex align-items-center gap-2 mb-3">
-            <button type="button" class="btn btn-sm btn-info" onclick="dataPendingPekerjaan()">
-                <i class="fa-solid fa-circle-info"></i> Info Data Pending
-            </button>
             <!-- Tombol Cetak Label -->
             <button type="button" class="btn btn-sm btn-primary" id="buttonLabel" onclick="labelDownload()" disabled>
                 <i class="fa-solid fa-qrcode"></i> Cetak Label

resources/views/guest/layout/main.blade.php

@@ -8,7 +8,7 @@
   <title>{{ $title }} | Order Gizi RSAB HK</title>
   <meta name="description" content="">
   <meta name="keywords" content="">
-  <link rel="icon" href="/logo/icon.ico" type="image/x-icon">
+   {{-- <link rel="icon" type="image/png" href="{{ asset('logo/logo_rsabhk.png') }}" sizes="16x16"> --}}
 
   <!-- Fonts -->
   <link href="https://fonts.googleapis.com" rel="preconnect">

routes/web.php

@@ -62,7 +62,6 @@ Route::group(['middleware' => ['auth']], function(){
         Route::put('/pending/action-billing/{order_id}', [PesananController::class, 'actionOrderViaBilling']);
         Route::get('/pending/action-progress-order/{order_id}', [PesananController::class, 'getDataOrderDetail']);
         Route::post('/pending/update-detail-status/{order_id}', [PesananController::class, 'updateDetailStatusOrder']);
-        Route::get('/data/pending', [PesananController::class, 'dataPending']);
 
         Route::get('/selesai', [PesananController::class, 'indexSelesai']);
         Route::post('/selesai/export', [PesananController::class, 'exportSelesai']);
@@ -82,7 +81,6 @@ Route::group(['middleware' => ['auth']], function(){
         Route::post('pekerjaan/export', [PesananController::class, 'exportPekerjaan']);
         Route::get('/pekerjaan/detail/{id}', [PesananController::class, 'getPekerjaanDetail']);
         Route::get('/pekerjaan/label', [PesananController::class, 'downloadLabel']);
-        Route::get('/data/pending-pekerjaan', [PesananController::class, 'dataPekerjaanPending']);
     });
 
     Route::post('/logout', [AuthController::class, 'logout']);