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

Fix #3425

Browse Source
This commit is contained in:
James Cole
2020-06-04 06:31:34 +02:00
parent 361f78542a
commit 3db778a2b1
4 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Http/Controllers/Budget/AvailableBudgetController.php
View File

@@ -177,12 +177,26 @@ class AvailableBudgetController extends Controller
$end = session()->get('end'); $end = session()->get('end');
Log::info($e->getMessage()); Log::info($e->getMessage());
} }
// validate amount
$amount = (string) $request->get('amount');
if ('' === $amount) {
session()->flash('error', trans('firefly.invalid_amount'));
return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
}
if (0 === bccomp('0', $amount)) {
session()->flash('error', trans('firefly.invalid_amount'));
return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
}
// find currency // find currency
$currency = $this->currencyRepos->find((int) $request->get('currency_id')); $currency = $this->currencyRepos->find((int) $request->get('currency_id'));
if (null === $currency) { if (null === $currency) {
session()->flash('error', trans('firefly.invalid_currency')); session()->flash('error', trans('firefly.invalid_currency'));
return redirect(route('budgets.index')); return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
} }
// find existing AB // find existing AB
@@ -190,7 +204,7 @@ class AvailableBudgetController extends Controller
if (null === $existing) { if (null === $existing) {
$this->abRepository->store( $this->abRepository->store(
[ [
'amount' => $request->get('amount'), 'amount' => $amount,
'currency' => $currency, 'currency' => $currency,
'start' => $start, 'start' => $start,
'end' => $end, 'end' => $end,
@@ -199,7 +213,7 @@ class AvailableBudgetController extends Controller
} }
if (null !== $existing) { if (null !== $existing) {
// update amount: // update amount:
$this->abRepository->update($existing, ['amount' => $request->get('amount')]); $this->abRepository->update($existing, ['amount' => $amount]);
} }
session()->flash('success', trans('firefly.set_ab')); session()->flash('success', trans('firefly.set_ab'));
@@ -217,7 +231,21 @@ class AvailableBudgetController extends Controller
*/ */
public function update(Request $request, AvailableBudget $availableBudget, Carbon $start, Carbon $end) public function update(Request $request, AvailableBudget $availableBudget, Carbon $start, Carbon $end)
{ {
$this->abRepository->update($availableBudget, ['amount' => $request->get('amount')]); // validate amount
$amount = (string) $request->get('amount');
if ('' === $amount) {
session()->flash('error', trans('firefly.invalid_amount'));
return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
}
if (0 === bccomp('0', $amount)) {
session()->flash('error', trans('firefly.invalid_amount'));
return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
}
$this->abRepository->update($availableBudget, ['amount' => $amount]);
session()->flash('success', trans('firefly.updated_ab')); session()->flash('success', trans('firefly.updated_ab'));
return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')])); return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));

2
resources/views/v1/budgets/available-budgets/create-alternative.twig
View File

@@ -24,7 +24,7 @@
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<input step="any" class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/> <input step="any" required class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

2
resources/views/v1/budgets/available-budgets/create.twig
View File

@@ -24,7 +24,7 @@
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">{{ currency.symbol|raw }}</div> <div class="input-group-addon">{{ currency.symbol|raw }}</div>
<input step="any" class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/> <input step="any" required class="form-control" id="amount" value="" autocomplete="off" name="amount" type="number"/>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">

2
resources/views/v1/budgets/available-budgets/edit.twig
View File

@@ -20,7 +20,7 @@
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">{{ availableBudget.transactionCurrency.symbol|raw }}</div> <div class="input-group-addon">{{ availableBudget.transactionCurrency.symbol|raw }}</div>
<input step="any" class="form-control" id="amount" value="{{ availableBudget.amount }}" autocomplete="off" name="amount" type="number"/> <input step="any" required class="form-control" id="amount" value="{{ availableBudget.amount }}" autocomplete="off" name="amount" type="number"/>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">