|
@@ -49,7 +49,7 @@ class DashboardService
|
|
|
$nextSchedules = Schedule::with('address:district,address,complement,number,source_id,source,id,address_type')
|
|
$nextSchedules = Schedule::with('address:district,address,complement,number,source_id,source,id,address_type')
|
|
|
->where('schedules.client_id', $cliente->id)
|
|
->where('schedules.client_id', $cliente->id)
|
|
|
->whereIn('schedules.status', ['accepted', 'paid'])
|
|
->whereIn('schedules.status', ['accepted', 'paid'])
|
|
|
- ->leftJoin('providers', 'providers.id', '=', 'schedules.provider_id')
|
|
|
|
|
|
|
+ ->whereDate('schedules.date', '>=', now()->toDateString())
|
|
|
->leftJoin('users as provider_user', 'provider_user.id', '=', 'providers.user_id')
|
|
->leftJoin('users as provider_user', 'provider_user.id', '=', 'providers.user_id')
|
|
|
->leftJoin('custom_schedules', 'custom_schedules.schedule_id', '=', 'schedules.id')
|
|
->leftJoin('custom_schedules', 'custom_schedules.schedule_id', '=', 'schedules.id')
|
|
|
->where('schedules.date', '>=', now()->toDateString())
|
|
->where('schedules.date', '>=', now()->toDateString())
|
|
@@ -213,8 +213,8 @@ class DashboardService
|
|
|
'providers.daily_price_8h',
|
|
'providers.daily_price_8h',
|
|
|
'providers.average_rating',
|
|
'providers.average_rating',
|
|
|
'providers.total_services',
|
|
'providers.total_services',
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
'users.name as provider_name'
|
|
'users.name as provider_name'
|
|
|
])
|
|
])
|
|
|
|
|
|
|
@@ -404,6 +404,7 @@ class DashboardService
|
|
|
$nextSchedules = Schedule::with('address:district,address,number,source_id,source,id')
|
|
$nextSchedules = 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', ['accepted', 'paid'])
|
|
->whereIn('schedules.status', ['accepted', 'paid'])
|
|
|
|
|
+ ->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')
|
|
|
->leftJoin('custom_schedules', 'custom_schedules.schedule_id', '=', 'schedules.id')
|
|
->leftJoin('custom_schedules', 'custom_schedules.schedule_id', '=', 'schedules.id')
|
|
@@ -426,6 +427,7 @@ class DashboardService
|
|
|
$opportunities = Schedule::with('address:district,source_id,source,id')
|
|
$opportunities = Schedule::with('address:district,source_id,source,id')
|
|
|
->where('schedules.schedule_type', 'custom')
|
|
->where('schedules.schedule_type', 'custom')
|
|
|
->where('schedules.status', 'pending')
|
|
->where('schedules.status', 'pending')
|
|
|
|
|
+ ->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')
|
|
|
->leftJoin('custom_schedules', 'custom_schedules.schedule_id', '=', 'schedules.id')
|
|
->leftJoin('custom_schedules', 'custom_schedules.schedule_id', '=', 'schedules.id')
|