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

Show info icon as orange if invitation opened but not viewed

Browse Source
This commit is contained in:
Hillel Coren 2016-04-09 23:36:32 +03:00
parent 2a328627ac
commit 769465542d
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/InvoiceController.php
View File

@ -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();
}
}

2
resources/views/invoices/edit.blade.php
View File

@ -110,7 +110,7 @@
data-bind="visible: $data.email_error, tooltip: {title: $data.email_error}"></span>
<span style="vertical-align:text-top" class="glyphicon glyphicon-info-sign"
data-bind="visible: $data.invitation_status, tooltip: {title: $data.invitation_status, html: true},
style: {color: $data.hasOwnProperty('invitation_viewed') &amp;&amp; $data.invitation_viewed() ? '#57D172':'#B1B5BA'}"></span>
style: {color: $data.info_color}"></span>
@endif
</span>
</div>

11
resources/views/invoices/knockout.blade.php
View File

@ -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) {