kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 10:47:00 +00:00
Code Issues Projects Releases Wiki Activity

Expand budget pages to work with new date view.

Browse Source
This commit is contained in:
James Cole
2017-08-26 14:30:41 +02:00
parent 094ddfcf5f
commit ea2af2378d
6 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/Http/Controllers/BudgetController.php
View File

@@ -75,11 +75,9 @@ class BudgetController extends Controller
*/
public function amount(Request $request, Budget $budget)
{
$amount = intval($request->get('amount'));
/** @var Carbon $start */
$start = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $end */
$end = session('end', Carbon::now()->endOfMonth());
$amount = intval($request->get('amount'));
$start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
$end = Carbon::createFromFormat('Y-m-d', $request->get('end'));
$budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount);
if ($amount === 0) {
$budgetLimit = null;
@@ -243,7 +241,7 @@ class BudgetController extends Controller
compact(
'available', 'currentMonth', 'next', 'nextText', 'prev', 'prevText',
'periodStart', 'periodEnd', 'budgetInformation', 'inactive', 'budgets',
'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start'
'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end'
)
);
}
@@ -313,15 +311,15 @@ class BudgetController extends Controller
*/
public function postUpdateIncome(BudgetIncomeRequest $request)
{
$start = session('start', new Carbon);
$end = session('end', new Carbon);
$start = Carbon::createFromFormat('Y-m-d', $request->string('start'));
$end = Carbon::createFromFormat('Y-m-d', $request->string('end'));
$defaultCurrency = Amount::getDefaultCurrency();
$amount = $request->get('amount');
$this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount);
Preferences::mark();
return redirect(route('budgets.index'));
return redirect(route('budgets.index',[$start->format('Y-m-d')]));
}
/**
@@ -443,17 +441,17 @@ class BudgetController extends Controller
}
/**
* @return View
* @param Carbon $start
* @param Carbon $end
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function updateIncome()
public function updateIncome(Carbon $start, Carbon $end)
{
$start = session('start', new Carbon);
$end = session('end', new Carbon);
$defaultCurrency = Amount::getDefaultCurrency();
$available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end);
$available = round($available, $defaultCurrency->decimal_places);
return view('budgets.income', compact('available', 'start', 'end'));
}

2
app/Http/Requests/BudgetIncomeRequest.php
View File

@@ -37,6 +37,8 @@ class BudgetIncomeRequest extends Request
{
return [
'amount' => 'numeric|required|min:0',
'start' => 'required|date|before:end',
'end' => 'required|date|after:start',
];
}
}