Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00
Code Issues Releases Activity

Working on #1234

Browse Source
This commit is contained in:
Hillel Coren 2017-02-05 23:29:11 +02:00
parent 297a898dbf
commit 30045ecdbb
8 changed files with 113 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/InvoiceController.php
View File

@ -359,7 +359,7 @@ class InvoiceController extends BaseController
Session::flash('message', $message);
if ($action == 'email') {
$this->emailInvoice($invoice, Input::get('pdfupload'));
$this->emailInvoice($invoice, Input::get('reminder'), Input::get('pdfupload'), Input::get('emailTemplate'));
}
return url($invoice->getRoute());
@ -390,13 +390,13 @@ class InvoiceController extends BaseController
} elseif ($action == 'convert') {
return $this->convertQuote($request, $invoice->public_id);
} elseif ($action == 'email') {
$this->emailInvoice($invoice, Input::get('pdfupload'));
$this->emailInvoice($invoice, Input::get('reminder'), Input::get('pdfupload'), Input::get('emailTemplate'));
}
return url($invoice->getRoute());
}
private function emailInvoice($invoice, $pdfUpload)
private function emailInvoice($invoice, $reminder = false, $pdfUpload = false, $template = false)
{
$entityType = $invoice->getEntityType();
$pdfUpload = Utils::decodePDF($pdfUpload);
@ -413,9 +413,9 @@ class InvoiceController extends BaseController
} else {
// TODO remove this with Laravel 5.3 (https://github.com/invoiceninja/invoiceninja/issues/1303)
if (config('queue.default') === 'sync') {
$response = app('App\Ninja\Mailers\ContactMailer')->sendInvoice($invoice, false, $pdfUpload);
$response = app('App\Ninja\Mailers\ContactMailer')->sendInvoice($invoice, $reminder, $pdfUpload, $template);
} else {
$this->dispatch(new SendInvoiceEmail($invoice, false, $pdfUpload));
$this->dispatch(new SendInvoiceEmail($invoice, $reminder, $pdfUpload, $template));
$response = true;
}
}

10
app/Jobs/SendInvoiceEmail.php
View File

