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

Expand changelog, add some debug.

Browse Source
This commit is contained in:
James Cole
2025-11-08 08:12:20 +01:00
parent 33e6a44d6f
commit 075b069026
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Recurring/EditController.php
View File

@@ -106,7 +106,6 @@ class EditController extends Controller
/** @var RecurrenceTransformer $transformer */ /** @var RecurrenceTransformer $transformer */
$transformer = app(RecurrenceTransformer::class); $transformer = app(RecurrenceTransformer::class);
$transformer->setParameters(new ParameterBag());
$array = $transformer->transform($recurrence); $array = $transformer->transform($recurrence);
$budgets = ExpandedForm::makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets()); $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgetRepos->getActiveBudgets());
$bills = ExpandedForm::makeSelectListWithEmpty($this->billRepository->getActiveBills()); $bills = ExpandedForm::makeSelectListWithEmpty($this->billRepository->getActiveBills());
@@ -155,6 +154,10 @@ class EditController extends Controller
$array['first_date'] = substr((string) $array['first_date'], 0, 10); $array['first_date'] = substr((string) $array['first_date'], 0, 10);
$array['repeat_until'] = substr((string) $array['repeat_until'], 0, 10); $array['repeat_until'] = substr((string) $array['repeat_until'], 0, 10);
$array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []); $array['transactions'][0]['tags'] = implode(',', $array['transactions'][0]['tags'] ?? []);
$array['transactions'][0]['amount'] = round((float) $array['transactions'][0]['amount'], $array['transactions'][0]['currency_decimal_places']);
if(null !== $array['transactions'][0]['foreign_amount']) {
$array['transactions'][0]['foreign_amount'] = round((float) $array['transactions'][0]['foreign_amount'], $array['transactions'][0]['foreign_currency_decimal_places']);
}
return view( return view(
'recurring.edit', 'recurring.edit',

11
app/Http/Controllers/ReportController.php
View File

@@ -155,16 +155,7 @@ class ReportController extends Controller
$start->endOfDay(); // end of day so the final balance is at the end of that day. $start->endOfDay(); // end of day so the final balance is at the end of that day.
$end->endOfDay(); $end->endOfDay();
app('view')->share( app('view')->share('subTitle', trans('firefly.report_category', ['start' => $start->isoFormat($this->monthAndDayFormat), 'end' => $end->isoFormat($this->monthAndDayFormat),]));
'subTitle',
trans(
'firefly.report_category',
[
'start' => $start->isoFormat($this->monthAndDayFormat),
'end' => $end->isoFormat($this->monthAndDayFormat),
]
)
);
$generator = ReportGeneratorFactory::reportGenerator('Category', $start, $end); $generator = ReportGeneratorFactory::reportGenerator('Category', $start, $end);
$generator->setAccounts($accounts); $generator->setAccounts($accounts);

8
app/TransactionRules/Engine/SearchRuleEngine.php
View File

@@ -376,15 +376,14 @@ class SearchRuleEngine implements RuleEngineInterface
$collection = $this->findStrictRule($rule); $collection = $this->findStrictRule($rule);
$this->processResults($rule, $collection); $this->processResults($rule, $collection);
Log::debug(sprintf('SearchRuleEngine:: done processing strict rule #%d', $rule->id));
$result = $collection->count() > 0; $result = $collection->count() > 0;
if (true === $result) { if (true === $result) {
Log::debug(sprintf('SearchRuleEngine:: rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count())); Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was triggered (on %d transaction(s)).', $rule->id, $collection->count()));
return true; return true;
} }
Log::debug(sprintf('SearchRuleEngine:: rule #%d was not triggered (on %d transaction(s)).', $rule->id, $collection->count())); Log::debug(sprintf('SearchRuleEngine:: Done. Rule #%d was not triggered (on %d transaction(s)).', $rule->id, $collection->count()));
return false; return false;
} }
@@ -496,7 +495,7 @@ class SearchRuleEngine implements RuleEngineInterface
$collection = $this->findNonStrictRule($rule); $collection = $this->findNonStrictRule($rule);
$this->processResults($rule, $collection); $this->processResults($rule, $collection);
Log::debug(sprintf('SearchRuleEngine:: done processing non-strict rule #%d', $rule->id)); Log::debug(sprintf('SearchRuleEngine:: Done processing non-strict rule #%d', $rule->id));
return $collection->count() > 0; return $collection->count() > 0;
} }
@@ -534,6 +533,7 @@ class SearchRuleEngine implements RuleEngineInterface
return; return;
} }
} }
Log::debug(sprintf('Done with rule group #%d.', $group->id));
} }
/** /**

3
changelog.md
View File

@@ -8,8 +8,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Fixed ### Fixed
- [Issue 11157](https://github.com/firefly-iii/firefly-iii/issues/11157) (Redacted amounts misbehave with Reports) reported by @barreeeiroo - [Issue 11157](https://github.com/firefly-iii/firefly-iii/issues/11157) (Redacted amounts misbehave with Reports) reported by @barreeeiroo
- #11166
- #11185 - #11185
## 6.4.4 - 2025-11-02 ## 6.4.4 - 2025-11-02
### Added ### Added