Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 05:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2015-11-06 09:54:29 +02:00
parent c79ee49c1d
commit a30b9039de
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Models/Contact.php
View File

@ -32,20 +32,6 @@ class Contact extends EntityModel
return PERSON_CONTACT; return PERSON_CONTACT;
} }
/*
public function getLastLogin()
{
if ($this->last_login == '0000-00-00 00:00:00')
{
return '---';
}
else
{
return $this->last_login->format('m/d/y h:i a');
}
}
*/
public function getName() public function getName()
{ {
return $this->getDisplayName(); return $this->getDisplayName();

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

@ -77,7 +77,8 @@
<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; (contacts()[0].email() || contacts()[0].first_name()), foreach: contacts"> <div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; (contacts()[0].email() || contacts()[0].first_name()), foreach: contacts">
<div class="col-lg-8 col-lg-offset-4"> <div class="col-lg-8 col-lg-offset-4">
<label class="checkbox" data-bind="attr: {for: $index() + '_check'}" onclick="refreshPDF(true)"> <label class="checkbox" data-bind="attr: {for: $index() + '_check'}" onclick="refreshPDF(true)">
<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check'}"> <input type="hidden" value="0" data-bind="attr: {name: 'client[contacts][' + $index() + '][send_invoice]'}">
<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check', name: 'client[contacts][' + $index() + '][send_invoice]'}">
<span data-bind="html: email.display"></span> <span data-bind="html: email.display"></span>
</label> </label>
<span data-bind="html: $data.view_as_recipient"></span>&nbsp;&nbsp; <span data-bind="html: $data.view_as_recipient"></span>&nbsp;&nbsp;
@ -612,7 +613,7 @@
for (var j=0; j<client.contacts.length; j++) { for (var j=0; j<client.contacts.length; j++) {
var contact = client.contacts[j]; var contact = client.contacts[j];
var contactName = getContactDisplayName(contact); var contactName = getContactDisplayName(contact);
if (contact.is_primary) { if (contact.is_primary === '1') {
contact.send_invoice = true; contact.send_invoice = true;
} }
if (clientName != contactName) { if (clientName != contactName) {