fix(*): fix the query and for getting the prospects

ColoredCow · Nov 3, 2024 · ce85ab1 · ce85ab1
1 parent d451515
commit ce85ab1
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/Modules/Prospect/Services/ProspectService.php b/Modules/Prospect/Services/ProspectService.php
@@ -61,20 +61,23 @@ private function getFilteredProspects(array $requestData = [])
     {
         $filter = $requestData['status'] ?? 'open';
 
-        return Prospect::query()
-            ->when($filter === 'open', function ($query) {
-                $query->whereNotIn('proposal_status', ['rejected', 'converted']);
-            }, function ($query) use ($filter) {
-                $query->where('proposal_status', $filter);
-            })
-            ->orderBy('created_at', 'desc')
-            ->paginate(config('constants.pagination_size'))
-            ->appends($requestData);
+        return Prospect::query()->when(
+            $filter === 'open',
+            fn ($query) => $query->where(function ($query) {
+                $query->whereNotIn('proposal_status', ['rejected', 'converted'])
+                    ->orWhereNull('proposal_status')
+                    ->orWhere('proposal_status', '');
+            }),
+            fn ($query) => $query->where('proposal_status', $filter)
+        )
+        ->orderBy('created_at', 'desc')
+        ->paginate(config('constants.pagination_size'))
+        ->appends($requestData);
     }
 
     private function getCurrencySymbols()
     {
-        return Country::all()->pluck('currency_symbol', 'currency');
+        return Country::pluck('currency_symbol', 'currency');
     }
 
     private function saveProspectData($prospect, $validated)