tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Trim contact email

Browse source
This commit is contained in:
Hillel Coren 2017-07-02 20:55:21 +03:00
parent 23a19be9e9
commit 25bd16ccb1
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Models/Client.php
View file

@ -305,6 +305,7 @@ class Client extends EntityModel
$contact->fill($data);
$contact->is_primary = $isPrimary;
$contact->email = trim($contact->email);
return $this->contacts()->save($contact);
}

6
resources/views/invoices/edit.blade.php
View file

@ -1441,7 +1441,8 @@
var isValid = model.invoice().client().name() ? true : false;
for (var i=0; i<model.invoice().client().contacts().length; i++) {
var contact = model.invoice().client().contacts()[i];
if (isValidEmailAddress(contact.email()) || contact.first_name() || contact.last_name()) {
var email = contact.email() ? contact.email().trim() : '';
if (isValidEmailAddress(email) || contact.first_name() || contact.last_name()) {
isValid = true;
break;
}
@ -1469,7 +1470,8 @@
if ( ! contact.send_invoice()) {
continue;
}
if (isValidEmailAddress(contact.email())) {
var email = contact.email() ? contact.email().trim() : '';
if (isValidEmailAddress(email)) {
isValid = true;
} else {
isValid = false;