IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-26 00:41:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make sure create uses the right fields.

Browse Source
This commit is contained in:
James Cole 2020-03-14 07:49:11 +01:00
parent bde0732135
commit fdffed636f
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Budget/CreateController.php
View File

@ -71,8 +71,8 @@ class CreateController extends Controller
{
$hasOldInput = null !== $request->old('_token');
// auto budget options
$autoBudgetOptions = [
// auto budget types
$autoBudgetTypes = [
0 => (string)trans('firefly.auto_budget_none'),
AutoBudget::AUTO_BUDGET_RESET => (string)trans('firefly.auto_budget_reset'),
AutoBudget::AUTO_BUDGET_ROLLOVER => (string)trans('firefly.auto_budget_rollover'),
@ -101,7 +101,7 @@ class CreateController extends Controller
$request->session()->forget('budgets.create.fromStore');
$subTitle = (string)trans('firefly.create_new_budget');
return view('budgets.create', compact('subTitle', 'autoBudgetOptions', 'autoBudgetPeriods'));
return view('budgets.create', compact('subTitle', 'autoBudgetTypes', 'autoBudgetPeriods'));
}

6
app/Http/Requests/BudgetFormStoreRequest.php
View File

@ -50,7 +50,7 @@ class BudgetFormStoreRequest extends Request
return [
'name' => $this->string('name'),
'active' => $this->boolean('active'),
'auto_budget_type' => $this->integer('auto_budget_type'),
'auto_budget_type' => $this->integer('auto_budget_type'),
'transaction_currency_id' => $this->integer('transaction_currency_id'),
'auto_budget_amount' => $this->string('auto_budget_amount'),
'auto_budget_period' => $this->string('auto_budget_period'),
@ -67,8 +67,8 @@ class BudgetFormStoreRequest extends Request
return [
'name' => 'required|between:1,100|uniqueObjectForUser:budgets,name',
'active' => 'numeric|between:0,1',
'auto_budget_option' => 'numeric|between:0,2',
'transaction_currency_id' => 'required|exists:transaction_currencies,id',
'auto_budget_type' => 'numeric|between:0,2',
'auto_budget_currency_id' => 'required|exists:transaction_currencies,id',
'auto_budget_amount' => 'min:0|max:1000000000',
'auto_budget_period' => 'in:daily,weekly,monthly,quarterly,half_year,yearly',
];

1
resources/lang/en_US/firefly.php
View File

@ -792,6 +792,7 @@ return [
'auto_budget_period_quarterly' => 'Quarterly',
'auto_budget_period_half_year' => 'Every half year',
'auto_budget_period_yearly' => 'Yearly',
'auto_budget_help' => 'You can read more about this feature in the help. Click the top-right (?) icon.',
// bills:
'match_between_amounts' => 'Bill matches transactions between :low and :high.',

3
resources/lang/en_US/form.php
View File

@ -43,6 +43,7 @@ return [
'journal_currency_id' => 'Currency',
'currency_id' => 'Currency',
'transaction_currency_id' => 'Currency',
'auto_budget_currency_id' => 'Currency',
'external_ip' => 'Your server\'s external IP',
'attachments' => 'Attachments',
'journal_amount' => 'Amount',
@ -260,7 +261,7 @@ return [
'expected_on' => 'Expected on',
'paid' => 'Paid',
'auto_budget_option' => 'Auto-budget',
'auto_budget_type' => 'Auto-budget',
'auto_budget_amount' => 'Auto-budget amount',
'auto_budget_period' => 'Auto-budget period',

4
resources/views/v1/budgets/create.twig
View File

@ -28,8 +28,8 @@
<h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="box-body">
{{ ExpandedForm.select('auto_budget_option', autoBudgetOptions) }}
{{ CurrencyForm.currencyList('transaction_currency_id') }}
{{ ExpandedForm.select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }}
{{ CurrencyForm.currencyList('auto_budget_currency_id') }}
{{ ExpandedForm.amountNoCurrency('auto_budget_amount') }}
{{ ExpandedForm.select('auto_budget_period', autoBudgetPeriods, null) }}
</div>