From be1bf0f3fd9f4e8c56cb4e70c8ab27b5a03c47fb Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Wed, 13 Dec 2017 09:12:09 +0200 Subject: [PATCH] Fix quote status in portal --- app/Ninja/Repositories/InvoiceRepository.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php index aa421b463536..8a21a37012c8 100644 --- a/app/Ninja/Repositories/InvoiceRepository.php +++ b/app/Ninja/Repositories/InvoiceRepository.php @@ -336,6 +336,9 @@ class InvoiceRepository extends BaseRepository } elseif ($model->invoice_status_id == INVOICE_STATUS_PARTIAL) { $label = trans('texts.status_partial'); $class = 'info'; + } elseif ($entityType == ENTITY_QUOTE && ($model->invoice_status_id >= INVOICE_STATUS_APPROVED || $model->quote_invoice_id)) { + $label = trans('texts.status_approved'); + $class = 'success'; } elseif (Invoice::calcIsOverdue($model->balance, $model->due_date)) { $class = 'danger'; if ($entityType == ENTITY_INVOICE) { @@ -343,9 +346,6 @@ class InvoiceRepository extends BaseRepository } else { $label = trans('texts.expired'); } - } elseif ($entityType == ENTITY_QUOTE && ($model->invoice_status_id >= INVOICE_STATUS_APPROVED || $model->quote_invoice_id)) { - $label = trans('texts.status_approved'); - $class = 'success'; } else { $class = 'default'; if ($entityType == ENTITY_INVOICE) {