|
@@ -122,7 +122,7 @@ abstract class BaseReportPage extends Page
|
122
|
122
|
if ($endDateField && ! $startDateField) {
|
123
|
123
|
$this->setFilterState('dateRange', $this->getDefaultDateRange());
|
124
|
124
|
$defaultEndDate = Carbon::parse($this->fiscalYearEndDate);
|
125
|
|
- $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? now()->endOfDay()->toDateTimeString() : $defaultEndDate->endOfDay()->toDateTimeString());
|
|
125
|
+ $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $defaultEndDate->endOfDay()->toDateTimeString());
|
126
|
126
|
|
127
|
127
|
return;
|
128
|
128
|
}
|
|
@@ -177,7 +177,7 @@ abstract class BaseReportPage extends Page
|
177
|
177
|
public function setDateRange(Carbon $start, Carbon $end): void
|
178
|
178
|
{
|
179
|
179
|
$this->setFilterState('startDate', $start->startOfDay()->toDateTimeString());
|
180
|
|
- $this->setFilterState('endDate', $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
|
|
180
|
+ $this->setFilterState('endDate', $end->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
|
181
|
181
|
}
|
182
|
182
|
|
183
|
183
|
public function getFormattedStartDate(): string
|