IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #4846

Browse Source
This commit is contained in:
James Cole 2021-06-12 08:46:06 +02:00
parent 10597e3bef
commit cd9d1cf4ab
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,9 @@ class AccountFormRequest extends FormRequest
if (false === $this->boolean('include_net_worth')) {
$data['include_net_worth'] = '0';
}
if('0' === $data['opening_balance']) {
$data['opening_balance'] = '';
}
// if the account type is "liabilities" there are actually four types of liability
// that could have been selected.
@ -95,7 +98,7 @@ class AccountFormRequest extends FormRequest
$ccPaymentTypes = implode(',', array_keys(config('firefly.ccTypes')));
$rules = [
'name' => 'required|min:1|uniqueAccountForUser',
'opening_balance' => 'numeric|required_with:opening_balance_date|nullable|max:1000000000',
'opening_balance' => 'numeric|nullable|max:1000000000',
'opening_balance_date' => 'date|required_with:opening_balance|nullable',
'iban' => ['iban', 'nullable', new UniqueIban(null, $this->string('objectType'))],
'BIC' => 'bic|nullable',

16
resources/views/v1/form/location.twig
View File

@ -1,19 +1,3 @@
<!--
<pre>
Some debug
name: {{ name }}
lat: {{ name~'_latitude' }}
long: {{ name~'_longitude' }}
zoom:{{ name~'_zoom_level' }}
old lat: {{ old(name~'_latitude') }}
old long: {{ old(name~'_longitude') }}
old zoom: {{ old(name~'_zoom_level') }}
default lat: {{ 'location.'~name~'.latitude' }}: {{ options.locations[name].latitude|default(config('firefly.default_location.latitude')) }} (with default)
default long: {{ 'location.'~name~'.longitude' }}: {{ options.locations[name].longitude|default(config('firefly.default_location.longitude')) }} (with default)
default zoom: {{ 'location.'~name~'.zoom_level' }}: {{ options.locations[name].zoom_level|default(config('firefly.default_location.zoom_level')) }} (with default)
</pre>
-->
<div class="{{ classes }}" id="{{ name }}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">