diff --git a/resources/views/split/journals/create.twig b/resources/views/split/journals/create.twig index cb995a1865..076d790df1 100644 --- a/resources/views/split/journals/create.twig +++ b/resources/views/split/journals/create.twig @@ -11,6 +11,17 @@ + + {% if errors.all()|length > 0 %}
@@ -40,14 +51,17 @@ {{ ExpandedForm.select('journal_currency_id', currencies, journal.transaction_currency_id) }} {{ ExpandedForm.staticText('journal_amount', preFilled.journal_amount|formatAmount ) }} + {% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %} {{ ExpandedForm.select('journal_source_account_id', assetAccounts, preFilled.journal_source_account_id) }} {% endif %} - + + {% if preFilled.what == 'deposit' %} - {{ ExpandedForm.text('journal_source_account_name', preFilled.journal_source_account_name) }} + {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} {% endif %} + {% if preFilled.what == 'transfer' %} {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} @@ -85,17 +99,26 @@ {{ trans('list.split_number') }} {{ trans('list.description') }} + + + {% if preFilled.what == 'withdrawal' %} {{ trans('list.destination') }} {% endif %} + {% if preFilled.what == 'deposit' %} {{ trans('list.source') }} {% endif %} + + {{ trans('list.amount') }} + + {% if preFilled.what == 'withdrawal' %} {{ trans('list.budget') }} {% endif %} {{ trans('list.category') }} + {% if preFilled.what == 'transfer' %} {{ trans('list.piggy_bank') }} {% endif %} @@ -117,10 +140,10 @@ {% endif %} - + {% if preFilled.what == 'deposit' %} - {{ Form.select('destination_account_id[]', assetAccounts, preFilled.destination_account_id[index], {class: 'form-control'}) }} + {% endif %} diff --git a/resources/views/split/journals/edit.twig b/resources/views/split/journals/edit.twig index e7fc9e7105..2ec26d99ea 100644 --- a/resources/views/split/journals/edit.twig +++ b/resources/views/split/journals/edit.twig @@ -51,10 +51,6 @@ {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} {% endif %} - - {% if preFilled.what == 'deposit' %} - {% endif %} - {% if preFilled.what == 'transfer' %} {{ ExpandedForm.select('journal_destination_account_id', assetAccounts, preFilled.journal_destination_account_id) }} @@ -97,6 +93,7 @@ {% if preFilled.what == 'withdrawal' %} {{ trans('list.destination') }} {% endif %} + {% if preFilled.what == 'deposit' %} {{ trans('list.source') }} {% endif %}