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

Add time to cron logs

Browse Source
This commit is contained in:
Hillel Coren 2018-04-18 22:56:55 +03:00
parent 77cf1a4ba2
commit 85a468e85d
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ class SendRecurringInvoices extends Command
->whereRaw('is_deleted IS FALSE AND deleted_at IS NULL AND is_recurring IS TRUE AND is_public IS TRUE AND frequency_id > 0 AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', [$today, $today]) ->whereRaw('is_deleted IS FALSE AND deleted_at IS NULL AND is_recurring IS TRUE AND is_public IS TRUE AND frequency_id > 0 AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', [$today, $today])
->orderBy('id', 'asc') ->orderBy('id', 'asc')
->get(); ->get();
$this->info($invoices->count() . ' recurring invoice(s) found'); $this->info(date('r ') . $invoices->count() . ' recurring invoice(s) found');
foreach ($invoices as $recurInvoice) { foreach ($invoices as $recurInvoice) {
$shouldSendToday = $recurInvoice->shouldSendToday(); $shouldSendToday = $recurInvoice->shouldSendToday();
@ -100,7 +100,7 @@ class SendRecurringInvoices extends Command
continue; continue;
} }
$this->info('Processing Invoice: '. $recurInvoice->id); $this->info(date('r') . ' Processing Invoice: '. $recurInvoice->id);
$account = $recurInvoice->account; $account = $recurInvoice->account;
$account->loadLocalizationSettings($recurInvoice->client); $account->loadLocalizationSettings($recurInvoice->client);
@ -109,13 +109,13 @@ class SendRecurringInvoices extends Command
try { try {
$invoice = $this->invoiceRepo->createRecurringInvoice($recurInvoice); $invoice = $this->invoiceRepo->createRecurringInvoice($recurInvoice);
if ($invoice && ! $invoice->isPaid() && $account->auto_email_invoice) { if ($invoice && ! $invoice->isPaid() && $account->auto_email_invoice) {
$this->info('Not billed - Sending Invoice'); $this->info(date('r') . ' Not billed - Sending Invoice');
dispatch(new SendInvoiceEmail($invoice, $invoice->user_id)); dispatch(new SendInvoiceEmail($invoice, $invoice->user_id));
} elseif ($invoice) { } elseif ($invoice) {
$this->info('Successfully billed invoice'); $this->info(date('r') . ' Successfully billed invoice');
} }
} catch (Exception $exception) { } catch (Exception $exception) {
$this->info('Error: ' . $exception->getMessage()); $this->info(date('r') . ' Error: ' . $exception->getMessage());
Utils::logError($exception); Utils::logError($exception);
} }
@ -133,7 +133,7 @@ class SendRecurringInvoices extends Command
[$today->format('Y-m-d')]) [$today->format('Y-m-d')])
->orderBy('invoices.id', 'asc') ->orderBy('invoices.id', 'asc')
->get(); ->get();
$this->info($delayedAutoBillInvoices->count() . ' due recurring invoice instance(s) found'); $this->info(date('r ') . $delayedAutoBillInvoices->count() . ' due recurring invoice instance(s) found');
/** @var Invoice $invoice */ /** @var Invoice $invoice */
foreach ($delayedAutoBillInvoices as $invoice) { foreach ($delayedAutoBillInvoices as $invoice) {
@ -142,7 +142,7 @@ 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(date('r') . ' Processing Autobill-delayed Invoice: ' . $invoice->id);
Auth::loginUsingId($invoice->activeUser()->id); Auth::loginUsingId($invoice->activeUser()->id);
$this->paymentService->autoBillInvoice($invoice); $this->paymentService->autoBillInvoice($invoice);
Auth::logout(); Auth::logout();
@ -158,7 +158,7 @@ class SendRecurringInvoices extends Command
->whereRaw('is_deleted IS FALSE AND deleted_at IS NULL AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', [$today, $today]) ->whereRaw('is_deleted IS FALSE AND deleted_at IS NULL AND start_date <= ? AND (end_date IS NULL OR end_date >= ?)', [$today, $today])
->orderBy('id', 'asc') ->orderBy('id', 'asc')
->get(); ->get();
$this->info($expenses->count() . ' recurring expenses(s) found'); $this->info(date('r ') . $expenses->count() . ' recurring expenses(s) found');
foreach ($expenses as $expense) { foreach ($expenses as $expense) {
$shouldSendToday = $expense->shouldSendToday(); $shouldSendToday = $expense->shouldSendToday();
@ -167,7 +167,7 @@ class SendRecurringInvoices extends Command
continue; continue;
} }
$this->info('Processing Expense: '. $expense->id); $this->info(date('r') . ' Processing Expense: '. $expense->id);
$this->recurringExpenseRepo->createRecurringExpense($expense); $this->recurringExpenseRepo->createRecurringExpense($expense);
} }
} }

30
app/Console/Commands/SendReminders.php
View File

