From 6dff048a199ce47f780d40e13cb12d0f435ab136 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 26 Jan 2022 20:05:59 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                         |  1 +
 ayanova/src/components/pm-item-units.vue         | 10 +++++-----
 ayanova/src/components/quote-item-units.vue      | 10 +++++-----
 ayanova/src/components/work-order-item-units.vue |  6 +++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 84f861b4..1f710884 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -863,6 +863,7 @@ BUILD 8.0.0-beta.0.13 CHANGES OF NOTE
 - fixed bug in wo, quote, pm that could result in grand child objects server validation errors not showing on subsequent save attempt after successful save just prior
 - fixed bug in expenses grandchildren for wo, quote, pm preventing displaying server validation errors properly 
 - fixed bug in form customization code that could sometimes prevent updates
+- fixed bug in wo, quote, pm where changing a unit in *ItemUnit level could trigger an error or contract change was not handled properly
 
 
 
diff --git a/ayanova/src/components/pm-item-units.vue b/ayanova/src/components/pm-item-units.vue
index 125f2292..7a81cb41 100644
--- a/ayanova/src/components/pm-item-units.vue
+++ b/ayanova/src/components/pm-item-units.vue
@@ -517,19 +517,19 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      const res = await window.$gz.api.get(`unit/active-contract/${id}`);
+      const res = await window.$gz.api.get(`unit/work-order-info/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
           window.$gz.errorHandler.errorToString(res, this)
         );
       } else {
-        if (res.data.id == 0) {
+        if (res.data.contract.id == 0) {
           //no contract, just bail
           return;
         }
         //has contract, if it differs from main work order contract then offer to set it
-        if (res.data.id == this.value.contractId) {
+        if (res.data.contract.id == this.value.contractId) {
           //same contract, just bail
           //yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
           return;
@@ -537,7 +537,7 @@ export default {
         //Prompt user to use new contract
         const prompt = this.$ay
           .t("ApplyUnitContract")
-          .replace("{0}", res.data.name);
+          .replace("{0}", res.data.contract.name);
 
         const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
           prompt,
@@ -546,7 +546,7 @@ export default {
         if (dialogResult == false) {
           return;
         } else {
-          this.value.contractId = res.data.id;
+          this.value.contractId = res.data.contract.id;
           this.value.isDirty = true;
           this.pvm.formState.dirty = true;
           this.$emit("change");
diff --git a/ayanova/src/components/quote-item-units.vue b/ayanova/src/components/quote-item-units.vue
index 30394413..e56426b9 100644
--- a/ayanova/src/components/quote-item-units.vue
+++ b/ayanova/src/components/quote-item-units.vue
@@ -509,19 +509,19 @@ export default {
       if (!id || id == 0) {
         return;
       }
-      const res = await window.$gz.api.get(`unit/active-contract/${id}`);
+      const res = await window.$gz.api.get(`unit/work-order-info/${id}`);
       if (res.error) {
         window.$gz.eventBus.$emit(
           "notify-warning",
           window.$gz.errorHandler.errorToString(res, this)
         );
       } else {
-        if (res.data.id == 0) {
+        if (res.data.contract.id == 0) {
           //no contract, just bail
           return;
         }
         //has contract, if it differs from main work order contract then offer to set it
-        if (res.data.id == this.value.contractId) {
+        if (res.data.contract.id == this.value.contractId) {
           //same contract, just bail
           //yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
           return;
@@ -529,7 +529,7 @@ export default {
         //Prompt user to use new contract
         const prompt = this.$ay
           .t("ApplyUnitContract")
-          .replace("{0}", res.data.name);
+          .replace("{0}", res.data.contract.name);
 
         const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
           prompt,
@@ -538,7 +538,7 @@ export default {
         if (dialogResult == false) {
           return;
         } else {
-          this.value.contractId = res.data.id;
+          this.value.contractId = res.data.contract.id;
           this.value.isDirty = true;
           this.pvm.formState.dirty = true;
           this.$emit("change");
diff --git a/ayanova/src/components/work-order-item-units.vue b/ayanova/src/components/work-order-item-units.vue
index ca6e8611..369493b3 100644
--- a/ayanova/src/components/work-order-item-units.vue
+++ b/ayanova/src/components/work-order-item-units.vue
@@ -560,7 +560,7 @@ export default {
         //CONTRACT
         if (res.data.contract.id != 0) {
           //has contract, if it differs from main work order contract then offer to set it
-          if (res.data.id == this.value.contractId) {
+          if (res.data.contract.id == this.value.contractId) {
             //same contract, just bail
             //yes the date could not be different but we're not going to pick that nit, they can just unset and set if it matters
             return;
@@ -568,7 +568,7 @@ export default {
           //Prompt user to use new contract
           const prompt = this.$ay
             .t("ApplyUnitContract")
-            .replace("{0}", res.data.name);
+            .replace("{0}", res.data.contract.name);
 
           const dialogResult = await window.$gz.dialog.confirmGenericPreTranslated(
             prompt,
@@ -577,7 +577,7 @@ export default {
           if (dialogResult == false) {
             return;
           } else {
-            this.value.contractId = res.data.id;
+            this.value.contractId = res.data.contract.id;
             this.value.isDirty = true;
             this.pvm.formState.dirty = true;
             this.$emit("change");