Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix now() without timezone functions #1790

Merged
merged 4 commits into from
Sep 9, 2018
Merged

fix: fix now() without timezone functions #1790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
381f743
Fix now() without timezone functions
asbiin Sep 6, 2018
d76d950
Update changelog
asbiin Sep 6, 2018
5f71aeb
Merge branch 'master' into fix/now-timezone
asbiin Sep 8, 2018
a5840eb
Merge branch 'master' into fix/now-timezone
asbiin Sep 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
UNRELEASED CHANGES:

*
* fix now() without timezone functions

RELEASED VERSIONS:

Expand Down
2 changes: 1 addition & 1 deletion app/Console/Commands/Reminder/ProcessOldReminders.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function handle()
}

if ($reminder->frequency_type != 'one_time') {
$reminder->calculateNextExpectedDate('UTC');
$reminder->calculateNextExpectedDate();
$reminder->save();
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/Helpers/DateHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public static function addTimeAccordingToFrequencyType(Carbon $date, $frequency,
*/
public static function getMonthAndYear(int $month)
{
$date = Date::now()->addMonthsNoOverflow($month);
$date = Date::now(static::getTimezone())->addMonthsNoOverflow($month);
$format = trans('format.short_month_year', [], Date::getLocale());

return $date->format($format) ?: '';
Expand Down
2 changes: 1 addition & 1 deletion resources/views/people/conversations/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<div class="dib">
<form-date
v-bind:id="'conversationDate'"
v-bind:default-date="'{{ now() }}'"
v-bind:default-date="'{{ now(\App\Helpers\DateHelper::getTimezone()) }}'"
v-bind:locale="'{{ $locale }}'">
</form-date>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/people/conversations/new.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<div class="dib">
<form-date
v-bind:id="'conversationDate'"
v-bind:default-date="'{{ now() }}'"
v-bind:default-date="'{{ now(\App\Helpers\DateHelper::getTimezone()) }}'"
v-bind:locale="'{{ $locale }}'">
</form-date>
</div>
Expand Down