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

Debug the account-create controller.

Browse Source
This commit is contained in:
James Cole
2019-06-22 05:51:32 +02:00
parent 74a3d155b0
commit abf70a235a
10 changed files with 96 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app/Http/Controllers/Account/CreateController.php
View File

@@ -64,31 +64,18 @@ class CreateController extends Controller
* Create a new account. * Create a new account.
* *
* @param Request $request * @param Request $request
* @param string|null $what * @param string|null $objectType
* *
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/ */
public function create(Request $request, string $what = null) public function create(Request $request, string $objectType = null)
{ {
$what = $what ?? 'asset'; $objectType = $objectType ?? 'asset';
$defaultCurrency = app('amount')->getDefaultCurrency(); $defaultCurrency = app('amount')->getDefaultCurrency();
$subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $objectType));
$subTitle = (string)trans('firefly.make_new_' . $what . '_account'); $subTitle = (string)trans(sprintf('firefly.make_new_%s_account', $objectType));
$roles = []; $roles = $this->getRoles();
foreach (config('firefly.accountRoles') as $role) { $liabilityTypes = $this->getLiabilityTypes();
$roles[$role] = (string)trans('firefly.account_role_' . $role);
}
// types of liability:
$debt = $this->repository->getAccountTypeByType(AccountType::DEBT);
$loan = $this->repository->getAccountTypeByType(AccountType::LOAN);
$mortgage = $this->repository->getAccountTypeByType(AccountType::MORTGAGE);
$liabilityTypes = [
$debt->id => (string)trans('firefly.account_type_' . AccountType::DEBT),
$loan->id => (string)trans('firefly.account_type_' . AccountType::LOAN),
$mortgage->id => (string)trans('firefly.account_type_' . AccountType::MORTGAGE),
];
asort($liabilityTypes);
// interest calculation periods: // interest calculation periods:
$interestPeriods = [ $interestPeriods = [
@@ -111,12 +98,11 @@ class CreateController extends Controller
$this->rememberPreviousUri('accounts.create.uri'); $this->rememberPreviousUri('accounts.create.uri');
} }
$request->session()->forget('accounts.create.fromStore'); $request->session()->forget('accounts.create.fromStore');
Log::channel('audit')->info('Create new account.'); Log::channel('audit')->info('Creating new account.');
return view('accounts.create', compact('subTitleIcon', 'what', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes')); return view('accounts.create', compact('subTitleIcon', 'objectType', 'interestPeriods', 'subTitle', 'roles', 'liabilityTypes'));
} }
/** /**
* Store the new account. * Store the new account.
* *
@@ -132,7 +118,7 @@ class CreateController extends Controller
$request->session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name])); $request->session()->flash('success', (string)trans('firefly.stored_new_account', ['name' => $account->name]));
app('preferences')->mark(); app('preferences')->mark();
Log::channel('audit')->info('Store new account.', $data); Log::channel('audit')->info('Stored new account.', $data);
// update preferences if necessary: // update preferences if necessary:
$frontPage = app('preferences')->get('frontPageAccounts', [])->data; $frontPage = app('preferences')->get('frontPageAccounts', [])->data;
@@ -148,10 +134,46 @@ class CreateController extends Controller
// set value so create routine will not overwrite URL: // set value so create routine will not overwrite URL:
$request->session()->put('accounts.create.fromStore', true); $request->session()->put('accounts.create.fromStore', true);
$redirect = redirect(route('accounts.create', [$request->input('what')]))->withInput(); $redirect = redirect(route('accounts.create', [$request->input('objectType')]))->withInput();
} }
return $redirect; return $redirect;
} }
/**
* @codeCoverageIgnore
* @return array
*/
protected function getRoles(): array
{
$roles = [];
foreach (config('firefly.accountRoles') as $role) {
$roles[$role] = (string)trans(sprintf('firefly.account_role_%s', $role));
}
return $roles;
}
/**
* @codeCoverageIgnore
* @return array
*/
protected function getLiabilityTypes(): array
{
// types of liability:
$debt = $this->repository->getAccountTypeByType(AccountType::DEBT);
$loan = $this->repository->getAccountTypeByType(AccountType::LOAN);
$mortgage = $this->repository->getAccountTypeByType(AccountType::MORTGAGE);
/** @noinspection NullPointerExceptionInspection */
$liabilityTypes = [
$debt->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::DEBT)),
$loan->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::LOAN)),
$mortgage->id => (string)trans(sprintf('firefly.account_type_%s', AccountType::MORTGAGE)),
];
asort($liabilityTypes);
return $liabilityTypes;
}
} }

8
app/Http/Controllers/Account/EditController.php
View File