@ -31,6 +31,11 @@ class SendInvoiceEmail extends Job implements ShouldQueue
*/
protected $pdfString;
/**
* @var array
*/
protected $template;
/**
* Create a new job instance.
*
@ -39,11 +44,12 @@ class SendInvoiceEmail extends Job implements ShouldQueue
* @param bool $reminder
* @param mixed $pdfString
*/
public function __construct(Invoice $invoice, $reminder = false, $pdfString = false)
public function __construct(Invoice $invoice, $reminder = false, $pdfString = false, $template = false)
{
$this->invoice = $invoice;
$this->reminder = $reminder;
$this->pdfString = $pdfString;
$this->template = $template;
}
/**
@ -53,7 +59,7 @@ class SendInvoiceEmail extends Job implements ShouldQueue
*/
public function handle(ContactMailer $mailer)
{
$mailer->sendInvoice($this->invoice, $this->reminder, $this->pdfString);
$mailer->sendInvoice($this->invoice, $this->reminder, $this->pdfString, $this->template);
}
/*

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

@ -36,7 +36,7 @@ class ContactMailer extends Mailer
*
* @return bool|null|string
*/
public function sendInvoice(Invoice $invoice, $reminder = false, $pdfString = false)
public function sendInvoice(Invoice $invoice, $reminder = false, $pdfString = false, $template = false)
{
if ($invoice->is_recurring) {
return false;
@ -57,8 +57,8 @@ class ContactMailer extends Mailer
}
$account->loadLocalizationSettings($client);
$emailTemplate = $account->getEmailTemplate($reminder ?: $entityType);
$emailSubject = $account->getEmailSubject($reminder ?: $entityType);
$emailTemplate = !empty($template['body']) ? $template['body'] : $account->getEmailTemplate($reminder ?: $entityType);
$emailSubject = !empty($template['subject']) ? $template['subject'] : $account->getEmailSubject($reminder ?: $entityType);
$sent = false;

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

@ -2354,6 +2354,7 @@ $LANG = array(
'days_ago' => ':count day ago|:count days ago',
'sent_by' => 'Sent by :user',
'recipients' => 'Recipients',
'today' => 'Today',
);

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

@ -11,6 +11,8 @@
<script src="{{ asset('pdf.built.js') }}?no_cache={{ NINJA_VERSION }}" type="text/javascript"></script>
<script src="{{ asset('js/lightbox.min.js') }}" type="text/javascript"></script>
<link href="{{ asset('css/lightbox.css') }}" rel="stylesheet" type="text/css"/>
<link href="{{ asset('css/quill.snow.css') }}" rel="stylesheet" type="text/css"/>
<script src="{{ asset('js/quill.min.js') }}" type="text/javascript"></script>
<style type="text/css">
select.tax-select {

104
resources/views/invoices/email.blade.php
View File

@ -1,5 +1,5 @@
<div class="modal fade" id="emailModal" tabindex="-1" role="dialog" aria-labelledby="emailModalLabel" aria-hidden="true">
<div class="modal-dialog" style="min-width:150px">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
@ -14,7 +14,7 @@
->value('') !!}
{!! Former::select('template')
->onchange('refreshPreview()')
->onchange('loadTemplate()')
->options([
$invoice->getEntityType() => trans('texts.initial_email'),
'reminder1' => trans('texts.first_reminder'),
@ -29,7 +29,9 @@
<a href="#preview" aria-controls="preview" role="tab" data-toggle="tab">{{ trans('texts.preview') }}</a>
</li>
<li role="presentation">
<a href="#customize" aria-controls="customize" role="tab" data-toggle="tab">{{ trans('texts.customize') }}</a>
<a href="#customize" aria-controls="customize" role="tab" data-toggle="tab">
{{ trans('texts.customize') }} {!! Auth::user()->isTrial() ? '<sup>' . trans('texts.pro') . '</sup>' : '' !!}
</a>
</li>
<li role="presentation">
<a href="#history" aria-controls="history" role="tab" data-toggle="tab">{{ trans('texts.history') }}</a>
@ -37,14 +39,30 @@
</ul>
</div>
<div class="tab-content">
<div role="tabpanel" class="tab-pane well active" id="preview">
<br/>
<div id="emailSubject"></div>
<br/>
<div id="emailBody"></div>
<div role="tabpanel" class="tab-pane active" id="preview">
<div style="padding:31px 14px 0px 14px">
<div id="emailSubjectDiv"></div>
<br/>
<div id="emailBodyDiv"></div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="customize">
<br/>
{!! Former::text('emailSubject')
->placeholder('subject')
->onchange('onEmailSubjectChange()')
->raw() !!}
<br/>
<div id="templateEditor" class="form-control" style="min-height:160px"></div>
<div style="displayx:none">
{!! Former::textarea("emailTemplate[body]")
->raw() !!}
{!! Former::text('emailTemplate[subject]')
->raw() !!}
{!! Former::text('reminder')
->raw() !!}
</div>
@include('partials/quill_toolbar', ['name' => 'template'])
</div>
<div role="tabpanel" class="tab-pane" id="history">
<br/>
@ -65,7 +83,7 @@
</td>
<td>
<span title="{{ $activity->present()->createdAt }}">
{{ $activity->present()->createdAtDate }} - {{ trans_choice('texts.days_ago', $activity->created_at->diffInDays()) }}
{{ $activity->present()->createdAtDate }} - {{ $activity->created_at->diffInDays() > 0 ? trans_choice('texts.days_ago', $activity->created_at->diffInDays()) : trans('texts.today') }}
</span>
</td>
</tr>
@ -105,21 +123,75 @@
emailTemplates['reminder3'] = "{{ $account->getEmailTemplate('reminder3') }}";
function showEmailModal() {
refreshPreview();
loadTemplate();
$('#recipients').html(getSendToEmails());
$('#emailModal').modal('show');
}
function refreshPreview() {
var invoice = createInvoiceModel();
function loadTemplate() {
var template = dencodeEntities(emailSubjects[$('#template').val()]);
$('#emailSubject').html('<b>' + renderEmailTemplate(template, invoice) + '</b>');
$("#emailSubject").val(template);
var template = dencodeEntities(emailTemplates[$('#template').val()]);
$('#emailBody').html(renderEmailTemplate(template, invoice));
emailEditor.setHTML(template);
var reminder = $('#template').val();
if (reminder == '{{ $invoice->getEntityType() }}') {
reminder = '';
}
$('#reminder').val(reminder);
refreshPreview();
}
function dencodeEntities(s){
function refreshPreview() {
var invoice = createInvoiceModel();
invoice = calculateAmounts(invoice);
console.log(invoice);
var template = $("#emailSubject").val();
$('#emailSubjectDiv').html('<b>' + renderEmailTemplate(template, invoice) + '</b>');
var template = emailEditor.getHTML();
$('#emailBodyDiv').html(renderEmailTemplate(template, invoice));
}
function dencodeEntities(s) {
return $("<div/>").html(s).text();
}
function onEmailSubjectChange() {
$("#emailTemplate\\[subject\\]").val($('#emailSubject').val());
refreshPreview();
NINJA.formIsChanged = true;
}
var emailEditor;
$(function() {
emailEditor = new Quill('#templateEditor', {
modules: {
'toolbar': { container: '#templateToolbar' },
'link-tooltip': true
},
theme: 'snow'
});
emailEditor.setHTML('test');
emailEditor.on('text-change', function(delta, source) {
if (source == 'api') {
return;
}
var html = emailEditor.getHTML();
$("#emailTemplate\\[body\\]").val(html);
refreshPreview();
NINJA.formIsChanged = true;
});
});
</script>
<style type="text/css">
@media only screen and (min-width : 767px) {
.modal-dialog {
width: 660px;
}
}
</style>

8
resources/views/partials/email_templates.blade.php
View File

@ -5,7 +5,7 @@
return '';
}
var passwordHtml = "{!! $account->isPro() && $account->enable_portal_password && $account->send_portal_password?'<p>'.trans('texts.password').': XXXXXXXXX<p>':'' !!}";
var passwordHtml = "{!! $account->isPro() && $account->enable_portal_password && $account->send_portal_password?'<br/>'.trans('texts.password').': XXXXXXXXX<br/>':'' !!}";
@if ($account->isPro())
var documentsHtml = "{!! trans('texts.email_documents_header').'<ul><li><a>'.trans('texts.email_documents_example_1').'</a></li><li><a>'.trans('texts.email_documents_example_2').'</a></li></ul>' !!}";
@ -19,16 +19,16 @@
'dueDate': "{{ $account->formatDate($account->getDateTime()) }}",
'invoiceDate': "{{ $account->formatDate($account->getDateTime()) }}",
'client': invoice ? getClientDisplayName(invoice.client) : 'Client Name',
'amount': invoice ? formatMoneyInvoice(invoice.amount, invoice) : formatMoneyAccount(100, account),
'amount': invoice ? formatMoneyInvoice(parseFloat(invoice.partial) || parseFloat(invoice.balance_amount), invoice) : formatMoneyAccount(100, account),
'contact': invoice ? getContactDisplayName(invoice.client.contacts[0]) : 'Contact Name',
'firstName': invoice ? invoice.client.contacts[0].first_name : 'First Name',
'invoice': invoice ? invoice.invoice_number : '0001',
'quote': invoice ? invoice.invoice_number : '0001',
'password': passwordHtml,
'documents': documentsHtml,
'viewLink': "{{ URL::to('/view/...') }}$password",
'viewLink': '{{ link_to('#', url('/view/...')) }}$password',
'viewButton': '{!! Form::flatButton('view_invoice', '#0b4d78') !!}$password',
'paymentLink': "{{ URL::to('/payment/...') }}$password",
'paymentLink': '{{ link_to('#', url('/payment/...')) }}$password',
'paymentButton': '{!! Form::flatButton('pay_now', '#36c157') !!}$password',
'autoBill': '{{ trans('texts.auto_bill_notification_placeholder') }}',
'portalLink': "{{ URL::to('/client/portal/...') }}",

4
resources/views/partials/quill_toolbar.blade.php
View File

@ -1,4 +1,4 @@
<div id="toolbar-toolbar" class="toolbar ql-toolbar ql-snow">
<div id="toolbar-toolbar" class="toolbar ql-toolbar ql-snow" style="padding-left:0px;padding-right:0px">
<div id="{{ $name }}Toolbar" class="toolbar" style="padding-left: 0px">
<span class="ql-format-group">
<select title="Font" class="ql-font">
@ -115,4 +115,4 @@
<span title="Link" class="ql-format-button ql-link"></span>
</span>
</div>
</div>
</div>