From 95e27fd5acf3b9e3d544734dedfc42ade45470e3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 26 May 2021 20:01:06 +1000 Subject: [PATCH] Fixes for import --- app/Console/Kernel.php | 2 +- app/Jobs/Cron/AutoBillCron.php | 1 + app/Jobs/Util/Import.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 82b3e2b6989f..943661c4ad2c 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -59,7 +59,7 @@ class Kernel extends ConsoleKernel $schedule->job(new RecurringInvoicesCron)->hourly()->withoutOverlapping(); - $schedule->job(new AutoBillCron)->daily()->withoutOverlapping(); + $schedule->job(new AutoBillCron)->dailyAt('00:30')->withoutOverlapping(); $schedule->job(new SchedulerCheck)->everyFiveMinutes(); diff --git a/app/Jobs/Cron/AutoBillCron.php b/app/Jobs/Cron/AutoBillCron.php index 8a56bb86e218..80068bfbe5f1 100644 --- a/app/Jobs/Cron/AutoBillCron.php +++ b/app/Jobs/Cron/AutoBillCron.php @@ -95,6 +95,7 @@ class AutoBillCron private function runAutoBiller(Invoice $invoice) { + nlog("Firing autobill for {$invoice->company_id} - {$invoice->number}"); $invoice->service()->autoBill()->save(); } } diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 299127213da1..d3fccae8cbd3 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -1654,7 +1654,7 @@ class Import implements ShouldQueue { $current_db = config('database.default'); - $local_company = Company::where('company_key', $this->company->company_key)->first(); + $local_company = Company::on($current_db)->where('company_key', $this->company->company_key)->first(); MultiDB::setDb('db-ninja-01'); $ninja_company = Company::find(config('ninja.ninja_default_company_id'));