Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Slightly bolder text.
James Cole27bd81a35a8a
diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.phpindex 4265b11ae5..3660a964b0 100644--- a/app/Factory/AccountFactory.php+++ b/app/Factory/AccountFactory.php@@ -29,6 +29,7 @@ use FireflyIII\Events\Model\Account\CreatedNewAccount;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\AccountType;+use FireflyIII\Models\UserGroup;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Services\Internal\Support\AccountServiceTrait;use FireflyIII\Services\Internal\Support\LocationServiceTrait;@@ -53,6 +54,7 @@ class AccountFactoryprivate array $canHaveOpeningBalance;private array $canHaveVirtual;private User $user;+ private UserGroup $userGroup;/*** AccountFactory constructor.@@ -134,7 +136,15 @@ class AccountFactorypublic function setUser(User $user): void{$this->user = $user;+ $this->userGroup = $user->userGroup;$this->accountRepository->setUser($user);+ $this->accountRepository->setUserGroup($this->userGroup);+ }++ public function setUserGroup(UserGroup $userGroup): void+ {+ $this->userGroup = $userGroup;+ $this->accountRepository->setUserGroup($userGroup);}/**diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.phpindex 33b05697c4..011cc492f0 100644--- a/app/Services/Internal/Update/AccountUpdateService.php+++ b/app/Services/Internal/Update/AccountUpdateService.php@@ -30,6 +30,7 @@ use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\AccountType;use FireflyIII\Models\Location;+use FireflyIII\Models\UserGroup;use FireflyIII\Repositories\Account\AccountRepositoryInterface;use FireflyIII\Services\Internal\Support\AccountServiceTrait;use FireflyIII\Support\Facades\Preferences;@@ -51,6 +52,7 @@ class AccountUpdateServiceprotected array $validFields;private array $canHaveOpeningBalance;private User $user;+ private UserGroup $userGroup;/*** Constructor.@@ -67,6 +69,12 @@ class AccountUpdateServicepublic function setUser(User $user): void{$this->user = $user;+ $this->userGroup = $user->userGroup;+ }++ public function setUserGroup(UserGroup $userGroup): void+ {+ $this->userGroup = $userGroup;}/**@@ -78,7 +86,9 @@ class AccountUpdateService{Log::debug(sprintf('Now in %s', __METHOD__));$this->accountRepository->setUser($account->user);+ $this->accountRepository->setUserGroup($account->userGroup);$this->user = $account->user;+ $this->userGroup = $account->userGroup;$oldData = $account->toArray();$oldData['account_number'] = $this->accountRepository->getMetaValue($account, 'account_number');$account = $this->updateAccount($account, $data);diff --git a/app/Support/Search/AccountSearch.php b/app/Support/Search/AccountSearch.phpindex e31be94a41..0ff51f76c0 100644--- a/app/Support/Search/AccountSearch.php+++ b/app/Support/Search/AccountSearch.php@@ -24,11 +24,11 @@ declare(strict_types=1);namespace FireflyIII\Support\Search;+use FireflyIII\Models\UserGroup;use FireflyIII\User;use Illuminate\Contracts\Auth\Authenticatable;use Illuminate\Database\Eloquent\Builder;use Illuminate\Support\Collection;-use function Safe\json_encode;/**@@ -36,20 +36,21 @@ use function Safe\json_encode;*/class AccountSearch implements GenericSearchInterface{- public const string SEARCH_ALL = 'all';+ public const string SEARCH_ALL = 'all';- public const string SEARCH_IBAN = 'iban';+ public const string SEARCH_IBAN = 'iban';- public const string SEARCH_ID = 'id';+ public const string SEARCH_ID = 'id';- public const string SEARCH_NAME = 'name';+ public const string SEARCH_NAME = 'name';public const string SEARCH_NUMBER = 'number';- private string $field;- private string $query;- private array $types = [];- private User $user;+ private string $field;+ private string $query;+ private array $types = [];+ private User $user;+ private UserGroup $userGroup;public function search(): Collection{@@ -81,7 +82,7 @@ class AccountSearch implements GenericSearchInterfacebreak;case self::SEARCH_ID:- $searchQuery->where('accounts.id', '=', (int) $originalQuery);+ $searchQuery->where('accounts.id', '=', (int)$originalQuery);break;@@ -124,10 +125,16 @@ class AccountSearch implements GenericSearchInterface$this->types = $types;}- public function setUser(Authenticatable|User|null $user): void+ public function setUser(Authenticatable | User | null $user): void{if ($user instanceof User) {- $this->user = $user;+ $this->user = $user;+ $this->userGroup = $user->userGroup;}}++ public function setUserGroup(UserGroup $userGroup): void+ {+ $this->userGroup = $userGroup;+ }}diff --git a/resources/assets/v3/sass/app.scss b/resources/assets/v3/sass/app.scssindex 122b67555a..6e552588ce 100644--- a/resources/assets/v3/sass/app.scss+++ b/resources/assets/v3/sass/app.scss@@ -19,7 +19,7 @@*/@use "bootstrap-icons/font/bootstrap-icons.css";-@use "@fontsource/roboto/300.css" as roboto300;+@use "@fontsource/roboto/400.css" as roboto400;$color-mode-type: data;$link-decoration: none;