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

Fixes for buy now clients

Browse Source
This commit is contained in:
Hillel Coren 2017-03-26 13:19:07 +03:00
parent ec613b1d90
commit c3168e0166
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -844,9 +844,11 @@
var client = clients[i]; var client = clients[i];
clientMap[client.public_id] = client; clientMap[client.public_id] = client;
var clientName = getClientDisplayName(client); var clientName = getClientDisplayName(client);
if (!clientName) { @if (! $invoice->id)
continue; if (!clientName) {
} continue;
}
@endif
for (var j=0; j<client.contacts.length; j++) { for (var j=0; j<client.contacts.length; j++) {
var contact = client.contacts[j]; var contact = client.contacts[j];
var contactName = getContactDisplayName(contact); var contactName = getContactDisplayName(contact);
@ -1384,6 +1386,11 @@
} }
function submitAction(value) { function submitAction(value) {
if (!isSaveValid()) {
model.showClientForm();
return false;
}
$('#action').val(value); $('#action').val(value);
$('#submitButton').click(); $('#submitButton').click();
} }

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

@ -670,7 +670,7 @@ function ContactModel(data) {
var str = ''; var str = '';
@if (Utils::isConfirmed()) @if (Utils::isConfirmed())
if (self.invitation_link()) { if (self.invitation_link()) {
// clicking add 'silent=true' however it's removed when copying the link // clicking adds 'silent=true' however it's removed when copying the link
str += '<a href="' + self.invitation_link() + '" onclick="window.open(\'' + self.invitation_link() str += '<a href="' + self.invitation_link() + '" onclick="window.open(\'' + self.invitation_link()
+ '?silent=true\', \'_blank\');return false;">{{ trans('texts.view_as_recipient') }}</a>'; + '?silent=true\', \'_blank\');return false;">{{ trans('texts.view_as_recipient') }}</a>';
} }