Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix CLI auto-billing

Browse Source
This commit is contained in:
Hillel Coren 2017-05-29 13:43:28 +03:00
parent e2088d81d3
commit 050739e7fd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Console/Commands/SendRecurringInvoices.php
View File

@ -10,6 +10,7 @@ use App\Services\PaymentService;
use DateTime; use DateTime;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Auth;
/** /**
* Class SendRecurringInvoices. * Class SendRecurringInvoices.
@ -91,12 +92,14 @@ class SendRecurringInvoices extends Command
$account = $recurInvoice->account; $account = $recurInvoice->account;
$account->loadLocalizationSettings($recurInvoice->client); $account->loadLocalizationSettings($recurInvoice->client);
Auth::loginUsingId($recurInvoice->user_id);
$invoice = $this->invoiceRepo->createRecurringInvoice($recurInvoice); $invoice = $this->invoiceRepo->createRecurringInvoice($recurInvoice);
if ($invoice && ! $invoice->isPaid()) { if ($invoice && ! $invoice->isPaid()) {
$this->info('Sending Invoice'); $this->info('Sending Invoice');
$this->mailer->sendInvoice($invoice); $this->mailer->sendInvoice($invoice);
} }
Auth::logout();
} }
$delayedAutoBillInvoices = Invoice::with('account.timezone', 'recurring_invoice', 'invoice_items', 'client', 'user') $delayedAutoBillInvoices = Invoice::with('account.timezone', 'recurring_invoice', 'invoice_items', 'client', 'user')
@ -115,7 +118,9 @@ class SendRecurringInvoices extends Command
if ($invoice->getAutoBillEnabled() && $invoice->client->autoBillLater()) { if ($invoice->getAutoBillEnabled() && $invoice->client->autoBillLater()) {
$this->info('Processing Autobill-delayed Invoice ' . $invoice->id); $this->info('Processing Autobill-delayed Invoice ' . $invoice->id);
Auth::loginUsingId($invoice->user_id);
$this->paymentService->autoBillInvoice($invoice); $this->paymentService->autoBillInvoice($invoice);
Auth::logout();
} }
} }

3
app/Ninja/Repositories/ActivityRepository.php
View File

@ -9,6 +9,7 @@ use Auth;
use DB; use DB;
use Request; use Request;
use Utils; use Utils;
use App;
class ActivityRepository class ActivityRepository
{ {
@ -56,9 +57,9 @@ class ActivityRepository
} else { } else {
$activity->user_id = $entity->user_id; $activity->user_id = $entity->user_id;
$activity->account_id = $entity->account_id; $activity->account_id = $entity->account_id;
$activity->is_system = true;
} }
$activity->is_system = App::runningInConsole();
$activity->token_id = session('token_id'); $activity->token_id = session('token_id');
return $activity; return $activity;