Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on #1234

Browse Source
This commit is contained in:
Hillel Coren 2017-02-06 11:51:40 +02:00
parent 58c50edff7
commit 865c379116
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

2
resources/assets/js/script.js
View File

@ -459,7 +459,7 @@ if (window.ko) {
function getContactDisplayName(contact) function getContactDisplayName(contact)
{ {
if (contact.first_name || contact.last_name) { if (contact.first_name || contact.last_name) {
return (contact.first_name || '') + ' ' + (contact.last_name || ''); return $.trim((contact.first_name || '') + ' ' + (contact.last_name || ''));
} else { } else {
return contact.email; return contact.email;
} }

23
resources/views/accounts/templates_and_reminders.blade.php
View File

@ -135,6 +135,29 @@
<div class="modal-body"> <div class="modal-body">
<p>{{ trans('texts.template_help_1') }}</p> <p>{{ trans('texts.template_help_1') }}</p>
<ul> <ul>
@foreach([
'footer',
'account',
'dueDate',
'invoiceDate',
'client',
'amount',
'contact',
'firstName',
'invoice',
'quote',
'password',
'documents',
'viewLink',
'viewButton',
'paymentLink',
'paymentButton',
'autoBill',
'portalLink',
'portalButton',
] as $field)
<li>${{ $field }}</li>
@endforeach
@if ($account->custom_client_label1) @if ($account->custom_client_label1)
<li>$customClient1</li> <li>$customClient1</li>
@endif @endif