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

Fix three years ago.

Browse Source
This commit is contained in:
James Cole
2025-08-10 07:31:10 +02:00
parent ef317d5b3c
commit c3a28fc698
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Account/ShowController.php
View File

@@ -119,8 +119,11 @@ class ShowController extends Controller
$firstTransaction = $this->repository->oldestJournalDate($account) ?? $start; $firstTransaction = $this->repository->oldestJournalDate($account) ?? $start;
// go back max 3 years. // go back max 3 years.
$threeYearsAgo = $start->subYears(3); $threeYearsAgo = clone $start;
$firstTransaction = $firstTransaction->lt($threeYearsAgo) ? $threeYearsAgo : $firstTransaction; $threeYearsAgo->startOfYear()->subYears(3);
if($firstTransaction->lt($threeYearsAgo)) {
$firstTransaction = clone $threeYearsAgo;
}
Log::debug('Start period overview'); Log::debug('Start period overview');
$timer = Timer::getInstance(); $timer = Timer::getInstance();

8
app/Support/JsonApi/Enrichments/SubscriptionEnrichment.php
View File

@@ -345,7 +345,7 @@ class SubscriptionEnrichment implements EnrichmentInterface
private function getLastPaidDate(array $paidData): ?Carbon private function getLastPaidDate(array $paidData): ?Carbon
{ {
Log::debug('getLastPaidDate()'); //Log::debug('getLastPaidDate()');
$return = null; $return = null;
foreach ($paidData as $entry) { foreach ($paidData as $entry) {
if (null !== $return) { if (null !== $return) {
@@ -354,15 +354,15 @@ class SubscriptionEnrichment implements EnrichmentInterface
if ($current->gt($return)) { if ($current->gt($return)) {
$return = clone $current; $return = clone $current;
} }
Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d'))); Log::debug(sprintf('[a] Last paid date is: %s', $return->format('Y-m-d')));
} }
if (null === $return) { if (null === $return) {
/** @var Carbon $return */ /** @var Carbon $return */
$return = $entry['date_object']; $return = $entry['date_object'];
Log::debug(sprintf('Last paid date is: %s', $return->format('Y-m-d'))); Log::debug(sprintf('[b] Last paid date is: %s', $return->format('Y-m-d')));
} }
} }
Log::debug(sprintf('Last paid date is: "%s"', $return?->format('Y-m-d'))); Log::debug(sprintf('[c] Last paid date is: "%s"', $return?->format('Y-m-d')));
return $return; return $return;
} }