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

Some cosmetic changes for #107.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/Account.php
View File

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

16
resources/views/accounts/create.twig
View File

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

1
resources/views/accounts/edit.twig
View File

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