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

Some generic code refactoring.

Browse Source
This commit is contained in:
James Cole
2019-06-21 19:10:02 +02:00
parent fb1af395f9
commit 2d3d7f7720
67 changed files with 920 additions and 603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ namespace FireflyIII\Http\Requests;
use FireflyIII\Models\Account;
use FireflyIII\Rules\UniqueIban;
use FireflyIII\Rules\ZeroOrMore;
/**
* Class AccountFormRequest.
@@ -55,15 +54,15 @@ class AccountFormRequest extends Request
'account_type' => $this->string('what'),
'account_type_id' => 0,
'currency_id' => $this->integer('currency_id'),
'virtual_balance' => $this->string('virtualBalance'),
'virtual_balance' => $this->string('virtual_balance'),
'iban' => $this->string('iban'),
'BIC' => $this->string('BIC'),
'account_number' => $this->string('accountNumber'),
'account_role' => $this->string('accountRole'),
'opening_balance' => $this->string('openingBalance'),
'opening_balance_date' => $this->date('openingBalanceDate'),
'cc_type' => $this->string('ccType'),
'cc_monthly_payment_date' => $this->string('ccMonthlyPaymentDate'),
'account_number' => $this->string('account_number'),
'account_role' => $this->string('account_role'),
'opening_balance' => $this->string('opening_balance'),
'opening_balance_date' => $this->date('opening_balance_date'),
'cc_type' => $this->string('cc_type'),
'cc_monthly_payment_date' => $this->string('cc_monthly_payment_date'),
'notes' => $this->string('notes'),
'interest' => $this->string('interest'),
'interest_period' => $this->string('interest_period'),
@@ -107,14 +106,14 @@ class AccountFormRequest extends Request
'ccType' => 'in:' . $ccPaymentTypes,
'cc_monthly_payment_date' => 'date',
'amount_currency_id_opening_balance' => 'exists:transaction_currencies,id',
'amount_currency_id_virtua_balance' => 'exists:transaction_currencies,id',
'amount_currency_id_virtual_balance' => 'exists:transaction_currencies,id',
'what' => 'in:' . $types,
'interest_period' => 'in:daily,monthly,yearly',
];
// TODO verify if this will work.
if ('liabilities' === $this->get('what')) {
$rules['opening_balance'] = ['numeric', 'required', new ZeroOrMore];
$rules['opening_balance'] = ['numeric', 'required'];
$rules['opening_balance_date'] = 'date|required';
}