kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1510

Browse Source
This commit is contained in:
James Cole
2018-06-24 13:59:20 +02:00
parent e05664f34f
commit 96b482dac5
1 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/Support/Import/Routine/File/ImportableConverter.php
View File

@@ -129,6 +129,28 @@ class ImportableConverter
$this->mappedValues = $mappedValues; $this->mappedValues = $mappedValues;
} }
/**
* @param string|null $date
*
* @return string|null
*/
private function convertDateValue(string $date = null): ?string
{
if (null === $date) {
return null;
}
try {
$object = Carbon::createFromFormat($this->config['date-format'] ?? 'Ymd', $date);
} catch (InvalidDateException|InvalidArgumentException $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
return null;
}
return $object->format('Y-m-d');
}
/** /**
* @param ImportTransaction $importable * @param ImportTransaction $importable
* *
@@ -224,19 +246,13 @@ class ImportableConverter
throw new FireflyException($message); throw new FireflyException($message);
} }
// throw error when both are he same $dateStr = $this->convertDateValue($importable->date);
if (null === $dateStr) {
try { $date = new Carbon;
$date = Carbon::createFromFormat($this->config['date-format'] ?? 'Ymd', $importable->date); $dateStr = $date->format('Y-m-d');
} catch (InvalidDateException|InvalidArgumentException $e) { unset($date);
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
$date = new Carbon;
} }
$dateStr = $date->format('Y-m-d');
return [ return [
'type' => $transactionType, 'type' => $transactionType,
'date' => $dateStr, 'date' => $dateStr,
@@ -253,12 +269,12 @@ class ImportableConverter
'sepa-country' => $importable->meta['sepa-countru'] ?? null, 'sepa-country' => $importable->meta['sepa-countru'] ?? null,
'sepa-ep' => $importable->meta['sepa-ep'] ?? null, 'sepa-ep' => $importable->meta['sepa-ep'] ?? null,
'sepa-ci' => $importable->meta['sepa-ci'] ?? null, 'sepa-ci' => $importable->meta['sepa-ci'] ?? null,
'interest_date' => $importable->meta['date-interest'] ?? null, 'interest_date' => $this->convertDateValue($importable->meta['date-interest'] ?? null),
'book_date' => $importable->meta['date-book'] ?? null, 'book_date' => $this->convertDateValue($importable->meta['date-book'] ?? null),
'process_date' => $importable->meta['date-process'] ?? null, 'process_date' => $this->convertDateValue($importable->meta['date-process'] ?? null),
'due_date' => $importable->meta['date-due'] ?? null, 'due_date' => $this->convertDateValue($importable->meta['date-due'] ?? null),
'payment_date' => $importable->meta['date-payment'] ?? null, 'payment_date' => $this->convertDateValue($importable->meta['date-payment'] ?? null),
'invoice_date' => $importable->meta['date-invoice'] ?? null, 'invoice_date' => $this->convertDateValue($importable->meta['date-invoice'] ?? null),
'external_id' => $importable->externalId, 'external_id' => $importable->externalId,
// journal data: // journal data: