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

Handle archived user in cron

Browse source
This commit is contained in:
Hillel Coren 2018-01-16 14:57:37 +02:00
parent 131e50d02e
commit 429982cb38
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Console/Commands/SendRecurringInvoices.php
View file

@ -111,7 +111,7 @@ class SendRecurringInvoices extends Command
$account = $recurInvoice->account;
$account->loadLocalizationSettings($recurInvoice->client);
Auth::loginUsingId($recurInvoice->user_id);
Auth::loginUsingId($recurInvoice->activeUser()->id);
try {
$invoice = $this->invoiceRepo->createRecurringInvoice($recurInvoice);
@ -157,7 +157,7 @@ class SendRecurringInvoices extends Command
continue;
}
Auth::loginUsingId($invoice->user_id);
Auth::loginUsingId($recurInvoice->activeUser()->id);
$this->paymentService->autoBillInvoice($invoice);
Auth::logout();
}

9
app/Models/Invoice.php
View file

@ -690,6 +690,15 @@ class Invoice extends EntityModel implements BalanceAffecting
}
}
public function activeUser()
{
if (! $this->user->trashed()) {
return $this->user;
}
return $this->account->users->first();
}
/**
* @return mixed
*/