From d5a10fc8752819d34975e1b6985afacd7055439c Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 20 Sep 2019 16:43:57 +0200
Subject: [PATCH] Fix #2624

---
 .../Budget/AvailableBudgetController.php           | 14 ++++++++++----
 .../views/v1/budgets/available-budgets/edit.twig   |  2 +-
 resources/views/v1/budgets/index.twig              |  4 ++--
 routes/web.php                                     |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Budget/AvailableBudgetController.php b/app/Http/Controllers/Budget/AvailableBudgetController.php
index f3d7402505..285cec087a 100644
--- a/app/Http/Controllers/Budget/AvailableBudgetController.php
+++ b/app/Http/Controllers/Budget/AvailableBudgetController.php
@@ -147,11 +147,14 @@ class AvailableBudgetController extends Controller
     /**
      * @param AvailableBudget $availableBudget
      *
+     * @param Carbon          $start
+     * @param Carbon          $end
+     *
      * @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 AvailableBudget $availableBudget
      *
+     * @param Carbon          $start
+     * @param Carbon          $end
+     *
      * @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')]);
         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')]));
     }
 
 }
\ No newline at end of file
diff --git a/resources/views/v1/budgets/available-budgets/edit.twig b/resources/views/v1/budgets/available-budgets/edit.twig
index b25add6acc..cbad29b1a7 100644
--- a/resources/views/v1/budgets/available-budgets/edit.twig
+++ b/resources/views/v1/budgets/available-budgets/edit.twig
@@ -9,7 +9,7 @@
             </h4>
         </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">
                 <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
                 <input type="hidden" name="page" value="{{ page }}"/>
diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig
index a611161841..8d34f9736a 100644
--- a/resources/views/v1/budgets/index.twig
+++ b/resources/views/v1/budgets/index.twig
@@ -413,9 +413,9 @@
         var budgetIndexUri = "{{ route('budgets.index',['START','END']) }}";
         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 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 updateBudgetLimitUri = "{{ route('budget-limits.update', ['REPLACEME']) }}";
 
diff --git a/routes/web.php b/routes/web.php
index b0ff79a092..f583310ca9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -240,8 +240,8 @@ Route::group(
         Route::post('store', ['uses' => 'Budget\AvailableBudgetController@store', 'as' => 'store']);
 
         // edit
-        Route::get('edit/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@edit', 'as' => 'edit']);
-        Route::post('update/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@update', 'as' => 'update']);
+        Route::get('edit/{availableBudget}/{start_date}/{end_date}', ['uses' => 'Budget\AvailableBudgetController@edit', 'as' => 'edit']);
+        Route::post('update/{availableBudget}/{start_date}/{end_date}', ['uses' => 'Budget\AvailableBudgetController@update', 'as' => 'update']);
 
         Route::get('delete/{availableBudget}', ['uses' => 'Budget\AvailableBudgetController@delete', 'as' => 'delete']);
     }