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

Merge pull request #7057 from firefly-iii/missing-indexes

Browse Source 
Missing indexes
This commit is contained in:
James Cole
2023-02-19 10:52:24 +01:00
committed by GitHub
parent b7c2576970 84987dbe02
commit aab8eb467c
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Http/Controllers/Bill/IndexController.php
View File

@@ -215,15 +215,19 @@ class IndexController extends Controller
// per period:
$division = [
'1Y' => '1',
'6M' => '2',
'3M' => '4',
'1M' => '12',
'1W' => '52.16',
'1D' => '365.24',
'YTD' => '1',
'QTD' => '4',
'MTD' => '12',
'1Y' => '1',
'6M' => '2',
'3M' => '4',
'1M' => '12',
'1W' => '52.16',
'1D' => '365.24',
'YTD' => '1',
'QTD' => '4',
'MTD' => '12',
'last7' => '52.16',
'last30' => '12',
'last90' => '4',
'last365' => '1',
];
$perPeriod = bcdiv($yearAmount, $division[$range]);

5
app/Services/Internal/Update/RecurrenceUpdateService.php
View File

@@ -193,8 +193,9 @@ class RecurrenceUpdateService
$originalCount = $recurrence->recurrenceRepetitions()->count();
if (1 === $originalCount) {
Log::debug('Return the first one');
return $recurrence->recurrenceRepetitions()->first();
/** @var RecurrenceRepetition $result */
$result = $recurrence->recurrenceRepetitions()->first();
return $result;
}
// find it:
$fields = [