kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-04 04:24:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix several issues with bunq import #1330

Browse Source
This commit is contained in:
James Cole
2018-04-10 21:18:38 +02:00
parent 0847040017
commit 90cf7a3bf5
22 changed files with 243 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en_US/form.php
View File

@@ -38,6 +38,7 @@ return [
'journal_currency_id' => 'Currency',
'currency_id' => 'Currency',
'transaction_currency_id' => 'Currency',
'external_ip' => 'Your server\'s external IP',
'attachments' => 'Attachments',
'journal_amount' => 'Amount',
'journal_source_account_name' => 'Revenue account (source)',

1
resources/lang/en_US/import.php
View File

@@ -164,6 +164,7 @@ return [
// bunq
'bunq_prerequisites_title' => 'Prerequisites for an import from bunq',
'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.',
'bunq_prerequisites_text_ip' => 'Bunq requires your externally facing IP address. Firefly III has tried to fill this in using <a href="https://www.ipify.org/">the ipify service</a>. Make sure this IP address is correct, or the import will fail.',
'bunq_do_import' => 'Yes, import from this account',
'bunq_accounts_title' => 'Bunq accounts',
'bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.',

14
resources/views/import/bunq/prerequisites.twig
View File

@@ -26,6 +26,20 @@
{{ ExpandedForm.text('api_key', key) }}
</div>
</div>
<div class="row">
<div class="col-lg-8">
<p>
{{ trans('import.bunq_prerequisites_text_ip')|raw }}
</p>
</div>
</div>
<div class="row">
<div class="col-lg-8">
{{ ExpandedForm.text('external_ip', ip) }}
</div>
</div>
</div>
<div class="box-footer">
<button type="submit" class="btn pull-right btn-success">