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

Fix #2467

Browse Source
This commit is contained in:
James Cole
2019-08-23 06:40:48 +02:00
parent 3d444eb833
commit a1f57a0949
6 changed files with 140 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BillController.php
View File

@@ -206,7 +206,7 @@ class BillController extends Controller
/** @var Collection $bills */
$bills = $paginator->getCollection()->map(
function (Bill $bill) use ($transformer) {
static function (Bill $bill) use ($transformer) {
$return = $transformer->transform($bill);
$return['currency'] = $bill->transactionCurrency;

4
app/Http/Middleware/Range.php
View File

@@ -95,6 +95,10 @@ class Range
$dateTimeFormat = (string)trans('config.date_time');
$defaultCurrency = app('amount')->getDefaultCurrency();
// also format for moment JS:
$madMomentJS = (string)trans('config.month_and_day_moment_js');
app('view')->share('madMomentJS', $madMomentJS);
app('view')->share('monthAndDayFormat', $monthAndDayFormat);
app('view')->share('dateTimeFormat', $dateTimeFormat);
app('view')->share('defaultCurrency', $defaultCurrency);