kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +00:00
Code Issues Projects Releases Wiki Activity

Replace direct calls to Carbon class.

Browse Source
This commit is contained in:
James Cole
2023-02-11 07:36:45 +01:00
parent 79e98cf8a2
commit c979cfcd89
44 changed files with 137 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/PiggyBank/PiggyBankRepository.php
View File

@@ -357,7 +357,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
return $savePerMonth;
}
if (null !== $piggyBank->targetdate && $repetition->currentamount < $piggyBank->targetamount) {
$now = Carbon::now();
$now = today(config('app.timezone'));
$startDate = null !== $piggyBank->startdate && $piggyBank->startdate->gte($now) ? $piggyBank->startdate : $now;
$diffInMonths = $startDate->diffInMonths($piggyBank->targetdate, false);
$remainingAmount = bcsub($piggyBank->targetamount, $repetition->currentamount);

2
app/Repositories/Recurring/RecurringRepository.php
View File

@@ -534,7 +534,7 @@ class RecurringRepository implements RecurringRepositoryInterface
}
if ('yearly' === $repetition->repetition_type) {
//
$today = Carbon::now()->endOfYear();
$today = today(config('app.timezone'))->endOfYear();
$repDate = Carbon::createFromFormat('Y-m-d', $repetition->repetition_moment);
$diffInYears = $today->diffInYears($repDate);
$repDate->addYears($diffInYears); // technically not necessary.

4
app/Repositories/User/UserRepository.php
View File

@@ -282,7 +282,7 @@ class UserRepository implements UserRepositoryInterface
*/
public function inviteUser(User $user, string $email): InvitedUser
{
$now = Carbon::now();
$now = today(config('app.timezone'));
$now->addDays(2);
$invitee = new InvitedUser();
$invitee->user()->associate($user);
@@ -463,7 +463,7 @@ class UserRepository implements UserRepositoryInterface
*/
public function validateInviteCode(string $code): bool
{
$now = Carbon::now();
$now = today(config('app.timezone'));
$invitee = InvitedUser::where('invite_code', $code)->where('expires', '>', $now->format('Y-m-d H:i:s'))->where('redeemed', 0)->first();
return null !== $invitee;
}