diff --git a/app/Support/FinTS/FinTS.php b/app/Support/FinTS/FinTS.php index f297f379cd..5ec5a94218 100644 --- a/app/Support/FinTS/FinTS.php +++ b/app/Support/FinTS/FinTS.php @@ -82,8 +82,8 @@ class FinTS return $account->getAccountNumber() === $accountNumber; } ); - if (count($filteredAccounts) != 1) { - throw new FireflyException("Cannot find account with number " . $accountNumber); + if (1 !== count($filteredAccounts)) { + throw new FireflyException(sprintf('Cannot find account with number "%s"', $accountNumber)); } return reset($filteredAccounts); diff --git a/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php b/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php index 362c458aa5..d5ccb9286a 100644 --- a/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php +++ b/app/Support/Import/JobConfiguration/FinTS/NewFinTSJobHandler.php @@ -59,17 +59,19 @@ class NewFinTSJobHandler implements FinTSConfigurationInterface $config['fints_bank_code'] = (string)($data['fints_bank_code'] ?? ''); $config['fints_username'] = (string)($data['fints_username'] ?? ''); $config['fints_password'] = (string)(Crypt::encrypt($data['fints_password']) ?? ''); + $config['apply-rules'] = 1 === (int)$data['apply_rules']; $this->repository->setConfiguration($this->importJob, $config); + $incomplete = false; foreach ($config as $value) { $incomplete = '' === $value or $incomplete; } + if ($incomplete) { return new MessageBag([trans('import.incomplete_fints_form')]); } - $finTS = app(FinTS::class, ['config' => $this->importJob->configuration]); if (true !== ($checkConnection = $finTS->checkConnection())) { return new MessageBag([trans('import.fints_connection_failed', ['originalError' => $checkConnection])]); diff --git a/resources/views/v1/import/fints/new.twig b/resources/views/v1/import/fints/new.twig index 839519a627..a5858e7be8 100644 --- a/resources/views/v1/import/fints/new.twig +++ b/resources/views/v1/import/fints/new.twig @@ -20,6 +20,7 @@ {{ ExpandedForm.text('fints_bank_code', data.fints_bank_code, {required: true}) }} {{ ExpandedForm.text('fints_username', data.fints_username, {helpText: trans('import.job_config_fints_username_help'), required: false}) }} {{ ExpandedForm.password('fints_password', {required: true}) }} + {{ ExpandedForm.checkbox('apply_rules', 1, true) }}