diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index fe56ce3ac3..6e4b1a69b5 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -440,6 +440,7 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface, /** @var TransactionJournal $journal */ foreach ($group->transactionJournals as $journal) { + $names = sprintf('%s%s', $names, $journal->date->format('Y-m-d-H:i:s')); /** @var Transaction $transaction */ foreach ($journal->transactions as $transaction) { if (-1 === bccomp('0', (string)$transaction->amount)) { diff --git a/app/Support/Cronjobs/AutoBudgetCronjob.php b/app/Support/Cronjobs/AutoBudgetCronjob.php index 3d88f51fd2..148f8a3e27 100644 --- a/app/Support/Cronjobs/AutoBudgetCronjob.php +++ b/app/Support/Cronjobs/AutoBudgetCronjob.php @@ -27,6 +27,7 @@ namespace FireflyIII\Support\Cronjobs; use Carbon\Carbon; use FireflyIII\Jobs\CreateAutoBudgetLimits; use FireflyIII\Models\Configuration; +use FireflyIII\Support\Facades\FireflyConfig; /** * Class AutoBudgetCronjob @@ -36,7 +37,7 @@ class AutoBudgetCronjob extends AbstractCronjob public function fire(): void { /** @var Configuration $config */ - $config = app('fireflyconfig')->get('last_ab_job', 0); + $config = FireflyConfig::get('last_ab_job', 0); $lastTime = (int) $config->data; $diff = Carbon::now()->getTimestamp() - $lastTime; $diffForHumans = today(config('app.timezone'))->diffForHumans(Carbon::createFromTimestamp($lastTime), null, true); @@ -78,7 +79,7 @@ class AutoBudgetCronjob extends AbstractCronjob $this->jobSucceeded = true; $this->message = 'Auto-budget cron job fired successfully.'; - app('fireflyconfig')->set('last_ab_job', (int) $this->date->format('U')); + FireflyConfig::set('last_ab_job', (int) $this->date->format('U')); app('log')->info('Done with auto budget cron job task.'); } }