diff --git a/app/Jobs/Cron/AutoBillCron.php b/app/Jobs/Cron/AutoBillCron.php index c291c5bca7ef..164b3d6943a5 100644 --- a/app/Jobs/Cron/AutoBillCron.php +++ b/app/Jobs/Cron/AutoBillCron.php @@ -62,8 +62,15 @@ class AutoBillCron nlog($auto_bill_partial_invoices->count().' partial invoices to auto bill'); - $auto_bill_partial_invoices->cursor()->each(function ($invoice) { - AutoBill::dispatch($invoice->id, false); + $auto_bill_partial_invoices->chunk(100, function ($invoices) { + + foreach($invoices as $invoice) + { + AutoBill::dispatch($invoice->id, false); + } + + sleep(2); + }); $auto_bill_invoices = Invoice::whereDate('due_date', '<=', now()) @@ -79,8 +86,15 @@ class AutoBillCron nlog($auto_bill_invoices->count().' full invoices to auto bill'); - $auto_bill_invoices->cursor()->each(function ($invoice) { - AutoBill::dispatch($invoice->id, false); + $auto_bill_invoices->chunk(100, function ($invoices) { + + foreach($invoices as $invoice) + { + AutoBill::dispatch($invoice->id, false); + } + + sleep(2); + }); } else { //multiDB environment, need to @@ -100,8 +114,14 @@ class AutoBillCron nlog($auto_bill_partial_invoices->count()." partial invoices to auto bill db = {$db}"); - $auto_bill_partial_invoices->cursor()->each(function ($invoice) use ($db) { - AutoBill::dispatch($invoice->id, $db); + $auto_bill_partial_invoices->chunk(100, function ($invoices) use($db){ + + foreach($invoices as $invoice) + { + AutoBill::dispatch($invoice->id, $db); + } + + sleep(2); }); $auto_bill_invoices = Invoice::whereDate('due_date', '<=', now()) @@ -117,10 +137,15 @@ class AutoBillCron nlog($auto_bill_invoices->count()." full invoices to auto bill db = {$db}"); - $auto_bill_invoices->cursor()->each(function ($invoice) use ($db) { - nlog($this->counter); - AutoBill::dispatch($invoice->id, $db); - $this->counter++; + $auto_bill_invoices->chunk(100, function ($invoices) use($db){ + + foreach($invoices as $invoice) + { + AutoBill::dispatch($invoice->id, $db); + } + + sleep(2); + }); } diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index 595b3a51f23a..86120629acf6 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -70,7 +70,7 @@ trait Inviteable $qr = $writer->writeString($this->getPaymentLink(), 'utf-8'); - return " + return " {$qr}"; }