IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Many updates to get split transactions and normal transactions working side by side.

Browse Source
This commit is contained in:
James Cole
2016-10-21 19:06:22 +02:00
parent 801c7c0ab6
commit 9a3cd27700
25 changed files with 960 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/views/form/date.twig
View File

@@ -2,7 +2,12 @@
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.input('date', name, value, options) }}
<div class="input-group">
<div class="input-group-addon">
<i class="fa fa-calendar"></i>
</div>
{{ Form.input('date', name, value, options) }}
</div>
{% include 'form/help.twig' %}
{% include 'form/feedback.twig' %}
</div>

30
resources/views/form/multi/amount.twig Normal file
View File

@@ -0,0 +1,30 @@
<div class="{{ classes }}" id="{{ name }}_{{ index }}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
<div class="input-group">
<div class="input-group-btn">
<button type="button"
class="btn btn-default dropdown-toggle currency-dropdown" id="currency_dropdown_{{ name }}_{{ index }}" data-toggle="dropdown"
aria-expanded="false">
<span id="currency_select_symbol_{{ name }}_{{ index }}">{{ defaultCurrency.symbol|raw }}</span> <span class="caret"></span>
</button>
<ul class="dropdown-menu currency-dropdown-menu" role="menu">
{% for currency in currencies %}
<li>
<a href="#"
class="multi-currency-option"
data-id="{{ currency.id }}"
data-name="{{ name }}"
data-index="{{ index }}"
data-currency="{{ currency.code }}"
data-symbol="{{ currency.symbol|raw }}">{{ currency.name }}</a></li>
{% endfor %}
</ul>
</div>
{{ Form.input('number', name~'['~index~']', value, options) }}
</div>
{% include 'form.multi.feedback.twig' %}
</div>
<input type="hidden" name="amount_currency_id_{{ name }}_{{ index }}" value="{{ defaultCurrency.id }}"/>
</div>

4
resources/views/form/multi/feedback.twig Normal file
View File

@@ -0,0 +1,4 @@
{% if errors.has(name~'.'~index) %}
<span class="form-control-feedback"><i class="fa fa-fw fa-remove"></i></span>
<p class="text-danger">{{ errors.first(name~'.'~index) }}</p>
{% endif %}

10
resources/views/form/multi/select.twig Normal file
View File

@@ -0,0 +1,10 @@
<div class="{{ classes }}" id="{{ name }}_{{ index }}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.select(name~'['~index~']', list, selected , options ) }}
{% include 'form.help.twig' %}
{% include 'form.multi.feedback.twig' %}
</div>
</div>

9
resources/views/form/multi/text.twig Normal file
View File

@@ -0,0 +1,9 @@
<div class="{{ classes }}" id="{{ name }}_{{ index }}_holder">
<label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>
<div class="col-sm-8">
{{ Form.input('text', name~'['~index~']', value, options) }}
{% include 'form/help.twig' %}
{% include 'form.multi.feedback.twig' %}
</div>
</div>

47
resources/views/transactions/create.twig
View File

