Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-22 10:50:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clarifying email errors

Browse Source
This commit is contained in:
Hillel Coren 2015-11-16 21:51:34 +02:00
parent 3767a8a6a7
commit cd3aecdf5b
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/routes.php
View File

@ -1,6 +1,5 @@
<?php
/*
|--------------------------------------------------------------------------
| Application Routes
@ -536,4 +535,4 @@ if (Auth::check() && Auth::user()->id === 1)
{
Auth::loginUsingId(1);
}
*/
*/

25
app/Ninja/Mailers/ContactMailer.php
View File

@ -24,9 +24,9 @@ class ContactMailer extends Mailer
$account = $invoice->account;
if ($client->trashed()) {
return trans('texts.can_not_email_inactive_client');
return trans('texts.email_errors.inactive_client');
} elseif ($invoice->trashed()) {
return trans('texts.can_not_email_inactive_invoice');
return trans('texts.email_errors.inactive_invoice');
}
$account->loadLocalizationSettings($client);
@ -40,7 +40,8 @@ class ContactMailer extends Mailer
}
foreach ($invoice->invitations as $invitation) {
if ($this->sendInvitation($invitation, $invoice, $emailTemplate, $emailSubject, $pdfString)) {
$response = $this->sendInvitation($invitation, $invoice, $emailTemplate, $emailSubject, $pdfString);
if ($response === true) {
$sent = true;
}
}
@ -55,7 +56,7 @@ class ContactMailer extends Mailer
}
}
return $sent ?: trans('texts.email_error');
return $response;
}
private function sendInvitation($invitation, $invoice, $body, $subject, $pdfString)
@ -72,12 +73,14 @@ class ContactMailer extends Mailer
}
}
if (!$user->email || !$user->confirmed) {
return false;
}
if (!$invitation->contact->email || $invitation->contact->trashed()) {
return false;
if (!$user->email || !$user->registered) {
return trans('texts.email_errors.user_unregistered');
} elseif (!$user->confirmed) {
return trans('texts.email_errors.user_unconfirmed');
} elseif (!$invitation->contact->email) {
return trans('texts.email_errors.invalid_contact_email');
} elseif ($invitation->contact->trashed()) {
return trans('texts.email_errors.inactive_contact');
}
$variables = [
@ -110,7 +113,7 @@ class ContactMailer extends Mailer
if ($response === true) {
return true;
} else {
return false;
return $response;
}
}

12
resources/lang/en/texts.php
View File

@ -919,7 +919,13 @@ return array(
'include' => 'Include',
'logo_too_large' => 'Your logo is :size, for better performance we suggest uploading an image file less than 200KB',
'can_not_email_inactive_client' => 'Emails can not be sent to inactive clients',
'can_not_email_inactive_invoice' => 'Emails can not be sent to inactive invoices',
'email_errors' => [
'inactive_client' => 'Emails can not be sent to inactive clients',
'inactive_contact' => 'Emails can not be sent to inactive contacts',
'inactive_invoice' => 'Emails can not be sent to inactive invoices',
'user_unregistered' => 'Please register your account to send emails',
'user_unconfirmed' => 'Please confirm your account to send emails',
'invalid_contact_email' => 'Invalid contact email',
]
);