diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index d97003cfea..7b90144bd1 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -100,7 +100,7 @@ class UpgradeDatabase extends Command Log::error($e->getMessage()); $this->error('Firefly III could not find the "identifier" field in the "transactions" table.'); $this->error('This field is required for Firefly III version ' . config('firefly.version') . ' to run.'); - $this->error('Please run "php artisan migrate" to upgrade your database.'); + $this->error('Please run "php artisan migrate" to add this field to the table.'); $this->info('Then, run "php artisan firefly:upgrade-database" to try again.'); break 2; } diff --git a/resources/views/split/journals/show.twig b/resources/views/split/journals/show.twig deleted file mode 100644 index 9fff906924..0000000000 --- a/resources/views/split/journals/show.twig +++ /dev/null @@ -1,210 +0,0 @@ -{% extends "./layout/default.twig" %} - -{% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, journal) }} -{% endblock %} - -{% block content %} -
-
-
-
-

Metadata

-
-
- - - - - - {% if journal.interest_date %} - - - - - {% endif %} - {% if journal.book_date %} - - - - - {% endif %} - {% if journal.process_date %} - - - - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - {% if journal.bill %} - - - - - {% endif %} - {% if journal.tags|length > 0 %} - - - - - {% endif %} -
{{ trans('list.date') }}{{ journal.date.formatLocalized(monthAndDayFormat) }}
{{ trans('list.interest_date') }}{{ journal.interest_date.formatLocalized(monthAndDayFormat) }}
{{ trans('list.book_date') }}{{ journal.book_date.formatLocalized(monthAndDayFormat) }}
{{ trans('list.process_date') }}{{ journal.process_date.formatLocalized(monthAndDayFormat) }}
{{ trans('list.type') }}{{ journal.transactiontype.type|_ }}
{{ trans('list.completed') }} - {% if journal.completed %} - {{ 'yes'|_ }} - {% else %} - {{ 'no'|_ }} - {% endif %} -
{{ 'budgets'|_ }}{{ journalBudgets(journal)|raw }}
{{ 'categories'|_ }}{{ journalCategories(journal)|raw }}
{{ 'source_accounts'|_ }}{{ sourceAccount(journal)|raw }}
{{ 'destination_accounts'|_ }}{{ destinationAccount(journal)|raw }}
{{ 'bill'|_ }}{{ journal.bill.name }}
{{ 'tags'|_ }} - {% for tag in journal.tags %} - -

- {% if tag.tagMode == 'nothing' %} - - {% endif %} - {% if tag.tagMode == 'balancingAct' %} - - {% endif %} - {% if tag.tagMode == 'advancePayment' %} - - {% endif %} - {{ tag.tag }} -

- {% endfor %} -
-
-
-
- {{ 'edit'|_ }} - {{ 'delete'|_ }} -
-
-
- - - {% if journal.piggyBankEvents|length > 0 %} -
-
-

{{ 'piggyBanks'|_ }}

-
-
- {% include 'list/piggy-bank-events' with {'events': events, 'showPiggyBank':true} %} -
-
- {% endif %} -
-
- {% if journal.attachments|length > 0 %} -
-
-

{{ 'attachments'|_ }}

-
-
- - {% for att in journal.attachments %} - - - - - - {% endfor %} -
-
- - -
- 		- - - {% if att.title %} - {{ att.title }} - {% else %} - {{ att.filename }} - {% endif %} - - ({{ att.size|filesize }}) - {% if att.description %} -
- {{ att.description }} - {% endif %} - 		- -
-
-
- {% endif %} -
-
- - -
-
- -
-
-

Transactions

-
- - - - - - - - - - - - - {% for index, t in transactions %} - - - - - - - - - {% endfor %} - -
{{ trans('list.description') }}{{ trans('list.account') }}{{ trans('list.amount') }}{{ trans('list.new_balance') }}{{ trans('list.budget') }}{{ trans('list.category') }}
- {% if (index+1) != transactions|length or what == 'transfer' %} - {{ t.description }} - {% endif %} - {{ t.account.name }} ({{ t.account.accounttype.type|_ }}){{ t.sum|formatAmount }}{{ t.before|formatAmount }} → {{ (t.sum+t.before)|formatAmount }} - {% if (index+1) != transactions|length or what == 'transfer' %} - {{ transactionBudgets(t)|raw }} - {% endif %} - - {% if (index+1) != transactions|length or what == 'transfer' %} - {{ transactionCategories(t)|raw }} - {% endif %} -
-
-
-
- -{% endblock %}