kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Catch escape in currencies

Browse Source
This commit is contained in:
James Cole
2023-02-17 05:49:54 +01:00
parent e4fa385ac5
commit 0667ccfc98
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Factory/TransactionCurrencyFactory.php
View File

@@ -41,6 +41,11 @@ class TransactionCurrencyFactory
*/ */
public function create(array $data): TransactionCurrency public function create(array $data): TransactionCurrency
{ {
$data['code'] = e($data['code']);
$data['symbol'] = e($data['symbol']);
$data['name'] = e($data['name']);
$data['decimal_places'] = (int)$data['decimal_places'];
$data['enabled'] = (bool)$data['enabled'];
// if the code already exists (deleted) // if the code already exists (deleted)
// force delete it and then create the transaction: // force delete it and then create the transaction:
$count = TransactionCurrency::withTrashed()->whereCode($data['code'])->count(); $count = TransactionCurrency::withTrashed()->whereCode($data['code'])->count();
@@ -78,7 +83,7 @@ class TransactionCurrencyFactory
*/ */
public function find(?int $currencyId, ?string $currencyCode): ?TransactionCurrency public function find(?int $currencyId, ?string $currencyCode): ?TransactionCurrency
{ {
$currencyCode = (string)$currencyCode; $currencyCode = (string)e($currencyCode);
$currencyId = (int)$currencyId; $currencyId = (int)$currencyId;
if ('' === $currencyCode && 0 === $currencyId) { if ('' === $currencyCode && 0 === $currencyId) {

10
app/Services/Internal/Update/CurrencyUpdateService.php
View File

@@ -41,23 +41,23 @@ class CurrencyUpdateService
public function update(TransactionCurrency $currency, array $data): TransactionCurrency public function update(TransactionCurrency $currency, array $data): TransactionCurrency
{ {
if (array_key_exists('code', $data) && '' !== (string)$data['code']) { if (array_key_exists('code', $data) && '' !== (string)$data['code']) {
$currency->code = $data['code']; $currency->code = e($data['code']);
} }
if (array_key_exists('symbol', $data) && '' !== (string)$data['symbol']) { if (array_key_exists('symbol', $data) && '' !== (string)$data['symbol']) {
$currency->symbol = $data['symbol']; $currency->symbol = e($data['symbol']);
} }
if (array_key_exists('name', $data) && '' !== (string)$data['name']) { if (array_key_exists('name', $data) && '' !== (string)$data['name']) {
$currency->name = $data['name']; $currency->name = e($data['name']);
} }
if (array_key_exists('enabled', $data) && is_bool($data['enabled'])) { if (array_key_exists('enabled', $data) && is_bool($data['enabled'])) {
$currency->enabled = $data['enabled']; $currency->enabled = (bool) $data['enabled'];
} }
if (array_key_exists('decimal_places', $data) && is_int($data['decimal_places'])) { if (array_key_exists('decimal_places', $data) && is_int($data['decimal_places'])) {
$currency->decimal_places = $data['decimal_places']; $currency->decimal_places = (int) $data['decimal_places'];
} }
$currency->save(); $currency->save();