From b7182f9462a6658d00bd448913829e7b61bc9b93 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 18 Nov 2018 22:36:05 +0100 Subject: [PATCH 1/5] Username for FinTS import is not mandatory. --- resources/views/v1/import/fints/new.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/v1/import/fints/new.twig b/resources/views/v1/import/fints/new.twig index 70e67b057a..2fc1e32b96 100644 --- a/resources/views/v1/import/fints/new.twig +++ b/resources/views/v1/import/fints/new.twig @@ -18,7 +18,7 @@ {{ ExpandedForm.text('fints_url', data.fints_url, {helpText: trans('import.job_config_fints_url_help'), required: true}) }} {{ ExpandedForm.text('fints_port', data.fints_port, {helpText: trans('import.job_config_fints_port_help'), required: true}) }} {{ 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: true}) }} + {{ ExpandedForm.text('fints_username', data.fints_username, {helpText: trans('import.job_config_fints_username_help'), required: false}) }} {{ ExpandedForm.password('fints_password', {required: true}) }} From 94614550fc6f1f8605e4a168bd08f2451ce161b6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 21 Nov 2018 05:54:57 +0100 Subject: [PATCH 2/5] First step towards a debug view for transactions. --- app/Http/Controllers/Transaction/SingleController.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 71f4a1df21..a3fc1d87e7 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -446,4 +446,14 @@ class SingleController extends Controller // redirect to previous URL. return redirect($this->getPreviousUri('transactions.edit.uri')); } + + /** + * Show a special JSONified view of a transaction, for easier debug purposes. + * + * @param TransactionJournal $journal + */ + public function debugShow(TransactionJournal $journal) + { + + } } From a8bc7dd7c1fcadaf5f5e1a322870d248db730154 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 21 Nov 2018 05:55:11 +0100 Subject: [PATCH 3/5] Auth routes now have names. --- routes/web.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routes/web.php b/routes/web.php index e7066f522a..adc4fb7c80 100755 --- a/routes/web.php +++ b/routes/web.php @@ -56,8 +56,8 @@ Route::group( // Password Reset Routes... Route::get('password/reset/{token}', ['uses' => 'Auth\ResetPasswordController@showResetForm', 'as' => 'password.reset']); Route::post('password/email', ['uses' => 'Auth\ForgotPasswordController@sendResetLinkEmail', 'as' => 'password.email']); - Route::post('password/reset', 'Auth\ResetPasswordController@reset'); - Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm'); + Route::post('password/reset',['uses' => 'Auth\ResetPasswordController@reset']); + Route::get('password/reset', ['uses' => 'Auth\ForgotPasswordController@showLinkRequestForm', 'as' => 'password.reset.request']); // Change email routes: Route::get('profile/confirm-email-change/{token}', ['uses' => 'ProfileController@confirmEmailChange', 'as' => 'profile.confirm-email-change']); From e18f843a57baf2221ab6c37342df06269cc557b0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 21 Nov 2018 06:08:14 +0100 Subject: [PATCH 4/5] Fix for #1877 --- app/Support/Search/Modifier.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/Support/Search/Modifier.php b/app/Support/Search/Modifier.php index 9e29d24925..bb2979a658 100644 --- a/app/Support/Search/Modifier.php +++ b/app/Support/Search/Modifier.php @@ -171,11 +171,11 @@ class Modifier { $journalBudget = ''; if (null !== $transaction->transaction_journal_budget_name) { - $journalBudget = app('steam')->decrypt((int)$transaction->transaction_journal_budget_encrypted, $transaction->transaction_journal_budget_name); + $journalBudget = app('steam')->tryDecrypt($transaction->transaction_journal_budget_name); } $transactionBudget = ''; if (null !== $transaction->transaction_budget_name) { - $journalBudget = app('steam')->decrypt((int)$transaction->transaction_budget_encrypted, $transaction->transaction_budget_name); + $journalBudget = app('steam')->tryDecrypt($transaction->transaction_budget_name); } return self::stringCompare($journalBudget, $search) || self::stringCompare($transactionBudget, $search); @@ -191,13 +191,11 @@ class Modifier { $journalCategory = ''; if (null !== $transaction->transaction_journal_category_name) { - $journalCategory = app('steam')->decrypt( - (int)$transaction->transaction_journal_category_encrypted, $transaction->transaction_journal_category_name - ); + $journalCategory = app('steam')->tryDecrypt($transaction->transaction_journal_category_name); } $transactionCategory = ''; if (null !== $transaction->transaction_category_name) { - $journalCategory = app('steam')->decrypt((int)$transaction->transaction_category_encrypted, $transaction->transaction_category_name); + $journalCategory = app('steam')->tryDecrypt($transaction->transaction_category_name); } return self::stringCompare($journalCategory, $search) || self::stringCompare($transactionCategory, $search); From f873f5488fc936e1d080a7bfedb7043300a64eee Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 21 Nov 2018 06:13:30 +0100 Subject: [PATCH 5/5] Fix date #1877 --- app/Support/Search/Search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index 00c484866c..86bed8decb 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -237,7 +237,7 @@ class Search implements SearchInterface case 'after': Log::debug(sprintf('Set "%s" using collector with value "%s"', $modifier['type'], $modifier['value'])); $after = new Carbon($modifier['value']); - $collector->setBefore($after); + $collector->setAfter($after); break; } }