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

Fix https://github.com/firefly-iii/firefly-iii/issues/8521

Browse Source
This commit is contained in:
James Cole
2024-02-07 06:14:40 +01:00
parent ba8d65835a
commit d0844356cb
4 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Handlers/Events/Model/BudgetLimitHandler.php
View File

@@ -154,6 +154,7 @@ class BudgetLimitHandler
] ]
); );
$availableBudget->save(); $availableBudget->save();
app('log')->debug(sprintf('ID of new AB is #%d', $availableBudget->id));
} }
} }

26
app/Helpers/Collector/GroupCollector.php
View File

@@ -672,8 +672,7 @@ class GroupCollector implements GroupCollectorInterface
// include budget ID + name (if any) // include budget ID + name (if any)
->withBudgetInformation() ->withBudgetInformation()
// include bill ID + name (if any) // include bill ID + name (if any)
->withBillInformation() ->withBillInformation();
;
return $this; return $this;
} }
@@ -931,6 +930,11 @@ class GroupCollector implements GroupCollectorInterface
private function postFilterCollection(Collection $collection): Collection private function postFilterCollection(Collection $collection): Collection
{ {
$currentCollection = $collection; $currentCollection = $collection;
$countFilters = count($this->postFilters);
$countCollection = count($currentCollection);
if (0 === $countFilters && 0 === $countCollection) {
return $currentCollection;
}
app('log')->debug(sprintf('GroupCollector: postFilterCollection has %d filter(s) and %d transaction(s).', count($this->postFilters), count($currentCollection))); app('log')->debug(sprintf('GroupCollector: postFilterCollection has %d filter(s) and %d transaction(s).', count($this->postFilters), count($currentCollection)));
/** /**
@@ -985,8 +989,7 @@ class GroupCollector implements GroupCollectorInterface
'transactions as source', 'transactions as source',
static function (JoinClause $join): void { static function (JoinClause $join): void {
$join->on('source.transaction_journal_id', '=', 'transaction_journals.id') $join->on('source.transaction_journal_id', '=', 'transaction_journals.id')
->where('source.amount', '<', 0) ->where('source.amount', '<', 0);
;
} }
) )
// join destination transaction // join destination transaction
@@ -994,8 +997,7 @@ class GroupCollector implements GroupCollectorInterface
'transactions as destination', 'transactions as destination',
static function (JoinClause $join): void { static function (JoinClause $join): void {
$join->on('destination.transaction_journal_id', '=', 'transaction_journals.id') $join->on('destination.transaction_journal_id', '=', 'transaction_journals.id')
->where('destination.amount', '>', 0) ->where('destination.amount', '>', 0);
;
} }
) )
// left join transaction type. // left join transaction type.
@@ -1010,8 +1012,7 @@ class GroupCollector implements GroupCollectorInterface
->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC') ->orderBy('transaction_journals.id', 'DESC')
->orderBy('transaction_journals.description', 'DESC') ->orderBy('transaction_journals.description', 'DESC')
->orderBy('source.amount', 'DESC') ->orderBy('source.amount', 'DESC');
;
} }
/** /**
@@ -1029,8 +1030,7 @@ class GroupCollector implements GroupCollectorInterface
'transactions as source', 'transactions as source',
static function (JoinClause $join): void { static function (JoinClause $join): void {
$join->on('source.transaction_journal_id', '=', 'transaction_journals.id') $join->on('source.transaction_journal_id', '=', 'transaction_journals.id')
->where('source.amount', '<', 0) ->where('source.amount', '<', 0);
;
} }
) )
// join destination transaction // join destination transaction
@@ -1038,8 +1038,7 @@ class GroupCollector implements GroupCollectorInterface
'transactions as destination', 'transactions as destination',
static function (JoinClause $join): void { static function (JoinClause $join): void {
$join->on('destination.transaction_journal_id', '=', 'transaction_journals.id') $join->on('destination.transaction_journal_id', '=', 'transaction_journals.id')
->where('destination.amount', '>', 0) ->where('destination.amount', '>', 0);
;
} }
) )
// left join transaction type. // left join transaction type.
@@ -1054,7 +1053,6 @@ class GroupCollector implements GroupCollectorInterface
->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC') ->orderBy('transaction_journals.id', 'DESC')
->orderBy('transaction_journals.description', 'DESC') ->orderBy('transaction_journals.description', 'DESC')
->orderBy('source.amount', 'DESC') ->orderBy('source.amount', 'DESC');
;
} }
} }

4
app/Repositories/Budget/AvailableBudgetRepository.php
View File

@@ -66,8 +66,8 @@ class AvailableBudgetRepository implements AvailableBudgetRepositoryInterface
if (null !== $start && null !== $end) { if (null !== $start && null !== $end) {
$query->where( $query->where(
static function (Builder $q1) use ($start, $end): void { // @phpstan-ignore-line static function (Builder $q1) use ($start, $end): void { // @phpstan-ignore-line
$q1->where('start_date', '=', $start->format('Y-m-d')); $q1->where('start_date', '=', $start);
$q1->where('end_date', '=', $end->format('Y-m-d')); $q1->where('end_date', '=', $end);
} }
); );
} }

1
app/Support/Navigation.php
View File

@@ -216,7 +216,6 @@ class Navigation
public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon
{ {
$currentEnd = clone $end; $currentEnd = clone $end;
Log::debug(sprintf('endOfPeriod("%s", "%s")', $currentEnd->format('Y-m-d'), $repeatFreq));
$functionMap = [ $functionMap = [
'1D' => 'endOfDay', '1D' => 'endOfDay',