IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7128 from firefly-iii/fix-7127

Browse Source 
Fix 7127
This commit is contained in:
James Cole 2023-03-04 22:19:17 +01:00 committed by GitHub
commit 8807f04599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/Api/V1/Controllers/Data/DestroyController.php
View File

@ -94,19 +94,39 @@ class DestroyController extends Controller
case 'object_groups': case 'object_groups':
$this->destroyObjectGroups(); $this->destroyObjectGroups();
break; break;
case 'not_assets_liabilities':
$this->destroyAccounts(
[
AccountType::BENEFICIARY,
AccountType::CASH,
AccountType::CREDITCARD,
AccountType::DEFAULT,
AccountType::EXPENSE,
AccountType::IMPORT,
AccountType::INITIAL_BALANCE,
AccountType::LIABILITY_CREDIT,
AccountType::RECONCILIATION,
AccountType::REVENUE,
]
);
break;
case 'accounts': case 'accounts':
$this->destroyAccounts( $this->destroyAccounts(
[ [
AccountType::ASSET, AccountType::ASSET,
AccountType::DEFAULT,
AccountType::BENEFICIARY, AccountType::BENEFICIARY,
AccountType::EXPENSE, AccountType::CASH,
AccountType::REVENUE, AccountType::CREDITCARD,
AccountType::INITIAL_BALANCE,
AccountType::DEBT, AccountType::DEBT,
AccountType::DEFAULT,
AccountType::EXPENSE,
AccountType::IMPORT,
AccountType::INITIAL_BALANCE,
AccountType::LIABILITY_CREDIT,
AccountType::LOAN, AccountType::LOAN,
AccountType::MORTGAGE, AccountType::MORTGAGE,
AccountType::CREDITCARD, AccountType::RECONCILIATION,
AccountType::REVENUE,
] ]
); );
break; break;

3
app/Api/V1/Requests/Data/DestroyRequest.php
View File

@ -53,7 +53,8 @@ class DestroyRequest extends FormRequest
public function rules(): array public function rules(): array
{ {
$valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'. $valid = 'budgets,bills,piggy_banks,rules,recurring,categories,tags,object_groups'.
',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'; ',accounts,asset_accounts,expense_accounts,revenue_accounts,liabilities,transactions,withdrawals,deposits,transfers'.
',not_assets_liabilities';
return [ return [
'objects' => sprintf('required|min:1|string|in:%s', $valid), 'objects' => sprintf('required|min:1|string|in:%s', $valid),

2
resources/views/profile/index.twig
View File

@ -318,7 +318,7 @@
url = '{{ route('api.v1.data.purge') }}'; url = '{{ route('api.v1.data.purge') }}';
} }
if (link.data('type') === 'unused_accounts') { if (link.data('type') === 'unused_accounts') {
url = deleteAPIRoute + '?objects=accounts&unused=true'; url = deleteAPIRoute + '?objects=not_assets_liabilities&unused=true';
} }
// replace icon with loading thing // replace icon with loading thing