mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Fix issue in number formatting.
This commit is contained in:
parent
b94885f8ba
commit
5eca404866
@ -72,7 +72,7 @@ interface BudgetLimitRepositoryInterface
|
||||
public function find(Budget $budget, TransactionCurrency $currency, Carbon $start, Carbon $end): ?BudgetLimit;
|
||||
|
||||
/**
|
||||
* See reference nr. 11
|
||||
* See reference nr. 11
|
||||
*
|
||||
* @param Carbon|null $start
|
||||
* @param Carbon|null $end
|
||||
|
@ -34,8 +34,6 @@ use Throwable;
|
||||
* Class CurrencyForm
|
||||
*
|
||||
* All currency related form methods.
|
||||
*
|
||||
* See reference nr. 22
|
||||
*/
|
||||
class CurrencyForm
|
||||
{
|
||||
@ -61,7 +59,7 @@ class CurrencyForm
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function currencyField(string $name, string $view, $value = null, array $options = null): string
|
||||
protected function currencyField(string $name, string $view, mixed $value = null, array $options = null): string
|
||||
{
|
||||
$label = $this->label($name, $options);
|
||||
$options = $this->expandOptionArray($name, $label, $options);
|
||||
|
@ -38,7 +38,7 @@ use Log;
|
||||
/**
|
||||
* Trait PeriodOverview.
|
||||
*
|
||||
* See reference nr. 36
|
||||
* See reference nr. 36
|
||||
*
|
||||
* - Always request start date and end date.
|
||||
* - Group expenses, income, etc. under this period.
|
||||
@ -91,7 +91,7 @@ trait PeriodOverview
|
||||
$cache->addProperty('account-show-period-entries');
|
||||
$cache->addProperty($account->id);
|
||||
if ($cache->has()) {
|
||||
return $cache->get();
|
||||
return $cache->get();
|
||||
}
|
||||
/** @var array $dates */
|
||||
$dates = app('navigation')->blockPeriods($start, $end, $range);
|
||||
@ -284,7 +284,7 @@ trait PeriodOverview
|
||||
$cache->addProperty($category->id);
|
||||
|
||||
if ($cache->has()) {
|
||||
return $cache->get();
|
||||
return $cache->get();
|
||||
}
|
||||
/** @var array $dates */
|
||||
$dates = app('navigation')->blockPeriods($start, $end, $range);
|
||||
@ -360,7 +360,7 @@ trait PeriodOverview
|
||||
$cache->addProperty('no-budget-period-entries');
|
||||
|
||||
if ($cache->has()) {
|
||||
return $cache->get();
|
||||
return $cache->get();
|
||||
}
|
||||
|
||||
/** @var array $dates */
|
||||
@ -392,7 +392,7 @@ trait PeriodOverview
|
||||
}
|
||||
|
||||
/**
|
||||
* See reference nr. 37
|
||||
* See reference nr. 37
|
||||
*
|
||||
* Show period overview for no category view.
|
||||
*
|
||||
@ -419,7 +419,7 @@ trait PeriodOverview
|
||||
$cache->addProperty('no-category-period-entries');
|
||||
|
||||
if ($cache->has()) {
|
||||
return $cache->get();
|
||||
return $cache->get();
|
||||
}
|
||||
|
||||
$dates = app('navigation')->blockPeriods($start, $end, $range);
|
||||
@ -494,7 +494,7 @@ trait PeriodOverview
|
||||
$cache->addProperty('tag-period-entries');
|
||||
$cache->addProperty($tag->id);
|
||||
if ($cache->has()) {
|
||||
return $cache->get();
|
||||
return $cache->get();
|
||||
}
|
||||
/** @var array $dates */
|
||||
$dates = app('navigation')->blockPeriods($start, $end, $range);
|
||||
@ -568,7 +568,7 @@ trait PeriodOverview
|
||||
$cache->addProperty('transactions-period-entries');
|
||||
$cache->addProperty($transactionType);
|
||||
if ($cache->has()) {
|
||||
return $cache->get();
|
||||
return $cache->get();
|
||||
}
|
||||
/** @var array $dates */
|
||||
$dates = app('navigation')->blockPeriods($start, $end, $range);
|
||||
|
@ -179,10 +179,13 @@ class FireflyValidator extends Validator
|
||||
'32', '33', '34', '35',];
|
||||
|
||||
// take
|
||||
$first = substr($value, 0, 4);
|
||||
$last = substr($value, 4);
|
||||
$iban = $last . $first;
|
||||
$iban = str_replace($search, $replace, $iban);
|
||||
$first = substr($value, 0, 4);
|
||||
$last = substr($value, 4);
|
||||
$iban = $last . $first;
|
||||
$iban = trim(str_replace($search, $replace, $iban));
|
||||
if (0 === strlen($iban)) {
|
||||
return false;
|
||||
}
|
||||
$checksum = bcmod($iban, '97');
|
||||
|
||||
return 1 === (int)$checksum;
|
||||
@ -265,7 +268,7 @@ class FireflyValidator extends Validator
|
||||
$repository = app(BudgetRepositoryInterface::class);
|
||||
$budgets = $repository->getBudgets();
|
||||
// count budgets, should have at least one
|
||||
// See reference nr. 102
|
||||
// See reference nr. 102
|
||||
$count = $budgets->filter(
|
||||
function (Budget $budget) use ($value) {
|
||||
return $budget->name === $value;
|
||||
@ -439,7 +442,7 @@ class FireflyValidator extends Validator
|
||||
*/
|
||||
private function validateAccountAnonymously(): bool
|
||||
{
|
||||
if (!array_key_exists('user_id',$this->data)) {
|
||||
if (!array_key_exists('user_id', $this->data)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -448,7 +451,7 @@ class FireflyValidator extends Validator
|
||||
$value = $this->data['name'];
|
||||
|
||||
$set = $user->accounts()->where('account_type_id', $type->id)->get();
|
||||
// See reference nr. 103
|
||||
// See reference nr. 103
|
||||
/** @var Account $entry */
|
||||
foreach ($set as $entry) {
|
||||
if ($entry->name === $value) {
|
||||
@ -480,7 +483,7 @@ class FireflyValidator extends Validator
|
||||
$accountTypeIds = $accountTypes->pluck('id')->toArray();
|
||||
/** @var Collection $set */
|
||||
$set = auth()->user()->accounts()->whereIn('account_type_id', $accountTypeIds)->where('id', '!=', $ignore)->get();
|
||||
// See reference nr. 104
|
||||
// See reference nr. 104
|
||||
/** @var Account $entry */
|
||||
foreach ($set as $entry) {
|
||||
if ($entry->name === $value) {
|
||||
@ -504,10 +507,10 @@ class FireflyValidator extends Validator
|
||||
|
||||
/** @var Collection $set */
|
||||
$set = auth()->user()->accounts()->where('account_type_id', $type->id)->where('id', '!=', $ignore)->get();
|
||||
// See reference nr. 105
|
||||
// See reference nr. 105
|
||||
/** @var Account $entry */
|
||||
foreach ($set as $entry) {
|
||||
// See reference nr. 106
|
||||
// See reference nr. 106
|
||||
if ($entry->name === $value) {
|
||||
return false;
|
||||
}
|
||||
@ -718,7 +721,7 @@ class FireflyValidator extends Validator
|
||||
* @param mixed $value
|
||||
* @param mixed $parameters
|
||||
*
|
||||
* See reference nr. 107
|
||||
* See reference nr. 107
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user