diff --git a/app/controllers/MigrateController.php b/app/controllers/MigrateController.php index 19b115f8e3..a9bd16c200 100644 --- a/app/controllers/MigrateController.php +++ b/app/controllers/MigrateController.php @@ -11,7 +11,8 @@ class MigrateController extends BaseController */ public function index() { - return View::make('migrate.index')->with('index', 'Migration'); + return View::make('migrate.index')->with('index', 'Migration')->with('title','Migrate')-> + with('subTitle','From Firefly II to Firefly III'); } /** diff --git a/app/controllers/PiggybankController.php b/app/controllers/PiggybankController.php index 906251bb3a..c761cbf207 100644 --- a/app/controllers/PiggybankController.php +++ b/app/controllers/PiggybankController.php @@ -49,10 +49,20 @@ class PiggybankController extends BaseController */ public function createPiggybank() { - $periods = Config::get('firefly.piggybank_periods'); - $accounts = $this->_accounts->getActiveDefaultAsSelectList(); + /** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */ + $toolkit = App::make('Firefly\Helper\Toolkit\Toolkit'); - return View::make('piggybanks.create-piggybank')->with('accounts', $accounts)->with('periods', $periods); + + $periods = Config::get('firefly.piggybank_periods'); + $list = $this->_accounts->getActiveDefault(); + $accounts = $toolkit->makeSelectList($list); + + View::share('title', 'Piggy banks'); + View::share('subTitle', 'Create new'); + View::share('mainTitleIcon', 'fa-sort-amount-asc'); + + return View::make('piggybanks.create-piggybank')->with('accounts', $accounts) + ->with('periods', $periods); } /** @@ -60,8 +70,16 @@ class PiggybankController extends BaseController */ public function createRepeated() { + /** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */ + $toolkit = App::make('Firefly\Helper\Toolkit\Toolkit'); + $periods = Config::get('firefly.piggybank_periods'); - $accounts = $this->_accounts->getActiveDefaultAsSelectList(); + $list = $this->_accounts->getActiveDefault(); + $accounts = $toolkit->makeSelectList($list); + + View::share('title', 'Repeated expenses'); + View::share('subTitle', 'Create new'); + View::share('mainTitleIcon', 'fa-rotate-right'); return View::make('piggybanks.create-repeated')->with('accounts', $accounts)->with('periods', $periods); } @@ -73,6 +91,15 @@ class PiggybankController extends BaseController */ public function delete(Piggybank $piggyBank) { + View::share('subTitle', 'Delete "'.$piggyBank->name.'"'); + if($piggyBank->repeats == 1) { + View::share('title', 'Repeated expenses'); + View::share('mainTitleIcon', 'fa-rotate-right'); + } else { + View::share('title', 'Piggy banks'); + View::share('mainTitleIcon', 'fa-sort-amount-asc'); + } + return View::make('piggybanks.delete')->with('piggybank', $piggyBank); } @@ -98,12 +125,29 @@ class PiggybankController extends BaseController */ public function edit(Piggybank $piggyBank) { - $accounts = $this->_accounts->getActiveDefaultAsSelectList(); + /** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */ + $toolkit = App::make('Firefly\Helper\Toolkit\Toolkit'); + + $list = $this->_accounts->getActiveDefault(); + $accounts = $toolkit->makeSelectList($list); $periods = Config::get('firefly.piggybank_periods'); + + + View::share('subTitle','Edit "'.$piggyBank->name.'"'); + + + if ($piggyBank->repeats == 1) { + View::share('title','Repeated expenses'); + View::share('mainTitleIcon', 'fa-rotate-left'); + return View::make('piggybanks.edit-repeated')->with('piggybank', $piggyBank)->with('accounts', $accounts) ->with('periods', $periods); } else { + // piggy bank. + View::share('title','Piggy banks'); + View::share('mainTitleIcon', 'fa-sort-amount-asc'); + return View::make('piggybanks.edit-piggybank')->with('piggybank', $piggyBank)->with('accounts', $accounts) ->with('periods', $periods); } @@ -114,7 +158,7 @@ class PiggybankController extends BaseController /** * @return $this */ - public function index() + public function piggybanks() { $countRepeating = $this->_repository->countRepeating(); $countNonRepeating = $this->_repository->countNonrepeating(); @@ -134,6 +178,44 @@ class PiggybankController extends BaseController } } + View::share('title', 'Piggy banks'); + View::share('subTitle', 'Save for big expenses'); + View::share('mainTitleIcon', 'fa-sort-amount-asc'); + + return View::make('piggybanks.index')->with('piggybanks', $piggybanks) + ->with('countRepeating', $countRepeating) + ->with('countNonRepeating', $countNonRepeating) + ->with('accounts', $accounts); + } + + /** + * @return $this + */ + public function repeated() + { + $countRepeating = $this->_repository->countRepeating(); + $countNonRepeating = $this->_repository->countNonrepeating(); + + $piggybanks = $this->_repository->get(); + + // get the accounts with each piggy bank and check their balance; Fireflyy might needs to + // show the user a correction. + + $accounts = []; + /** @var \Piggybank $piggybank */ + foreach ($piggybanks as $piggybank) { + $account = $piggybank->account; + $id = $account->id; + if (!isset($accounts[$id])) { + $accounts[$id] = ['account' => $account, 'left' => $this->_repository->leftOnAccount($account)]; + } + } + + View::share('title', 'Repeated expenses'); + View::share('subTitle', 'Save for returning bills'); + View::share('mainTitleIcon', 'fa-rotate-left'); + + return View::make('piggybanks.index')->with('piggybanks', $piggybanks) ->with('countRepeating', $countRepeating) ->with('countNonRepeating', $countNonRepeating) @@ -203,6 +285,18 @@ class PiggybankController extends BaseController $leftOnAccount = $this->_repository->leftOnAccount($piggyBank->account); $balance = $piggyBank->account->balance(); + View::share('subTitle',$piggyBank->name); + + if($piggyBank->repeats == 1) { + // repeated expense. + View::share('title','Repeated expenses'); + View::share('mainTitleIcon', 'fa-rotate-left'); + } else { + // piggy bank. + View::share('title','Piggy banks'); + View::share('mainTitleIcon', 'fa-sort-amount-asc'); + } + return View::make('piggybanks.show')->with('piggyBank', $piggyBank)->with('leftOnAccount', $leftOnAccount) ->with('balance', $balance); } @@ -226,7 +320,7 @@ class PiggybankController extends BaseController Session::flash('success', 'New piggy bank "' . $piggyBank->name . '" created!'); Event::fire('piggybanks.store', [$piggyBank]); - return Redirect::route('piggybanks.index'); + return Redirect::route('piggybanks.index.piggybanks'); } else { @@ -254,8 +348,7 @@ class PiggybankController extends BaseController if ($piggyBank->id) { Session::flash('success', 'New piggy bank "' . $piggyBank->name . '" created!'); Event::fire('piggybanks.store', [$piggyBank]); - - return Redirect::route('piggybanks.index'); + return Redirect::route('piggybanks.index.repeated'); } else { Session::flash('error', 'Could not save piggy bank: ' . $piggyBank->errors()->first()); diff --git a/app/controllers/PreferencesController.php b/app/controllers/PreferencesController.php index 246720d24b..2e1d82bcda 100644 --- a/app/controllers/PreferencesController.php +++ b/app/controllers/PreferencesController.php @@ -22,6 +22,8 @@ class PreferencesController extends BaseController $this->_accounts = $accounts; $this->_preferences = $preferences; + View::share('title','Preferences'); + View::share('mainTitleIcon','fa-gear'); } /** diff --git a/app/controllers/ProfileController.php b/app/controllers/ProfileController.php index 2ae0db6295..a7bbf4d55d 100644 --- a/app/controllers/ProfileController.php +++ b/app/controllers/ProfileController.php @@ -22,6 +22,9 @@ class ProfileController extends BaseController */ public function index() { + View::share('title','Profile'); + View::share('subTitle',Auth::user()->email); + View::share('mainTitleIcon','fa-user'); return View::make('profile.index'); } @@ -30,6 +33,9 @@ class ProfileController extends BaseController */ public function changePassword() { + View::share('title',Auth::user()->email); + View::share('subTitle','Change your password'); + View::share('mainTitleIcon','fa-user'); return View::make('profile.change-password'); } diff --git a/app/controllers/RecurringController.php b/app/controllers/RecurringController.php index 6eb63cdd94..404a9f3c46 100644 --- a/app/controllers/RecurringController.php +++ b/app/controllers/RecurringController.php @@ -17,6 +17,9 @@ class RecurringController extends BaseController public function __construct(RTR $repository) { $this->_repository = $repository; + + View::share('title','Recurring transactions'); + View::share('mainTitleIcon','fa-rotate-right'); } /** @@ -24,6 +27,7 @@ class RecurringController extends BaseController */ public function create() { + View::share('subTitle','Create new'); $periods = \Config::get('firefly.periods_to_text'); return View::make('recurring.create')->with('periods', $periods); @@ -36,6 +40,7 @@ class RecurringController extends BaseController */ public function delete(RecurringTransaction $recurringTransaction) { + View::share('subTitle','Delete "' .$recurringTransaction->name.'"'); return View::make('recurring.delete')->with('recurringTransaction', $recurringTransaction); } @@ -67,6 +72,8 @@ class RecurringController extends BaseController { $periods = \Config::get('firefly.periods_to_text'); + View::share('subTitle','Edit "' .$recurringTransaction->name.'"'); + return View::make('recurring.edit')->with('periods', $periods)->with( 'recurringTransaction', $recurringTransaction ); @@ -79,6 +86,8 @@ class RecurringController extends BaseController { $list = $this->_repository->get(); + + return View::make('recurring.index')->with('list', $list); } @@ -87,6 +96,7 @@ class RecurringController extends BaseController */ public function show(RecurringTransaction $recurringTransaction) { + View::share('subTitle',$recurringTransaction->name); return View::make('recurring.show')->with('recurring', $recurringTransaction); } diff --git a/app/controllers/TransactionController.php b/app/controllers/TransactionController.php index b84832650f..8bd880a8e2 100644 --- a/app/controllers/TransactionController.php +++ b/app/controllers/TransactionController.php @@ -22,6 +22,7 @@ class TransactionController extends BaseController { $this->_repository = $repository; View::share('title', 'Transactions'); + View::share('mainTitleIcon', 'fa-repeat'); } /** @@ -37,8 +38,8 @@ class TransactionController extends BaseController // get asset accounts with names and id's. /** @var \Firefly\Storage\Account\AccountRepositoryInterface $accountRepository */ $accountRepository = App::make('Firefly\Storage\Account\AccountRepositoryInterface'); - $accounts = $accountRepository->getOfTypes(['Asset account','Default account']); - $assetAccounts = $toolkit->makeSelectList($accounts); + $list = $accountRepository->getActiveDefault(); + $assetAccounts = $toolkit->makeSelectList($list); // get budgets as a select list. @@ -64,6 +65,12 @@ class TransactionController extends BaseController */ public function delete(TransactionJournal $transactionJournal) { + View::share( + 'subTitle', + 'Delete ' . strtolower($transactionJournal->transactionType->type) . ' "' . $transactionJournal->description + . '"' + ); + return View::make('transactions.delete')->with('journal', $transactionJournal); @@ -95,9 +102,18 @@ class TransactionController extends BaseController // some lists prefilled: // get accounts with names and id's. + /** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */ + $toolkit = App::make('Firefly\Helper\Toolkit\Toolkit'); + + // get asset accounts with names and id's. /** @var \Firefly\Storage\Account\AccountRepositoryInterface $accountRepository */ $accountRepository = App::make('Firefly\Storage\Account\AccountRepositoryInterface'); - $accounts = $accountRepository->getActiveDefaultAsSelectList(); + $list = $accountRepository->getActiveDefault(); + $accounts = $toolkit->makeSelectList($list); + + View::share( + 'subTitle', 'Edit ' . strtolower($journal->transactionType->type) . ' "' . $journal->description . '"' + ); // get budgets as a select list. /** @var \Firefly\Storage\Budget\BudgetRepositoryInterface $budgetRepository */ @@ -156,8 +172,8 @@ class TransactionController extends BaseController public function expenses() { $transactionType = $this->_repository->getTransactionType('Withdrawal'); - $start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate')); - $end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate')); + $start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate')); + $end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate')); if ($start <= $end && !is_null($start) && !is_null($end)) { $journals = $this->_repository->paginate($transactionType, 25, $start, $end); $filtered = true; @@ -168,17 +184,17 @@ class TransactionController extends BaseController $filters = null; } - + View::share('subTitleIcon', 'fa-long-arrow-left'); return View::make('transactions.index')->with('journals', $journals)->with('filtered', $filtered)->with( 'filters', $filters - ); + )->with('subTitle', 'Expenses'); } public function revenue() { $transactionType = $this->_repository->getTransactionType('Deposit'); - $start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate')); - $end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate')); + $start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate')); + $end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate')); if ($start <= $end && !is_null($start) && !is_null($end)) { $journals = $this->_repository->paginate($transactionType, 25, $start, $end); $filtered = true; @@ -189,18 +205,18 @@ class TransactionController extends BaseController $filters = null; } - + View::share('subTitleIcon', 'fa-long-arrow-right'); return View::make('transactions.index')->with('journals', $journals)->with('filtered', $filtered)->with( 'filters', $filters - ); + )->with('subTitle', 'Revenue'); } public function transfers() { $transactionType = $this->_repository->getTransactionType('Transfer'); - $start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate')); - $end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate')); + $start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate')); + $end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate')); if ($start <= $end && !is_null($start) && !is_null($end)) { $journals = $this->_repository->paginate($transactionType, 25, $start, $end); $filtered = true; @@ -211,10 +227,10 @@ class TransactionController extends BaseController $filters = null; } - + View::share('subTitleIcon', 'fa-arrows-h'); return View::make('transactions.index')->with('journals', $journals)->with('filtered', $filtered)->with( 'filters', $filters - ); + )->with('subTitle', 'Transfers'); } @@ -248,6 +264,8 @@ class TransactionController extends BaseController */ public function show(TransactionJournal $journal) { + View::share('subTitle', $journal->transactionType->type . ' "' . $journal->description . '"'); + return View::make('transactions.show')->with('journal', $journal); } @@ -260,8 +278,8 @@ class TransactionController extends BaseController { $journal = $this->_repository->store($what, Input::all()); - if($journal->errors()->count() > 0) { - Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first().'!'); + if ($journal->errors()->count() > 0) { + Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first() . '!'); return Redirect::route('transactions.create', [$what])->withInput()->withErrors($journal->errors()); } @@ -282,7 +300,7 @@ class TransactionController extends BaseController if (Input::get('create') == '1') { return Redirect::route('transactions.create', [$what])->withInput(); } else { - switch($what) { + switch ($what) { case 'withdrawal': return Redirect::route('transactions.expenses'); break; @@ -296,7 +314,7 @@ class TransactionController extends BaseController } } else { - Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first().'!'); + Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first() . '!'); return Redirect::route('transactions.create', [$what])->withInput()->withErrors($journal->errors()); } diff --git a/app/views/migrate/index.blade.php b/app/views/migrate/index.blade.php index 6524f0a9be..dec6859517 100644 --- a/app/views/migrate/index.blade.php +++ b/app/views/migrate/index.blade.php @@ -2,18 +2,14 @@ @section('content')
-

Firefly
- Migration -

+

+ Read the wiki to read more about how data migration. +

  1. Upload firefly-export-****-**-**.json
  2. Wait..
  3. Done!
- -

-   -

{{Form::open(['files' => true,'url' => route('migrate.upload')])}}
diff --git a/app/views/partials/menu.blade.php b/app/views/partials/menu.blade.php index 74f95dd58c..7274303d40 100644 --- a/app/views/partials/menu.blade.php +++ b/app/views/partials/menu.blade.php @@ -12,13 +12,14 @@
    + @if(Session::has('job_pct'))
  • - @if(Session::has('job_pct')) +
    • -
  • +
  • Money management diff --git a/app/views/piggybanks/create-piggybank.blade.php b/app/views/piggybanks/create-piggybank.blade.php index ce61153649..b73c2e78ff 100644 --- a/app/views/piggybanks/create-piggybank.blade.php +++ b/app/views/piggybanks/create-piggybank.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Create a new piggy bank -

    Use piggy banks to save for a one-time goal.

    diff --git a/app/views/piggybanks/create-repeated.blade.php b/app/views/piggybanks/create-repeated.blade.php index a5af80812f..68e89bc94c 100644 --- a/app/views/piggybanks/create-repeated.blade.php +++ b/app/views/piggybanks/create-repeated.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Create a new repeated expense -

    Create repeated expenses to keep track of long-term planned expenses

    diff --git a/app/views/piggybanks/delete.blade.php b/app/views/piggybanks/delete.blade.php index 85745f95b5..29255e2188 100644 --- a/app/views/piggybanks/delete.blade.php +++ b/app/views/piggybanks/delete.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Delete piggy bank -

    Remember that deleting something is permanent.

    @@ -29,7 +26,11 @@
    - Cancel + @if($piggybank->repeats == 1) + Cancel + @else + Cancel + @endif
    diff --git a/app/views/piggybanks/edit-piggybank.blade.php b/app/views/piggybanks/edit-piggybank.blade.php index 23a0888634..5646d599d0 100644 --- a/app/views/piggybanks/edit-piggybank.blade.php +++ b/app/views/piggybanks/edit-piggybank.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Edit piggy bank "{{{$piggybank->name}}}" -

    Use piggy banks to save for a one-time goal.

    diff --git a/app/views/piggybanks/edit-repeated.blade.php b/app/views/piggybanks/edit-repeated.blade.php index 60ca30490f..76efa56153 100644 --- a/app/views/piggybanks/edit-repeated.blade.php +++ b/app/views/piggybanks/edit-repeated.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Edit repeated expense "{{{$piggybank->name}}}" -

    Create repeated expenses to keep track of long-term planned expenses

    diff --git a/app/views/piggybanks/index.blade.php b/app/views/piggybanks/index.blade.php index 6eea7d73dc..36639fd03c 100644 --- a/app/views/piggybanks/index.blade.php +++ b/app/views/piggybanks/index.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Piggy banks, large expenses and repeated expenses -

    diff --git a/app/views/piggybanks/show.blade.php b/app/views/piggybanks/show.blade.php index 96adfacdd9..90c84704e2 100644 --- a/app/views/piggybanks/show.blade.php +++ b/app/views/piggybanks/show.blade.php @@ -2,15 +2,6 @@ @section('content')
    -

    Firefly - - @if($piggyBank->repeats == 1) - Repeated expense - @else - Piggy bank - @endif - "{{{$piggyBank->name}}}" -

    Edit Delete diff --git a/app/views/preferences/index.blade.php b/app/views/preferences/index.blade.php index a649ea0876..f9afac5501 100644 --- a/app/views/preferences/index.blade.php +++ b/app/views/preferences/index.blade.php @@ -1,13 +1,5 @@ @extends('layouts.default') @section('content') -
    -
    -

    Firefly - Preferences -

    -
    -
    - {{Form::open(['class' => 'form-horizontal'])}} diff --git a/app/views/profile/change-password.blade.php b/app/views/profile/change-password.blade.php index ff4371a2f1..6891c7a6f4 100644 --- a/app/views/profile/change-password.blade.php +++ b/app/views/profile/change-password.blade.php @@ -2,14 +2,7 @@ @section('content')
    -

    Change your password
    - Logged in as {{Auth::user()->email}} -

    -
    -
    -
    -
    -

    +

    Use this extremely obvious form to change your password.

    @@ -40,7 +33,7 @@
    - +
    {{Form::close()}} diff --git a/app/views/profile/index.blade.php b/app/views/profile/index.blade.php index 2a569df30c..00c7bdc119 100644 --- a/app/views/profile/index.blade.php +++ b/app/views/profile/index.blade.php @@ -1,13 +1,6 @@ @extends('layouts.default') @section('content') -
    -
    -

    Profile
    - Logged in as {{Auth::user()->email}} -

    -
    -
    -
    +

    Change your password

    diff --git a/app/views/recurring/create.blade.php b/app/views/recurring/create.blade.php index 4cfd860cda..fca054015d 100644 --- a/app/views/recurring/create.blade.php +++ b/app/views/recurring/create.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Create a recurring transaction -

    Use recurring transactions to track repeated expenses

    Bla bla. @@ -192,5 +189,4 @@ @stop @section('scripts') - @stop \ No newline at end of file diff --git a/app/views/recurring/delete.blade.php b/app/views/recurring/delete.blade.php index e94b5b6ac3..44fa177b1a 100644 --- a/app/views/recurring/delete.blade.php +++ b/app/views/recurring/delete.blade.php @@ -2,9 +2,6 @@ @section('content')

    -

    Firefly - Delete recurring transaction "{{{$recurringTransaction->name}}}" -

    Remember that deleting something is permanent.

    diff --git a/app/views/recurring/edit.blade.php b/app/views/recurring/edit.blade.php index 1a4904ca45..a181d3711f 100644 --- a/app/views/recurring/edit.blade.php +++ b/app/views/recurring/edit.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Edit recurring transaction "{{{$recurringTransaction->name}}}" -

    Use recurring transactions to track repeated expenses

    Bla bla. diff --git a/app/views/recurring/index.blade.php b/app/views/recurring/index.blade.php index 2cf5be03b5..2e2e651e6f 100644 --- a/app/views/recurring/index.blade.php +++ b/app/views/recurring/index.blade.php @@ -2,9 +2,6 @@ @section('content')

    -

    Firefly - Recurring transactions -

    Use recurring transactions to track repeated withdrawals

    We all have bills to pay. Firefly can help you organize those bills into recurring transactions, which are exactly what the name suggests. Firefly can match new (and existing) transactions to such a recurring transaction diff --git a/app/views/recurring/show.blade.php b/app/views/recurring/show.blade.php index b2ea1de8c1..48f68e5c65 100644 --- a/app/views/recurring/show.blade.php +++ b/app/views/recurring/show.blade.php @@ -2,9 +2,6 @@ @section('content')

    -

    Firefly - Recurring transaction "{{{$recurring->name}}}" -

    Use recurring transactions to track repeated withdrawals

    diff --git a/app/views/transactions/delete.blade.php b/app/views/transactions/delete.blade.php index 6c57de415a..810d983c47 100644 --- a/app/views/transactions/delete.blade.php +++ b/app/views/transactions/delete.blade.php @@ -2,9 +2,6 @@ @section('content')
    -

    Firefly - Delete transaction -

    Remember that deleting something is permanent.

    @@ -25,7 +22,16 @@
    - Cancel + @if($journal->transactiontype->type == 'Withdrawal') + Cancel + @endif + @if($journal->transactiontype->type == 'Deposit') + Cancel + @endif + @if($journal->transactiontype->type == 'Transfer') + Cancel + @endif +
    diff --git a/app/views/transactions/edit.blade.php b/app/views/transactions/edit.blade.php index a8a8058fc5..cc511cadda 100644 --- a/app/views/transactions/edit.blade.php +++ b/app/views/transactions/edit.blade.php @@ -1,12 +1,5 @@ @extends('layouts.default') @section('content') -
    -
    -

    Firefly - Edit transaction "{{{$journal->description}}}" -

    -
    -

    diff --git a/app/views/transactions/show.blade.php b/app/views/transactions/show.blade.php index b43dabb70f..a4e1115466 100644 --- a/app/views/transactions/show.blade.php +++ b/app/views/transactions/show.blade.php @@ -1,13 +1,5 @@ @extends('layouts.default') @section('content') -

    -
    -

    Firefly - Transaction "{{{$journal->description}}}" -

    -
    -
    -

    Metadata