Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Can now store and update account object groups
James Coleb0b393dfba93
diff --git a/app/Api/V1/Requests/Models/Account/StoreRequest.php b/app/Api/V1/Requests/Models/Account/StoreRequest.phpindex 1db2bfb5aa..1db598c186 100644--- a/app/Api/V1/Requests/Models/Account/StoreRequest.php+++ b/app/Api/V1/Requests/Models/Account/StoreRequest.php@@ -76,6 +76,8 @@ class StoreRequest extends FormRequest'notes' => $this->stringWithNewlines('notes'),'interest' => $this->convertString('interest'),'interest_period' => $this->convertString('interest_period'),+ 'object_group_title' => $this->convertString('object_group_title'),+ 'object_group_id' => $this->convertInteger('object_group_id'),];// append location information.$data = $this->appendLocationData($data, null);@@ -122,6 +124,8 @@ class StoreRequest extends FormRequest'interest' => ['min:0', 'max:100', 'numeric'],'interest_period' => sprintf('nullable|in:%s', implode(',', config('firefly.interest_periods'))),'notes' => ['min:0', 'max:32768'],+ 'object_group_id' => ['numeric', 'belongsToUser:object_groups,id'],+ 'object_group_title' => ['min:0', 'max:255'],];return Location::requestRules($rules);diff --git a/app/Api/V1/Requests/Models/Account/UpdateRequest.php b/app/Api/V1/Requests/Models/Account/UpdateRequest.phpindex 5d184f2969..3b5aa322f3 100644--- a/app/Api/V1/Requests/Models/Account/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/Account/UpdateRequest.php@@ -74,6 +74,8 @@ class UpdateRequest extends FormRequest'liability_direction' => ['liability_direction', 'convertString'],'liability_amount' => ['liability_amount', 'convertString'],'liability_start_date' => ['liability_start_date', 'date'],+ 'object_group_id' => ['object_group_id', 'convertInteger'],+ 'object_group_title' => ['object_group_title', 'convertString'],];$data = $this->getAllData($fields);@@ -113,6 +115,8 @@ class UpdateRequest extends FormRequest'interest' => ['required_if:type,liability', 'min:0', 'max:100', 'numeric'],'interest_period' => ['required_if:type,liability', 'in:daily,monthly,yearly'],'notes' => ['min:0', 'max:32768'],+ 'object_group_id' => ['numeric', 'belongsToUser:object_groups,id'],+ 'object_group_title' => ['min:0', 'max:255'],];return Location::requestRules($rules);diff --git a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.phpindex e93e708401..b845a49215 100644--- a/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php+++ b/app/Api/V1/Requests/Models/PiggyBank/StoreRequest.php@@ -77,7 +77,7 @@ class StoreRequest extends FormRequest'accounts.*.account_id' => ['required', 'numeric', 'belongsToUser:accounts,id'],'accounts.*.current_amount' => ['numeric', new IsValidZeroOrMoreAmount()],'object_group_id' => ['numeric', 'belongsToUser:object_groups,id'],- 'object_group_title' => ['min:1', 'max:255'],+ 'object_group_title' => ['min:0', 'max:255'],'target_amount' => ['required', new IsValidZeroOrMoreAmount()],'start_date' => ['required', 'date', 'after:1970-01-01', 'before:2038-01-17'],'transaction_currency_id' => ['exists:transaction_currencies,id', 'required_without:transaction_currency_code'],diff --git a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.phpindex f7fe234148..3f2e42539e 100644--- a/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php+++ b/app/Api/V1/Requests/Models/PiggyBank/UpdateRequest.php@@ -87,7 +87,7 @@ class UpdateRequest extends FormRequest'accounts.*.account_id' => ['required', 'numeric', 'belongsToUser:accounts,id'],'accounts.*.current_amount' => ['numeric', 'nullable', new IsValidZeroOrMoreAmount(true), new IsEnoughInAccounts($piggyBank, $this->getAll())],'object_group_id' => ['numeric', 'belongsToUser:object_groups,id'],- 'object_group_title' => ['min:1', 'max:255'],+ 'object_group_title' => ['min:0', 'max:255'],'transaction_currency_id' => ['exists:transaction_currencies,id', 'nullable'],'transaction_currency_code' => ['exists:transaction_currencies,code', 'nullable'],];diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.phpindex 620fc0bea1..4c1ab231ec 100644--- a/app/Factory/AccountFactory.php+++ b/app/Factory/AccountFactory.php@@ -29,8 +29,10 @@ use FireflyIII\Events\Model\Account\CreatedNewAccount;use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\AccountType;+use FireflyIII\Models\ObjectGroup;use FireflyIII\Models\UserGroup;use FireflyIII\Repositories\Account\AccountRepositoryInterface;+use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;use FireflyIII\Services\Internal\Support\AccountServiceTrait;use FireflyIII\Services\Internal\Support\LocationServiceTrait;use FireflyIII\Services\Internal\Update\AccountUpdateService;@@ -46,6 +48,7 @@ class AccountFactory{use AccountServiceTrait;use LocationServiceTrait;+ use CreatesObjectGroups;protected AccountRepositoryInterface $accountRepository;protected array $validAssetFields;@@ -266,6 +269,23 @@ class AccountFactory// set order$this->storeOrder($account, $data);+ $objectGroupTitle = $data['object_group_title'] ?? '';+ if ('' !== $objectGroupTitle) {+ $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);+ if ($objectGroup instanceof ObjectGroup) {+ $account->objectGroups()->sync([$objectGroup->id]);+ }+ }+ // try also with ID+ $objectGroupId = (int) ($data['object_group_id'] ?? 0);+ if (0 !== $objectGroupId) {+ $objectGroup = $this->findObjectGroupById($objectGroupId);+ if ($objectGroup instanceof ObjectGroup) {+ $account->objectGroups()->sync([$objectGroup->id]);+ }+ }+ $account->save();+// refresh and return$account->refresh();diff --git a/app/Http/Controllers/Account/EditController.php b/app/Http/Controllers/Account/EditController.phpindex e4b95ed447..3618276b84 100644--- a/app/Http/Controllers/Account/EditController.php+++ b/app/Http/Controllers/Account/EditController.php@@ -157,6 +157,7 @@ final class EditController extends Controller'interest_period' => $repository->getMetaValue($account, 'interest_period'),'notes' => $this->repository->getNoteText($account),'active' => $hasOldInput ? (bool) $request->old('active') : $account->active,+ 'object_group' => null !== $account->objectGroups->first() ? $account->objectGroups->first()->title : '',];if ('' === $openingBalanceAmount) {$preFilled['opening_balance'] = '';diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.phpindex f33fdf0c1a..6158212f7d 100644--- a/app/Http/Requests/AccountFormRequest.php+++ b/app/Http/Requests/AccountFormRequest.php@@ -72,6 +72,7 @@ class AccountFormRequest extends FormRequest'interest_period' => $this->convertString('interest_period'),'include_net_worth' => '1','liability_direction' => $this->convertString('liability_direction'),+ 'object_group_title' => $this->convertString('object_group'),];$data = $this->appendLocationData($data, 'location');@@ -122,6 +123,7 @@ class AccountFormRequest extends FormRequest'interest_period' => 'in:daily,monthly,yearly','notes' => ['min:1', 'max:32768', 'nullable'],'_from' => ['nullable', 'max:255', new IsValidOriginUrl()],+ 'object_group' => ['min:0', 'max:255'],];$rules = Location::requestRules($rules);diff --git a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php b/app/Repositories/PiggyBank/ModifiesPiggyBanks.phpindex 43852665f2..cf639e4efc 100644--- a/app/Repositories/PiggyBank/ModifiesPiggyBanks.php+++ b/app/Repositories/PiggyBank/ModifiesPiggyBanks.php@@ -326,7 +326,7 @@ trait ModifiesPiggyBanksreturn $piggyBank;}- $piggyBank->objectGroups()->sync([]);+ $piggyBank->objectGroups()->detach();$piggyBank->save();}@@ -342,6 +342,7 @@ trait ModifiesPiggyBanksreturn $piggyBank;}+ $piggyBank->objectGroups()->detach();}return $piggyBank;diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.phpindex 06a76e13ea..e67284ff01 100644--- a/app/Services/Internal/Update/AccountUpdateService.php+++ b/app/Services/Internal/Update/AccountUpdateService.php@@ -30,8 +30,10 @@ use FireflyIII\Exceptions\FireflyException;use FireflyIII\Models\Account;use FireflyIII\Models\AccountType;use FireflyIII\Models\Location;+use FireflyIII\Models\ObjectGroup;use FireflyIII\Models\UserGroup;use FireflyIII\Repositories\Account\AccountRepositoryInterface;+use FireflyIII\Repositories\ObjectGroup\CreatesObjectGroups;use FireflyIII\Services\Internal\Support\AccountServiceTrait;use FireflyIII\Support\Facades\Preferences;use FireflyIII\Support\Facades\Steam;@@ -45,6 +47,7 @@ use Illuminate\Support\Facades\Log;class AccountUpdateService{use AccountServiceTrait;+ use CreatesObjectGroups;protected AccountRepositoryInterface $accountRepository;protected array $validAssetFields;@@ -122,6 +125,26 @@ class AccountUpdateService// update preferences if inactive:$this->updatePreferences($account);+ $objectGroupTitle = $data['object_group_title'] ?? '';+ if ('' !== $objectGroupTitle) {+ $objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);+ if ($objectGroup instanceof ObjectGroup) {+ $account->objectGroups()->sync([$objectGroup->id]);+ }+ }+ // try also with ID+ $objectGroupId = (int) ($data['object_group_id'] ?? 0);+ if (0 !== $objectGroupId) {+ $objectGroup = $this->findObjectGroupById($objectGroupId);+ if ($objectGroup instanceof ObjectGroup) {+ $account->objectGroups()->sync([$objectGroup->id]);+ }+ }+ if('' === $objectGroupTitle && 0 === $objectGroupId) {+ $account->objectGroups()->detach();+ }+ $account->save();+event(new UpdatedExistingAccount($account, $oldData));return $account;diff --git a/resources/views/accounts/create.blade.php b/resources/views/accounts/create.blade.phpindex d46dd41e4d..e8310418e2 100644--- a/resources/views/accounts/create.blade.php+++ b/resources/views/accounts/create.blade.php@@ -59,6 +59,7 @@@endif{!! ExpandedForm::textarea('notes',null,['helpText' => trans('firefly.field_supports_markdown')]) !!}{!! ExpandedForm::file('attachments[]', ['multiple' => 'multiple','helpText' => trans('firefly.upload_max_file_size', ['size' => $uploadSize ?? $filesize])]) !!}+ {!! ExpandedForm::objectGroup() !!}</div></div></div>diff --git a/resources/views/accounts/edit.blade.php b/resources/views/accounts/edit.blade.phpindex 0bf1019ba4..723d88df18 100644--- a/resources/views/accounts/edit.blade.php+++ b/resources/views/accounts/edit.blade.php@@ -68,6 +68,7 @@{!! ExpandedForm::textarea('notes', $preFilled['notes'],['helpText' => trans('firefly.field_supports_markdown')]) !!}{!! ExpandedForm::checkbox('active', 1) !!}{!! ExpandedForm::file('attachments[]', ['multiple' => 'multiple','helpText' => trans('firefly.upload_max_file_size', ['size' => $uploadSize ?? $filesize])]) !!}+ {!! ExpandedForm::objectGroup() !!}</div></div>diff --git a/resources/views/form/options.blade.php b/resources/views/form/options.blade.phpindex 7f7e79fc9f..1f263bb819 100644--- a/resources/views/form/options.blade.php+++ b/resources/views/form/options.blade.php@@ -14,7 +14,7 @@<div class="row mb-2" id="{{ $name }}_holder"><div class="col-sm-9 offset-sm-3"><div class="form-check has-validation">- {{ Html::checkbox('create_another')->class('form-check-input')->id($name . '_return_to_edit') }}+ {{ Html::checkbox('return_to_edit')->class('form-check-input')->id($name . '_return_to_edit') }}<label class="form-check-label" for="{{ $name }}">{{ trans('form.returnHereUpdateExplanation') }}</label>