select whereDate to where
This commit is contained in:
1 parent
79271f22e1
commit
d58d543583
15 files changed
+61
-61
No files matched your search
+10
-10
@@ -117,15 +117,15 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from)->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '>=', $from)->where('starttime', '<=', $end);
|
||||
} elseif (isset($timeframe['start'])) {
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from);
|
||||
$query->where('starttime', '>=', $from);
|
||||
} elseif (isset($timeframe['end'])) {
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '<=', $end);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -161,15 +161,15 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from)->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '>=', $from)->where('starttime', '<=', $end);
|
||||
} elseif (isset($timeframe['start'])) {
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from);
|
||||
$query->where('starttime', '>=', $from);
|
||||
} elseif (isset($timeframe['end'])) {
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '<=', $end);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -225,18 +225,18 @@ class MapperLeft extends Component implements HasActions, HasSchemas, HasTable
|
||||
$end = Carbon::createFromDate($starttime_period['end']);
|
||||
|
||||
return $query
|
||||
->whereDate('starttime', '>=', $from)
|
||||
->whereDate('starttime', '<=', $end);
|
||||
->where('starttime', '>=', $from)
|
||||
->where('starttime', '<=', $end);
|
||||
} elseif (isset($starttime_period['start'])) {
|
||||
$from = Carbon::createFromDate($starttime_period['start']);
|
||||
|
||||
return $query
|
||||
->whereDate('starttime', '>=', $from);
|
||||
->where('starttime', '>=', $from);
|
||||
} elseif (isset($starttime_period['end'])) {
|
||||
$end = Carbon::createFromDate($starttime_period['end']);
|
||||
|
||||
return $query
|
||||
->whereDate('starttime', '<=', $end);
|
||||
->where('starttime', '<=', $end);
|
||||
}
|
||||
});
|
||||
})->indicateUsing(function (): array {
|
||||
|
||||
@@ -119,15 +119,15 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from)->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '>=', $from)->where('starttime', '<=', $end);
|
||||
} elseif (isset($timeframe['start'])) {
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from);
|
||||
$query->where('starttime', '>=', $from);
|
||||
} elseif (isset($timeframe['end'])) {
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '<=', $end);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,15 +155,15 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from)->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '>=', $from)->where('starttime', '<=', $end);
|
||||
} elseif (isset($timeframe['start'])) {
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from);
|
||||
$query->where('starttime', '>=', $from);
|
||||
} elseif (isset($timeframe['end'])) {
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '<=', $end);
|
||||
}
|
||||
}
|
||||
if ($get('country_id') ?? null) {
|
||||
@@ -201,15 +201,15 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from)->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '>=', $from)->where('starttime', '<=', $end);
|
||||
} elseif (isset($timeframe['start'])) {
|
||||
$from = Carbon::createFromDate($timeframe['start']);
|
||||
|
||||
$query->whereDate('starttime', '>=', $from);
|
||||
$query->where('starttime', '>=', $from);
|
||||
} elseif (isset($timeframe['end'])) {
|
||||
$end = Carbon::createFromDate($timeframe['end']);
|
||||
|
||||
$query->whereDate('starttime', '<=', $end);
|
||||
$query->where('starttime', '<=', $end);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -251,18 +251,18 @@ class MapperRight extends Component implements HasActions, HasSchemas, HasTable
|
||||
$end = Carbon::createFromDate($starttime_period['end']);
|
||||
|
||||
return $query
|
||||
->whereDate('starttime', '>=', $from)
|
||||
->whereDate('starttime', '<=', $end);
|
||||
->where('starttime', '>=', $from)
|
||||
->where('starttime', '<=', $end);
|
||||
} elseif (isset($starttime_period['start'])) {
|
||||
$from = Carbon::createFromDate($starttime_period['start']);
|
||||
|
||||
return $query
|
||||
->whereDate('starttime', '>=', $from);
|
||||
->where('starttime', '>=', $from);
|
||||
} elseif (isset($starttime_period['end'])) {
|
||||
$end = Carbon::createFromDate($starttime_period['end']);
|
||||
|
||||
return $query
|
||||
->whereDate('starttime', '<=', $end);
|
||||
->where('starttime', '<=', $end);
|
||||
}
|
||||
});
|
||||
})->indicateUsing(function (): array {
|
||||
|
||||
Reference in new issue
Block a user