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

Fix bar, also multi currency #2977

Browse Source
This commit is contained in:
James Cole
2020-03-21 15:12:23 +01:00
parent 790e29f15e
commit cf4f76f211
5 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Json/BudgetController.php
View File

@@ -81,12 +81,24 @@ class BudgetController extends Controller
*/
public function getBudgetInformation(TransactionCurrency $currency, Carbon $start, Carbon $end): JsonResponse
{
$budgeted = $this->blRepository->budgeted($start, $end, $currency,);
$budgeted = $this->blRepository->budgeted($start, $end, $currency,);
$availableBudget = $this->abRepository->getByCurrencyDate($start, $end, $currency);
$available = '0';
$percentage = '0';
if (null !== $availableBudget) {
$available = $availableBudget->amount;
$percentage = bcmul(bcdiv($budgeted, $available), '100');
}
// if available, get the AB for this period + currency, so the bar can be redrawn.
return response()->json(
[
'budgeted' => $budgeted,
'budgeted_formatted' => app('amount')->formatAnything($currency, $budgeted, true),
'available' => app('amount')->formatAnything($currency, $available, true),
'available_formatted' => $available,
'percentage' => $percentage,
'currency_id' => $currency->id,
'currency_code' => $currency->code,
'currency_symbol' => $currency->symbol,