kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into layout-v2

Browse Source 
* develop:
  Fix date #1877
  Fix for #1877
  Auth routes now have names.
  First step towards a debug view for transactions.
  Username for FinTS import is not mandatory.
This commit is contained in:
James Cole
2018-11-21 06:20:23 +01:00
parent b2052615e3 f873f5488f
commit 6a6ca22bf0
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Transaction/SingleController.php
View File

@@ -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)
{
}
}

10
app/Support/Search/Modifier.php
View File

@@ -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);

2
app/Support/Search/Search.php
View File

@@ -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;
}
}

2
resources/views/v1/import/fints/new.twig
View File

@@ -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}) }}
</div>
</div>

4
routes/web.php
View File

@@ -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']);