diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index aa25f47fdc..d5276872f5 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -157,7 +157,7 @@ class SplitController extends Controller $type = strtolower($this->repository->getTransactionType($journal)); session()->flash('success', (string)trans('firefly.updated_' . $type, ['description' => $journal->description])); - Preferences::mark(); + app('preferences')->mark(); // @codeCoverageIgnoreStart if (1 === (int)$request->get('return_to_edit')) { diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index e54c69266f..28da385b2f 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -41,6 +41,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; * * @property User $user * @property int $bill_id + * @property Collection $categories */ class TransactionJournal extends Model { diff --git a/app/Support/Preferences.php b/app/Support/Preferences.php index cc24ef44f1..9dc524af8b 100644 --- a/app/Support/Preferences.php +++ b/app/Support/Preferences.php @@ -163,14 +163,17 @@ class Preferences { $lastActivity = microtime(); $preference = $this->get('lastActivity', microtime()); + if (null !== $preference && null !== $preference->data) { $lastActivity = $preference->data; } if (\is_array($lastActivity)) { $lastActivity = implode(',', $lastActivity); } + $hash = md5($lastActivity); + Log::debug(sprintf('Value of last activity is %s, hash is %s', $lastActivity, $hash)); - return md5($lastActivity); + return $hash; } /** diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index c68a7bedfe..d8613a6e4f 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -198,6 +198,7 @@ class Journal extends Twig_Extension ->leftJoin('transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->where('categories.user_id', $journal->user_id) ->where('transaction_journals.id', $journal->id) + ->whereNull('transactions.deleted_at') ->get(['categories.*']); /** @var Category $category */ foreach ($set as $category) { diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js index a99a39f651..a780fe071f 100644 --- a/public/js/ff/transactions/split/edit.js +++ b/public/js/ff/transactions/split/edit.js @@ -188,12 +188,12 @@ function resetDivSplits() { // ends with ][destination_account_name] $.each($('input[name$="][destination_name]"]'), function (i, v) { var input = $(v); - input.attr('name', 'transactions[' + i + '][destination_account_name]'); + input.attr('name', 'transactions[' + i + '][destination_name]'); }); // ends with ][source_account_name] $.each($('input[name$="][source_name]"]'), function (i, v) { var input = $(v); - input.attr('name', 'transactions[' + i + '][source_account_name]'); + input.attr('name', 'transactions[' + i + '][source_name]'); }); // ends with ][amount] $.each($('input[name$="][amount]"]'), function (i, v) {