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

Fix views for #1000

Browse Source
This commit is contained in:
James Cole
2017-11-18 05:45:58 +01:00
parent 51a1512a3f
commit 573e72f7fb
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,12 +48,12 @@ class AccountFormRequest extends Request
'active' => $this->boolean('active'), 'active' => $this->boolean('active'),
'accountType' => $this->string('what'), 'accountType' => $this->string('what'),
'currency_id' => $this->integer('currency_id'), 'currency_id' => $this->integer('currency_id'),
'virtualBalance' => $this->float('virtualBalance'), 'virtualBalance' => $this->string('virtualBalance'),
'iban' => $this->string('iban'), 'iban' => $this->string('iban'),
'BIC' => $this->string('BIC'), 'BIC' => $this->string('BIC'),
'accountNumber' => $this->string('accountNumber'), 'accountNumber' => $this->string('accountNumber'),
'accountRole' => $this->string('accountRole'), 'accountRole' => $this->string('accountRole'),
'openingBalance' => $this->float('openingBalance'), 'openingBalance' => $this->string('openingBalance'),
'openingBalanceDate' => $this->date('openingBalanceDate'), 'openingBalanceDate' => $this->date('openingBalanceDate'),
'ccType' => $this->string('ccType'), 'ccType' => $this->string('ccType'),
'ccMonthlyPaymentDate' => $this->string('ccMonthlyPaymentDate'), 'ccMonthlyPaymentDate' => $this->string('ccMonthlyPaymentDate'),

4
app/Http/Requests/BillFormRequest.php
View File

@@ -44,10 +44,10 @@ class BillFormRequest extends Request
return [ return [
'name' => $this->string('name'), 'name' => $this->string('name'),
'match' => $this->string('match'), 'match' => $this->string('match'),
'amount_min' => $this->float('amount_min'), 'amount_min' => $this->string('amount_min'),
'amount_currency_id_amount_min' => $this->integer('amount_currency_id_amount_min'), 'amount_currency_id_amount_min' => $this->integer('amount_currency_id_amount_min'),
'amount_currency_id_amount_max' => $this->integer('amount_currency_id_amount_max'), 'amount_currency_id_amount_max' => $this->integer('amount_currency_id_amount_max'),
'amount_max' => $this->float('amount_max'), 'amount_max' => $this->string('amount_max'),
'date' => $this->date('date'), 'date' => $this->date('date'),
'repeat_freq' => $this->string('repeat_freq'), 'repeat_freq' => $this->string('repeat_freq'),
'skip' => $this->integer('skip'), 'skip' => $this->integer('skip'),

8
app/Http/Requests/JournalFormRequest.php
View File

@@ -64,7 +64,7 @@ class JournalFormRequest extends Request
// transaction / journal data: // transaction / journal data:
'description' => $this->string('description'), 'description' => $this->string('description'),
'amount' => $this->float('amount'), 'amount' => $this->string('amount'),
'budget_id' => $this->integer('budget_id'), 'budget_id' => $this->integer('budget_id'),
'category' => $this->string('category'), 'category' => $this->string('category'),
'source_account_id' => $this->integer('source_account_id'), 'source_account_id' => $this->integer('source_account_id'),
@@ -74,9 +74,9 @@ class JournalFormRequest extends Request
'piggy_bank_id' => $this->integer('piggy_bank_id'), 'piggy_bank_id' => $this->integer('piggy_bank_id'),
// native amount and stuff like that: // native amount and stuff like that:
'native_amount' => $this->float('native_amount'), 'native_amount' => $this->string('native_amount'),
'source_amount' => $this->float('source_amount'), 'source_amount' => $this->string('source_amount'),
'destination_amount' => $this->float('destination_amount'), 'destination_amount' => $this->string('destination_amount'),
]; ];
return $data; return $data;

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

@@ -47,7 +47,7 @@ class PiggyBankFormRequest extends Request
'name' => $this->string('name'), 'name' => $this->string('name'),
'startdate' => new Carbon, 'startdate' => new Carbon,
'account_id' => $this->integer('account_id'), 'account_id' => $this->integer('account_id'),
'targetamount' => $this->float('targetamount'), 'targetamount' => $this->string('targetamount'),
'targetdate' => $this->date('targetdate'), 'targetdate' => $this->date('targetdate'),
'note' => $this->string('note'), 'note' => $this->string('note'),
]; ];

2
public/js/ff/transactions/list.js vendored
View File

@@ -147,7 +147,7 @@ function countChecked() {
$('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')'); $('.mass_delete span').text(delete_selected_txt + ' (' + checked + ')');
// get amount for the transactions: // get amount for the transactions:
getAmounts(); //getAmounts();
$('.mass_button_options').show(); $('.mass_button_options').show();

2
resources/views/index.twig
View File

@@ -79,7 +79,7 @@
<div class="box-footer clearfix"> <div class="box-footer clearfix">
<a class="btn btn-sm btn-default btn-flat pull-right" <a class="btn btn-sm btn-default btn-flat pull-right"
href="{{ route('accounts.show',data[1].id) }}">{{ (data[1]|balance)|formatAmountPlain }}</a> href="{{ route('accounts.show',data[1].id) }}">{{ formatAmountByAccount(data[1], data[1]|balance, false) }}</a>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}