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

🤖 Auto commit for release 'develop' on 2025-08-15

Browse Source
This commit is contained in:
JC5
2025-08-15 13:37:27 +02:00
parent 4885dbc78e
commit f2dc0d234b
20 changed files with 293 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByCurrenciesRequest.php
View File

@@ -60,14 +60,17 @@ class StoreByCurrenciesRequest extends FormRequest
try {
$date = Carbon::createFromFormat('Y-m-d', $date);
} catch (InvalidFormatException $e) {
$validator->errors()->add('date', trans('validation.date',['attribute' => 'date']));
$validator->errors()->add('date', trans('validation.date', ['attribute' => 'date']));
return;
}
if (!is_numeric($rate)) {
$validator->errors()->add('rate', trans('validation.number',['attribute' => 'rate']));
$validator->errors()->add('rate', trans('validation.number', ['attribute' => 'rate']));
return;
}
}
});
}
);
}
}

9
app/Api/V1/Requests/Models/CurrencyExchangeRate/StoreByDateRequest.php
View File

@@ -38,7 +38,7 @@ class StoreByDateRequest extends FormRequest
public function getAll(): array
{
return [
'from' => $this->get('from'),
'from' => $this->get('from'),
'rates' => $this->get('rates', []),
];
}
@@ -62,7 +62,7 @@ class StoreByDateRequest extends FormRequest
public function withValidator(Validator $validator): void
{
$from = $this->getFromCurrency();
$from = $this->getFromCurrency();
$validator->after(
static function (Validator $validator) use ($from): void {
@@ -70,11 +70,13 @@ class StoreByDateRequest extends FormRequest
$rates = $data['rates'] ?? [];
if (0 === count($rates)) {
$validator->errors()->add('rates', 'No rates given.');
return;
}
foreach ($rates as $key => $entry) {
if ($key === $from->code) {
$validator->errors()->add(sprintf('rates.%s', $key), trans('validation.convert_to_itself', ['code' => $key]));
continue;
}
$to = TransactionCurrency::where('code', $key)->first();
@@ -82,6 +84,7 @@ class StoreByDateRequest extends FormRequest
$validator->errors()->add(sprintf('rates.%s', $key), trans('validation.invalid_currency_code', ['code' => $key]));
}
}
});
}
);
}
}