|
@@ -182,6 +182,32 @@ class DashboardService
|
|
|
->orderBy('schedules.date', 'asc')
|
|
->orderBy('schedules.date', 'asc')
|
|
|
->get();
|
|
->get();
|
|
|
|
|
|
|
|
|
|
+ $todaySchedules = Schedule::with('address:district,address,number,source_id,source,id,address_type')
|
|
|
|
|
+ ->where('schedules.client_id', $cliente->id)
|
|
|
|
|
+ ->whereIn('schedules.status', ['accepted', 'paid', 'started', 'finished'])
|
|
|
|
|
+ ->whereDate('schedules.date', now()->toDateString())
|
|
|
|
|
+ ->leftJoin('providers', 'providers.id', '=', 'schedules.provider_id')
|
|
|
|
|
+ ->leftJoin('users as provider_user', 'provider_user.id', '=', 'providers.user_id')
|
|
|
|
|
+ ->leftJoin('media', 'media.id', '=', 'providers.profile_media_id')
|
|
|
|
|
+ ->select(
|
|
|
|
|
+ 'schedules.id',
|
|
|
|
|
+ 'schedules.provider_id',
|
|
|
|
|
+ 'provider_user.name as provider_name',
|
|
|
|
|
+ 'schedules.date',
|
|
|
|
|
+ 'schedules.start_time',
|
|
|
|
|
+ 'schedules.end_time',
|
|
|
|
|
+ 'schedules.total_amount',
|
|
|
|
|
+ 'schedules.period_type',
|
|
|
|
|
+ 'schedules.schedule_type',
|
|
|
|
|
+ 'schedules.address_id',
|
|
|
|
|
+ 'schedules.status',
|
|
|
|
|
+ 'schedules.code_verified',
|
|
|
|
|
+ 'schedules.code',
|
|
|
|
|
+ 'media.url as provider_photo',
|
|
|
|
|
+ )
|
|
|
|
|
+ ->orderBy('schedules.start_time', 'asc')
|
|
|
|
|
+ ->get();
|
|
|
|
|
+
|
|
|
return [
|
|
return [
|
|
|
'headerBar' => $headerBar,
|
|
'headerBar' => $headerBar,
|
|
|
'summaryInfos' => $summaryInfos,
|
|
'summaryInfos' => $summaryInfos,
|
|
@@ -190,6 +216,7 @@ class DashboardService
|
|
|
'lastDoneSchedules' => $lastDoneSchedules,
|
|
'lastDoneSchedules' => $lastDoneSchedules,
|
|
|
'favoriteProviders' => $favoriteProviders,
|
|
'favoriteProviders' => $favoriteProviders,
|
|
|
'providersClose' => $providersClose,
|
|
'providersClose' => $providersClose,
|
|
|
|
|
+ 'todaySchedules' => $todaySchedules,
|
|
|
];
|
|
];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -297,7 +324,7 @@ class DashboardService
|
|
|
|
|
|
|
|
$todayServices = Schedule::with('address:district,address,number,source_id,source,id')
|
|
$todayServices = 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', 'started'])
|
|
|
|
|
|
|
+ ->whereIn('schedules.status', ['accepted', 'paid', 'started', 'finished'])
|
|
|
->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')
|
|
@@ -314,7 +341,7 @@ class DashboardService
|
|
|
'schedules.schedule_type',
|
|
'schedules.schedule_type',
|
|
|
'schedules.status',
|
|
'schedules.status',
|
|
|
'schedules.code_verified',
|
|
'schedules.code_verified',
|
|
|
- 'schedules.status',
|
|
|
|
|
|
|
+ 'schedules.code',
|
|
|
'custom_schedules.offers_meal',
|
|
'custom_schedules.offers_meal',
|
|
|
)
|
|
)
|
|
|
->orderBy('schedules.start_time', 'asc')
|
|
->orderBy('schedules.start_time', 'asc')
|