Mirrors
/
data-importer
mirror of https://github.com/firefly-iii/data-importer.git
3
0
Fork 0
Code Releases Activity
Browse Source

Add mapping preference from config

pull/373/head
James Cole 2 years ago
parent
29a095ee6d
commit
9e84576798
3 changed files with 85 additions and 69 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      app/Http/Controllers/Import/File/RoleController.php
  2. 74
      app/Services/Shared/Configuration/Configuration.php
  3. 1
      resources/views/import/005-roles/index-camt.twig

79
app/Http/Controllers/Import/File/RoleController.php
View File

@ -236,13 +236,14 @@ class RoleController extends Controller
$subTitle = 'Configure the role of each field in your camt.053 file';
// get example data from file.
$content = StorageService::getContent(session()->get(Constants::UPLOAD_DATA_FILE), $configuration->isConversion());
$examples = RoleService::getExampleDataFromCamt($content, $configuration);
$content = StorageService::getContent(session()->get(Constants::UPLOAD_DATA_FILE), $configuration->isConversion());
$examples = RoleService::getExampleDataFromCamt($content, $configuration);
$roles = $configuration->getRoles();
$doMapping = $configuration->getDoMapping();
// four levels in a CAMT file, level A B C D. Each level has a pre-defined set of
// available fields and information.
// TODO restore mappable checkbox from configuration
// TODO should not be a big array right here maybe.
$levels = [
'A' => [
'title' => trans('camt.level_A'),
@ -253,8 +254,8 @@ class RoleController extends Controller
'title' => 'messageId',
'roles' => config('camt.roles.level_a'),
'mappable' => false,
'selected_role' => 'note', // todo from config
'example_data' => $examples['messageId']
'selected_role' => $roles['messageId'] ?? 'note', // todo from config
'example_data' => $examples['messageId'],
],
],
],
@ -267,23 +268,25 @@ class RoleController extends Controller
'title' => 'statementCreationDate',
'roles' => config('camt.roles.dates'),
'mappable' => false,
'selected_role' => 'date_process',
'selected_role' => $roles['statementCreationDate'] ?? 'date_process',
'example_data' => $examples['statementCreationDate'],
],
[
'section' => false,
'title' => 'statementAccountIban',
'selected_role' => 'account-iban',
'selected_role' => $roles['statementAccountIban'] ?? 'account-iban',
'roles' => config('camt.roles.iban'),
'mappable' => true,
'do_mapping' => $doMapping['statementAccountIban'] ?? false,
'example_data' => $examples['statementAccountIban'],
],
[
'section' => false,
'title' => 'statementAccountNumber',
'selected_role' => 'account-number',
'selected_role' => $roles['statementAccountNumber'] ?? 'account-number',
'roles' => config('camt.roles.account_number'),
'mappable' => true,
'do_mapping' => $doMapping['statementAccountNumber'] ?? false,
'example_data' => $examples['statementAccountNumber'],
],
],
@ -295,7 +298,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDate',
'selected_role' => 'date_transaction',
'selected_role' => $roles['entryDate'] ?? 'date_transaction',
'roles' => config('camt.roles.dates'),
'mappable' => false,
'example_data' => $examples['entryDate'],
@ -303,7 +306,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryAccountServicerReference',
'selected_role' => 'external-id',
'selected_role' => $roles['entryAccountServicerReference'] ?? 'external-id',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryAccountServicerReference'],
@ -311,7 +314,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryReference',
'selected_role' => 'internal_reference',
'selected_role' => $roles['entryReference'] ?? 'internal_reference',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryReference'],
@ -319,7 +322,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryAdditionalInfo',
'selected_role' => 'note',
'selected_role' => $roles['entryAdditionalInfo'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryAdditionalInfo'],
@ -333,7 +336,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryAmount',
'selected_role' => 'amount',
'selected_role' => $roles['entryAmount'] ?? 'amount',
'roles' => config('camt.roles.amount'),
'mappable' => false,
'example_data' => $examples['entryAmount'],
@ -342,16 +345,17 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryAmountCurrency',
'selected_role' => 'currency-code',
'selected_role' => $roles['entryAmountCurrency'] ?? 'currency-code',
'roles' => config('camt.roles.currency'),
'mappable' => true,
'do_mapping' => $doMapping['entryAmountCurrency'] ?? false,
'example_data' => $examples['entryAmountCurrency'],
],
// entryValueDate
[
'section' => false,
'title' => 'entryValueDate',
'selected_role' => 'date_payment',
'selected_role' => $roles['entryValueDate'] ?? 'date_payment',
'roles' => config('camt.roles.dates'),
'mappable' => false,
'example_data' => $examples['entryValueDate'],
@ -360,7 +364,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryBookingDate',
'selected_role' => 'date_book',
'selected_role' => $roles['entryBookingDate'] ?? 'date_book',
'roles' => config('camt.roles.dates'),
'mappable' => false,
'example_data' => $examples['entryBookingDate'],
@ -373,7 +377,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryBtcDomainCode',
'selected_role' => 'note',
'selected_role' => $roles['entryBtcDomainCode'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryBtcDomainCode'],
@ -382,7 +386,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryBtcFamilyCode',
'selected_role' => 'note',
'selected_role' => $roles['entryBtcFamilyCode'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryBtcFamilyCode'],
@ -391,7 +395,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryBtcSubFamilyCode',
'selected_role' => 'note',
'selected_role' => $roles['entryBtcSubFamilyCode'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryBtcSubFamilyCode'],
@ -404,27 +408,30 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDetailOpposingAccountIban',
'selected_role' => 'opposing-iban',
'selected_role' => $roles['entryDetailOpposingAccountIban'] ?? 'opposing-iban',
'roles' => config('camt.roles.iban'),
'mappable' => true,
'do_mapping' => $doMapping['entryDetailOpposingAccountIban'] ?? false,
'example_data' => $examples['entryDetailOpposingAccountIban'],
],
// entryDetailOpposingAccountNumber
[
'section' => false,
'title' => 'entryDetailOpposingAccountNumber',
'selected_role' => 'opposing-number',
'selected_role' => $roles['entryDetailOpposingAccountNumber'] ?? 'opposing-number',
'roles' => config('camt.roles.account_number'),
'mappable' => true,
'do_mapping' => $doMapping['entryDetailOpposingAccountNumber'] ?? false,
'example_data' => $examples['entryDetailOpposingAccountNumber'],
],
// entryDetailOpposingName
[
'section' => false,
'title' => 'entryDetailOpposingName',
'selected_role' => 'opposing-name',
'selected_role' => $roles['entryDetailOpposingName'] ?? 'opposing-name',
'roles' => config('camt.roles.account_name'),
'mappable' => true,
'do_mapping' => $doMapping['entryDetailOpposingName'] ?? false,
'example_data' => $examples['entryDetailOpposingName'],
],
@ -439,7 +446,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDetailAccountServicerReference',
'selected_role' => 'note',
'selected_role' => $roles['entryDetailAccountServicerReference'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryDetailAccountServicerReference'],
@ -448,7 +455,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDetailRemittanceInformationUnstructuredBlockMessage',
'selected_role' => 'note',
'selected_role' => $roles['entryDetailRemittanceInformationUnstructuredBlockMessage'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryDetailRemittanceInformationUnstructuredBlockMessage'],
@ -457,7 +464,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDetailRemittanceInformationStructuredBlockAdditionalRemittanceInformation',
'selected_role' => 'note',
'selected_role' => $roles['entryDetailRemittanceInformationStructuredBlockAdditionalRemittanceInformation'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryDetailRemittanceInformationStructuredBlockAdditionalRemittanceInformation'],
@ -472,7 +479,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDetailAmount',
'selected_role' => 'amount',
'selected_role' => $roles['entryDetailAmount'] ?? 'amount',
'roles' => config('camt.roles.amount'),
'mappable' => false,
'example_data' => $examples['entryDetailAmount'],
@ -481,9 +488,10 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDetailAmountCurrency',
'selected_role' => 'currency-code',
'selected_role' => $roles['entryDetailAmountCurrency'] ?? 'currency-code',
'roles' => config('camt.roles.currency'),
'mappable' => true,
'do_mapping' => $doMapping['entryDetailAmountCurrency'] ?? false,
'example_data' => $examples['entryDetailAmountCurrency'],
],
@ -496,7 +504,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryBtcDomainCode',
'selected_role' => 'note',
'selected_role' => $roles['entryBtcDomainCode'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryBtcDomainCode'],
@ -505,7 +513,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryBtcFamilyCode',
'selected_role' => 'note',
'selected_role' => $roles['entryBtcFamilyCode'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryBtcFamilyCode'],
@ -514,7 +522,7 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryBtcSubFamilyCode',
'selected_role' => 'note',
'selected_role' => $roles['entryBtcSubFamilyCode'] ?? 'note',
'roles' => config('camt.roles.meta'),
'mappable' => false,
'example_data' => $examples['entryBtcSubFamilyCode'],
@ -529,27 +537,30 @@ class RoleController extends Controller
[
'section' => false,
'title' => 'entryDetailOpposingAccountIban',
'selected_role' => 'opposing-iban',
'selected_role' => $roles['entryDetailOpposingAccountIban'] ?? 'opposing-iban',
'roles' => config('camt.roles.iban'),
'mappable' => true,
'do_mapping' => $doMapping['entryDetailOpposingAccountIban'] ?? false,
'example_data' => $examples['entryDetailOpposingAccountIban'],
],
// entryDetailOpposingAccountNumber
[
'section' => false,
'title' => 'entryDetailOpposingAccountNumber',
'selected_role' => 'opposing-number',
'selected_role' => $roles['entryDetailOpposingAccountNumber'] ?? 'opposing-number',
'roles' => config('camt.roles.account_number'),
'mappable' => true,
'do_mapping' => $doMapping['entryDetailOpposingAccountNumber'] ?? false,
'example_data' => $examples['entryDetailOpposingAccountNumber'],
],
// entryDetailOpposingName
[
'section' => false,
'title' => 'entryDetailOpposingName',
'selected_role' => 'opposing-name',
'selected_role' => $roles['entryDetailOpposingName'] ?? 'opposing-name',
'roles' => config('camt.roles.account_name'),
'mappable' => true,
'do_mapping' => $doMapping['entryDetailOpposingName'] ?? false,
'example_data' => $examples['entryDetailOpposingName'],
],
],

74
app/Services/Shared/Configuration/Configuration.php
View File

@ -358,6 +358,7 @@ class Configuration
$object->dateNotBefore = $array['date_not_before'] ?? '';
$object->dateNotAfter = $array['date_not_after'] ?? '';
// camt
$object->groupedTransactionHandling = $array['grouped_transaction_handling'] ?? 'single';
$object->useEntireOpposingAddress = $array['use_entire_opposing_address'] ?? false;
@ -900,52 +901,56 @@ class Configuration
public function toArray(): array
{
$array = [
'version' => $this->version,
'source' => sprintf('fidi-%s', config('importer.version')),
'created_at' => date(DateTimeInterface::W3C),
'date' => $this->date,
'default_account' => $this->defaultAccount,
'delimiter' => $this->delimiter,
'headers' => $this->headers,
'rules' => $this->rules,
'skip_form' => $this->skipForm,
'add_import_tag' => $this->addImportTag,
'roles' => $this->roles,
'do_mapping' => $this->doMapping,
'mapping' => $this->mapping,
'duplicate_detection_method' => $this->duplicateDetectionMethod,
'ignore_duplicate_lines' => $this->ignoreDuplicateLines,
'unique_column_index' => $this->uniqueColumnIndex,
'unique_column_type' => $this->uniqueColumnType,
'flow' => $this->flow,
'content_type' => $this->contentType,
'version' => $this->version,
'source' => sprintf('fidi-%s', config('importer.version')),
'created_at' => date(DateTimeInterface::W3C),
'date' => $this->date,
'default_account' => $this->defaultAccount,
'delimiter' => $this->delimiter,
'headers' => $this->headers,
'rules' => $this->rules,
'skip_form' => $this->skipForm,
'add_import_tag' => $this->addImportTag,
'roles' => $this->roles,
'do_mapping' => $this->doMapping,
'mapping' => $this->mapping,
'duplicate_detection_method' => $this->duplicateDetectionMethod,
'ignore_duplicate_lines' => $this->ignoreDuplicateLines,
'unique_column_index' => $this->uniqueColumnIndex,
'unique_column_type' => $this->uniqueColumnType,
'flow' => $this->flow,
'content_type' => $this->contentType,
// spectre
'identifier' => $this->identifier,
'connection' => $this->connection,
'ignore_spectre_categories' => $this->ignoreSpectreCategories,
'identifier' => $this->identifier,
'connection' => $this->connection,
'ignore_spectre_categories' => $this->ignoreSpectreCategories,
// camt:
'grouped_transaction_handling' => $this->groupedTransactionHandling,
'use_entire_opposing_address' => $this->useEntireOpposingAddress,
// mapping for spectre + nordigen
'map_all_data' => $this->mapAllData,
'map_all_data' => $this->mapAllData,
// settings for spectre + nordigen
'accounts' => $this->accounts,
'accounts' => $this->accounts,
// date range settings:
'date_range' => $this->dateRange,
'date_range_number' => $this->dateRangeNumber,
'date_range_unit' => $this->dateRangeUnit,
'date_not_before' => $this->dateNotBefore,
'date_not_after' => $this->dateNotAfter,
'date_range' => $this->dateRange,
'date_range_number' => $this->dateRangeNumber,
'date_range_unit' => $this->dateRangeUnit,
'date_not_before' => $this->dateNotBefore,
'date_not_after' => $this->dateNotAfter,
// nordigen information:
'nordigen_country' => $this->nordigenCountry,
'nordigen_bank' => $this->nordigenBank,
'nordigen_requisitions' => $this->nordigenRequisitions,
'nordigen_max_days' => $this->nordigenMaxDays,
'nordigen_country' => $this->nordigenCountry,
'nordigen_bank' => $this->nordigenBank,
'nordigen_requisitions' => $this->nordigenRequisitions,
'nordigen_max_days' => $this->nordigenMaxDays,
// utf8
'conversion' => $this->conversion,
'conversion' => $this->conversion,
];
// make sure that "ignore duplicate transactions" is turned off
@ -1060,5 +1065,4 @@ class Configuration
}
}

1
resources/views/import/005-roles/index-camt.twig
View File

@ -111,6 +111,7 @@
{% if true == field.mappable %}
<label for="do_mapping_{{ field.title }}">
<input type="checkbox" name="do_mapping[{{ field.title }}]" id="do_mapping_{{ field.title }}"
{% if field.do_mapping %}checked="checked"{% endif %}
value="1"/>
</label>
{% endif %}

Write Preview
Loading…
Cancel
Save