kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 23:06:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2624

Browse Source
This commit is contained in:
James Cole
2019-09-20 16:43:57 +02:00
parent 50ad9fbf94
commit d5a10fc875
4 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,11 +147,14 @@ class AvailableBudgetController extends Controller
/** /**
* @param AvailableBudget $availableBudget * @param AvailableBudget $availableBudget
* *
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/ */
public function edit(AvailableBudget $availableBudget) public function edit(AvailableBudget $availableBudget, Carbon $start, Carbon $end)
{ {
return view('budgets.available-budgets.edit', compact('availableBudget')); return view('budgets.available-budgets.edit', compact('availableBudget','start','end'));
} }
/** /**
@@ -203,14 +206,17 @@ class AvailableBudgetController extends Controller
* @param Request $request * @param Request $request
* @param AvailableBudget $availableBudget * @param AvailableBudget $availableBudget
* *
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/ */
public function update(Request $request, AvailableBudget $availableBudget) public function update(Request $request, AvailableBudget $availableBudget, Carbon $start, Carbon $end)
{ {
$this->abRepository->update($availableBudget, ['amount' => $request->get('amount')]); $this->abRepository->update($availableBudget, ['amount' => $request->get('amount')]);
session()->flash('success', trans('firefly.updated_ab')); session()->flash('success', trans('firefly.updated_ab'));
return redirect(route('budgets.index')); return redirect(route('budgets.index', [$start->format('Y-m-d'), $end->format('Y-m-d')]));
} }
} }

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

@@ -9,7 +9,7 @@
</h4> </h4>
</div> </div>
<form style="display: inline;" id="income" action="{{ route('available-budgets.update', [availableBudget.id]) }}" method="POST"> <form style="display: inline;" id="income" action="{{ route('available-budgets.update', [availableBudget.id, start.format('Y-m-d'), end.format('Y-m-d')]) }}" method="POST">
<div class="modal-body"> <div class="modal-body">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/> <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<input type="hidden" name="page" value="{{ page }}"/> <input type="hidden" name="page" value="{{ page }}"/>

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

@@ -413,9 +413,9 @@
var budgetIndexUri = "{{ route('budgets.index',['START','END']) }}"; var budgetIndexUri = "{{ route('budgets.index',['START','END']) }}";
var createAvailableBudgetUri = "{{ route('available-budgets.create', [start.format('Y-m-d'), end.format('Y-m-d')]) }}"; var createAvailableBudgetUri = "{{ route('available-budgets.create', [start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var createAltAvailableBudgetUri = "{{ route('available-budgets.create-alternative', [start.format('Y-m-d'), end.format('Y-m-d')]) }}"; var createAltAvailableBudgetUri = "{{ route('available-budgets.create-alternative', [start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var editAvailableBudgetUri = "{{ route('available-budgets.edit', ['REPLACEME']) }}"; var editAvailableBudgetUri = "{{ route('available-budgets.edit', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var createBudgetLimitUri = "{{ route('budget-limits.create', ['REPLACEME',start.format('Y-m-d'), end.format('Y-m-d')]) }}"; var createBudgetLimitUri = "{{ route('budget-limits.create', ['REPLACEME', start.format('Y-m-d'), end.format('Y-m-d')]) }}";
var storeBudgetLimitUri = "{{ route('budget-limits.store') }}"; var storeBudgetLimitUri = "{{ route('budget-limits.store') }}";
var updateBudgetLimitUri = "{{ route('budget-limits.update', ['REPLACEME']) }}"; var updateBudgetLimitUri = "{{ route('budget-limits.update', ['REPLACEME']) }}";

4
routes/web.php
View File

@@ -240,8 +240,8 @@ Route::group(
Route::post('store', ['uses' => 'Budget\AvailableBudgetController@store', 'as' => 'store']); Route::post('store', ['uses' => 'Budget\AvailableBudgetController@store', 'as' => 'store']);
// edit // edit
Route::get('edit/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@edit', 'as' => 'edit']); Route::get('edit/{availableBudget}/{start_date}/{end_date}', ['uses' => 'Budget\AvailableBudgetController@edit', 'as' => 'edit']);
Route::post('update/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@update', 'as' => 'update']); Route::post('update/{availableBudget}/{start_date}/{end_date}', ['uses' => 'Budget\AvailableBudgetController@update', 'as' => 'update']);
Route::get('delete/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@delete', 'as' => 'delete']); Route::get('delete/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@delete', 'as' => 'delete']);
} }