mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Fix #1425
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{% extends "./layout/default" %}
|
||||
|
||||
{% block breadcrumbs %}
|
||||
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }}
|
||||
{{ Breadcrumbs.render(Route.getCurrentRoute.getName, transactions) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
@@ -29,90 +29,91 @@
|
||||
<th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.category') }}</th>
|
||||
<th class="col-lg-2 col-md-2 col-sm-2">{{ trans('list.budget') }}</th>
|
||||
</tr>
|
||||
{% for journal in journals %}
|
||||
{% for transaction in transactions %}
|
||||
<tr>
|
||||
<td>
|
||||
{# LINK TO EDIT FORM #}
|
||||
<a href="{{ route('transactions.edit', journal.journal_id) }}" class="btn btn-xs btn-default"><i
|
||||
<a href="{{ route('transactions.edit', transaction.journal_id) }}" class="btn btn-xs btn-default"><i
|
||||
class="fa fa-fw fa-pencil"></i></a>
|
||||
<input type="hidden" name="journals[]" value="{{ journal.journal_id }}"/>
|
||||
<input type="hidden" name="journals[]" value="{{ transaction.journal_id }}"/>
|
||||
</td>
|
||||
<td>
|
||||
{# DESCRIPTION #}
|
||||
<input class="form-control input-sm" autocomplete="off"
|
||||
placeholder="{{ journal.description }}" name="description[{{ journal.journal_id }}]"
|
||||
type="text" value="{{ journal.description }}">
|
||||
placeholder="{{ transaction.description }}" name="description[{{ transaction.journal_id }}]"
|
||||
type="text" value="{{ transaction.description }}">
|
||||
</td>
|
||||
{# AMOUNT #}
|
||||
<td>
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-addon">{{ journal.currency_symbol }}</span>
|
||||
<input name="amount[{{ journal.journal_id }}]" class="form-control" autocomplete="off"
|
||||
step="any" type="number" value="{{ journal.amount }}">
|
||||
<input type="hidden" name="transaction_currency_id[{{ journal.journal_id }}]"
|
||||
value="{{ journal.currency_id }}">
|
||||
<span class="input-group-addon">{{ transaction.currency_symbol }}</span>
|
||||
<input name="amount[{{ transaction.journal_id }}]" class="form-control" autocomplete="off"
|
||||
step="any" type="number" value="{{ transaction.amount }}">
|
||||
<input type="hidden" name="transaction_currency_id[{{ transaction.journal_id }}]"
|
||||
value="{{ transaction.currency_id }}">
|
||||
</div>
|
||||
{% if journal.foreign_amount %}
|
||||
{% if transaction.foreign_amount %}
|
||||
{# insert foreign data #}
|
||||
<div class="input-group input-group-sm">
|
||||
<span class="input-group-addon">{{ journal.foreign_currency.symbol }}</span>
|
||||
<input name="foreign_amount[{{ journal.journal_id }}]" class="form-control" autocomplete="off"
|
||||
step="any" type="number" value="{{ journal.foreign_amount }}">
|
||||
<input type="hidden" name="foreign_currency_id[{{ journal.journal_id }}]" value="{{ journal.foreign_currency.id }}">
|
||||
<span class="input-group-addon">{{ transaction.foreign_currency_symbol }}</span>
|
||||
<input name="foreign_amount[{{ transaction.journal_id }}]" class="form-control" autocomplete="off"
|
||||
step="any" type="number" value="{{ transaction.foreign_amount }}">
|
||||
<input type="hidden" name="foreign_currency_id[{{ transaction.journal_id }}]" value="{{ transaction.foreign_currency_id }}">
|
||||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{# DATE #}
|
||||
<input class="form-control input-sm" autocomplete="off"
|
||||
name="date[{{ journal.journal_id }}]" type="date" value="{{ journal.date.format('Y-m-d') }}">
|
||||
name="date[{{ transaction.journal_id }}]" type="date" value="{{ transaction.date }}">
|
||||
</td>
|
||||
<td>
|
||||
{# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #}
|
||||
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %}
|
||||
<select class="form-control input-sm" name="source_account_id[{{ journal.journal_id }}]">
|
||||
{% if transaction.type == 'Transfer' or transaction.type == 'Withdrawal' %}
|
||||
<select class="form-control input-sm" name="source_account_id[{{ transaction.journal_id }}]">
|
||||
{% for account in accounts %}
|
||||
<option value="{{ account.id }}"{% if account.id==journal.source_account_id %} selected="selected"{% endif %}
|
||||
label="{{ account.name }}">{{ account.name }}</option>
|
||||
<!-- {{ transaction.type }}: {{ transaction.source_name }} -->
|
||||
<option value="{{ account.id }}"{% if account.id == transaction.source_id %} selected{% endif %} label="{{ account.name }}">{{ account.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
{% else %}
|
||||
{# SOURCE ACCOUNT NAME FOR DEPOSIT #}
|
||||
<input class="form-control input-sm" placeholder="{{ journal.source_account_name }}" autocomplete="off"
|
||||
name="source_account_name[{{ journal.journal_id }}]" type="text" value="{{ journal.source_account_name }}">
|
||||
<input class="form-control input-sm" placeholder="{% if transaction.source_type != 'Cash account' %}{{ transaction.source_name }}{% endif %}" autocomplete="off"
|
||||
name="source_account_name[{{ transaction.journal_id }}]" type="text" value="{% if transaction.source_type != 'Cash account' %}{{ transaction.source_name }}{% endif %}">
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %}
|
||||
{% if transaction.type == 'Transfer' or transaction.type == 'Deposit' %}
|
||||
{# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #}
|
||||
<select class="form-control input-sm" name="destination_account_id[{{ journal.journal_id }}]">
|
||||
<select class="form-control input-sm" name="destination_account_id[{{ transaction.journal_id }}]">
|
||||
{% for account in accounts %}
|
||||
<option value="{{ account.id }}"{% if account.id==journal.destination_account_id %} selected="selected"{% endif %}
|
||||
<option value="{{ account.id }}"{% if account.id == transaction.destination_id %} selected="selected"{% endif %}
|
||||
label="{{ account.name }}">{{ account.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
{% else %}
|
||||
|
||||
{# DESTINATION ACCOUNT NAME FOR EXPENSE #}
|
||||
<input class="form-control input-sm" placeholder="{{ journal.destination_account_name }}"
|
||||
name="destination_account_name[{{ journal.journal_id }}]" type="text" autocomplete="off"
|
||||
value="{{ journal.destination_account_name }}">
|
||||
<input class="form-control input-sm" placeholder="{% if transaction.destination_type != 'Cash account' %}{{ transaction.destination_name }}{% endif %}"
|
||||
name="destination_account_name[{{ transaction.journal_id }}]" type="text" autocomplete="off"
|
||||
value="{% if transaction.destination_type != 'Cash account' %}{{ transaction.destination_name }}{% endif %}">
|
||||
{% endif %}
|
||||
</td>
|
||||
{# category #}
|
||||
<td>
|
||||
<input class="form-control input-sm" placeholder="{{ journal.categories[0].name }}" autocomplete="off"
|
||||
name="category[{{ journal.journal_id }}]" type="text" value="{{ journal.categories[0].name }}">
|
||||
<input class="form-control input-sm" placeholder="{{ transaction.category_name }}" autocomplete="off"
|
||||
name="category[{{ transaction.journal_id }}]" type="text" value="{{ transaction.category_name }}">
|
||||
</td>
|
||||
{# budget #}
|
||||
<td>
|
||||
{% if journal.transaction_type_type == 'Withdrawal' %}
|
||||
<select class="form-control input-sm" name="budget_id[{{ journal.journal_id }}]">
|
||||
{% if transaction.type == 'Withdrawal' %}
|
||||
<select class="form-control input-sm" name="budget_id[{{ transaction.journal_id }}]">
|
||||
<option value="0" label="({{ 'no_budget'|_ }})"
|
||||
{% if journal.budgets.count == 0 %}selected="selected"{% endif %}
|
||||
{% if transaction.budget_id == 0 %}selected="selected"{% endif %}
|
||||
>({{ 'no_budget'|_ }})
|
||||
</option>
|
||||
{% for budget in budgets %}
|
||||
<option value="{{ budget.id }}"{% if budget.id==journal.budgets[0].id %} selected="selected"{% endif %}
|
||||
<option value="{{ budget.id }}"{% if budget.id == transaction.budget_id %} selected="selected"{% endif %}
|
||||
label="{{ budget.name }}">{{ budget.name }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
|
||||
Reference in New Issue
Block a user