@@ -29,23 +29,22 @@
</div>
<!-- DESCRIPTION ALWAYS AVAILABLE -->
{# DESCRIPTION IS ALWAYS AVAILABLE #}
{{ ExpandedForm.text('description') }}
<!-- SELECTABLE SOURCE ACCOUNT ONLY FOR WITHDRAWALS AND TRANSFERS -->
{{ ExpandedForm.select('source_account_id',assetAccounts, null, {label: trans('form.asset_source_account')}) }}
{# SELECTABLE SOURCE ACCOUNT ONLY FOR WITHDRAWALS AND TRANSFERS #}
{{ ExpandedForm.select('source_account_id', assetAccounts, null, {label: trans('form.asset_source_account')}) }}
<!-- FREE FORMAT SOURCE ACCOUNT ONLY FOR DEPOSITS -->
{{ ExpandedForm.text('source_account_name',null, {label: trans('form.revenue_account')}) }}
{# FREE FORMAT SOURCE ACCOUNT ONLY FOR DEPOSITS #}
{{ ExpandedForm.text('source_account_name', null, {label: trans('form.revenue_account')}) }}
<!-- FREE FORMAT DESTINATION ACCOUNT ONLY FOR EXPENSES -->
{{ ExpandedForm.text('destination_account_name',null, {label: trans('form.expense_account')}) }}
{# FREE FORMAT DESTINATION ACCOUNT ONLY FOR EXPENSES #}
{{ ExpandedForm.text('destination_account_name', null, {label: trans('form.expense_account')}) }}
<!-- SELECTABLE DESTINATION ACCOUNT ONLY FOR TRANSFERS AND DEPOSITS -->
{{ ExpandedForm.select('destination_account_id',assetAccounts, null, {label: trans('form.asset_destination_account')} ) }}
{# SELECTABLE DESTINATION ACCOUNT ONLY FOR TRANSFERS AND DEPOSITS #}
{{ ExpandedForm.select('destination_account_id', assetAccounts, null, {label: trans('form.asset_destination_account')} ) }}
<!-- ALWAYS SHOW AMOUNT -->
{# ALWAYS SHOW AMOUNT #}
{{ ExpandedForm.amount('amount') }}
<!-- ALWAYS SHOW DATE -->
@@ -66,9 +65,9 @@
<div class="box-body">
<!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
{% if budgets|length > 1 %}
{{ ExpandedForm.select('budget_id',budgets,0) }}
{{ ExpandedForm.select('budget_id', budgets, 0) }}
{% else %}
{{ ExpandedForm.select('budget_id',budgets,0, {helpText: trans('firefly.no_budget_pointer')}) }}
{{ ExpandedForm.select('budget_id', budgets, 0, {helpText: trans('firefly.no_budget_pointer')}) }}
{% endif %}
<!-- CATEGORY ALWAYS -->
@@ -78,7 +77,7 @@
{{ ExpandedForm.text('tags') }}
<!-- RELATE THIS TRANSFER TO A PIGGY BANK -->
{{ ExpandedForm.select('piggy_bank_id',piggies) }}
{{ ExpandedForm.select('piggy_bank_id', piggies) }}
</div>
</div>
@@ -108,33 +107,33 @@
</div>
<div class="box-body">
{# INTEREST DATE #}
{% if optionalFields.interest_date %}
<!-- INTEREST DATE -->
{{ ExpandedForm.date('interest_date') }}
{% endif %}
{# BOOK DATE #}
{% if optionalFields.book_date %}
<!-- BOOK DATE -->
{{ ExpandedForm.date('book_date') }}
{% endif %}
{# PROCESSING DATE #}
{% if optionalFields.process_date %}
<!-- PROCESSING DATE -->
{{ ExpandedForm.date('process_date') }}
{% endif %}
{# DUE DATE #}
{% if optionalFields.due_date %}
<!-- DUE DATE -->
{{ ExpandedForm.date('due_date') }}
{% endif %}
{# PAYMENT DATE #}
{% if optionalFields.payment_date %}
<!-- PAYMENT DATE -->
{{ ExpandedForm.date('payment_date') }}
{% endif %}
{# INVOICE DATE #}
{% if optionalFields.invoice_date %}
<!-- INVOICE DATE -->
{{ ExpandedForm.date('invoice_date') }}
{% endif %}
@@ -149,13 +148,14 @@
<h3 class="box-title">{{ 'optional_field_meta_business'|_ }}</h3>
</div>
<div class="box-body">
{# REFERENCE #}
{% if optionalFields.internal_reference %}
<!-- REFERENCE -->
{{ ExpandedForm.text('internal_reference') }}
{% endif %}
{# NOTES #}
{% if optionalFields.notes %}
<!-- NOTES -->
{{ ExpandedForm.textarea('notes') }}
{% endif %}
@@ -170,8 +170,8 @@
<h3 class="box-title">{{ 'optional_field_attachments'|_ }}</h3>
</div>
<div class="box-body">
{# ATTACHMENTS #}
{% if optionalFields.attachments %}
<!-- ATTACHMENTS -->
{{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }}
{% endif %}
</div>
@@ -193,6 +193,7 @@
</div>
</div>
</div>
#}
</div>
</form>