tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5830 from turbo124/v5-develop

Browse source 
Fixes for import
This commit is contained in:
David Bomba 2021-05-26 20:01:22 +10:00 • committed by GitHub
commit 84041ead51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Kernel.php
View file

@ -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();

1
app/Jobs/Cron/AutoBillCron.php
View file

@ -95,6 +95,7 @@ class AutoBillCron
private function runAutoBiller(Invoice $invoice)
{
nlog("Firing autobill for {$invoice->company_id} - {$invoice->number}");
$invoice->service()->autoBill()->save();
}
}

2
app/Jobs/Util/Import.php
View file

@ -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'));