update-index 9b1f3a4..b8c6f5e 100644

2025-09-05 07:52:42 +07:00
parent 9c78f7c088
commit 7794fc6fdf
17 changed files with 7705 additions and 2989 deletions
@@ -182,10 +182,11 @@ class Controller extends BaseController
                return $query->whereDate('daftar', Carbon::today());
            } else {
                return $query->where(function($q) {
-                        $q->where('status', 'Selesai')
-                        ->orWhereNull('status')
-                        ->orWhere('status', 'not like', 'Dibatalkan%');
-                    });
+                            $q->where(function($sub) {
+                                $sub->where('status', '!=', 'Selesai')
+                                    ->where('status', 'not like', 'Dibatalkan%');
+                            })->orWhereNull('status');
+                        });
            }
        } else if ($jenis == 'mundur2') {
            return $query->whereDate('daftar', '>=', Carbon::today()->subDays(2));