From ba035c688902c8f59fe73013097e13d157fafdba Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 8 Mar 2022 23:49:48 +0000
Subject: [PATCH]

---
 .../views/customer-notify-subscription.vue    | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ayanova/src/views/customer-notify-subscription.vue b/ayanova/src/views/customer-notify-subscription.vue
index 1c0791d1..e9248a46 100644
--- a/ayanova/src/views/customer-notify-subscription.vue
+++ b/ayanova/src/views/customer-notify-subscription.vue
@@ -604,8 +604,9 @@ export default {
       }
     },
     showWorkOrderReportSelector() {
-      //## MUST ALSO UPDATE submit() check for reportable event if add here
+      //## MUST ALSO UPDATE CoreJobCustomerNotify check for reportable event if add here
       switch (this.obj.eventType) {
+        case 4: //WorkorderStatusChange = 4
         case 30: //workorder completed
           return true;
         default:
@@ -613,7 +614,7 @@ export default {
       }
     },
     showQuoteReportSelector() {
-      //## MUST ALSO UPDATE submit() check for reportable event if add here
+      //## MUST ALSO UPDATE CoreJobCustomerNotify check for reportable event if add here
       switch (this.obj.eventType) {
         case 9: //quote status changed
           return true;
@@ -913,14 +914,13 @@ export default {
       try {
         vm.formState.loading = true;
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        //don't send the report if it's not reportable (could be set by duplicate option from one that *is* reportable)
-        //## MUST ALSO UPDATE CoreJobCustomerNotify check for reportable event if add here
-        switch (vm.obj.eventType) {
-          case 9:
-          case 30:
-            break;
-          default:
-            vm.obj.linkReportId = null;
+
+        //don't include invalid settings (could be set by duplicate option)
+        if (
+          !this.showWorkOrderReportSelector &&
+          !this.showQuoteReportSelector
+        ) {
+          vm.obj.linkReportId = null;
         }
 
         if (!this.showAgeValue) {