@@ -126,10 +126,10 @@ class EditController extends Controller
// code to handle active-checkboxes // code to handle active-checkboxes
$hasOldInput = null !== $request->old('_token'); $hasOldInput = null !== $request->old('_token');
$preFilled = [ $preFilled = [
'account_number' => $repository->getMetaValue($account, 'accountNumber'), 'account_number' => $repository->getMetaValue($account, 'account_number'),
'account_role' => $repository->getMetaValue($account, 'accountRole'), 'account_role' => $repository->getMetaValue($account, 'account_role'),
'cc_type' => $repository->getMetaValue($account, 'ccType'), 'cc_type' => $repository->getMetaValue($account, 'cc_type'),
'cc_monthly_payment_date' => $repository->getMetaValue($account, 'ccMonthlyPaymentDate'), 'cc_monthly_payment_date' => $repository->getMetaValue($account, 'cc_monthly_payment_date'),
'BIC' => $repository->getMetaValue($account, 'BIC'), 'BIC' => $repository->getMetaValue($account, 'BIC'),
'opening_balance_date' => $openingBalanceDate, 'opening_balance_date' => $openingBalanceDate,
'liability_type_id' => $account->account_type_id, 'liability_type_id' => $account->account_type_id,

2
app/Http/Controllers/Json/IntroController.php
View File

@@ -135,7 +135,7 @@ class IntroController
Log::debug(sprintf('Going to mark the following route as done: %s with special "%s" (%s)', $route, $specialPage, $key)); Log::debug(sprintf('Going to mark the following route as done: %s with special "%s" (%s)', $route, $specialPage, $key));
app('preferences')->set($key, true); app('preferences')->set($key, true);
return response()->json(['result' => sprintf('Reported demo watched for route "%s".', $route)]); return response()->json(['result' => sprintf('Reported demo watched for route "%s" (%s): %s.', $route, $specialPage, $key)]);
} }
} }

2
app/Http/Requests/AccountFormRequest.php
View File

