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

Auto commit for release 'develop' on 2024-12-28

Browse Source
This commit is contained in:
github-actions
2024-12-28 10:58:01 +01:00
parent f2166b97b8
commit 6c655634bc
22 changed files with 87 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Account/EditController.php
View File

@@ -90,7 +90,7 @@ class EditController extends Controller
$latitude = null !== $location ? $location->latitude : config('firefly.default_location.latitude');
$longitude = null !== $location ? $location->longitude : config('firefly.default_location.longitude');
$zoomLevel = null !== $location ? $location->zoom_level : config('firefly.default_location.zoom_level');
$canEditCurrency = $account->piggyBanks()->count() === 0;
$canEditCurrency = 0 === $account->piggyBanks()->count();
$hasLocation = null !== $location;
$locations = [
'location' => [
@@ -163,7 +163,7 @@ class EditController extends Controller
$request->session()->flash('preFilled', $preFilled);
return view('accounts.edit', compact('account', 'currency','canEditCurrency', 'showNetWorth', 'subTitle', 'subTitleIcon', 'locations', 'liabilityDirections', 'objectType', 'roles', 'preFilled', 'liabilityTypes', 'interestPeriods'));
return view('accounts.edit', compact('account', 'currency', 'canEditCurrency', 'showNetWorth', 'subTitle', 'subTitleIcon', 'locations', 'liabilityDirections', 'objectType', 'roles', 'preFilled', 'liabilityTypes', 'interestPeriods'));
}
/**

10
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -197,11 +197,11 @@ class CategoryController extends Controller
$chartData[$inKey]
= [
'label' => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
'entries' => [],
'type' => 'bar',
'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
];
'label' => sprintf('%s (%s)', (string) trans('firefly.earned'), $currencyInfo['currency_name']),
'entries' => [],
'type' => 'bar',
'backgroundColor' => 'rgba(0, 141, 76, 0.5)', // green
];
// loop empty periods:
foreach (array_keys($periods) as $period) {
$label = $periods[$period];

2
app/Http/Controllers/ExchangeRates/IndexController.php
View File

@@ -47,7 +47,7 @@ class IndexController extends Controller
return $next($request);
}
);
if(!config('cer.enabled')) {
if (!config('cer.enabled')) {
throw new NotFoundHttpException();
}
}