kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-30 17:05:31 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-01-23

Browse Source
This commit is contained in:
JC5
2026-01-23 15:14:29 +01:00
parent 8f15a32bd6
commit eeeba86d38
888 changed files with 10732 additions and 10387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Transaction/EditController.php
View File

@@ -100,28 +100,28 @@ class EditController extends Controller
$previousUrl = str_replace($search, '', $previousUrl);
// settings necessary for v2
$optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
$optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
if (!is_array($optionalFields)) {
$optionalFields = [];
}
// not really a fan of this, but meh.
$optionalDateFields = [
$optionalDateFields = [
'interest_date' => $optionalFields['interest_date'] ?? false,
'book_date' => $optionalFields['book_date'] ?? false,
'process_date' => $optionalFields['process_date'] ?? false,
'due_date' => $optionalFields['due_date'] ?? false,
'payment_date' => $optionalFields['payment_date'] ?? false,
'invoice_date' => $optionalFields['invoice_date'] ?? false
'invoice_date' => $optionalFields['invoice_date'] ?? false,
];
$optionalFields['external_url'] ??= false;
$optionalFields['location'] ??= false;
$optionalFields['location'] =
$optionalFields['location'] && true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
$optionalFields['location'] ??= false;
$optionalFields['location']
= $optionalFields['location'] && true === FireflyConfig::get('enable_external_map', config('firefly.enable_external_map'))->data;
// map info voor v2:
$longitude = config('firefly.default_location.longitude');
$latitude = config('firefly.default_location.latitude');
$zoomLevel = config('firefly.default_location.zoom_level');
$longitude = config('firefly.default_location.longitude');
$latitude = config('firefly.default_location.latitude');
$zoomLevel = config('firefly.default_location.zoom_level');
return view('transactions.edit', [
'cash' => $cash,
@@ -137,7 +137,7 @@ class EditController extends Controller
'transactionGroup' => $transactionGroup,
'allowedOpposingTypes' => $allowedOpposingTypes,
'accountToTypes' => $accountToTypes,
'previousUrl' => $previousUrl
'previousUrl' => $previousUrl,
]);
}