@@ -51,7 +51,7 @@ class AccountFormRequest extends Request
$data = [ $data = [
'name' => $this->string('name'), 'name' => $this->string('name'),
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'account_type' => $this->string('what'), 'account_type' => $this->string('objectType'),
'account_type_id' => 0, 'account_type_id' => 0,
'currency_id' => $this->integer('currency_id'), 'currency_id' => $this->integer('currency_id'),
'virtual_balance' => $this->string('virtual_balance'), 'virtual_balance' => $this->string('virtual_balance'),

8
app/Support/Http/Controllers/RequestInformation.php
View File

@@ -168,17 +168,17 @@ trait RequestInformation
$specificPage = $this->getSpecificPageName(); $specificPage = $this->getSpecificPageName();
// indicator if user has seen the help for this page ( + special page): // indicator if user has seen the help for this page ( + special page):
$key = 'shown_demo_' . $page . $specificPage; $key = sprintf('shown_demo_%s%s', $page, $specificPage);
// is there an intro for this route? // is there an intro for this route?
$intro = config('intro.' . $page) ?? []; $intro = config(sprintf('intro.%s', $page)) ?? [];
$specialIntro = config('intro.' . $page . $specificPage) ?? []; $specialIntro = config(sprintf('intro.%s%s', $page, $specificPage)) ?? [];
// some routes have a "what" parameter, which indicates a special page: // some routes have a "what" parameter, which indicates a special page:
$shownDemo = true; $shownDemo = true;
// both must be array and either must be > 0 // both must be array and either must be > 0
if (count($intro) > 0 || count($specialIntro) > 0) { if (count($intro) > 0 || count($specialIntro) > 0) {
$shownDemo = app('preferences')->get($key, false)->data; $shownDemo = app('preferences')->get($key, false)->data;
Log::debug(sprintf('Check if user has already seen intro with key "%s". Result is %d', $key, $shownDemo)); Log::debug(sprintf('Check if user has already seen intro with key "%s". Result is %s', $key, var_export($shownDemo, true)));
} }
if (!is_bool($shownDemo)) { if (!is_bool($shownDemo)) {
$shownDemo = true; $shownDemo = true;

4
config/intro.php
View File

@@ -41,9 +41,9 @@ return [
], ],
// extra text for asset account creation. // extra text for asset account creation.
'accounts_create_asset' => [ 'accounts_create_asset' => [
'opening_balance' => ['element' => '#ffInput_openingBalance'], 'opening_balance' => ['element' => '#ffInput_opening_balance'],
'currency' => ['element' => '#ffInput_currency_id'], 'currency' => ['element' => '#ffInput_currency_id'],
'virtual' => ['element' => '#ffInput_virtualBalance'], 'virtual' => ['element' => '#ffInput_virtual_balance'],
], ],
// budgets: index // budgets: index

2
resources/lang/en_US/firefly.php
View File

@@ -952,7 +952,7 @@ return [
'errors' => 'Errors', 'errors' => 'Errors',
'debt_start_date' => 'Start date of debt', 'debt_start_date' => 'Start date of debt',
'debt_start_amount' => 'Start amount of debt', 'debt_start_amount' => 'Start amount of debt',
'debt_start_amount_help' => 'Please enter the original amount of this liability as a positive number. You may also enter the current amount. Make sure to edit the date below to match.', 'debt_start_amount_help' => 'If you owe an amount its best to enter a negative amount, because it influences your net worth. If you\'re owed an amount the same applies. Check out the help pages for more information.',
'store_new_liabilities_account' => 'Store new liability', 'store_new_liabilities_account' => 'Store new liability',
'edit_liabilities_account' => 'Edit liability ":name"', 'edit_liabilities_account' => 'Edit liability ":name"',

12
resources/views/v1/accounts/create.twig
View File

@@ -1,12 +1,12 @@
{% extends "./layout/default" %} {% extends "./layout/default" %}
{% block breadcrumbs %} {% block breadcrumbs %}
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, what) }} {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<form action="{{ route('accounts.store') }}" method="post" id="store" class="form-horizontal"> <form action="{{ route('accounts.store') }}" method="post" id="store" class="form-horizontal">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<input type="hidden" name="what" value="{{ what }}"/> <input type="hidden" name="objectType" value="{{ objectType }}"/>
<input type="hidden" name="active" value="1"/> <input type="hidden" name="active" value="1"/>
<div class="row"> <div class="row">
@@ -17,10 +17,10 @@
</div> </div>
<div class="box-body"> <div class="box-body">
{{ ExpandedForm.text('name') }} {{ ExpandedForm.text('name') }}
{% if what == 'asset' or what == 'liabilities' %} {% if objectType == 'asset' or objectType == 'liabilities' %}
{{ ExpandedForm.currencyList('currency_id', null, {helpText:'account_default_currency'|_}) }} {{ ExpandedForm.currencyList('currency_id', null, {helpText:'account_default_currency'|_}) }}
{% endif %} {% endif %}
{% if what == 'liabilities' %} {% if objectType == 'liabilities' %}
{{ ExpandedForm.select('liability_type_id', liabilityTypes) }} {{ ExpandedForm.select('liability_type_id', liabilityTypes) }}
{{ ExpandedForm.amountNoCurrency('opening_balance', null, {label:'debt_start_amount'|_, helpText: 'debt_start_amount_help'|_}) }} {{ ExpandedForm.amountNoCurrency('opening_balance', null, {label:'debt_start_amount'|_, helpText: 'debt_start_amount_help'|_}) }}
{{ ExpandedForm.date('opening_balance_date', null, {label:'debt_start_date'|_}) }} {{ ExpandedForm.date('opening_balance_date', null, {label:'debt_start_date'|_}) }}
@@ -43,7 +43,7 @@
{{ ExpandedForm.text('BIC', null, {maxlength: 11}) }} {{ ExpandedForm.text('BIC', null, {maxlength: 11}) }}
{{ ExpandedForm.text('account_number') }} {{ ExpandedForm.text('account_number') }}
{% if what == 'asset' %} {% if objectType == 'asset' %}
{{ ExpandedForm.amountNoCurrency('opening_balance') }} {{ ExpandedForm.amountNoCurrency('opening_balance') }}
{{ ExpandedForm.date('opening_balance_date') }} {{ ExpandedForm.date('opening_balance_date') }}
@@ -67,7 +67,7 @@
</div> </div>
<div class="box-footer"> <div class="box-footer">
<button type="submit" class="btn pull-right btn-success"> <button type="submit" class="btn pull-right btn-success">
{{ ('store_new_' ~ what ~ '_account')|_ }} {{ ('store_new_' ~ objectType ~ '_account')|_ }}
</button> </button>
</div> </div>
</div> </div>

24
resources/views/v1/accounts/edit.twig
View File

@@ -24,8 +24,8 @@
{% if what == 'liabilities' %} {% if what == 'liabilities' %}
{{ ExpandedForm.select('liability_type_id', liabilityTypes) }} {{ ExpandedForm.select('liability_type_id', liabilityTypes) }}
{{ ExpandedForm.amountNoCurrency('openingBalance', null, {label:'debt_start_amount'|_, helpText: 'debt_start_amount_help'|_}) }} {{ ExpandedForm.amountNoCurrency('opening_balance', null, {label:'debt_start_amount'|_, helpText: 'debt_start_amount_help'|_}) }}
{{ ExpandedForm.date('openingBalanceDate', null, {label:'debt_start_date'|_}) }} {{ ExpandedForm.date('opening_balance_date', null, {label:'debt_start_date'|_}) }}
{{ ExpandedForm.percentage('interest') }} {{ ExpandedForm.percentage('interest') }}
{{ ExpandedForm.select('interest_period', interestPeriods) }} {{ ExpandedForm.select('interest_period', interestPeriods) }}
{% endif %} {% endif %}
@@ -41,19 +41,19 @@
<div class="box-body"> <div class="box-body">
{{ ExpandedForm.text('iban') }} {{ ExpandedForm.text('iban') }}
{{ ExpandedForm.text('BIC', null, {maxlength: 11}) }} {{ ExpandedForm.text('BIC', null, {maxlength: 11}) }}
{% if preFilled.accountRole == 'ccAsset' %} {% if preFilled.account_role == 'ccAsset' %}
{{ ExpandedForm.text('accountNumber', null , {label:trans('form.creditCardNumber')}) }} {{ ExpandedForm.text('account_number', null , {label:trans('form.creditCardNumber')}) }}
{% else %} {% else %}
{{ ExpandedForm.text('accountNumber') }} {{ ExpandedForm.text('account_number') }}
{% endif %} {% endif %}
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %} {% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
{# get opening balance entry for this thing! #} {# get opening balance entry for this thing! #}
{{ ExpandedForm.amountNoCurrency('openingBalance',null) }} {{ ExpandedForm.amountNoCurrency('opening_balance',null) }}
{{ ExpandedForm.date('openingBalanceDate') }} {{ ExpandedForm.date('opening_balance_date') }}
{{ ExpandedForm.select('accountRole', roles) }} {{ ExpandedForm.select('account_role', roles) }}
{{ ExpandedForm.amountNoCurrency('virtualBalance',null) }} {{ ExpandedForm.amountNoCurrency('virtual_balance',null) }}
{% endif %} {% endif %}
@@ -68,14 +68,14 @@
</div> </div>
{# panel for credit card options #} {# panel for credit card options #}
{% if preFilled.accountRole == 'ccAsset' %} {% if preFilled.account_role == 'ccAsset' %}
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'credit_card_options'|_ }}</h3> <h3 class="box-title">{{ 'credit_card_options'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{{ ExpandedForm.select('ccType',Config.get('firefly.ccTypes')) }} {{ ExpandedForm.select('cc_type',Config.get('firefly.ccTypes')) }}
{{ ExpandedForm.date('ccMonthlyPaymentDate',null,{'helpText' : 'Select any year and any month, it will be ignored anway. Only the day of the month is relevant.'}) }} {{ ExpandedForm.date('cc_monthly_payment_date',null,{'helpText' : 'Select any year and any month, it will be ignored anway. Only the day of the month is relevant.'}) }}
</div> </div>
</div> </div>
{% endif %} {% endif %}

6
routes/web.php
View File

@@ -112,10 +112,10 @@ Route::group(
['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'accounts', 'as' => 'accounts.'], function () { ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'accounts', 'as' => 'accounts.'], function () {
// show: // show:
Route::get('{what}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('what', 'revenue|asset|expense|liabilities'); Route::get('{objectType}', ['uses' => 'Account\IndexController@index', 'as' => 'index'])->where('objectType', 'revenue|asset|expense|liabilities');
// create // create
Route::get('create/{what}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where('what', 'revenue|asset|expense|liabilities'); Route::get('create/{objectType}', ['uses' => 'Account\CreateController@create', 'as' => 'create'])->where('objectType', 'revenue|asset|expense|liabilities');
Route::post('store', ['uses' => 'Account\CreateController@store', 'as' => 'store']); Route::post('store', ['uses' => 'Account\CreateController@store', 'as' => 'store']);
@@ -564,7 +564,7 @@ Route::group(
Route::get('rate/{fromCurrencyCode}/{toCurrencyCode}/{date}', ['uses' => 'Json\ExchangeController@getRate', 'as' => 'rate']); Route::get('rate/{fromCurrencyCode}/{toCurrencyCode}/{date}', ['uses' => 'Json\ExchangeController@getRate', 'as' => 'rate']);
// intro things: // intro things:
Route::post('intro/finished/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postFinished', 'as' => 'intro.finished']); Route::any('intro/finished/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postFinished', 'as' => 'intro.finished']);
Route::post('intro/enable/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postEnable', 'as' => 'intro.enable']); Route::post('intro/enable/{route}/{specificPage?}', ['uses' => 'Json\IntroController@postEnable', 'as' => 'intro.enable']);
Route::get('intro/{route}/{specificPage?}', ['uses' => 'Json\IntroController@getIntroSteps', 'as' => 'intro']); Route::get('intro/{route}/{specificPage?}', ['uses' => 'Json\IntroController@getIntroSteps', 'as' => 'intro']);