diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 611ca37a93..0f2e719f3a 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -110,7 +110,7 @@ class TransactionFactory // all this data is the same for both transactions: Log::debug('Searching for currency info.'); $currency = $this->findCurrency($data['currency_id'], $data['currency_code']); - $description = $journal->description === $data['description'] ? null : $data['description']; + //$description = $data['description']; // type of source account and destination account depends on journal type: $sourceType = $this->accountType($journal, 'source'); @@ -135,10 +135,9 @@ class TransactionFactory // based on the source type, destination type and transaction type, the system can start throwing FireflyExceptions. $this->validateTransaction($sourceAccount->accountType->type, $destinationAccount->accountType->type, $journal->transactionType->type); - $source = $this->create( [ - 'description' => $description, + 'description' => $data['description'], 'amount' => app('steam')->negative((string)$data['amount']), 'foreign_amount' => null, 'currency' => $currency, @@ -150,7 +149,7 @@ class TransactionFactory ); $dest = $this->create( [ - 'description' => $description, + 'description' => $data['description'], 'amount' => app('steam')->positive((string)$data['amount']), 'foreign_amount' => null, 'currency' => $currency, diff --git a/app/Services/Internal/Update/TransactionUpdateService.php b/app/Services/Internal/Update/TransactionUpdateService.php index 49a0156cd2..cae572b9e5 100644 --- a/app/Services/Internal/Update/TransactionUpdateService.php +++ b/app/Services/Internal/Update/TransactionUpdateService.php @@ -89,11 +89,10 @@ class TransactionUpdateService { $currency = $this->findCurrency($data['currency_id'], $data['currency_code']); $journal = $transaction->transactionJournal; - $description = $journal->description === $data['description'] ? null : $data['description']; $amount = (string)$data['amount']; $account = null; // update description: - $transaction->description = $description; + $transaction->description = $data['description']; $foreignAmount = null; if ((float)$transaction->amount < 0) { // this is the source transaction. @@ -112,7 +111,7 @@ class TransactionUpdateService } // update the actual transaction: - $transaction->description = $description; + $transaction->description = $data['description']; $transaction->amount = $amount; $transaction->foreign_amount = null; $transaction->transaction_currency_id = null === $currency ? $transaction->transaction_currency_id : $currency->id;