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

Clarify recurring invoice error if client isn't set

Browse Source
This commit is contained in:
Hillel Coren 2017-03-09 15:25:10 +02:00
parent 8623c3a3c6
commit e631a6a7ba
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1336,6 +1336,10 @@
function onMarkSentClick() { function onMarkSentClick() {
if (model.invoice().is_recurring()) { if (model.invoice().is_recurring()) {
if (!isSaveValid()) {
model.showClientForm();
return false;
}
// warn invoice will be emailed when saving new recurring invoice // warn invoice will be emailed when saving new recurring invoice
var text = '\n' + getSendToEmails() + '\n\n' + "{!! trans("texts.confirm_recurring_timing") !!}"; var text = '\n' + getSendToEmails() + '\n\n' + "{!! trans("texts.confirm_recurring_timing") !!}";
var title = "{!! trans("texts.confirm_recurring_email_$entityType") !!}"; var title = "{!! trans("texts.confirm_recurring_email_$entityType") !!}";
@ -1464,7 +1468,7 @@
} }
function isSaveValid() { function isSaveValid() {
var isValid = model.invoice().client().name ? true : false; var isValid = model.invoice().client().name() ? true : false;
for (var i=0; i<model.invoice().client().contacts().length; i++) { for (var i=0; i<model.invoice().client().contacts().length; i++) {
var contact = model.invoice().client().contacts()[i]; var contact = model.invoice().client().contacts()[i];
if (isValidEmailAddress(contact.email()) || contact.first_name() || contact.last_name()) { if (isValidEmailAddress(contact.email()) || contact.first_name() || contact.last_name()) {