diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 07074e04b566..8008dce28388 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -959,6 +959,7 @@ class AccountController extends BaseController $account->pdf_email_attachment = Input::get('pdf_email_attachment') ? true : false; $account->document_email_attachment = Input::get('document_email_attachment') ? true : false; $account->email_design_id = Input::get('email_design_id'); + $account->bcc_email = Input::get('bcc_email'); if (Utils::isNinja()) { $account->enable_email_markup = Input::get('enable_email_markup') ? true : false; diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php index d06fc6433c44..d6db736a1889 100644 --- a/app/Ninja/Mailers/ContactMailer.php +++ b/app/Ninja/Mailers/ContactMailer.php @@ -199,6 +199,7 @@ class ContactMailer extends Mailer 'invoice' => $invoice, 'documents' => $documentStrings, 'notes' => $reminder, + 'bcc_email' => $account->isPro() ? $account->bcc_email : false, ]; if ($account->attachPDF()) { @@ -285,6 +286,7 @@ class ContactMailer extends Mailer 'account' => $account, 'payment' => $payment, 'entityType' => ENTITY_INVOICE, + 'bcc_email' => $account->isPro() ? $account->bcc_email : false, ]; if ($account->attachPDF()) { diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php index ea2f9cde77e7..12d28c7d7bdb 100644 --- a/app/Ninja/Mailers/Mailer.php +++ b/app/Ninja/Mailers/Mailer.php @@ -47,6 +47,11 @@ class Mailer ->replyTo($replyEmail, $fromName) ->subject($subject); + // Optionally BCC the email + if (!empty($data['bcc_email'])) { + $message->bcc($data['bcc_email']); + } + // Attach the PDF to the email if (!empty($data['pdfString']) && !empty($data['pdfFileName'])) { $message->attachData($data['pdfString'], $data['pdfFileName']); diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 729043ee6548..a2db7aa08ba5 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2304,6 +2304,8 @@ $LANG = array( 'notes_reminder1' => 'First Reminder', 'notes_reminder2' => 'Second Reminder', 'notes_reminder3' => 'Third Reminder', + 'bcc_email' => 'BCC Email', + 'bcc_email_help' => 'All emails sent to your clients will also be sent to this address.', ); diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php index ad0bb97f6065..766b3f7f636f 100644 --- a/resources/views/accounts/email_settings.blade.php +++ b/resources/views/accounts/email_settings.blade.php @@ -15,7 +15,8 @@ @include('accounts.nav', ['selected' => ACCOUNT_EMAIL_SETTINGS, 'advanced' => true]) {!! Former::open()->rules([ - 'iframe_url' => 'url' + 'iframe_url' => 'url', + 'bcc_email' => 'email', ])->addClass('warn-on-exit') !!} {{ Former::populate($account) }} {{ Former::populateField('pdf_email_attachment', intval($account->pdf_email_attachment)) }} @@ -40,6 +41,10 @@   + {!! Former::text('bcc_email')->help('bcc_email_help') !!} + +   + {{-- Former::select('recurring_hour')->options($recurringHours) --}} {!! Former::inline_radios('custom_invoice_link')