Merge branch 'release/2023-09-29' into feature/ems-tax-calculation

2023-09-26 12:59:42 -07:00
parent d2fe9b0590 dc05e4e166
commit b2529207e1
20 changed files with 312 additions and 170 deletions
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -574,7 +574,6 @@ export const GET_JOB_BY_PK = gql`
      est_co_nm
      est_ct_fn
      est_ct_ln
-
      est_ph1
      est_ea
      selling_dealer
@@ -756,6 +755,7 @@ export const GET_JOB_BY_PK = gql`
        jobid
        amount
        payer
+        paymentnum
        created_at
        transactionid
        memo
--- a/client/src/graphql/payment_response.queries.js
+++ b/client/src/graphql/payment_response.queries.js
@@ -28,16 +28,14 @@ export const QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID = gql`
  }
 `;

-export const QUERY_RO_AND_OWNER_BY_JOB_PK = gql`
-  query QUERY_RO_AND_OWNER_BY_JOB_PK($jobid: uuid!) {
-    jobs_by_pk(id: $jobid) {
+export const QUERY_RO_AND_OWNER_BY_JOB_PKS = gql`
+  query QUERY_RO_AND_OWNER_BY_JOB_PKS($jobids: [uuid!]!) {
+    jobs(where: { id: { _in: $jobids } }) {
      ro_number
-      owner {
-        ownr_fn
-        ownr_ln
-        ownr_ea
-        ownr_zip
-      }
+      ownr_fn
+      ownr_ln
+      ownr_ea
+      ownr_zip
    }
  }
 `;