Merge branch 'release/2023-07-28' into feature/payroll

2023-07-27 11:24:31 -07:00
parent 7b49a94edd a7ad18fae2
commit ab2cf8c8c7
31 changed files with 200 additions and 29 deletions
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -34,6 +34,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
      id
      lbr_adjustments
      converted
+      status
    }
    joblines(where: { jobid: { _eq: $id }, removed: { _eq: false } }) {
      id
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -682,6 +682,7 @@ export const GET_JOB_BY_PK = gql`
      date_rentalresp
      date_exported
      date_repairstarted
+      date_void
      status
      owner_owing
      tax_registration_number
@@ -1118,6 +1119,7 @@ export const UPDATE_JOB = gql`
        scheduled_completion
        actual_in
        date_repairstarted
+        date_void
      }
    }
  }
@@ -1165,6 +1167,7 @@ export const VOID_JOB = gql`
    update_jobs_by_pk(_set: $job, pk_columns: { id: $jobId }) {
      id
      date_exported
+      date_void
      status
      alt_transport
      ro_number