Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug Fixes

Browse Source
This commit is contained in:
David Bomba 2019-05-24 08:37:47 +10:00
parent 474d99505e
commit 9f56e5f99e
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Jobs/Cron/RecurringInvoicesCron.php
View File

@ -39,16 +39,38 @@ class RecurringInvoicesCron
public function handle() : void public function handle() : void
{ {
/* Get all invoices where the send date is less than NOW + 30 minutes() */ /* Get all invoices where the send date is less than NOW + 30 minutes() */
if (! config('ninja.db.multi_db_enabled'))
{
$recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->get();
$recurring_invoices = RecurringInvoice::where('next_send_date', '<=' Carbon::now()->addMinutes(30))->get(); Log::info(Carbon::now()->addMinutes(30) . ' Sending Recurring Invoices. Count = '. $recurring_invoices->count() );
Log::info(Carbon::now()->addMinutes(30) . ' Sending Recurring Invoices. Count = '. $recurring_invoices->count() ); $recurring_invoices->each(function ($recurring_invoice, $key) {
SendRecurring::dispatch($recurring_invoice, $recurring_invoice->company->db);
$recurring_invoices->each(function ($recurring_invoice, $key) { });
}
SendRecurring::dispatch($recurring_invoice); else
{
//multiDB environment, need to
foreach (MultiDB::$dbs as $db)
{
MultiDB::setDB($db);
}); $recurring_invoices = RecurringInvoice::where('next_send_date', '<=', Carbon::now()->addMinutes(30))->get();
Log::info(Carbon::now()->addMinutes(30) . ' Sending Recurring Invoices. Count = '. $recurring_invoices->count() . 'On Database # '. $db);
$recurring_invoices->each(function ($recurring_invoice, $key) {
SendRecurring::dispatch($recurring_invoice, $recurring_invoice->company->db);
});
}
}
} }

6
app/Jobs/RecurringInvoice/SendRecurring.php
View File

@ -26,16 +26,19 @@ class SendRecurring
public $recurring_invoice; public $recurring_invoice;
protected $db;
/** /**
* Create a new job instance. * Create a new job instance.
* *
* @return void * @return void
*/ */
public function __construct(RecurringInvoice $recurring_invoice) public function __construct(RecurringInvoice $recurring_invoice, string $db = 'db-ninja-01')
{ {
$this->recurring_invoice = $recurring_invoice; $this->recurring_invoice = $recurring_invoice;
$this->db = $db;
} }
@ -46,6 +49,7 @@ class SendRecurring
*/ */
public function handle() : void public function handle() : void
{ {
MultiDb::setDb($this->db);
// Generate Standard Invoice // Generate Standard Invoice
$invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice); $invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice);