Some cosmetic changes for #107.

This commit is contained in:
James Cole
2016-02-11 06:30:09 +01:00
parent aa057d6a57
commit 40245ef43b
3 changed files with 13 additions and 14 deletions

View File

@@ -134,7 +134,6 @@ class Account extends Model
}
/**
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\HasMany
*/
public function accountMeta()
@@ -171,11 +170,9 @@ class Account extends Model
*
* @param string $fieldName
*
* @codeCoverageIgnore
*
* @return string|null
* @return string
*/
public function getMeta($fieldName)
public function getMeta($fieldName): string
{
foreach ($this->accountMeta as $meta) {
if ($meta->name == $fieldName) {
@@ -183,8 +180,7 @@ class Account extends Model
}
}
return null;
return '';
}
/**

View File

@@ -21,7 +21,7 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
@@ -29,17 +29,19 @@
<div class="box-body">
{{ ExpandedForm.text('iban') }}
{% if what == 'asset' %}
{{ ExpandedForm.text('accountNumber') }}
{{ ExpandedForm.balance('openingBalance') }}
{{ ExpandedForm.date('openingBalanceDate', phpdate('Y-m-d')) }}
{{ ExpandedForm.select('accountRole', Config.get('firefly.accountRoles'),null,{'helpText' : 'asset_account_role_help'|_}) }}
{{ ExpandedForm.balance('virtualBalance') }}
{% if what == 'asset' %}
{{ ExpandedForm.balance('openingBalance') }}
{{ ExpandedForm.date('openingBalanceDate', phpdate('Y-m-d')) }}
{{ ExpandedForm.select('accountRole', Config.get('firefly.accountRoles'),null,{'helpText' : 'asset_account_role_help'|_}) }}
{{ ExpandedForm.balance('virtualBalance') }}
{% endif %}
</div>
</div>
<div class="box">
<div class="box-header with-border">

View File

@@ -29,6 +29,7 @@
<div class="box-body">
{{ ExpandedForm.text('iban') }}
{{ ExpandedForm.text('accountNumber') }}
{% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %}
{{ ExpandedForm.balance('openingBalance',null, {'currency' : openingBalance ? openingBalance.transactionCurrency : null}) }}
{{ ExpandedForm.date('openingBalanceDate') }}