1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 20:22:42 +01:00

Added and as email template variables

This commit is contained in:
Hillel Coren 2016-07-04 21:47:05 +03:00
parent aba50f66dc
commit b5f606df47
5 changed files with 12 additions and 2 deletions

View File

@ -33,6 +33,8 @@ class ContactMailer extends Mailer
'paymentLink', 'paymentLink',
'paymentButton', 'paymentButton',
'autoBill', 'autoBill',
'portalLink',
'portalButton',
]; ];
/** /**

View File

@ -63,6 +63,8 @@ class TemplateService
'$customInvoice2' => $account->custom_invoice_text_label2, '$customInvoice2' => $account->custom_invoice_text_label2,
'$documents' => $documentsHTML, '$documents' => $documentsHTML,
'$autoBill' => empty($data['autobill'])?'':$data['autobill'], '$autoBill' => empty($data['autobill'])?'':$data['autobill'],
'$portalLink' => $invitation->contact->link,
'$portalButton' => Form::emailViewButton($invitation->contact->link, 'portal'),
]; ];
// Add variables for available payment types // Add variables for available payment types

View File

@ -1692,7 +1692,7 @@ $LANG = array(
'lang_Spanish' => 'Spanish', 'lang_Spanish' => 'Spanish',
'lang_Spanish - Spain' => 'Spanish - Spain', 'lang_Spanish - Spain' => 'Spanish - Spain',
'lang_Swedish' => 'Swedish', 'lang_Swedish' => 'Swedish',
// Frequencies // Frequencies
'freq_weekly' => 'Weekly', 'freq_weekly' => 'Weekly',
'freq_two_weeks' => 'Two weeks', 'freq_two_weeks' => 'Two weeks',
@ -2004,6 +2004,8 @@ $LANG = array(
'country_Yemen' => 'Yemen', 'country_Yemen' => 'Yemen',
'country_Zambi' => 'Zambi', 'country_Zambi' => 'Zambi',
'view_client_portal' => 'View client portal',
'view_portal' => 'View Portal',
); );
return $LANG; return $LANG;

View File

@ -267,6 +267,8 @@
"{{ URL::to('/payment/...') }}$password", "{{ URL::to('/payment/...') }}$password",
'{!! Form::flatButton('pay_now', '#36c157') !!}$password', '{!! Form::flatButton('pay_now', '#36c157') !!}$password',
'{{ trans('texts.auto_bill_notification_placeholder') }}', '{{ trans('texts.auto_bill_notification_placeholder') }}',
"{{ URL::to('/client/portal/...') }}",
'{!! Form::flatButton('view_portal', '#36c157') !!}',
]; ];
// Add blanks for custom values // Add blanks for custom values

View File

@ -148,7 +148,9 @@
@if ($contact->phone) @if ($contact->phone)
<i class="fa fa-phone" style="width: 20px"></i>{{ $contact->phone }}<br/> <i class="fa fa-phone" style="width: 20px"></i>{{ $contact->phone }}<br/>
@endif @endif
<i class="fa fa-dashboard" style="width: 20px"></i><a href="{{ $contact->link }}" target="_blank">{{ trans('texts.view_dashboard') }}</a><br/> @if ($client->account->enable_client_portal)
<i class="fa fa-dashboard" style="width: 20px"></i><a href="{{ $contact->link }}" target="_blank">{{ trans('texts.view_client_portal') }}</a><br/>
@endif
@endforeach @endforeach
</div> </div>