kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-07-23 16:04:46 -07:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-02-06

Browse Source
This commit is contained in:
JC5
2026-02-06 18:26:14 +01:00
parent df8a406c58
commit e37ef69491
18 changed files with 255 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/RuleGroup/ExecutionController.php
+12 -12
View File
@@ -43,7 +43,7 @@ use Illuminate\View\View;
*/
class ExecutionController extends Controller
{
private readonly AccountRepositoryInterface $repository;
private readonly AccountRepositoryInterface $repository;
private readonly RuleGroupRepositoryInterface $ruleGroupRepository;
/**
@@ -55,7 +55,7 @@ class ExecutionController extends Controller
$this->repository = app(AccountRepositoryInterface::class);
$this->ruleGroupRepository = app(RuleGroupRepositoryInterface::class);
$this->middleware(function ($request, $next) {
app('view')->share('title', (string)trans('firefly.rules'));
app('view')->share('title', (string) trans('firefly.rules'));
app('view')->share('mainTitleIcon', 'fa-random');
$this->repository->setUser(auth()->user());
$this->ruleGroupRepository->setUser(auth()->user());
@@ -75,8 +75,8 @@ class ExecutionController extends Controller
// start code
/** @var User $user */
$user = auth()->user();
$accounts = implode(',', $request->get('accounts'));
$user = auth()->user();
$accounts = implode(',', $request->get('accounts'));
// create new rule engine:
$newRuleEngine = app(RuleEngineInterface::class);
$newRuleEngine->setUser($user);
@@ -84,22 +84,22 @@ class ExecutionController extends Controller
// add date operators.
if (null !== $request->get('start')) {
$startDate = new Carbon($request->get('start'));
$newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]);
$newRuleEngine->addOperator(['type' => 'date_after', 'value' => $startDate->format('Y-m-d')]);
}
if (null !== $request->get('end')) {
$endDate = new Carbon($request->get('end'));
$newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]);
$newRuleEngine->addOperator(['type' => 'date_before', 'value' => $endDate->format('Y-m-d')]);
}
// add extra operators:
$newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]);
$newRuleEngine->addOperator(['type' => 'account_id', 'value' => $accounts]);
// set rules:
$rules = $this->ruleGroupRepository->getActiveRules($ruleGroup);
$rules = $this->ruleGroupRepository->getActiveRules($ruleGroup);
$newRuleEngine->setRules($rules);
$newRuleEngine->fire();
$resultCount = $newRuleEngine->getResults();
$resultCount = $newRuleEngine->getResults();
// Tell the user that the job is queued
session()->flash('success', trans_choice('firefly.applied_rule_group_selection', $resultCount, ['title' => $ruleGroup->title]));
@@ -112,10 +112,10 @@ class ExecutionController extends Controller
*
* @return Factory|View
*/
public function selectTransactions(RuleGroup $ruleGroup): Factory | \Illuminate\Contracts\View\View
public function selectTransactions(RuleGroup $ruleGroup): Factory|\Illuminate\Contracts\View\View
{
$subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
$subTitle = (string) trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
return view('rules.rule-group.select-transactions', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]);
return view('rules.rule-group.select-transactions', ['ruleGroup' => $ruleGroup, 'subTitle' => $subTitle]);
}
}
app/Http/Controllers/Transaction/ShowController.php
+5 -2
View File
@@ -192,7 +192,6 @@ class ShowController extends Controller
{
$amounts = [];
foreach ($group['transactions'] as $transaction) {
// add normal amount:
$symbol = $transaction['currency_symbol'];
$amounts[$symbol] ??= ['amount' => '0', 'symbol' => $symbol, 'decimal_places' => $transaction['currency_decimal_places']];
@@ -214,7 +213,11 @@ class ShowController extends Controller
$amounts[$foreignSymbol]['amount'] = bcadd($amounts[$foreignSymbol]['amount'], (string) $transaction['foreign_amount']);
}
// add primary currency amount, but only if it is not the foreign amount or the current one.
if (null !== $transaction['pc_amount'] && $transaction['currency_id'] !== $this->primaryCurrency->id && $transaction['foreign_currency_code'] !== $this->primaryCurrency->code) {
if (
null !== $transaction['pc_amount']
&& $transaction['currency_id'] !== $this->primaryCurrency->id
&& $transaction['foreign_currency_code'] !== $this->primaryCurrency->code
) {
// same for foreign currency:
$primarySymbol = $this->primaryCurrency->symbol;
$amounts[$primarySymbol] ??= [