diff --git a/app/Ninja/Datatables/RecurringInvoiceDatatable.php b/app/Ninja/Datatables/RecurringInvoiceDatatable.php index 9b0007aca944..797d3ca0cf1c 100644 --- a/app/Ninja/Datatables/RecurringInvoiceDatatable.php +++ b/app/Ninja/Datatables/RecurringInvoiceDatatable.php @@ -81,8 +81,12 @@ class RecurringInvoiceDatatable extends EntityDatatable $class = Invoice::calcStatusClass($model->invoice_status_id, $model->balance, $model->due_date_sql, $model->is_recurring); $label = Invoice::calcStatusLabel($model->invoice_status_name, $class, $this->entityType, $model->quote_invoice_id); - if ($model->invoice_status_id == INVOICE_STATUS_SENT && (! $model->last_sent_date_sql || $model->last_sent_date_sql == '0000-00-00')) { - $label = trans('texts.pending'); + if ($model->invoice_status_id == INVOICE_STATUS_SENT) { + if (! $model->last_sent_date_sql || $model->last_sent_date_sql == '0000-00-00') { + $label = trans('texts.pending'); + } else { + $label = trans('texts.active'); + } } return "

$label

"; diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index 5e9752b955d3..f63415ab33c0 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -53,8 +53,12 @@
  • {!! link_to(($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'), trans('texts.' . ($entityType == ENTITY_QUOTE ? 'quotes' : 'invoices'))) !!}
  • {{ $invoice->invoice_number }}
  • @endif - @if ($invoice->is_recurring && $invoice->isSent() && (! $invoice->last_sent_date || $invoice->last_sent_date == '0000-00-00')) - {!! $invoice->present()->statusLabel(trans('texts.pending')) !!} + @if ($invoice->is_recurring && $invoice->isSent()) + @if (! $invoice->last_sent_date || $invoice->last_sent_date == '0000-00-00') + {!! $invoice->present()->statusLabel(trans('texts.pending')) !!} + @else + {!! $invoice->present()->statusLabel(trans('texts.active')) !!} + @endif @else {!! $invoice->present()->statusLabel !!} @endif