kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-18 12:28:46 +00:00
Code Issues Projects Releases Wiki Activity

Fix multi currency edit display

Browse Source
This commit is contained in:
James Cole
2017-08-10 19:55:13 +02:00
parent 1d67939e76
commit c0c5ced6ad
1 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
resources/views/transactions/split/edit.twig
View File

@@ -199,9 +199,9 @@
<div class="col-lg-2 col-md-5 col-sm-12 col-xs-12"><strong>{{ trans('list.source') }}</strong></div> <div class="col-lg-2 col-md-5 col-sm-12 col-xs-12"><strong>{{ trans('list.source') }}</strong></div>
{% endif %} {% endif %}
<div class="col-lg-1 col-md-5 col-sm-12 col-xs-12"><strong>{{ trans('list.amount') }}</strong></div> <div class="col-lg-1 col-md-5 col-sm-12 col-xs-12"><strong>{{ trans('list.amount') }}</strong></div>
{% if transaction.foreign_amount != null %} <div class="col-lg-1 col-md-7 col-sm-12 col-xs-12">
<div class="col-lg-1 col-md-7 col-sm-12 col-xs-12">&nbsp;</div> &nbsp;
{% endif %} </div>
{# only withdrawal has budget #} {# only withdrawal has budget #}
{% if preFilled.what == 'withdrawal' %} {% if preFilled.what == 'withdrawal' %}
<div class="col-lg-1 col-md-6 col-sm-12 col-xs-12"><strong>{{ trans('list.budget') }}</strong></div> <div class="col-lg-1 col-md-6 col-sm-12 col-xs-12"><strong>{{ trans('list.budget') }}</strong></div>
@@ -209,83 +209,86 @@
<div class="col-lg-2 col-md-6 col-sm-12 col-xs-12"><strong>{{ trans('list.category') }}</strong></div> <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12"><strong>{{ trans('list.category') }}</strong></div>
</div> </div>
{% for index, transaction in preFilled.transactions %} {% for index, transaction in preFilled.transactions %}
<div class="row {% if loop.index0 % 2 == 1 %}bg-gray-light{% endif %} split_row" data-split="{{ loop.index0 }}"> <div class="row {% if loop.index0 % 2 == 1 %}bg-gray-light{% endif %} split_row" data-split="{{ loop.index0 }}">
{# button #} {# button #}
<div class="col-lg-1 col-md-1 col-sm-6 col-xs-6"> <div class="col-lg-1 col-md-1 col-sm-6 col-xs-6">
<a href="#" class="btn btn-xs btn-danger remove-current-split" data-split="{{ loop.index0 }}"> <a href="#" class="btn btn-xs btn-danger remove-current-split" data-split="{{ loop.index0 }}">
<i class="fa fa-trash" data-split="{{ loop.index0 }}"></i></a> <i class="fa fa-trash" data-split="{{ loop.index0 }}"></i></a>
</div>
{# index #}
<div class="col-lg-1 col-md-1 col-sm-6 col-xs-6 count">#{{ loop.index }}</div>
{# description #}
<div class="col-lg-3 col-md-5 col-sm-12 col-xs-12">
<input type="text" name="transactions[{{ loop.index0 }}][description]" value="{{ transaction.description }}"
class="form-control"/>
</div>
{# destination for withdrawals: #}
{% if preFilled.what == 'withdrawal' %}
<div class="col-lg-2 col-md-5 col-sm-12 col-xs-12">
<input type="text" name="transactions[{{ loop.index0 }}][destination_account_name]"
value="{{ transaction.destination_account_name }}" class="form-control"/>
</div> </div>
{% endif %}
{# source for deposits #} {# index #}
{% if preFilled.what == 'deposit' %} <div class="col-lg-1 col-md-1 col-sm-6 col-xs-6 count">#{{ loop.index }}</div>
<div class="col-lg-2 col-md-5 col-sm-12 col-xs-12">
<input type="text" name="transactions[{{ loop.index0 }}][source_account_name]" {# description #}
value="{{ transaction.source_account_name }}" class="form-control"/> <div class="col-lg-3 col-md-5 col-sm-12 col-xs-12">
<input type="text" name="transactions[{{ loop.index0 }}][description]" value="{{ transaction.description }}"
class="form-control"/>
</div> </div>
{% endif %}
{# amount#} {# destination for withdrawals: #}
<div class="col-lg-1 col-md-5 col-sm-12 col-xs-12"> {% if preFilled.what == 'withdrawal' %}
<div class="input-group"> <div class="col-lg-2 col-md-5 col-sm-12 col-xs-12">
<div class="input-group-addon">{{ transaction.transaction_currency_symbol }}</div> <input type="text" name="transactions[{{ loop.index0 }}][destination_account_name]"
<input type="number" name="transactions[{{ loop.index0 }}][amount]" value="{{ transaction.amount }}" value="{{ transaction.destination_account_name }}" class="form-control"/>
class="form-control" autocomplete="off" step="any"> </div>
</div> {% endif %}
<input type="hidden" name="transactions[{{ loop.index0 }}][transaction_currency_id]"
value="{{ transaction.transaction_currency_id }}">
</div>
{# foreign amount #} {# source for deposits #}
{% if transaction.foreign_amount != null %} {% if preFilled.what == 'deposit' %}
<div class="col-lg-1 col-md-7 col-sm-12 col-xs-12"> <div class="col-lg-2 col-md-5 col-sm-12 col-xs-12">
<input type="text" name="transactions[{{ loop.index0 }}][source_account_name]"
value="{{ transaction.source_account_name }}" class="form-control"/>
</div>
{% endif %}
{# amount#}
<div class="col-lg-1 col-md-5 col-sm-12 col-xs-12">
<div class="input-group"> <div class="input-group">
<div class="input-group-addon">{{ transaction.foreign_currency_symbol }}</div> <div class="input-group-addon">{{ transaction.transaction_currency_symbol }}</div>
<input type="number" name="transactions[{{ loop.index0 }}][foreign_amount]" value="{{ transaction.foreign_amount }}" <input type="number" name="transactions[{{ loop.index0 }}][amount]" value="{{ transaction.amount }}"
class="form-control" autocomplete="off" step="any"> class="form-control" autocomplete="off" step="any">
</div> </div>
<input type="hidden" <input type="hidden" name="transactions[{{ loop.index0 }}][transaction_currency_id]"
name="transactions[{{ loop.index0 }}][foreign_currency_id]" value="{{ transaction.transaction_currency_id }}">
value="{{ transaction.foreign_currency_id }}">
</div> </div>
{% endif %}
{# budget #} {# foreign amount #}
{% if preFilled.what == 'withdrawal' %} <div class="col-lg-1 col-md-7 col-sm-12 col-xs-12">
<div class="col-lg-1 col-md-6 col-sm-12 col-xs-12"> {% if transaction.foreign_amount != null %}
<select class="form-control" name="transactions[{{ loop.index0 }}][budget_id]">
{% for key, budget in budgets %} <div class="input-group">
<option label="{{ budget }}" value="{{ key }}" <div class="input-group-addon">{{ transaction.foreign_currency_symbol }}</div>
{% if transaction.budget_id == key %} selected="selected"{% endif %}>{{ budget }}</option> <input type="number" name="transactions[{{ loop.index0 }}][foreign_amount]"
{% endfor %} value="{{ transaction.foreign_amount }}"
</select> class="form-control" autocomplete="off" step="any">
</div>
<input type="hidden"
name="transactions[{{ loop.index0 }}][foreign_currency_id]"
value="{{ transaction.foreign_currency_id }}">
{% endif %}
</div> </div>
{% endif %}
{# category #} {# budget #}
<div class="col-lg-2 col-md-6 col-sm-12 col-xs-12"> {% if preFilled.what == 'withdrawal' %}
<input type="text" name="transactions[{{ loop.index0 }}][category]" value="{{ transaction.category }}" <div class="col-lg-1 col-md-6 col-sm-12 col-xs-12">
class="form-control"/> <select class="form-control" name="transactions[{{ loop.index0 }}][budget_id]">
{% for key, budget in budgets %}
<option label="{{ budget }}" value="{{ key }}"
{% if transaction.budget_id == key %} selected="selected"{% endif %}>{{ budget }}</option>
{% endfor %}
</select>
</div>
{% endif %}
{# category #}
<div class="col-lg-2 col-md-6 col-sm-12 col-xs-12">
<input type="text" name="transactions[{{ loop.index0 }}][category]" value="{{ transaction.category }}"
class="form-control"/>
</div>
</div> </div>
</div> {% endfor %}
{% endfor %}
</div> </div>
<p> <p>
<br/> <br/>