IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-08-26 13:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-03-13

Browse Source
This commit is contained in:
JC5
2026-03-13 03:55:47 +01:00
parent bc23bc0173
commit 63c49f740f
262 changed files with 904 additions and 940 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Rule/CreateController.php
+2 -3
View File
@@ -40,7 +40,6 @@ use Illuminate\Contracts\View\Factory;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
/**
@@ -95,13 +94,13 @@ final class CreateController extends Controller
if (count($words) > 0) {
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $words)]));
foreach ($words as $word) {
$operators[] = ['type' => 'description_contains', 'value' => $word];
$operators[] = ['type' => 'description_contains', 'value' => $word];
}
}
if (count($excludedWords) > 0) {
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $excludedWords)]));
foreach ($excludedWords as $excludedWord) {
$operators[] = ['type' => '-description_contains', 'value' => $excludedWord];
$operators[] = ['type' => '-description_contains', 'value' => $excludedWord];
}
}
$oldTriggers = $this->parseFromOperators($operators);
app/Http/Controllers/Rule/DeleteController.php
+1 -1
View File
@@ -69,7 +69,7 @@ final class DeleteController extends Controller
// put previous url in session
$this->rememberPreviousUrl('rules.delete.url');
return view('rules.rule.delete', ['rule' => $rule, 'subTitle' => $subTitle]);
return view('rules.rule.delete', ['rule' => $rule, 'subTitle' => $subTitle]);
}
/**
app/Http/Controllers/Rule/EditController.php
+3 -4
View File
@@ -37,7 +37,6 @@ use FireflyIII\Support\Search\SearchInterface;
use Illuminate\Contracts\View\Factory;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use Throwable;
@@ -94,13 +93,13 @@ final class EditController extends Controller
if (count($words) > 0) {
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $words)]));
foreach ($words as $word) {
$operators[] = ['type' => 'description_contains', 'value' => $word];
$operators[] = ['type' => 'description_contains', 'value' => $word];
}
}
if (count($excludedWords) > 0) {
session()->flash('warning', trans('firefly.rule_from_search_words', ['string' => implode('', $excludedWords)]));
foreach ($excludedWords as $excludedWord) {
$operators[] = ['type' => '-description_contains', 'value' => $excludedWord];
$operators[] = ['type' => '-description_contains', 'value' => $excludedWord];
}
}
$oldTriggers = $this->parseFromOperators($operators);
@@ -130,7 +129,7 @@ final class EditController extends Controller
// get rule trigger for update / store-journal:
$primaryTrigger = $this->ruleRepos->getPrimaryTrigger($rule);
$subTitle = (string) trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]);
$subTitle = (string) trans('firefly.edit_rule', ['nr' => $rule->order, 'title' => $rule->title]);
// put previous url in session if not redirect from store (not "return_to_edit").
if (true !== session('rules.edit.fromUpdate')) {
app/Http/Controllers/Rule/IndexController.php
+1 -1
View File
@@ -87,7 +87,7 @@ final class IndexController extends Controller
{
$route = route('search.index');
$query = $this->ruleRepos->getSearchQuery($rule);
$route = sprintf('%s?%s', $route, http_build_query(['search' => $query, 'rule' => $rule->id]));
$route = sprintf('%s?%s', $route, http_build_query(['search' => $query, 'rule' => $rule->id]));
return redirect($route);
}
app/Http/Controllers/Rule/SelectController.php
+8 -8
View File
@@ -80,15 +80,15 @@ final class SelectController 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:
$newRuleEngine->setRules(new Collection()->push($rule));
@@ -113,7 +113,7 @@ final class SelectController extends Controller
// does the user have shared accounts?
$subTitle = (string) trans('firefly.apply_rule_selection', ['title' => $rule->title]);
return view('rules.rule.select-transactions', ['rule' => $rule, 'subTitle' => $subTitle]);
return view('rules.rule.select-transactions', ['rule' => $rule, 'subTitle' => $subTitle]);
}
/**
@@ -136,7 +136,7 @@ final class SelectController extends Controller
// warn if nothing.
if (0 === count($textTriggers)) {
return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]);
return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]);
}
foreach ($textTriggers as $textTrigger) {
@@ -185,7 +185,7 @@ final class SelectController extends Controller
throw new FireflyException($view, 0, $exception);
}
return response()->json(['html' => $view, 'warning' => $warning]);
return response()->json(['html' => $view, 'warning' => $warning]);
}
/**
@@ -199,7 +199,7 @@ final class SelectController extends Controller
$triggers = $rule->ruleTriggers;
if (0 === count($triggers)) {
return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]);
return response()->json(['html' => '', 'warning' => (string) trans('firefly.warning_no_valid_triggers')]);
}
// create new rule engine:
$newRuleEngine = app(RuleEngineInterface::class);
@@ -227,6 +227,6 @@ final class SelectController extends Controller
throw new FireflyException($message, 0, $exception);
}
return response()->json(['html' => $view, 'warning' => $warning]);
return response()->json(['html' => $view, 'warning' => $warning]);
}
}