diff --git a/app/Module/TimeRange.php b/app/Module/TimeRange.php index 5b9b8d95f..2e77b823d 100644 --- a/app/Module/TimeRange.php +++ b/app/Module/TimeRange.php @@ -29,8 +29,9 @@ class TimeRange $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]); $deleted = Base::isNumber($range[1]) ? intval($range[1]) : trim($range[1]); // - $this->updated = $updated ? Carbon::parse($updated) : null; - $this->deleted = $deleted ? Carbon::parse($deleted) : null; + $timezone = config('app.timezone'); + $this->updated = $updated ? Carbon::parse($updated)->setTimezone($timezone) : null; + $this->deleted = $deleted ? Carbon::parse($deleted)->setTimezone($timezone) : null; } /** diff --git a/resources/assets/js/store/utils.js b/resources/assets/js/store/utils.js index 47670ccfd..7e15d0642 100644 --- a/resources/assets/js/store/utils.js +++ b/resources/assets/js/store/utils.js @@ -27,7 +27,7 @@ function __callData(key, requestData, state) { * @returns {*} */ this.get = () => { - requestData.timerange = requestData.timerange || `${callData.updated ? $A.formatDate("Y-m-d H:i:s", callData.updated) : 0},${callData.deleted ? $A.formatDate("Y-m-d H:i:s", callData.deleted) : 0}` + requestData.timerange = requestData.timerange || `${callData.updated || 0},${callData.deleted || 0}` return requestData }