kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-02 03:51:18 +00:00
Code Issues Projects Releases Wiki Activity

Update libraries, add some views.

Browse Source
This commit is contained in:
James Cole
2019-08-04 19:54:31 +02:00
parent cc56a981cd
commit a077d58e9c
17 changed files with 74 additions and 57833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/transactions/CreateTransaction.vue
View File

@@ -164,7 +164,7 @@
</div>
</div>
<div class="box-footer" v-if="transactions.length-1 === index">
<button class="btn btn-primary" @click="addTransactionToArray">Add another split</button>
<button class="split_add_btn btn btn-primary" @click="addTransactionToArray">Add another split</button>
</div>
</div>
</div>

3
resources/views/v1/accounts/show.twig
View File

@@ -170,5 +170,6 @@
<script src="v1/js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="v1/js/lib/jquery.color-2.1.2.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="v1/js/ff/accounts/show.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

3
resources/views/v1/bills/show.twig
View File

@@ -180,5 +180,6 @@
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/bills/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

3
resources/views/v1/budgets/no-budget.twig
View File

@@ -59,5 +59,6 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

3
resources/views/v1/budgets/show.twig
View File

@@ -183,5 +183,6 @@
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/budgets/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

3
resources/views/v1/categories/no-category.twig
View File

@@ -59,5 +59,6 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

3
resources/views/v1/categories/show.twig
View File

@@ -103,5 +103,6 @@
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/categories/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

10
resources/views/v1/list/groups.twig
View File

@@ -2,7 +2,7 @@
TODO: reconcile
TODO: hide and show columns
-->
<table class="table">
<table class="table table-condensed table-hover">
<thead>
<tr>
<td colspan="7" class="no-margin-pagination">{{ groups.render|raw }}</td>
@@ -80,7 +80,13 @@ TODO: hide and show columns
{% if transaction.reconciled %}
<i class="fa fa-check"></i>
{% endif %}
<a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">{{ transaction.description }}</a>
{% if group.count == 1 %}
<a href="{{ route('transactions.show', [group.id]) }}" title="{{ transaction.description }}">
{% endif %}
{{ transaction.description }}
{% if group.count == 1 %}
</a>
{% endif %}
</td>
<td style=" {{ style|raw }}">
{% if transaction.transaction_type_type == 'Deposit' %}

3
resources/views/v1/recurring/show.twig
View File

@@ -211,5 +211,6 @@
{% block scripts %}
<script type="text/javascript" src="v1/js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

3
resources/views/v1/search/index.twig
View File

@@ -124,5 +124,6 @@
var searchUri = "{{ route('search.search') }}";
</script>
<script type="text/javascript" src="v1/js/ff/search/index.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

2
resources/views/v1/search/search.twig
View File

@@ -3,4 +3,4 @@
{{ trans('firefly.search_found_transactions', {count: transactions.count, time: searchTime}) }}
</p>
{% include 'list.groups' %}
{% include 'list.groups' %}

7
resources/views/v1/transactions/index.twig
View File

@@ -66,11 +66,6 @@
{% endblock %}
{% block scripts %}
{# old list script #}
{# <script type="text/javascript" src="v1/js/ff/transactions/list.js?v={{ FF_VERSION }}"></script> #}
<script type="text/javascript">
</script>
{# required for groups.twig #}
<script type="text/javascript" src="v1/js/ff/list/groups.js?v={{ FF_VERSION }}"></script>
{% endblock %}

6
resources/views/v1/transactions/show.twig
View File

@@ -91,7 +91,7 @@
{% if groupArray.transactions[0].type != 'opening balance' and groupArray.transactions[0].type != 'reconciliation' %}
CLONE
<!--CLONE-->
{#<a href="{{ route('transactions.clone', [transactionGroup.id]) }}" class="btn btn-default"><i class="fa fa-copy"></i> {{ 'clone'|_ }}</a>#}
{% endif %}
{#
@@ -148,10 +148,10 @@
<td>
{% for amount in amounts %}
{% if type == 'Withdrawal' or type == 'Deposit' %}
{{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }},
{{ formatAmountBySymbol(amount.amount*-1,amount.symbol, amount.decimal_places) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
{% elseif type == 'Transfer' %}
<span class="text-info">
{{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }},
{{ formatAmountBySymbol(amount.amount, amount.symbol, amount.decimal_places, false) }}{% if loop.index0 != amounts|length -1 %}, {% endif %}
</span>
{% endif %}
{% endfor %}