kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 19:53:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'adminlte4' into develop

Browse Source
This commit is contained in:
James Cole
2023-08-12 17:44:08 +02:00
parent 1b9d8dd3c3 4a73caf4c3
commit 7ce6dc9f16
119 changed files with 22217 additions and 5547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Api/V1/Controllers/Summary/BasicController.php
View File

@@ -322,16 +322,11 @@ class BasicController extends Controller
'currency_decimal_places' => $row['currency_decimal_places'],
'value_parsed' => app('amount')->formatFlat($row['currency_symbol'], $row['currency_decimal_places'], $leftToSpend, false),
'local_icon' => 'money',
'sub_title' => (string)trans(
'firefly.box_spend_per_day',
[
'amount' => app('amount')->formatFlat(
$row['currency_symbol'],
$row['currency_decimal_places'],
$perDay,
false
),
]
'sub_title' => app('amount')->formatFlat(
$row['currency_symbol'],
$row['currency_decimal_places'],
$perDay,
false
),
];
}

1
app/Api/V2/Controllers/Chart/CategoryController.php
View File

@@ -134,5 +134,4 @@ class CategoryController extends Controller
return response()->json($this->clean($return));
}
}