|
|
@@ -138,9 +138,9 @@ class DashboardService
|
|
|
)
|
|
|
->get();
|
|
|
|
|
|
- $pendingSchedules = Schedule::with('address:district,address,number,source_id,source,id')
|
|
|
+ $pendingSchedules = Schedule::with('address:district,address,number,source_id,source,id,address_type')
|
|
|
->where('schedules.client_id', $cliente->id)
|
|
|
- ->where('schedules.status', 'pending')
|
|
|
+ ->whereIn('schedules.status', ['pending', 'accepted'])
|
|
|
->where('schedules.schedule_type', 'default')
|
|
|
->leftJoin('providers', 'providers.id', '=', 'schedules.provider_id')
|
|
|
->leftJoin('users as provider_user', 'provider_user.id', '=', 'providers.user_id')
|
|
|
@@ -149,11 +149,14 @@ class DashboardService
|
|
|
'schedules.provider_id',
|
|
|
'provider_user.name as provider_name',
|
|
|
'schedules.date',
|
|
|
+ DB::raw("TO_CHAR(schedules.date, 'DD \"de\" TMMonth \"de\" YYYY') as formatted_date"),
|
|
|
'schedules.start_time',
|
|
|
'schedules.end_time',
|
|
|
'schedules.period_type',
|
|
|
'schedules.address_id',
|
|
|
'schedules.status',
|
|
|
+ 'schedules.total_amount',
|
|
|
+ DB::raw("(SELECT district FROM addresses WHERE source = 'provider' AND source_id = schedules.provider_id and deleted_at is null ORDER BY is_primary DESC LIMIT 1) as provider_district"),
|
|
|
DB::raw("CASE
|
|
|
WHEN (now() - schedules.created_at) < INTERVAL '1 hour' THEN CONCAT(ROUND(EXTRACT(EPOCH FROM (now() - schedules.created_at)) / 60), 'min')
|
|
|
WHEN (now() - schedules.created_at) < INTERVAL '1 day' THEN CONCAT(ROUND(EXTRACT(EPOCH FROM (now() - schedules.created_at)) / 3600), 'h')
|