mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Bug fix
This commit is contained in:
Hillel Coren
parent
f1bf91b0fb
commit
d3550903f4
@ -443,7 +443,7 @@ class InvoiceController extends BaseController
|
|||||||
// check if we created a new client with the invoice
|
// check if we created a new client with the invoice
|
||||||
if ($input->invoice->client->public_id == '-1') {
|
if ($input->invoice->client->public_id == '-1') {
|
||||||
$message = $message.' '.trans('texts.and_created_client');
|
$message = $message.' '.trans('texts.and_created_client');
|
||||||
$url = URL::to('clients/'.$client->public_id);
|
$url = URL::to('clients/'.$input->invoice->client->public_id);
|
||||||
Utils::trackViewed($client->getDisplayName(), ENTITY_CLIENT, $url);
|
Utils::trackViewed($client->getDisplayName(), ENTITY_CLIENT, $url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,187 +0,0 @@
|
|||||||
@extends('accounts.nav')
|
|
||||||
|
|
||||||
@section('head')
|
|
||||||
@parent
|
|
||||||
|
|
||||||
<style type="text/css">
|
|
||||||
textarea {
|
|
||||||
min-height: 150px !important;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
@stop
|
|
||||||
|
|
||||||
@section('content')
|
|
||||||
@parent
|
|
||||||
@include('accounts.nav_advanced')
|
|
||||||
|
|
||||||
{!! Former::open()->addClass('col-md-10 col-md-offset-1 warn-on-exit') !!}
|
|
||||||
{!! Former::populateField('email_template_invoice', $invoiceEmail) !!}
|
|
||||||
{!! Former::populateField('email_template_quote', $quoteEmail) !!}
|
|
||||||
{!! Former::populateField('email_template_payment', $paymentEmail) !!}
|
|
||||||
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading">
|
|
||||||
<h3 class="panel-title">{!! trans('texts.email_templates') !!}</h3>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="row">
|
|
||||||
|
|
||||||
<div role="tabpanel">
|
|
||||||
<ul class="nav nav-tabs" role="tablist" style="border: none">
|
|
||||||
<li role="presentation" class="active"><a href="#invoice" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.invoice_email') }}</a></li>
|
|
||||||
<li role="presentation"><a href="#quote" aria-controls="terms" role="tab" data-toggle="tab">{{ trans('texts.quote_email') }}</a></li>
|
|
||||||
<li role="presentation"><a href="#payment" aria-controls="footer" role="tab" data-toggle="tab">{{ trans('texts.payment_email') }}</a></li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="tab-content">
|
|
||||||
<div role="tabpanel" class="tab-pane active" id="invoice">
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="col-md-6">
|
|
||||||
{!! Former::textarea('email_template_invoice')->raw() !!}
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6" id="invoice_preview"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div role="tabpanel" class="tab-pane" id="quote">
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="col-md-6">
|
|
||||||
{!! Former::textarea('email_template_quote')->raw() !!}
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6" id="quote_preview"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div role="tabpanel" class="tab-pane" id="payment">
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="col-md-6">
|
|
||||||
{!! Former::textarea('email_template_payment')->raw() !!}
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6" id="payment_preview"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p> </p>
|
|
||||||
|
|
||||||
<div class="panel panel-default">
|
|
||||||
<div class="panel-heading">
|
|
||||||
<h3 class="panel-title">{!! trans('texts.reminder_emails') !!}</h3>
|
|
||||||
</div>
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="row">
|
|
||||||
|
|
||||||
<div role="tabpanel">
|
|
||||||
<ul class="nav nav-tabs" role="tablist" style="border: none">
|
|
||||||
<li role="presentation" class="active"><a href="#invoice" aria-controls="notes" role="tab" data-toggle="tab">{{ trans('texts.invoice_email') }}</a></li>
|
|
||||||
<li role="presentation"><a href="#quote" aria-controls="terms" role="tab" data-toggle="tab">{{ trans('texts.quote_email') }}</a></li>
|
|
||||||
<li role="presentation"><a href="#payment" aria-controls="footer" role="tab" data-toggle="tab">{{ trans('texts.payment_email') }}</a></li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="tab-content">
|
|
||||||
<div role="tabpanel" class="tab-pane active" id="invoice">
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="col-md-6">
|
|
||||||
{!! Former::textarea('email_template_invoice')->raw() !!}
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6" id="invoice_preview"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div role="tabpanel" class="tab-pane" id="quote">
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="col-md-6">
|
|
||||||
{!! Former::textarea('email_template_quote')->raw() !!}
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6" id="quote_preview"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div role="tabpanel" class="tab-pane" id="payment">
|
|
||||||
<div class="panel-body">
|
|
||||||
<div class="col-md-6">
|
|
||||||
{!! Former::textarea('email_template_payment')->raw() !!}
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6" id="payment_preview"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@if (Auth::user()->isPro())
|
|
||||||
<center>
|
|
||||||
{!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!}
|
|
||||||
</center>
|
|
||||||
@else
|
|
||||||
<script>
|
|
||||||
$(function() {
|
|
||||||
$('form.warn-on-exit input').prop('disabled', true);
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
{!! Former::close() !!}
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
|
||||||
|
|
||||||
$(function() {
|
|
||||||
$('#email_template_invoice').keyup(refreshInvoice);
|
|
||||||
$('#email_template_quote').keyup(refreshQuote);
|
|
||||||
$('#email_template_payment').keyup(refreshPayment);
|
|
||||||
|
|
||||||
refreshInvoice();
|
|
||||||
refreshQuote();
|
|
||||||
refreshPayment();
|
|
||||||
});
|
|
||||||
|
|
||||||
function refreshInvoice() {
|
|
||||||
$('#invoice_preview').html(processVariables($('#email_template_invoice').val()));
|
|
||||||
}
|
|
||||||
|
|
||||||
function refreshQuote() {
|
|
||||||
$('#quote_preview').html(processVariables($('#email_template_quote').val()));
|
|
||||||
}
|
|
||||||
|
|
||||||
function refreshPayment() {
|
|
||||||
$('#payment_preview').html(processVariables($('#email_template_payment').val()));
|
|
||||||
}
|
|
||||||
|
|
||||||
function processVariables(str) {
|
|
||||||
if (!str) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
keys = ['footer', 'account', 'client', 'amount', 'link', 'contact'];
|
|
||||||
vals = [{!! json_encode($emailFooter) !!}, '{!! Auth::user()->account->getDisplayName() !!}', 'Client Name', formatMoney(100), '{!! SITE_URL . '/view/...' !!}', 'Contact Name'];
|
|
||||||
|
|
||||||
// Add any available payment method links
|
|
||||||
@foreach (\App\Models\Gateway::getPaymentTypeLinks() as $type)
|
|
||||||
{!! "keys.push('" . $type.'_link' . "');" !!}
|
|
||||||
{!! "vals.push('" . URL::to("/payment/xxxxxx/{$type}") . "');" !!}
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
for (var i=0; i<keys.length; i++) {
|
|
||||||
var regExp = new RegExp('\\$'+keys[i], 'g');
|
|
||||||
str = str.replace(regExp, vals[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return str;
|
|
||||||
}
|
|
||||||
|
|
||||||
</script>
|
|
||||||
|
|
||||||
@stop
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
<ul class="nav nav-tabs nav nav-justified">
|
|
||||||
{!! HTML::nav_link('company/advanced_settings/invoice_design', 'invoice_design') !!}
|
|
||||||
{!! HTML::nav_link('company/advanced_settings/invoice_settings', 'invoice_settings') !!}
|
|
||||||
{!! HTML::nav_link('company/advanced_settings/templates_and_reminders', 'templates_and_reminders') !!}
|
|
||||||
{!! HTML::nav_link('company/advanced_settings/charts_and_reports', 'charts_and_reports') !!}
|
|
||||||
{!! HTML::nav_link('company/advanced_settings/user_management', 'users_and_tokens') !!}
|
|
||||||
</ul>
|
|
||||||
<p> </p>
|
|
||||||
|
|
||||||
@if (!Auth::user()->account->isPro())
|
|
||||||
<center>
|
|
||||||
<div style="font-size:larger;" class="col-md-8 col-md-offset-2">
|
|
||||||
{!! trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan(\''.$feature.'\')">'.trans('texts.pro_plan.remove_logo_link').'</a>']) !!}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<p> <p/>
|
|
||||||
|
|
||||||
</center>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<br/>
|
|
||||||
Loading…
x
Reference in New Issue
Block a user