mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Fixes #1586
This commit is contained in:
parent
2290fcde22
commit
7a9ab190eb
@ -95,19 +95,13 @@ trait JournalServiceTrait
|
|||||||
*/
|
*/
|
||||||
protected function storeMeta(TransactionJournal $journal, array $data, string $field): void
|
protected function storeMeta(TransactionJournal $journal, array $data, string $field): void
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!isset($data[$field])) {
|
|
||||||
Log::debug(sprintf('Want to store meta-field "%s", but no value.', $field));
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
$set = [
|
$set = [
|
||||||
'journal' => $journal,
|
'journal' => $journal,
|
||||||
'name' => $field,
|
'name' => $field,
|
||||||
'data' => (string)$data[$field],
|
'data' => (string)($data[$field] ?? ''),
|
||||||
];
|
];
|
||||||
|
|
||||||
Log::debug(sprintf('Going to store meta-field "%s", with value "%s".', $field, (string)$data[$field]));
|
Log::debug(sprintf('Going to store meta-field "%s", with value "%s".', $set['name'], $set['data']));
|
||||||
|
|
||||||
/** @var TransactionJournalMetaFactory $factory */
|
/** @var TransactionJournalMetaFactory $factory */
|
||||||
$factory = app(TransactionJournalMetaFactory::class);
|
$factory = app(TransactionJournalMetaFactory::class);
|
||||||
|
@ -183,7 +183,9 @@ class ImportTransaction
|
|||||||
|
|
||||||
$meta = ['sepa-ct-id', 'sepa-ct-op', 'sepa-db', 'sepa-cc', 'sepa-country', 'sepa-batch-id', 'sepa-ep', 'sepa-ci', 'internal-reference', 'date-interest',
|
$meta = ['sepa-ct-id', 'sepa-ct-op', 'sepa-db', 'sepa-cc', 'sepa-country', 'sepa-batch-id', 'sepa-ep', 'sepa-ci', 'internal-reference', 'date-interest',
|
||||||
'date-invoice', 'date-book', 'date-payment', 'date-process', 'date-due',];
|
'date-invoice', 'date-book', 'date-payment', 'date-process', 'date-due',];
|
||||||
|
Log::debug(sprintf('Now going to check role "%s".', $role));
|
||||||
if (\in_array($role, $meta, true)) {
|
if (\in_array($role, $meta, true)) {
|
||||||
|
Log::debug(sprintf('Role "%s" is in allowed meta roles, so store its value %s.', $role, $columnValue->getValue()));
|
||||||
$this->meta[$role] = $columnValue->getValue();
|
$this->meta[$role] = $columnValue->getValue();
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -133,9 +133,9 @@ class ImportableConverter
|
|||||||
/**
|
/**
|
||||||
* @param string|null $date
|
* @param string|null $date
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
private function convertDateValue(string $date = null): string
|
private function convertDateValue(string $date = null): ?string
|
||||||
{
|
{
|
||||||
$result = null;
|
$result = null;
|
||||||
if (null !== $date) {
|
if (null !== $date) {
|
||||||
@ -147,11 +147,6 @@ class ImportableConverter
|
|||||||
Log::error($e->getTraceAsString());
|
Log::error($e->getTraceAsString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (null === $result) {
|
|
||||||
$object = new Carbon;
|
|
||||||
$result = $object->format('Y-m-d');
|
|
||||||
}
|
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -167,6 +162,8 @@ class ImportableConverter
|
|||||||
$foreignAmount = $importable->calculateForeignAmount();
|
$foreignAmount = $importable->calculateForeignAmount();
|
||||||
$amount = $importable->calculateAmount();
|
$amount = $importable->calculateAmount();
|
||||||
|
|
||||||
|
Log::debug('All meta data: ', $importable->meta);
|
||||||
|
|
||||||
if ('' === $amount) {
|
if ('' === $amount) {
|
||||||
$amount = $foreignAmount;
|
$amount = $foreignAmount;
|
||||||
}
|
}
|
||||||
@ -215,7 +212,7 @@ class ImportableConverter
|
|||||||
|
|
||||||
return [
|
return [
|
||||||
'type' => $transactionType,
|
'type' => $transactionType,
|
||||||
'date' => $this->convertDateValue($importable->date),
|
'date' => $this->convertDateValue($importable->date) ?? Carbon::create()->format('Y-m-d'),
|
||||||
'tags' => $importable->tags,
|
'tags' => $importable->tags,
|
||||||
'user' => $this->importJob->user_id,
|
'user' => $this->importJob->user_id,
|
||||||
'notes' => $importable->note,
|
'notes' => $importable->note,
|
||||||
|
Loading…
Reference in New Issue
Block a user