From a24854464199ccc51f3315249cb8fff37b1302b8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 9 Aug 2019 20:33:57 +0200 Subject: [PATCH] Some more last-minute fixes. --- app/Factory/TransactionFactory.php | 7 ++++- app/Factory/TransactionJournalFactory.php | 7 ++++- .../Transaction/ShowController.php | 3 +- app/Import/Storage/ImportArrayStorage.php | 5 ++-- .../Routine/File/ImportableConverter.php | 1 - resources/views/v1/transactions/index.twig | 8 ++--- resources/views/v1/transactions/show.twig | 30 ------------------- 7 files changed, 20 insertions(+), 41 deletions(-) diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 6331f2eed5..3cf47f1eed 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -177,7 +177,12 @@ class TransactionFactory } // @codeCoverageIgnoreEnd if (null !== $result) { - Log::debug(sprintf('Created transaction #%d (%s %s), part of journal #%d', $result->id, $this->currency->code, $amount, $this->journal->id)); + Log::debug( + sprintf( + 'Created transaction #%d (%s %s, account %s), part of journal #%d', $result->id, $this->currency->code, $amount, $this->account->name, + $this->journal->id + ) + ); // do foreign currency thing: add foreign currency info to $one and $two if necessary. if (null !== $this->foreignCurrency && null !== $foreignAmount && $this->foreignCurrency->id !== $this->currency->id) { diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index 76c382c9cc..d185e4c975 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -287,7 +287,7 @@ class TransactionJournalFactory $destForeignCurrency = $foreignCurrency; } - if ('Transfer' === $type->type) { + if (TransactionType::TRANSFER === $type->type) { // get currencies $currency = $this->getCurrency($currency, $sourceAccount); $foreignCurrency = $this->getCurrency($foreignCurrency, $destinationAccount); @@ -298,6 +298,11 @@ class TransactionJournalFactory $destForeignCurrency = $currency; } + // if transfer, switch accounts: + if (TransactionType::TRANSFER === $type->type) { + [$sourceAccount, $destinationAccount] = [$destinationAccount, $sourceAccount]; + } + /** Create a basic journal. */ $journal = TransactionJournal::create( [ diff --git a/app/Http/Controllers/Transaction/ShowController.php b/app/Http/Controllers/Transaction/ShowController.php index 246ac0c8ba..80b9240914 100644 --- a/app/Http/Controllers/Transaction/ShowController.php +++ b/app/Http/Controllers/Transaction/ShowController.php @@ -73,7 +73,6 @@ class ShowController extends Controller $type = $first->transactionType->type; $title = 1 === $splits ? $first->description : $transactionGroup->title; $subTitle = sprintf('%s: "%s"', $type, $title); - $message = $request->get('message'); /** @var TransactionGroupTransformer $transformer */ $transformer = app(TransactionGroupTransformer::class); @@ -91,7 +90,7 @@ class ShowController extends Controller return view( 'transactions.show', compact( 'transactionGroup', 'amounts', 'first', 'type', 'subTitle', 'splits', 'groupArray', - 'events', 'attachments', 'links', 'message' + 'events', 'attachments', 'links' ) ); } diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php index 4963d35039..b10c3a9f92 100644 --- a/app/Import/Storage/ImportArrayStorage.php +++ b/app/Import/Storage/ImportArrayStorage.php @@ -459,8 +459,9 @@ class ImportArrayStorage // compare date: $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) { + $transactionDate = $transaction['date']->format('Y-m-d H:i:s'); + Log::debug(sprintf('Comparing dates "%s" to "%s"', $transactionDate, $transferDate)); + if ($transactionDate !== $transferDate) { Log::debug('Date is not a match, continue with next transfer.'); continue; // @codeCoverageIgnore } diff --git a/app/Support/Import/Routine/File/ImportableConverter.php b/app/Support/Import/Routine/File/ImportableConverter.php index c88822811f..69025d24f3 100644 --- a/app/Support/Import/Routine/File/ImportableConverter.php +++ b/app/Support/Import/Routine/File/ImportableConverter.php @@ -120,7 +120,6 @@ class ImportableConverter // amount is positive? Then switch: if (1 === bccomp($amount, '0')) { - [$destination, $source] = [$source, $destination]; Log::debug( sprintf( diff --git a/resources/views/v1/transactions/index.twig b/resources/views/v1/transactions/index.twig index 878c4ef490..3646195456 100644 --- a/resources/views/v1/transactions/index.twig +++ b/resources/views/v1/transactions/index.twig @@ -10,7 +10,7 @@ {% if periods|length > 0 %}
-

{{ 'showEverything'|_ }}

+

{{ 'showEverything'|_ }}

{% endif %} @@ -34,12 +34,12 @@ {% if periods|length > 0 %}

- {{ 'show_all_no_filter'|_ }} + {{ 'show_all_no_filter'|_ }}

{% else %}

- {{ 'show_the_current_period_and_overview'|_ }} + {{ 'show_the_current_period_and_overview'|_ }}

{% endif %} @@ -59,7 +59,7 @@ {% if periods|length > 0 %}
-

{{ 'showEverything'|_ }}

+

{{ 'showEverything'|_ }}

{% endif %} diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig index 972d715285..3b0e75c589 100644 --- a/resources/views/v1/transactions/show.twig +++ b/resources/views/v1/transactions/show.twig @@ -5,36 +5,6 @@ {% endblock %} {% block content %} - {% if message == 'created' %} -
-
- -
-
- {% endif %} - - {% if message == 'updated' %} -
-
- -
-
- {% endif %} -