|
@@ -332,7 +332,7 @@ class Client extends Model
|
|
|
{
|
|
{
|
|
|
return $this->hasMany(Appointment::class, 'client_id', 'id')
|
|
return $this->hasMany(Appointment::class, 'client_id', 'id')
|
|
|
->where('raw_date', '>=', date('Y-m-d'))
|
|
->where('raw_date', '>=', date('Y-m-d'))
|
|
|
- ->whereIn('status', ['CREATED', 'CONFIRMED'])
|
|
|
|
|
|
|
+ ->whereIn('status', ['PENDING', 'CONFIRMED'])
|
|
|
->orderBy('start_time', 'desc')
|
|
->orderBy('start_time', 'desc')
|
|
|
->limit(5);
|
|
->limit(5);
|
|
|
}
|
|
}
|
|
@@ -341,7 +341,7 @@ class Client extends Model
|
|
|
return Appointment
|
|
return Appointment
|
|
|
::where('client_id', $this->id)
|
|
::where('client_id', $this->id)
|
|
|
->where('raw_date', '>=', DB::raw('NOW()'))
|
|
->where('raw_date', '>=', DB::raw('NOW()'))
|
|
|
- ->whereIn('status', ['CONFIRMED', 'CREATED'])
|
|
|
|
|
|
|
+ ->whereIn('status', ['PENDING', 'CONFIRMED'])
|
|
|
->orderBy('start_time')
|
|
->orderBy('start_time')
|
|
|
->first();
|
|
->first();
|
|
|
}
|
|
}
|
|
@@ -349,11 +349,10 @@ class Client extends Model
|
|
|
public function appointmentsFromLastWeek()
|
|
public function appointmentsFromLastWeek()
|
|
|
{
|
|
{
|
|
|
|
|
|
|
|
- $dateLastWeek = date_sub(date_create(), date_interval_create_from_date_string("7 days"));
|
|
|
|
|
|
|
+ $dateLastWeek = date_sub(date_create(), date_interval_create_from_date_string("14 days"));
|
|
|
$dateLastWeek = date_format($dateLastWeek, "Y-m-d");
|
|
$dateLastWeek = date_format($dateLastWeek, "Y-m-d");
|
|
|
return $this->hasMany(Appointment::class, 'client_id', 'id')
|
|
return $this->hasMany(Appointment::class, 'client_id', 'id')
|
|
|
->where('raw_date', '>=', $dateLastWeek)
|
|
->where('raw_date', '>=', $dateLastWeek)
|
|
|
- ->whereIn('status', ['CREATED', 'CONFIRMED'])
|
|
|
|
|
->orderBy('start_time', 'desc');
|
|
->orderBy('start_time', 'desc');
|
|
|
}
|
|
}
|
|
|
|
|
|
