kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 03:43:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix missing external url field.

Browse Source
This commit is contained in:
James Cole
2022-01-24 07:50:33 +01:00
parent 75d52b7024
commit 7718deb4a5
41 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Api/V1/Requests/Models/Transaction/StoreRequest.php
View File

@@ -137,7 +137,7 @@ class StoreRequest extends FormRequest
'original_source' => sprintf('ff3-v%s|api-v%s', config('firefly.version'), config('firefly.api_version')),
'recurrence_id' => $this->integerFromValue($object['recurrence_id']),
'bunq_payment_id' => $this->clearString((string)$object['bunq_payment_id'], false),
'external_uri' => $this->clearString((string)$object['external_uri'], false),
'external_url' => $this->clearString((string)$object['external_url'], false),
'sepa_cc' => $this->clearString((string)$object['sepa_cc'], false),
'sepa_ct_op' => $this->clearString((string)$object['sepa_ct_op'], false),
@@ -228,7 +228,7 @@ class StoreRequest extends FormRequest
'transactions.*.external_id' => 'min:1,max:255|nullable',
'transactions.*.recurrence_id' => 'min:1,max:255|nullable',
'transactions.*.bunq_payment_id' => 'min:1,max:255|nullable',
'transactions.*.external_uri' => 'min:1,max:255|nullable|url',
'transactions.*.external_url' => 'min:1,max:255|nullable|url',
// SEPA fields:
'transactions.*.sepa_cc' => 'min:1,max:255|nullable',

4
app/Api/V1/Requests/Models/Transaction/UpdateRequest.php
View File

@@ -113,7 +113,7 @@ class UpdateRequest extends FormRequest
'sepa_ep',
'sepa_ci',
'sepa_batch_id',
'external_uri',
'external_url',
];
$this->booleanFields = [
'reconciled',
@@ -335,7 +335,7 @@ class UpdateRequest extends FormRequest
'transactions.*.external_id' => 'min:1,max:255|nullable',
'transactions.*.recurrence_id' => 'min:1,max:255|nullable',
'transactions.*.bunq_payment_id' => 'min:1,max:255|nullable',
'transactions.*.external_uri' => 'min:1,max:255|nullable|url',
'transactions.*.external_url' => 'min:1,max:255|nullable|url',
// SEPA fields:
'transactions.*.sepa_cc' => 'min:1,max:255|nullable',

2
app/Http/Controllers/PreferencesController.php
View File

@@ -214,7 +214,7 @@ class PreferencesController extends Controller
'internal_reference' => array_key_exists('internal_reference', $setOptions),
'notes' => array_key_exists('notes', $setOptions),
'attachments' => array_key_exists('attachments', $setOptions),
'external_uri' => array_key_exists('external_uri', $setOptions),
'external_url' => array_key_exists('external_url', $setOptions),
'location' => array_key_exists('location', $setOptions),
'links' => array_key_exists('links', $setOptions),
];

2
app/Services/Internal/Update/JournalUpdateService.php
View File

@@ -84,7 +84,7 @@ class JournalUpdateService
$this->currencyRepository = app(CurrencyRepositoryInterface::class);
$this->metaString = ['sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep', 'sepa_ci', 'sepa_batch_id',
'recurrence_id',
'internal_reference', 'bunq_payment_id', 'external_id', 'external_uri'];
'internal_reference', 'bunq_payment_id', 'external_id', 'external_url'];
$this->metaDate = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date',];
}

2
app/Support/Export/ExportDataGenerator.php
View File

@@ -709,7 +709,7 @@ class ExportDataGenerator
$metaData['sepa_ep'],
$metaData['sepa_ci'],
$metaData['sepa_batch_id'],
$metaData['external_uri'],
$metaData['external_url'],
// dates
$metaData['interest_date'],

4
app/Transformers/TransactionGroupTransformer.php
View File

@@ -58,7 +58,7 @@ class TransactionGroupTransformer extends AbstractTransformer
$this->metaFields = [
'sepa_cc', 'sepa_ct_op', 'sepa_ct_id', 'sepa_db', 'sepa_country', 'sepa_ep',
'sepa_ci', 'sepa_batch_id', 'internal_reference', 'bunq_payment_id', 'import_hash_v2',
'recurrence_id', 'external_id', 'original_source', 'external_uri',
'recurrence_id', 'external_id', 'original_source', 'external_url',
'recurrence_count', 'recurrence_total',
];
$this->metaDateFields = ['interest_date', 'book_date', 'process_date', 'due_date', 'payment_date', 'invoice_date'];
@@ -189,7 +189,7 @@ class TransactionGroupTransformer extends AbstractTransformer
'recurrence_total' => $this->integerFromArray($metaFieldData->getArrayCopy(), 'recurrence_total'),
'recurrence_count' => $this->integerFromArray($metaFieldData->getArrayCopy(), 'recurrence_count'),
'bunq_payment_id' => $metaFieldData['bunq_payment_id'],
'external_uri' => $metaFieldData['external_uri'],
'external_url' => $metaFieldData['external_url'],
'import_hash_v2' => $metaFieldData['import_hash_v2'],
'sepa_cc' => $metaFieldData['sepa_cc'],