kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Lots of new code for Spectre import.

Browse Source
This commit is contained in:
James Cole
2018-01-03 19:17:30 +01:00
parent 4e0319bacc
commit 5177619301
17 changed files with 911 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/accounts/index.twig
View File

@@ -33,7 +33,7 @@
</div>
</div>
{% endif %}
{% if accounts.count == 0 and page == 0 %}
{% if accounts.count == 0 and page == 1 %}
{% include 'partials.empty' with {what: what, type: 'accounts',route: route('accounts.create', [what])} %}
{% endif %}
{% endblock %}

2
resources/views/form/options.twig
View File

@@ -5,7 +5,7 @@
</label>
<div class="col-sm-8">
<div class="radio">
<div class="checkbox">
<label>
{{ Form.checkbox('create_another', '1', false, {'id': name ~ '_return_to_form'}) }}
{{ trans('form.returnHereExplanation') }}

6
resources/views/import/file/initial.twig
View File

@@ -47,7 +47,7 @@
</label>
<div class="col-sm-8">
<div class="radio"><label>
<div class="checkbox"><label>
{{ Form.checkbox('apply_rules', '1',
job.configuration.apply_rules == '1', {'id': 'apply_rules_label'}) }}
{{ trans('import.file_apply_rules_description') }}
@@ -61,7 +61,7 @@
</label>
<div class="col-sm-8">
<div class="radio"><label>
<div class="checkbox"><label>
{{ Form.checkbox('match_bills', '1',
job.configuration.match_bills == '1', {'id': 'match_bills_label'}) }}
{{ trans('import.file_match_bills_description') }}
@@ -77,7 +77,7 @@
</label>
<div class="col-sm-8">
<div class="radio"><label>
<div class="checkbox"><label>
{{ Form.checkbox('specifics['~type~']', '1',
job.configuration.specifics[type] == '1', {'id': type ~ '_label'}) }}
{{ specific.description }}

88
resources/views/import/spectre/accounts.twig Normal file
View File

@@ -0,0 +1,88 @@
{% extends "./layout/default" %}
{% block breadcrumbs %}
{{ Breadcrumbs.render }}
{% endblock %}
{% block content %}
<div class="row">
<form class="form-horizontal" action="{{ route('import.configure.post',[job.key]) }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">{{ trans('import.spectre_accounts_title') }}</h3>
</div>
<div class="box-body">
<div class="row">
<div class="col-lg-8">
<p>
{{ trans('import.spectre_accounts_text')|raw }}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>{{ trans('list.account_on_spectre') }}</th>
<th>{{ trans('list.account') }}</th>
<th>{{ trans('list.do_import') }}</th>
</tr>
</thead>
<tbody>
{% for account in data.config.accounts %}
<tr>
<td>
<input type="hidden" name="spectre_account_id[]" value="{{ account.id }}" />
{{ account.nature|capitalize }} "<strong>{{ account.name }}</strong>" ({{ formatAmountBySymbol(account.balance, account.currency_code~' ') }})<br />
{% for name, value in account.extra %}
{% if not value is iterable and name != 'sort_code' and name !='current_date' and name != 'available_amount' and name !='current_time' and name != 'last_posted_transaction_id' %}
{{ name|capitalize }}: {{ value }}<br />
{% endif %}
{% if name == 'available_amount' %}
Available amount: {{ formatAmountBySymbol(value, account.currency_code~' ') }}
{% endif %}
{% endfor %}
</td>
<td>
<select class="form-control" name="import[{{ account.id }}]">
{% for id,name in account.options %}
<option value="{{ id }}" label="{{ name }}">{{ name }}</option>
{% endfor %}
</select>
</td>
<td>
<div class="checkbox">
<label>
<input type="checkbox" value="1" name="do_import[{{ account.id }}]" checked>
{{ 'spectre_do_import'|_ }}
</label>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">
{{ ('submit')|_ }}
</button>
</div>
</div>
</div>
</form>
</div>
{% endblock %}
{% block scripts %}
{% endblock %}
{% block styles %}
{% endblock %}

1
resources/views/import/status.twig
View File

@@ -145,6 +145,7 @@
<script type="text/javascript">
// some useful translations.
var langImportTimeOutError = '(time out thing)';
var langImportSingleError = '{{ trans('import.status_errors_single')|escape('js') }}';
var langImportMultiError = '{{ trans('import.status_errors_multi')|escape('js') }}';
var jobStatusUri = '{{ route('import.status.json', [job.key]) }}';