diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index 6da281f269..eb1299a6ce 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -457,7 +457,7 @@ class ImportArrayStorage Log::debug(sprintf('Going to store entry %d of %d', $index + 1, $count)); // convert the date to an object: - $store['date'] = Carbon::createFromFormat('Y-m-d', $store['date']); + $store['date'] = Carbon::parse($store['date'], config('app.timezone')); $store['description'] = '' === $store['description'] ? '(empty description)' : $store['description']; // store the journal. try { @@ -556,7 +556,7 @@ class ImportArrayStorage Log::debug(sprintf('Comparison is a hit! (%s)', $hits)); // compare date: - $transferDate = $transfer->date->format('Y-m-d'); + $transferDate = $transfer->date->format('Y-m-d H:i:s'); Log::debug(sprintf('Comparing dates "%s" to "%s"', $transaction['date'], $transferDate)); if ($transaction['date'] !== $transferDate) { continue; // @codeCoverageIgnore diff --git a/app/Support/Import/Routine/Bunq/PaymentConverter.php b/app/Support/Import/Routine/Bunq/PaymentConverter.php index cff39a747a..e37da1ecaf 100644 --- a/app/Support/Import/Routine/Bunq/PaymentConverter.php +++ b/app/Support/Import/Routine/Bunq/PaymentConverter.php @@ -105,7 +105,10 @@ class PaymentConverter $type = TransactionType::TRANSFER; Log::debug('Because both transctions are asset, will make it a transfer.'); } - $created = new Carbon($payment->getCreated()); + Log::debug(sprintf('Bunq created = %s', $payment->getCreated())); + $created = new Carbon($payment->getCreated(), 'UTC'); + // correct timezone to system timezone. + $created->setTimezone(config('app.timezone')); $description = $payment->getDescription(); if ('' === $payment->getDescription() && 'SAVINGS' === $payment->getType()) { @@ -115,7 +118,7 @@ class PaymentConverter $storeData = [ 'user' => $this->importJob->user_id, 'type' => $type, - 'date' => $created->format('Y-m-d'), + 'date' => $created->format('Y-m-d H:i:s'), 'timestamp' => $created->toAtomString(), 'description' => $description, 'piggy_bank_id' => null, @@ -151,7 +154,7 @@ class PaymentConverter ], ], ]; - Log::info(sprintf('Parsed %s: "%s" (%s).', $created->format('Y-m-d'), $storeData['description'], $storeData['transactions'][0]['amount'])); + Log::info(sprintf('Parsed %s: "%s" (%s).', $created->format('Y-m-d H:i:s'), $storeData['description'], $storeData['transactions'][0]['amount'])); return $storeData; diff --git a/app/Support/Logging/AuditLogger.php b/app/Support/Logging/AuditLogger.php index 3c98651b85..751fccac66 100644 --- a/app/Support/Logging/AuditLogger.php +++ b/app/Support/Logging/AuditLogger.php @@ -17,7 +17,7 @@ class AuditLogger */ public function __invoke($logger) { - $processor = new AuditProcessor(); + $processor = new AuditProcessor; $logger->pushProcessor($processor); } } \ No newline at end of file diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig index 94ce47984e..57a7c397cc 100644 --- a/resources/views/v1/transactions/show.twig +++ b/resources/views/v1/transactions/show.twig @@ -108,7 +108,7 @@