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

Merge branch 'develop' into 5.8-dev

Browse Source 
# Conflicts:
#	frontend/src/i18n/tr_TR/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt-br.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	resources/lang/bg_BG/firefly.php
#	resources/lang/fr_FR/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/ru_RU/firefly.php
This commit is contained in:
James Cole
2022-10-08 07:03:40 +02:00
parent da71d6172c 030b6cb281
commit 05fe503456
157 changed files with 22467 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Budget/BudgetLimitController.php
View File

@@ -157,8 +157,8 @@ class BudgetLimitController extends Controller
// return empty=ish array:
return response()->json([]);
}
if ((int) $amount > 16777216) {
$amount = '16777216';
if ((int) $amount > 268435456) {
$amount = '268435456';
}
if (null !== $limit) {
@@ -223,8 +223,8 @@ class BudgetLimitController extends Controller
];
return response()->json($array);
}
if ((int) $amount > 16777216) { // 16 million
$amount = '16777216';
if ((int) $amount > 268435456) { // 268 million
$amount = '268435456';
}
$limit = $this->blRepository->update($budgetLimit, ['amount' => $amount]);

2
app/Validation/AutoBudget/ValidatesAutoBudgetRequest.php
View File

@@ -67,7 +67,7 @@ trait ValidatesAutoBudgetRequest
$validator->errors()->add('auto_budget_amount', (string) trans('validation.require_currency_info'));
}
// too big amount
if((int)$amount > 16777216) {
if((int)$amount > 268435456) {
$validator->errors()->add('auto_budget_amount', (string) trans('validation.amount_required_for_auto_budget'));
return;
}