2022-01-24 23:38:53 +00:00
parent 48bc9be4ff
commit 530956cd7f
6 changed files with 53 additions and 49 deletions
--- a/ayanova/src/components/work-order-item-expenses.vue
+++ b/ayanova/src/components/work-order-item-expenses.vue
@@ -112,7 +112,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].WorkOrderItemExpenseName`
+                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].name`
              )
            "
            data-cy="expenses.name"
@@ -317,7 +317,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].WorkOrderItemExpenseChargeTaxCodeID`
+                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].chargeTaxCodeId`
              )
            "
            @input="
@@ -391,7 +391,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].WorkOrderItemExpenseUserID`
+                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].userId`
              )
            "
            @input="
@@ -421,7 +421,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].WorkOrderItemExpenseDescription`
+                `Items[${activeWoItemIndex}].expenses[${activeItemIndex}].description`
              )
            "
            data-cy="expenses.description"
--- a/ayanova/src/components/work-order-item-labors.vue
+++ b/ayanova/src/components/work-order-item-labors.vue
@@ -242,7 +242,7 @@
        </v-col>

        <v-col
-          v-if="form().showMe(this, 'LaborUserID')"
+          v-if="form().showMe(this, 'WorkOrderItemLaborUserID')"
          cols="12"
          sm="6"
          lg="4"
@@ -280,7 +280,7 @@
        </v-col>

        <v-col
-          v-if="form().showMe(this, 'NoChargeQuantity')"
+          v-if="form().showMe(this, 'WorkOrderItemLaborNoChargeQuantity')"
          cols="12"
          sm="6"
          lg="4"
@@ -324,7 +324,8 @@

        <v-col
          v-if="
-            form().showMe(this, 'TaxCodeSaleId') && !value.userIsRestrictedType
+            form().showMe(this, 'WorkOrderItemLaborTaxRateSaleID') &&
+              !value.userIsRestrictedType
          "
          cols="12"
          sm="6"
@@ -386,7 +387,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].laborpriceOverride`
+                `Items[${activeWoItemIndex}].labors[${activeItemIndex}].priceOverride`
              )
            "
            :rules="[
@@ -524,7 +525,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "LaborUserID")) {
+      if (this.form().showMe(this, "WorkOrderItemLaborUserID")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemLaborUserID"),
          align: "left",
@@ -532,7 +533,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "NoChargeQuantity")) {
+      if (this.form().showMe(this, "WorkOrderItemLaborNoChargeQuantity")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemLaborNoChargeQuantity"),
          align: "right",
@@ -594,7 +595,7 @@ export default {
      }

      if (
-        this.form().showMe(this, "TaxCodeSaleId") &&
+        this.form().showMe(this, "WorkOrderItemLaborTaxRateSaleID") &&
        !this.value.userIsRestrictedType
      ) {
        headers.push({
--- a/ayanova/src/components/work-order-item-loans.vue
+++ b/ayanova/src/components/work-order-item-loans.vue
@@ -216,7 +216,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].WorkOrderItemLoanOutDate`
+                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].outDate`
              )
            "
            @input="
@@ -248,7 +248,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].WorkOrderItemLoanDueDate`
+                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].dueDate`
              )
            "
            @input="
@@ -280,7 +280,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].WorkOrderItemLoanReturnDate`
+                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].returnDate`
              )
            "
            @input="
@@ -317,7 +317,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].WorkOrderItemLoanTaxCodeID`
+                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].taxCodeID`
              )
            "
            @input="
@@ -355,7 +355,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].LoanPriceOverride`
+                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].priceOverride`
              )
            "
            :rules="[
@@ -384,7 +384,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].WorkOrderItemLoanNotes`
+                `Items[${activeWoItemIndex}].loans[${activeItemIndex}].notes`
              )
            "
            data-cy="loans.notes"
--- a/ayanova/src/components/work-order-item-outside-services.vue
+++ b/ayanova/src/components/work-order-item-outside-services.vue
@@ -141,7 +141,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceVendorSentToID`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].vendorSentToID`
              )
            "
            @input="
@@ -174,7 +174,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceRMANumber`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].rmaNumber`
              )
            "
            data-cy="outsideServices.rma"
@@ -208,7 +208,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceRepairCost`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairCost`
              )
            "
            :rules="[
@@ -252,7 +252,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceRepairPrice`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].repairPrice`
              )
            "
            :rules="[
@@ -299,7 +299,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceVendorSentViaID`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].vendorSentViaID`
              )
            "
            @input="
@@ -334,7 +334,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceTrackingNumber`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].trackingNumber`
              )
            "
            data-cy="outsideServices.trackingNumber"
@@ -368,7 +368,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceShippingCost`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingCost`
              )
            "
            :rules="[
@@ -412,7 +412,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceShippingPrice`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].shippingPrice`
              )
            "
            :rules="[
@@ -455,7 +455,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceDateSent`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].sentDate`
              )
            "
            @input="
@@ -488,7 +488,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceDateETA`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].etaDate`
              )
            "
            @input="
@@ -521,7 +521,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceDateReturned`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].returnDate`
              )
            "
            @input="
@@ -556,7 +556,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceTaxCode`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].taxCodeId`
              )
            "
            @input="
@@ -586,7 +586,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].WorkOrderItemOutsideServiceNotes`
+                `Items[${activeWoItemIndex}].outsideServices[${activeItemIndex}].notes`
              )
            "
            data-cy="outsideServices.notes"
