|
|
@@ -63,11 +63,7 @@ class ClientCalendarService
|
|
|
|
|
|
$upcomingSchedules = Schedule::with('address:district,address,number,source_id,source,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())
|
|
|
->leftJoin('providers', 'providers.id', '=', 'schedules.provider_id')
|
|
|
->leftJoin('users as provider_user', 'provider_user.id', '=', 'providers.user_id')
|