kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix issues with #1521

Browse Source
This commit is contained in:
James Cole
2018-07-02 15:37:56 +02:00
parent f62fd18b72
commit 7629dfd54a
7 changed files with 101 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -151,6 +151,10 @@ class SingleController extends Controller
$optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
$source = (int)$request->get('source');
// grab old currency ID from old data:
$currencyID = (int)$request->old('amount_currency_id_amount');
$preFilled['amount_currency_id_amount'] = $currencyID;
if (($what === 'withdrawal' || $what === 'transfer') && $source > 0) {
$preFilled['source_id'] = $source;
}

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

@@ -24,6 +24,7 @@ namespace FireflyIII\Http\Requests;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\TransactionType;
use Illuminate\Validation\Validator;
/**
* Class JournalFormRequest.
@@ -179,6 +180,22 @@ class JournalFormRequest extends Request
return $rules;
}
/**
* Configure the validator instance.
*
* @param Validator $validator
*
* @return void
*/
public function withValidator(Validator $validator): void
{
$validator->after(
function (Validator $validator) {
$this->validNativeAmount($validator);
}
);
}
/**
* Inspired by https://www.youtube.com/watch?v=WwnI0RS6J5A.
*
@@ -212,4 +229,51 @@ class JournalFormRequest extends Request
return $rules;
}
/**
* @param Validator $validator
*/
private function validNativeAmount(Validator $validator): void
{
$data = $validator->getData();
$type = $data['what'] ?? 'invalid';
if ($type === 'withdrawal') {
$selectedCurrency = (int)($data['amount_currency_id_amount'] ?? 0);
$accountCurrency = (int)($data['source_account_currency'] ?? 0);
$nativeAmount = (string)$data['native_amount'];
if ($selectedCurrency !== $accountCurrency && '' === $nativeAmount) {
$validator->errors()->add('native_amount', trans('validation.numeric', ['attribute' => 'native_amount']));
return;
}
}
// same thing for deposits:
if ($type === 'deposit') {
$selectedCurrency = (int)($data['amount_currency_id_amount'] ?? 0);
$accountCurrency = (int)($data['destination_account_currency'] ?? 0);
$nativeAmount = (string)$data['native_amount'];
if ($selectedCurrency !== $accountCurrency && '' === $nativeAmount) {
$validator->errors()->add('native_amount', trans('validation.numeric', ['attribute' => 'native_amount']));
return;
}
}
// and for transfers
if ($type === 'transfer') {
$sourceCurrency = (int)($data['source_account_currency'] ?? 0);
$destinationCurrency = (int)($data['destination_account_currency'] ?? 0);
$sourceAmount = (string)$data['source_amount'];
$destinationAmount = (string)$data['destination_amount'];
if ($sourceCurrency !== $destinationCurrency && '' === $sourceAmount) {
$validator->errors()->add('source_amount', trans('validation.numeric', ['attribute' => 'source_amount']));
}
if ($sourceCurrency !== $destinationCurrency && '' === $destinationAmount) {
$validator->errors()->add('destination_amount', trans('validation.numeric', ['attribute' => 'destination_amount']));
}
return;
}
}
}