@ -74,7 +74,7 @@ class SendReminders extends Command
$this->sendScheduledReports(); $this->sendScheduledReports();
$this->loadExchangeRates(); $this->loadExchangeRates();
$this->info('Done'); $this->info(date('r') . ' Done');
if ($errorEmail = env('ERROR_EMAIL')) { if ($errorEmail = env('ERROR_EMAIL')) {
\Mail::raw('EOM', function ($message) use ($errorEmail, $database) { \Mail::raw('EOM', function ($message) use ($errorEmail, $database) {
@ -88,7 +88,7 @@ class SendReminders extends Command
private function chargeLateFees() private function chargeLateFees()
{ {
$accounts = $this->accountRepo->findWithFees(); $accounts = $this->accountRepo->findWithFees();
$this->info($accounts->count() . ' accounts found with fees'); $this->info(date('r ') . $accounts->count() . ' accounts found with fees');
foreach ($accounts as $account) { foreach ($accounts as $account) {
if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS)) { if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS)) {
@ -96,11 +96,11 @@ class SendReminders extends Command
} }
$invoices = $this->invoiceRepo->findNeedingReminding($account, false); $invoices = $this->invoiceRepo->findNeedingReminding($account, false);
$this->info($account->name . ': ' . $invoices->count() . ' invoices found'); $this->info(date('r ') . $account->name . ': ' . $invoices->count() . ' invoices found');
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {
if ($reminder = $account->getInvoiceReminder($invoice, false)) { if ($reminder = $account->getInvoiceReminder($invoice, false)) {
$this->info('Charge fee: ' . $invoice->id); $this->info(date('r') . ' Charge fee: ' . $invoice->id);
$account->loadLocalizationSettings($invoice->client); // support trans to add fee line item $account->loadLocalizationSettings($invoice->client); // support trans to add fee line item
$number = preg_replace('/[^0-9]/', '', $reminder); $number = preg_replace('/[^0-9]/', '', $reminder);
@ -115,7 +115,7 @@ class SendReminders extends Command
private function sendReminderEmails() private function sendReminderEmails()
{ {
$accounts = $this->accountRepo->findWithReminders(); $accounts = $this->accountRepo->findWithReminders();
$this->info(count($accounts) . ' accounts found with reminders'); $this->info(date('r ') . count($accounts) . ' accounts found with reminders');
foreach ($accounts as $account) { foreach ($accounts as $account) {
if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS)) { if (! $account->hasFeature(FEATURE_EMAIL_TEMPLATES_REMINDERS)) {
@ -124,27 +124,27 @@ class SendReminders extends Command
// standard reminders // standard reminders
$invoices = $this->invoiceRepo->findNeedingReminding($account); $invoices = $this->invoiceRepo->findNeedingReminding($account);
$this->info($account->name . ': ' . $invoices->count() . ' invoices found'); $this->info(date('r ') . $account->name . ': ' . $invoices->count() . ' invoices found');
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {
if ($reminder = $account->getInvoiceReminder($invoice)) { if ($reminder = $account->getInvoiceReminder($invoice)) {
if ($invoice->last_sent_date == date('Y-m-d')) { if ($invoice->last_sent_date == date('Y-m-d')) {
continue; continue;
} }
$this->info('Send email: ' . $invoice->id); $this->info(date('r') . ' Send email: ' . $invoice->id);
dispatch(new SendInvoiceEmail($invoice, $invoice->user_id, $reminder)); dispatch(new SendInvoiceEmail($invoice, $invoice->user_id, $reminder));
} }
} }
// endless reminders // endless reminders
$invoices = $this->invoiceRepo->findNeedingEndlessReminding($account); $invoices = $this->invoiceRepo->findNeedingEndlessReminding($account);
$this->info($account->name . ': ' . $invoices->count() . ' endless invoices found'); $this->info(date('r ') . $account->name . ': ' . $invoices->count() . ' endless invoices found');
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {
if ($invoice->last_sent_date == date('Y-m-d')) { if ($invoice->last_sent_date == date('Y-m-d')) {
continue; continue;
} }
$this->info('Send email: ' . $invoice->id); $this->info(date('r') . ' Send email: ' . $invoice->id);
dispatch(new SendInvoiceEmail($invoice, $invoice->user_id, 'reminder4')); dispatch(new SendInvoiceEmail($invoice, $invoice->user_id, 'reminder4'));
} }
} }
@ -155,10 +155,10 @@ class SendReminders extends Command
$scheduledReports = ScheduledReport::where('send_date', '<=', date('Y-m-d')) $scheduledReports = ScheduledReport::where('send_date', '<=', date('Y-m-d'))
->with('user', 'account.company') ->with('user', 'account.company')
->get(); ->get();
$this->info($scheduledReports->count() . ' scheduled reports'); $this->info(date('r ') . $scheduledReports->count() . ' scheduled reports');
foreach ($scheduledReports as $scheduledReport) { foreach ($scheduledReports as $scheduledReport) {
$this->info('Processing report: ' . $scheduledReport->id); $this->info(date('r') . ' Processing report: ' . $scheduledReport->id);
$user = $scheduledReport->user; $user = $scheduledReport->user;
$account = $scheduledReport->account; $account = $scheduledReport->account;
@ -180,12 +180,12 @@ class SendReminders extends Command
if ($file) { if ($file) {
try { try {
$this->userMailer->sendScheduledReport($scheduledReport, $file); $this->userMailer->sendScheduledReport($scheduledReport, $file);
$this->info('Sent report'); $this->info(date('r') . ' Sent report');
} catch (Exception $exception) { } catch (Exception $exception) {
$this->info('ERROR: ' . $exception->getMessage()); $this->info(date('r') . ' ERROR: ' . $exception->getMessage());
} }
} else { } else {
$this->info('ERROR: Failed to run report'); $this->info(date('r') . ' ERROR: Failed to run report');
} }
$scheduledReport->updateSendDate(); $scheduledReport->updateSendDate();
@ -200,7 +200,7 @@ class SendReminders extends Command
return; return;
} }
$this->info('Loading latest exchange rates...'); $this->info(date('r') . ' Loading latest exchange rates...');
$data = CurlUtils::get(config('ninja.exchange_rates_url')); $data = CurlUtils::get(config('ninja.exchange_rates_url'));
$data = json_decode($data); $data = json_decode($data);