--- a/ayanova/src/components/work-order-item-parts.vue
+++ b/ayanova/src/components/work-order-item-parts.vue
@@ -370,7 +370,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].parts[${activeItemIndex}].partpriceOverride`
+                `Items[${activeWoItemIndex}].parts[${activeItemIndex}].priceOverride`
              )
            "
            :rules="[
--- a/ayanova/src/components/work-order-item-travels.vue
+++ b/ayanova/src/components/work-order-item-travels.vue
@@ -80,7 +80,7 @@
        >

        <v-col
-          v-if="form().showMe(this, 'TravelStartDate')"
+          v-if="form().showMe(this, 'WorkOrderItemTravelStartDate')"
          cols="12"
          sm="6"
          lg="4"
@@ -113,7 +113,7 @@
        </v-col>

        <v-col
-          v-if="form().showMe(this, 'TravelStopDate')"
+          v-if="form().showMe(this, 'WorkOrderItemTravelStopDate')"
          cols="12"
          sm="6"
          lg="4"
@@ -226,7 +226,7 @@
        </v-col>

        <v-col
-          v-if="form().showMe(this, 'TravelRateId')"
+          v-if="form().showMe(this, 'WorkOrderItemTravelServiceRateID')"
          cols="12"
          sm="6"
          lg="4"
@@ -263,7 +263,7 @@
        </v-col>

        <v-col
-          v-if="form().showMe(this, 'TravelUserId')"
+          v-if="form().showMe(this, 'WorkOrderItemTravelUserID')"
          cols="12"
          sm="6"
          lg="4"
@@ -288,7 +288,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].traveluserId`
+                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].userId`
              )
            "
            @input="
@@ -301,7 +301,7 @@
        </v-col>

        <v-col
-          v-if="form().showMe(this, 'TravelNoChargeQuantity')"
+          v-if="form().showMe(this, 'WorkOrderItemTravelNoChargeQuantity')"
          cols="12"
          sm="6"
          lg="4"
@@ -322,7 +322,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelnoChargeQuantity`
+                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].noChargeQuantity`
              )
            "
            :rules="[
@@ -345,7 +345,7 @@

        <v-col
          v-if="
-            form().showMe(this, 'TravelTaxCodeSaleId') &&
+            form().showMe(this, 'WorkOrderItemTravelTaxRateSaleID') &&
              !value.userIsRestrictedType
          "
          cols="12"
@@ -370,7 +370,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].traveltaxCodeSaleId`
+                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].taxCodeSaleId`
              )
            "
            @input="
@@ -408,7 +408,7 @@
            :error-messages="
              form().serverErrors(
                this,
-                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelpriceOverride`
+                `Items[${activeWoItemIndex}].travels[${activeItemIndex}].priceOverride`
              )
            "
            :rules="[
@@ -425,7 +425,10 @@
          ></gz-currency>
        </v-col>

-        <v-col v-if="form().showMe(this, 'TravelDetails')" cols="12">
+        <v-col
+          v-if="form().showMe(this, 'WorkOrderItemTravelDetails')"
+          cols="12"
+        >
          <v-textarea
            :ref="
              `Items[${activeWoItemIndex}].travels[${activeItemIndex}].travelDetails`
@@ -504,7 +507,7 @@ export default {
    headerList: function() {
      const headers = [];

-      if (this.form().showMe(this, "TravelStartDate")) {
+      if (this.form().showMe(this, "WorkOrderItemTravelStartDate")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemTravelStartDate"),
          align: "right",
@@ -512,7 +515,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "TravelStopDate")) {
+      if (this.form().showMe(this, "WorkOrderItemTravelStopDate")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemTravelStopDate"),
          align: "right",
@@ -534,7 +537,7 @@ export default {
        value: "distance"
      });

-      if (this.form().showMe(this, "TravelRateId")) {
+      if (this.form().showMe(this, "WorkOrderItemTravelServiceRateID")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemTravelServiceRateID"),
          align: "left",
@@ -542,7 +545,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "TravelDetails")) {
+      if (this.form().showMe(this, "WorkOrderItemTravelDetails")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemTravelDetails"),
          align: "left",
@@ -550,7 +553,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "TravelUserId")) {
+      if (this.form().showMe(this, "WorkOrderItemTravelUserID")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemTravelUserID"),
          align: "left",
@@ -558,7 +561,7 @@ export default {
        });
      }

-      if (this.form().showMe(this, "TravelNoChargeQuantity")) {
+      if (this.form().showMe(this, "WorkOrderItemTravelNoChargeQuantity")) {
        headers.push({
          text: this.$ay.t("WorkOrderItemTravelNoChargeQuantity"),
          align: "right",
@@ -620,7 +623,7 @@ export default {
      }

      if (
-        this.form().showMe(this, "TravelTaxCodeSaleId") &&
+        this.form().showMe(this, "WorkOrderItemTravelTaxRateSaleID") &&
        !this.value.userIsRestrictedType
      ) {
        headers.push({