diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 17a6b5f315e7..794f09404a2d 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -214,6 +214,7 @@ class InvoiceController extends BaseController $contact->email_error = $invitation->email_error; $contact->invitation_link = $invitation->getLink(); $contact->invitation_viewed = $invitation->viewed_date && $invitation->viewed_date != '0000-00-00 00:00:00' ? $invitation->viewed_date : false; + $contact->invitation_openend = $invitation->opened_date && $invitation->opened_date != '0000-00-00 00:00:00' ? $invitation->opened_date : false; $contact->invitation_status = $contact->email_error ? false : $invitation->getStatus(); } } diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index c78d9aa8abdd..d37ab982cb2f 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -110,7 +110,7 @@ data-bind="visible: $data.email_error, tooltip: {title: $data.email_error}"> + style: {color: $data.info_color}"> @endif diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php index 114c60d1677e..fd94500724ad 100644 --- a/resources/views/invoices/knockout.blade.php +++ b/resources/views/invoices/knockout.blade.php @@ -615,6 +615,7 @@ function ContactModel(data) { self.send_invoice = ko.observable(false); self.invitation_link = ko.observable(''); self.invitation_status = ko.observable(''); + self.invitation_openend = ko.observable(false); self.invitation_viewed = ko.observable(false); self.email_error = ko.observable(''); @@ -656,6 +657,16 @@ function ContactModel(data) { return str; }); + + self.info_color = ko.computed(function() { + if (self.invitation_viewed()) { + return '#57D172'; + } else if (self.invitation_openend()) { + return '#FFCC00'; + } else { + return '#B1B5BA'; + } + }); } function ItemModel(data) {