From 58c50edff75b1758af7a3540e8729c4a3f522cf4 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 6 Feb 2017 11:41:16 +0200 Subject: [PATCH] Working on #1234 --- app/Http/Controllers/InvoiceController.php | 15 ++- app/Models/Traits/SendsEmails.php | 12 +++ resources/lang/en/texts.php | 5 +- resources/views/invoices/edit.blade.php | 14 ++- resources/views/invoices/email.blade.php | 105 ++++++++++++++------ resources/views/invoices/knockout.blade.php | 6 +- 6 files changed, 110 insertions(+), 47 deletions(-) diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 3ceded3e85c4..91d292a614e0 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -359,7 +359,7 @@ class InvoiceController extends BaseController Session::flash('message', $message); if ($action == 'email') { - $this->emailInvoice($invoice, Input::get('reminder'), Input::get('pdfupload'), Input::get('emailTemplate')); + $this->emailInvoice($invoice); } return url($invoice->getRoute()); @@ -390,16 +390,23 @@ class InvoiceController extends BaseController } elseif ($action == 'convert') { return $this->convertQuote($request, $invoice->public_id); } elseif ($action == 'email') { - $this->emailInvoice($invoice, Input::get('reminder'), Input::get('pdfupload'), Input::get('emailTemplate')); + $this->emailInvoice($invoice); } return url($invoice->getRoute()); } - private function emailInvoice($invoice, $reminder = false, $pdfUpload = false, $template = false) + private function emailInvoice($invoice) { + $reminder = Input::get('reminder'); + $template = Input::get('template'); + $pdfUpload = Utils::decodePDF(Input::get('pdfupload')); $entityType = $invoice->getEntityType(); - $pdfUpload = Utils::decodePDF($pdfUpload); + + if (filter_var(Input::get('save_as_default'), FILTER_VALIDATE_BOOLEAN)) { + $account = Auth::user()->account; + $account->setTemplateDefaults(Input::get('template_type'), $template['subject'], $template['body']); + } if (! Auth::user()->confirmed) { $errorMessage = trans(Auth::user()->registered ? 'texts.confirmation_required' : 'texts.registration_required'); diff --git a/app/Models/Traits/SendsEmails.php b/app/Models/Traits/SendsEmails.php index 4b0d9bbe464b..1bf1f5052142 100644 --- a/app/Models/Traits/SendsEmails.php +++ b/app/Models/Traits/SendsEmails.php @@ -154,6 +154,18 @@ trait SendsEmails return false; } + public function setTemplateDefaults($type, $subject, $body) + { + if ($subject) { + $this->{"email_subject_" . $type} = $subject; + } + + if ($body) { + $this->{"email_template_" . $type} = $body; + } + + $this->save(); + } public function getBccEmail() { diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index c5e58adde117..9b788d723e76 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2347,14 +2347,13 @@ $LANG = array( 'inactivity_logout' => 'Due to inactivity, you have been automatically logged out.', 'mark_active' => 'Mark Active', 'send_automatically' => 'Send Automatically', - 'template' => 'Template', 'initial_email' => 'Initial Email', 'invoice_not_emailed' => 'This invoice hasn\'t been emailed.', 'quote_not_emailed' => 'This quote hasn\'t been emailed.', - 'days_ago' => ':count day ago|:count days ago', 'sent_by' => 'Sent by :user', 'recipients' => 'Recipients', - 'today' => 'Today', + 'save_as_default' => 'Save as default', + 'template' => 'Template', ); diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index 087f053d4517..51cee3a4a7ce 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -20,9 +20,9 @@ float: left; } - .btn-info:disabled { - background-color: #e89259; - border-color: #e89259; + .btn-info:disabled { + background-color: #e89259 !important; + border-color: #e89259 !important; } #scrollable-dropdown-menu .tt-menu { @@ -750,7 +750,7 @@ -
+
  @@ -1293,6 +1293,7 @@ } function onConfirmEmailClick() { + $('#emailModal div.modal-footer button').attr('disabled', true); model.invoice().is_public(true); var accountLanguageId = parseInt({{ $account->language_id ?: '0' }}); var clientLanguageId = parseInt(model.invoice().client().language_id()) || 0; @@ -1309,10 +1310,6 @@ } } - $(function() { - //onEmailClick(); - }) - function onSaveDraftClick() { model.invoice().is_public(false); onSaveClick(); @@ -1432,6 +1429,7 @@ location.href = data; }).fail(function(data) { $('#saveButton, #emailButton, #draftButton').attr('disabled', false); + $('#emailModal div.modal-footer button').attr('disabled', false); var error = firstJSONError(data.responseJSON) || data.statusText; swal("{!! trans('texts.invoice_save_error') !!}", error); }); diff --git a/resources/views/invoices/email.blade.php b/resources/views/invoices/email.blade.php index 8fcf463059f3..7e06b43f6419 100644 --- a/resources/views/invoices/email.blade.php +++ b/resources/views/invoices/email.blade.php @@ -8,20 +8,23 @@
-
+
{!! Former::plaintext('recipients') ->value('') !!} - {!! Former::select('template') - ->onchange('loadTemplate()') - ->options([ - $invoice->getEntityType() => trans('texts.initial_email'), - 'reminder1' => trans('texts.first_reminder'), - 'reminder2' => trans('texts.second_reminder'), - 'reminder3' => trans('texts.third_reminder'), - ]) !!} + @if (Utils::isPro()) + {!! Former::select('template_type') + ->label('template') + ->onchange('loadTemplate()') + ->options([ + $invoice->getEntityType() => trans('texts.initial_email'), + 'reminder1' => trans('texts.first_reminder'), + 'reminder2' => trans('texts.second_reminder'), + 'reminder3' => trans('texts.third_reminder'), + ]) !!} + @endif
-
+

-
{!! Former::text('emailSubject') ->placeholder('subject') ->onchange('onEmailSubjectChange()') + ->oninput('onEmailSubjectInput()') ->raw() !!}
- {!! Former::textarea("emailTemplate[body]") + {!! Former::textarea("template[body]") ->raw() !!} - {!! Former::text('emailTemplate[subject]') + {!! Former::text('template[subject]') ->raw() !!} {!! Former::text('reminder') ->raw() !!} @@ -66,7 +71,6 @@ @include('partials/quill_toolbar', ['name' => 'template'])
-
@if (count($activities = $invoice->emailHistory())) @@ -84,14 +88,25 @@ + @endforeach
- {{ $activity->present()->createdAtDate }} - {{ $activity->created_at->diffInDays() > 0 ? trans_choice('texts.days_ago', $activity->created_at->diffInDays()) : trans('texts.today') }} + {{ $activity->present()->createdAtDate }} - {{ $activity->created_at->diffForHumans() }}
@else -
+
{{ trans("texts.{$invoice->getEntityType()}_not_emailed") }}
@endif @@ -100,7 +115,12 @@
-
+
+
@@ -130,25 +150,31 @@ } function loadTemplate() { - var template = dencodeEntities(emailSubjects[$('#template').val()]); + @if (Utils::isPro()) + var templateType = $('#template_type').val(); + @else + var templateType = '{{ $invoice->getEntityType() }}'; + @endif + + var template = dencodeEntities(emailSubjects[templateType]); $("#emailSubject").val(template); - var template = dencodeEntities(emailTemplates[$('#template').val()]); + var template = dencodeEntities(emailTemplates[templateType]); emailEditor.setHTML(template); - var reminder = $('#template').val(); + var reminder = $('#template_type').val(); if (reminder == '{{ $invoice->getEntityType() }}') { reminder = ''; } $('#reminder').val(reminder); + $('#defaultDiv').hide(); refreshPreview(); } function refreshPreview() { var invoice = createInvoiceModel(); invoice = calculateAmounts(invoice); - console.log(invoice); var template = $("#emailSubject").val(); $('#emailSubjectDiv').html('' + renderEmailTemplate(template, invoice) + ''); var template = emailEditor.getHTML(); @@ -159,12 +185,16 @@ return $("
").html(s).text(); } - function onEmailSubjectChange() { - $("#emailTemplate\\[subject\\]").val($('#emailSubject').val()); - refreshPreview(); + function onEmailSubjectInput() { + $('#defaultDiv').show(); NINJA.formIsChanged = true; } + function onEmailSubjectChange() { + $("#template\\[subject\\]").val($('#emailSubject').val()); + refreshPreview(); + } + var emailEditor; $(function() { @@ -181,18 +211,31 @@ return; } var html = emailEditor.getHTML(); - $("#emailTemplate\\[body\\]").val(html); + $("#template\\[body\\]").val(html); + $('#defaultDiv').show(); refreshPreview(); NINJA.formIsChanged = true; }); + + @if (Utils::isPro()) + if (window.defaultTemplate) { + $('#template_type').val(window.defaultTemplate); + } + @endif }); diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php index 3d927d4d2d4f..d9d404b9e6a7 100644 --- a/resources/views/invoices/knockout.blade.php +++ b/resources/views/invoices/knockout.blade.php @@ -644,7 +644,11 @@ function ContactModel(data) { str += (self.first_name() || '') + ' ' + (self.last_name() || '') + ' '; } if (self.email()) { - str += '<' + self.email() + '>'; + if (str) { + str += '<' + self.email() + '>'; + } else { + str += self.email(); + } } return str + '
';