diff --git a/app/Api/V1/Controllers/Models/Rule/TriggerController.php b/app/Api/V1/Controllers/Models/Rule/TriggerController.php index d1ef9a4bca..90dff0e13f 100644 --- a/app/Api/V1/Controllers/Models/Rule/TriggerController.php +++ b/app/Api/V1/Controllers/Models/Rule/TriggerController.php @@ -96,6 +96,7 @@ class TriggerController extends Controller $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); } + // file the rule(s) $transactions = $ruleEngine->find(); $count = $transactions->count(); @@ -149,6 +150,7 @@ class TriggerController extends Controller $ruleEngine->addOperator(['type' => 'account_id', 'value' => implode(',', $parameters['accounts'])]); } + // fire the rule(s) $ruleEngine->fire(); diff --git a/app/Support/Form/AccountForm.php b/app/Support/Form/AccountForm.php index d221cdcf0a..bd0d1be23d 100644 --- a/app/Support/Form/AccountForm.php +++ b/app/Support/Form/AccountForm.php @@ -152,6 +152,11 @@ class AccountForm return $this->select($name, $grouped, $value, $options); } + /** + * @param array $types + * @param AccountRepositoryInterface|null $repository + * @return array + */ private function getAccountsGrouped(array $types, AccountRepositoryInterface $repository = null): array { if (null === $repository) { diff --git a/app/TransactionRules/Engine/SearchRuleEngine.php b/app/TransactionRules/Engine/SearchRuleEngine.php index 69248cee96..c8199c49a2 100644 --- a/app/TransactionRules/Engine/SearchRuleEngine.php +++ b/app/TransactionRules/Engine/SearchRuleEngine.php @@ -247,7 +247,7 @@ class SearchRuleEngine implements RuleEngineInterface $str = sprintf('%s%d', $str, $transaction['transaction_journal_id']); } $key = sprintf('%d%s', $group['id'], $str); - Log::debug(sprintf('Return key: %s ', $key)); + //Log::debug(sprintf('Return key: %s ', $key)); return $key; } diff --git a/resources/views/form/assetAccountCheckList.twig b/resources/views/form/assetAccountCheckList.twig index fff275d711..f0f2bdc025 100644 --- a/resources/views/form/assetAccountCheckList.twig +++ b/resources/views/form/assetAccountCheckList.twig @@ -8,9 +8,9 @@