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

Empty foreign amount should not be a problem.

Browse Source
This commit is contained in:
James Cole
2019-10-24 10:14:08 +02:00
parent a39bdc9cb0
commit b8c8aabbf4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Api/V1/Requests/TransactionStoreRequest.php
View File

@@ -89,7 +89,7 @@ class TransactionStoreRequest extends Request
// amount // amount
'transactions.*.amount' => 'required|numeric|more:0', 'transactions.*.amount' => 'required|numeric|more:0',
'transactions.*.foreign_amount' => 'numeric|more:0', 'transactions.*.foreign_amount' => 'numeric',
// description // description
'transactions.*.description' => 'nullable|between:1,1000', 'transactions.*.description' => 'nullable|between:1,1000',

4
app/Validation/TransactionValidation.php
View File

@@ -162,7 +162,9 @@ trait TransactionValidation
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
// if foreign amount is present, then the currency must be as well. // if foreign amount is present, then the currency must be as well.
if (isset($transaction['foreign_amount']) && !(isset($transaction['foreign_currency_id']) || isset($transaction['foreign_currency_code']))) { if (isset($transaction['foreign_amount']) && !(isset($transaction['foreign_currency_id']) || isset($transaction['foreign_currency_code']))
&& 0 !== bccomp('0', $transaction['foreign_amount'])
) {
$validator->errors()->add( $validator->errors()->add(
'transactions.' . $index . '.foreign_amount', 'transactions.' . $index . '.foreign_amount',
(string)trans('validation.require_currency_info') (string)trans('validation.require_currency_info')