kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-02 03:51:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix for #1016 and #968

Browse Source
This commit is contained in:
James Cole
2017-11-24 17:05:22 +01:00
parent 1aa325053e
commit 7a1f698d5e
3 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,7 +79,7 @@ class BudgetController extends Controller
*
* @return \Illuminate\Http\JsonResponse
*/
public function amount(Request $request, Budget $budget)
public function amount(Request $request, BudgetRepositoryInterface $repository, Budget $budget)
{
$amount = strval($request->get('amount'));
$start = Carbon::createFromFormat('Y-m-d', $request->get('start'));
@@ -88,9 +88,15 @@ class BudgetController extends Controller
if (0 === $amount) {
$budgetLimit = null;
}
// calculate left in budget:
$spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end);
$currency = app('amount')->getDefaultCurrency();
$left = app('amount')->formatAnything($currency, bcadd($amount, $spent), true);
Preferences::mark();
return Response::json(['name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount]);
return Response::json(['left' => $left, 'name' => $budget->name, 'limit' => $budgetLimit ? $budgetLimit->id : 0, 'amount' => $amount]);
}
/**