kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #3160

Browse Source
This commit is contained in:
James Cole
2020-03-11 06:50:23 +01:00
parent c526c4ae1a
commit c1654f1d04
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Exceptions/GracefulNotFoundHandler.php
View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\Attachment;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\TransactionGroup; use FireflyIII\Models\TransactionGroup;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -225,6 +226,10 @@ class GracefulNotFoundHandler extends ExceptionHandler
$type = $journal->transactionType->type; $type = $journal->transactionType->type;
$request->session()->reflash(); $request->session()->reflash();
if (TransactionType::RECONCILIATION === $type) {
return redirect(route('accounts.index', ['asset']));
}
return redirect(route('transactions.index', [strtolower($type)])); return redirect(route('transactions.index', [strtolower($type)]));
} }

1
resources/lang/en_US/firefly.php
View File

@@ -944,6 +944,7 @@ return [
'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"', 'deleted_withdrawal' => 'Successfully deleted withdrawal ":description"',
'deleted_deposit' => 'Successfully deleted deposit ":description"', 'deleted_deposit' => 'Successfully deleted deposit ":description"',
'deleted_transfer' => 'Successfully deleted transfer ":description"', 'deleted_transfer' => 'Successfully deleted transfer ":description"',
'deleted_reconciliation' =>'Successfully reconciliation transaction ":description"',
'stored_journal' => 'Successfully created new transaction ":description"', 'stored_journal' => 'Successfully created new transaction ":description"',
'stored_journal_no_descr' => 'Successfully created your new transaction', 'stored_journal_no_descr' => 'Successfully created your new transaction',
'updated_journal_no_descr' => 'Successfully updated your transaction', 'updated_journal_no_descr' => 'Successfully updated your transaction',

7
routes/breadcrumbs.php
View File

@@ -1108,7 +1108,12 @@ try {
$title = limitStringLength($group->title); $title = limitStringLength($group->title);
} }
if('opening balance' === $type) { if('opening balance' === $type) {
// TODO link to account.
$breadcrumbs->push($title, route('transactions.show', [$group->id]));
return;
}
if('reconciliation' === $type) {
// TODO link to account.
$breadcrumbs->push($title, route('transactions.show', [$group->id])); $breadcrumbs->push($title, route('transactions.show', [$group->id]));
return; return;
} }