kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-16 17:33:45 +00:00
Code Issues Projects Releases Wiki Activity

Double fix. Not sure yet what causes this.

Browse Source
This commit is contained in:
James Cole
2024-12-29 06:17:29 +01:00
parent 7189986c03
commit 9a9dd9e075
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Support/Amount.php
View File

@@ -31,7 +31,6 @@ use FireflyIII\Models\UserGroup;
use FireflyIII\Support\Facades\Preferences; use FireflyIII\Support\Facades\Preferences;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Log;
/** /**
* Class Amount. * Class Amount.
@@ -160,11 +159,13 @@ class Amount
public function getDefaultCurrency(): TransactionCurrency public function getDefaultCurrency(): TransactionCurrency
{ {
if(auth()->check()) { if (auth()->check()) {
/** @var User $user */ /** @var User $user */
$user = auth()->user(); $user = auth()->user();
if (null !== $user->userGroup) {
return $this->getDefaultCurrencyByUserGroup($user->userGroup); return $this->getDefaultCurrencyByUserGroup($user->userGroup);
} }
}
return $this->getSystemCurrency(); return $this->getSystemCurrency();
} }
@@ -324,11 +325,11 @@ class Amount
} }
// default is amount before currency // default is amount before currency
$format = $posA.$posD.'%v'.$space.$posB.'%s'.$posC.$posE; $format = $posA . $posD . '%v' . $space . $posB . '%s' . $posC . $posE;
if ($csPrecedes) { if ($csPrecedes) {
// alternative is currency before amount // alternative is currency before amount
$format = $posA.$posB.'%s'.$posC.$space.$posD.'%v'.$posE; $format = $posA . $posB . '%s' . $posC . $space . $posD . '%v' . $posE;
} }
return $format; return $format;