From e631a6a7ba0ae18022335a3081664bb25cc5cc50 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 9 Mar 2017 15:25:10 +0200 Subject: [PATCH] Clarify recurring invoice error if client isn't set --- resources/views/invoices/edit.blade.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index 8ddeb26c7a6b..db359f3379f1 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -1336,6 +1336,10 @@ function onMarkSentClick() { if (model.invoice().is_recurring()) { + if (!isSaveValid()) { + model.showClientForm(); + return false; + } // warn invoice will be emailed when saving new recurring invoice var text = '\n' + getSendToEmails() + '\n\n' + "{!! trans("texts.confirm_recurring_timing") !!}"; var title = "{!! trans("texts.confirm_recurring_email_$entityType") !!}"; @@ -1464,7 +1468,7 @@ } function isSaveValid() { - var isValid = model.invoice().client().name ? true : false; + var isValid = model.invoice().client().name() ? true : false; for (var i=0; i