Merge branch 'master' into feature/america

2023-08-30 08:04:57 -07:00
parent c097f98959 763b199646
commit 7d18c9b160
43 changed files with 1812 additions and 11735 deletions
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -757,7 +757,6 @@ export const GET_JOB_BY_PK = gql`
        amount
        payer
        created_at
-        stripeid
        transactionid
        memo
        date
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -69,7 +69,7 @@ export const QUERY_OWNER_BY_ID = gql`
      preferred_contact
      note
      tax_number
-      jobs {
+      jobs(order_by: { date_open: desc }) {
        id
        ro_number
        clm_no
--- a/client/src/graphql/payments.queries.js
+++ b/client/src/graphql/payments.queries.js
@@ -5,6 +5,15 @@ export const INSERT_NEW_PAYMENT = gql`
    insert_payments(objects: $paymentInput) {
      returning {
        id
+        jobid
+        amount
+        payer
+        created_at
+        transactionid
+        memo
+        date
+        type
+        exportedat
      }
    }
  }
--- a/client/src/graphql/vehicles.queries.js
+++ b/client/src/graphql/vehicles.queries.js
@@ -28,11 +28,10 @@ export const QUERY_VEHICLE_BY_ID = gql`
      updated_at
      trim_color
      notes
-      jobs {
+      jobs(order_by: { date_open: desc }) {
        id
        ro_number
        ownr_fn
-
        ownr_ln
        owner {
          id