mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-01-08 15:14:06 -06:00
Expand views and files to use new methods.
This commit is contained in:
James Cole
parent
1645490f5c
commit
3b735c7533
@ -174,6 +174,24 @@ return [
|
||||
'converter' => 'Date',
|
||||
'field' => 'date-process',
|
||||
],
|
||||
'date-due' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Date',
|
||||
'field' => 'date-due',
|
||||
],
|
||||
'date-payment' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Date',
|
||||
'field' => 'date-payment',
|
||||
],
|
||||
'date-invoice' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Date',
|
||||
'field' => 'date-invoice',
|
||||
],
|
||||
'budget-id' => [
|
||||
'mappable' => true,
|
||||
'pre-process-map' => false,
|
||||
@ -266,7 +284,7 @@ return [
|
||||
'converter' => 'AccountId',
|
||||
'mapper' => 'OpposingAccounts',
|
||||
],
|
||||
'opposing-bic' => [
|
||||
'opposing-bic' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'field' => 'opposing-account-bic',
|
||||
@ -317,23 +335,62 @@ return [
|
||||
'converter' => 'Amount',
|
||||
'field' => 'amount_foreign',
|
||||
],
|
||||
|
||||
// SEPA end to end ID
|
||||
'sepa-ct-id' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'description',
|
||||
'field' => 'sepa_ct_id',
|
||||
],
|
||||
// SEPA opposing account identifier
|
||||
'sepa-ct-op' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'description',
|
||||
'field' => 'sepa_ct_op',
|
||||
],
|
||||
// SEPA Direct Debit Mandate Identifier
|
||||
'sepa-db' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'description',
|
||||
'field' => 'sepa_db',
|
||||
],
|
||||
// SEPA clearing code
|
||||
'sepa-cc' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'sepa_cc',
|
||||
],
|
||||
// SEPA country
|
||||
'sepa-country' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'sepa_country',
|
||||
],
|
||||
// SEPA external purpose
|
||||
'sepa-ep' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'sepa_ep',
|
||||
],
|
||||
// SEPA creditor identifier
|
||||
'sepa-ci' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'sepa_ci',
|
||||
],
|
||||
// Internal reference
|
||||
'internal-reference' => [
|
||||
'mappable' => false,
|
||||
'pre-process-map' => false,
|
||||
'converter' => 'Description',
|
||||
'field' => 'internal_reference',
|
||||
],
|
||||
],
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* import.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
@ -131,22 +132,30 @@ return [
|
||||
'column_date-book' => 'Transaction booking date',
|
||||
'column_date-process' => 'Transaction process date',
|
||||
'column_date-transaction' => 'Date',
|
||||
'column_date-due' => 'Transaction due date',
|
||||
'column_date-payment' => 'Transaction payment date',
|
||||
'column_date-invoice' => 'Transaction invoice date',
|
||||
'column_description' => 'Description',
|
||||
'column_opposing-iban' => 'Opposing account (IBAN)',
|
||||
'column_opposing-bic' => 'Opposing account (BIC)',
|
||||
'column_opposing-bic' => 'Opposing account (BIC)',
|
||||
'column_opposing-id' => 'Opposing account ID (matching FF3)',
|
||||
'column_external-id' => 'External ID',
|
||||
'column_opposing-name' => 'Opposing account (name)',
|
||||
'column_rabo-debit-credit' => 'Rabobank specific debit/credit indicator',
|
||||
'column_ing-debit-credit' => 'ING specific debit/credit indicator',
|
||||
'column_sepa-ct-id' => 'SEPA Credit Transfer end-to-end ID',
|
||||
'column_sepa-ct-op' => 'SEPA Credit Transfer opposing account',
|
||||
'column_sepa-db' => 'SEPA Direct Debit',
|
||||
'column_sepa-ct-id' => 'SEPA end-to-end Identifier',
|
||||
'column_sepa-ct-op' => 'SEPA Opposing Account Identifier',
|
||||
'column_sepa-db' => 'SEPA Mandate Identifier',
|
||||
'column_sepa-cc' => 'SEPA Clearing Code',
|
||||
'column_sepa-ci' => 'SEPA Creditor Identifier',
|
||||
'column_sepa-ep' => 'SEPA External Purpose',
|
||||
'column_sepa-country' => 'SEPA Country Code',
|
||||
'column_tags-comma' => 'Tags (comma separated)',
|
||||
'column_tags-space' => 'Tags (space separated)',
|
||||
'column_account-number' => 'Asset account (account number)',
|
||||
'column_opposing-number' => 'Opposing account (account number)',
|
||||
'column_note' => 'Note(s)',
|
||||
'column_internal-reference' => 'Internal reference',
|
||||
|
||||
// prerequisites
|
||||
'prerequisites' => 'Prerequisites',
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* list.php
|
||||
* Copyright (c) 2017 thegrumpydictator@gmail.com
|
||||
@ -102,4 +103,11 @@ return [
|
||||
'reconcile' => 'Reconcile',
|
||||
'account_on_spectre' => 'Account (Spectre)',
|
||||
'do_import' => 'Import from this account',
|
||||
'sepa-ct-id' => 'SEPA End to End Identifier',
|
||||
'sepa-ct-op' => 'SEPA Opposing Account Identifier',
|
||||
'sepa-db' => 'SEPA Mandate Identifier',
|
||||
'sepa-country' => 'SEPA Country',
|
||||
'sepa-cc' => 'SEPA Clearing Code',
|
||||
'sepa-ep' => 'SEPA External Purpose',
|
||||
'sepa-ci' => 'SEPA Creditor Identifier',
|
||||
];
|
||||
|
||||
@ -129,7 +129,7 @@
|
||||
<td class="hide-internal_reference">
|
||||
|
||||
{% if transaction.transactionJournal.hasMeta('internal_reference') %}
|
||||
{{ getMetaField(transaction.transactionJournal,'internal_reference') }}
|
||||
{{ journalGetMetaField(transaction.transactionJournal,'internal_reference') }}
|
||||
{% endif %}
|
||||
|
||||
</td>
|
||||
|
||||
@ -200,55 +200,24 @@
|
||||
<td>{{ journalBudgets(journal)|raw }}</td>
|
||||
</tr>
|
||||
|
||||
{% if journal.hasMeta('interest_date') %}
|
||||
<tr>
|
||||
<td>{{ trans('list.interest_date') }}</td>
|
||||
<td>{{ getMetaDate(journal,'interest_date').formatLocalized(monthAndDayFormat) }}</td>
|
||||
</tr>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if journal.hasMeta('book_date') %}
|
||||
<tr>
|
||||
<td>{{ trans('list.book_date') }}</td>
|
||||
<td>{{ getMetaDate(journal,'book_date').formatLocalized(monthAndDayFormat) }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% if journal.hasMeta('process_date') %}
|
||||
<tr>
|
||||
<td>{{ trans('list.process_date') }}</td>
|
||||
<td>{{ getMetaDate(journal,'process_date').formatLocalized(monthAndDayFormat) }}</td>
|
||||
</tr>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if journal.hasMeta('due_date') %}
|
||||
<tr>
|
||||
<td>{{ trans('list.due_date') }}</td>
|
||||
<td>{{ getMetaDate(journal,'due_date').formatLocalized(monthAndDayFormat) }}</td>
|
||||
</tr>
|
||||
|
||||
{% endif %}
|
||||
{% if journal.hasMeta('payment_date') %}
|
||||
<tr>
|
||||
<td>{{ trans('list.payment_date') }}</td>
|
||||
<td>{{ getMetaDate(journal,'payment_date').formatLocalized(monthAndDayFormat) }}</td>
|
||||
</tr>
|
||||
|
||||
{% endif %}
|
||||
{% if journal.hasMeta('invoice_date') %}
|
||||
<tr>
|
||||
<td>{{ trans('list.invoice_date') }}</td>
|
||||
<td>{{ getMetaDate(journal,'invoice_date').formatLocalized(monthAndDayFormat) }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% set intRef = getMetaField(journal, 'internal_reference') %}
|
||||
{% if intRef != "" %}
|
||||
<tr>
|
||||
<td>{{ trans('list.internal_reference') }}</td>
|
||||
<td>{{ intRef }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{# all date meta values #}
|
||||
{% for dateField in ['interest_date','book_date','process_date','due_date','payment_date','invoice_date'] %}
|
||||
{% if journalHasMeta(journal, dateField) %}
|
||||
<tr>
|
||||
<td>{{ trans('list.'~dateField) }}</td>
|
||||
<td>{{ journalGetMetaDate(journal,dateField).formatLocalized(monthAndDayFormat) }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{# all other meta values #}
|
||||
{% for metaField in ['internal_reference','sepa-ct-id','sepa-ct-op','sepa-db','sepa-country','sepa-cc','sepa-ep','sepa-ci'] %}
|
||||
{% if journalHasMeta(journal, metaField) %}
|
||||
<tr>
|
||||
<td>{{ trans('list.'~metaField) }}</td>
|
||||
<td>{{ journalGetMetaField(journal, metaField) }}</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% if journal.notes.count == 1 %}
|
||||
<tr>
|
||||
<td>{{ trans('list.notes') }}</td>
|
||||
@ -315,7 +284,7 @@
|
||||
</a>
|
||||
({{ att.size|filesize }})
|
||||
{% if att.notes.first %}
|
||||
{{ att.notes.first.text|markdown}}
|
||||
{{ att.notes.first.text|markdown }}
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user