Browse Source

fix agendamentos aparecendo na agenda sem estar pagos ainda

Gustavo Zanatta 1 day ago
parent
commit
e1dc82f3c0

+ 1 - 5
app/Services/ClientCalendarService.php

@@ -63,11 +63,7 @@ class ClientCalendarService
 
 
         $upcomingSchedules = Schedule::with('address:district,address,number,source_id,source,id')
         $upcomingSchedules = Schedule::with('address:district,address,number,source_id,source,id')
             ->where('schedules.client_id', $client->id)
             ->where('schedules.client_id', $client->id)
-            ->whereIn('schedules.status', ['pending', 'accepted', 'paid', 'started'])
-            ->where(function ($query) {
-                $query->where('schedules.schedule_type', '!=', 'custom')
-                    ->orWhereIn('schedules.status', ['paid', 'started']);
-            })
+            ->whereIn('schedules.status', ['paid', 'started'])
             ->whereDate('schedules.date', '>=', now()->toDateString())
             ->whereDate('schedules.date', '>=', now()->toDateString())
             ->leftJoin('providers', 'providers.id', '=', 'schedules.provider_id')
             ->leftJoin('providers', 'providers.id', '=', 'schedules.provider_id')
             ->leftJoin('users as provider_user', 'provider_user.id', '=', 'providers.user_id')
             ->leftJoin('users as provider_user', 'provider_user.id', '=', 'providers.user_id')

+ 1 - 1
app/Services/ProviderCalendarService.php

@@ -82,7 +82,7 @@ class ProviderCalendarService
 
 
         $upcomingSchedules = Schedule::with('address:district,address,number,source_id,source,id')
         $upcomingSchedules = Schedule::with('address:district,address,number,source_id,source,id')
             ->where('schedules.provider_id', $provider->id)
             ->where('schedules.provider_id', $provider->id)
-            ->whereIn('schedules.status', ['pending', 'accepted', 'paid', 'started'])
+            ->whereIn('schedules.status', ['paid', 'started'])
             ->whereDate('schedules.date', '>=', now()->toDateString())
             ->whereDate('schedules.date', '>=', now()->toDateString())
             ->leftJoin('clients', 'clients.id', '=', 'schedules.client_id')
             ->leftJoin('clients', 'clients.id', '=', 'schedules.client_id')
             ->leftJoin('users as client_user', 'client_user.id', '=', 'clients.user_id')
             ->leftJoin('users as client_user', 'client_user.id', '=', 'clients.user_id')