Merge branch 'master' into feature/intellipay

2023-08-09 19:48:33 -07:00
parent fb5c5561e9 e69e844568
commit b8942c320e
325 changed files with 19181 additions and 8389 deletions
--- a/client/src/graphql/appointments.queries.js
+++ b/client/src/graphql/appointments.queries.js
@@ -57,6 +57,8 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
        v_model_yr
        v_make_desc
        v_model_desc
+        est_ct_fn
+        est_ct_ln
        labhrs: joblines_aggregate(
          where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }
        ) {
@@ -268,6 +270,7 @@ export const CANCEL_APPOINTMENTS_BY_JOB_ID = gql`
      scheduled_in
      scheduled_completion
      status
+      lost_sale_reason
    }
  }
 `;
--- a/client/src/graphql/associations.queries.js
+++ b/client/src/graphql/associations.queries.js
@@ -1,8 +1,11 @@
 import { gql } from "@apollo/client";

 export const QUERY_ALL_ASSOCIATIONS = gql`
-  query QUERY_ALL_ASSOCIATIONS {
-    associations(order_by: { bodyshop: { shopname: asc } }) {
+  query QUERY_ALL_ASSOCIATIONS($email: String) {
+    associations(
+      where: { useremail: { _eq: $email } }
+      order_by: { bodyshop: { shopname: asc } }
+    ) {
      id
      active
      bodyshop {
@@ -27,6 +30,30 @@ export const UPDATE_ASSOCIATION = gql`
    }
  }
 `;
+export const UPDATE_ACTIVE_ASSOCIATION = gql`
+  mutation UPDATE_ACTIVE_ASSOCIATION($newActiveAssocId: uuid) {
+    nweActive: update_associations(
+      where: { id: { _eq: $newActiveAssocId } }
+      _set: { active: true }
+    ) {
+      returning {
+        id
+        shopid
+        active
+      }
+    }
+    inactive: update_associations(
+      where: { id: { _neq: $newActiveAssocId } }
+      _set: { active: false }
+    ) {
+      returning {
+        id
+        shopid
+        active
+      }
+    }
+  }
+`;

 export const UPDATE_ACTIVE_PROD_LIST_VIEW = gql`
  mutation UPDATE_ACTIVE_PROD_LIST_VIEW($assocId: uuid, $view: String) {
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -20,13 +20,11 @@ export const DELETE_BILL = gql`

 export const QUERY_ALL_BILLS_PAGINATED = gql`
  query QUERY_ALL_BILLS_PAGINATED(
-    $search: String
    $offset: Int
    $limit: Int
    $order: [bills_order_by!]!
  ) {
-    search_bills(
-      args: { search: $search }
+    bills(
      offset: $offset
      limit: $limit
      order_by: $order
@@ -51,7 +49,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
        ro_number
      }
    }
-    search_bills_aggregate(args: { search: $search }) {
+    bills_aggregate {
      aggregate {
        count(distinct: true)
      }
@@ -69,6 +67,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
      vendor {
        id
        name
+        email
      }
      order_date
      deliver_by
@@ -104,6 +103,7 @@ export const QUERY_BILLS_BY_JOBID = gql`
      vendor {
        id
        name
+        email
      }
      total
      invoice_number
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -12,6 +12,7 @@ export const QUERY_BODYSHOP = gql`
  query QUERY_BODYSHOP {
    bodyshops(where: { associations: { active: { _eq: true } } }) {
      associations {
+        id
        authlevel
        useremail
        default_prod_list_view
@@ -112,6 +113,11 @@ export const QUERY_BODYSHOP = gql`
      localmediaservernetwork
      localmediatoken
      enforce_conversion_csr
+      md_lost_sale_reasons
+      md_parts_scan
+      enforce_conversion_category
+      tt_enforce_hours_for_tech_console
+      use_paint_scale_data
      employees {
        user_email
        id
@@ -121,6 +127,7 @@ export const QUERY_BODYSHOP = gql`
        employee_number
        rates
        external_id
+        flat_rate
      }
    }
  }
@@ -222,6 +229,10 @@ export const UPDATE_SHOP = gql`
        localmediaservernetwork
        localmediatoken
        enforce_conversion_csr
+        md_lost_sale_reasons
+        md_parts_scan
+        enforce_conversion_category
+        tt_enforce_hours_for_tech_console
        employees {
          id
          first_name
--- a/client/src/graphql/conversations.queries.js
+++ b/client/src/graphql/conversations.queries.js
@@ -1,41 +1,23 @@
 import { gql } from "@apollo/client";

-// export const CONVERSATION_LIST_SUBSCRIPTION = gql`
-//   subscription CONVERSATION_LIST_SUBSCRIPTION {
-//     conversations(
-//       order_by: { updated_at: desc }
-//       limit: 50
-//       where: { archived: { _eq: false } }
-//     ) {
-//       phone_num
-//       id
-//       updated_at
-//       unreadcnt
-//       messages_aggregate(
-//         where: { read: { _eq: false }, isoutbound: { _eq: false } }
-//       ) {
-//         aggregate {
-//           count
-//         }
-//       }
-//       job_conversations {
-//         job {
-//           id
-//           ro_number
-//           ownr_fn
-//           ownr_ln
-//           ownr_co_nm
-//         }
-//       }
-//     }
-//   }
-// `;
+export const UNREAD_CONVERSATION_COUNT = gql`
+  query UNREAD_CONVERSATION_COUNT {
+    messages_aggregate(
+      where: { read: { _eq: false }, isoutbound: { _eq: false } }
+    ) {
+      aggregate {
+        count
+      }
+    }
+  }
+`;

 export const CONVERSATION_LIST_QUERY = gql`
-  query CONVERSATION_LIST_QUERY {
+  query CONVERSATION_LIST_QUERY($offset: Int!) {
    conversations(
      order_by: { updated_at: desc }
      limit: 50
+      offset: $offset
      where: { archived: { _eq: false } }
    ) {
      phone_num
--- 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
@@ -284,6 +284,7 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
      clm_no
      v_make_desc
      v_color
+      vehicleid
      plate_no
      actual_in
      scheduled_completion
@@ -536,6 +537,7 @@ export const GET_JOB_BY_PK = gql`
      driveable
      towin
      loss_of_use
+      lost_sale_reason
      vehicle {
        id
        plate_no
@@ -680,6 +682,7 @@ export const GET_JOB_BY_PK = gql`
      date_rentalresp
      date_exported
      date_repairstarted
+      date_void
      status
      owner_owing
      tax_registration_number
@@ -721,6 +724,7 @@ export const GET_JOB_BY_PK = gql`
        ioucreated
        convertedtolbr
        ah_detail_line
+        critical
        billlines(limit: 1, order_by: { bill: { date: desc } }) {
          id
          quantity
@@ -1072,6 +1076,10 @@ export const UPDATE_JOB = gql`
        lbr_adjustments
        suspended
        queued_for_parts
+        scheduled_completion
+        actual_in
+        date_repairstarted
+        date_void
      }
    }
  }
@@ -1119,6 +1127,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
@@ -1213,10 +1222,10 @@ export const ACTIVE_JOBS_FOR_AUTOCOMPLETE = gql`
  query ACTIVE_JOBS_FOR_AUTOCOMPLETE($statuses: [String!]!) {
    jobs(where: { status: { _in: $statuses } }) {
      id
+      ownr_co_nm
      ownr_fn
      ownr_ln
      ro_number
-
      vehicleid
      v_make_desc
      v_model_desc
@@ -1244,6 +1253,7 @@ export const SEARCH_JOBS_FOR_AUTOCOMPLETE = gql`
      }
    ) {
      id
+      ownr_co_nm
      ownr_fn
      ownr_ln
      ro_number
@@ -1260,6 +1270,7 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql`
  query SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE($id: uuid!) {
    jobs_by_pk(id: $id) {
      id
+      ownr_co_nm
      ownr_fn
      ownr_ln
      ro_number
@@ -1275,9 +1286,10 @@ export const SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE = gql`

 export const SEARCH_FOR_JOBS = gql`
  query SEARCH_FOR_JOBS($search: String!) {
-    search_jobs(args: { search: $search }) {
+    search_jobs(args: { search: $search }, limit: 25) {
      id
      ro_number
+      ownr_co_nm
      ownr_fn
      ownr_ln
    }
@@ -1778,14 +1790,12 @@ export const QUERY_ALL_JOB_FIELDS = gql`

 export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
  query QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED(
-    $search: String
    $offset: Int
    $limit: Int
    $order: [jobs_order_by!]
    $statusList: [String!]
  ) {
-    search_jobs(
-      args: { search: $search }
+    jobs(
      offset: $offset
      limit: $limit
      order_by: $order
@@ -1816,10 +1826,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
      updated_at
      ded_amt
    }
-    search_jobs_aggregate(
-      args: { search: $search }
-      where: { status: { _in: $statusList } }
-    ) {
+    jobs_aggregate(where: { status: { _in: $statusList } }) {
      aggregate {
        count(distinct: true)
      }
@@ -2060,6 +2067,7 @@ export const QUERY_JOB_EXPORT_DMS = gql`
      ownr_fn
      ownr_ln
      ownr_co_nm
+      ins_co_nm
      kmin
      kmout
      v_make_desc
--- a/client/src/graphql/notes.queries.js
+++ b/client/src/graphql/notes.queries.js
@@ -4,7 +4,16 @@ export const INSERT_NEW_NOTE = gql`
  mutation INSERT_NEW_NOTE($noteInput: [notes_insert_input!]!) {
    insert_notes(objects: $noteInput) {
      returning {
+        created_at
+        created_by
+        critical
        id
+        jobid
+        private
+        text
+        updated_at
+        audit
+        type
      }
    }
  }
@@ -15,8 +24,8 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
    jobs_by_pk(id: $id) {
      id
      ro_number
-      vehicle{
-        jobs{
+      vehicle {
+        jobs {
          id
          ro_number
          status
@@ -33,6 +42,7 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
        text
        updated_at
        audit
+        type
      }
    }
  }
@@ -52,6 +62,7 @@ export const UPDATE_NOTE = gql`
        text
        updated_at
        audit
+        type
      }
    }
  }
--- a/client/src/graphql/owners.queries.js
+++ b/client/src/graphql/owners.queries.js
@@ -94,6 +94,14 @@ export const UPDATE_OWNER = gql`
  }
 `;

+export const DELETE_OWNER = gql`
+  mutation DELETE_OWNER($id: uuid!) {
+    delete_owners_by_pk(id: $id) {
+      id
+    }
+  }
+`;
+
 export const QUERY_ALL_OWNERS = gql`
  query QUERY_ALL_OWNERS {
    owners {
--- a/client/src/graphql/payments.queries.js
+++ b/client/src/graphql/payments.queries.js
@@ -12,39 +12,39 @@ export const INSERT_NEW_PAYMENT = gql`

 export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
  query QUERY_ALL_PAYMENTS_PAGINATED(
-    $search: String
    $offset: Int
    $limit: Int
    $order: [payments_order_by!]!
  ) {
-    search_payments(
-      args: { search: $search }
-      offset: $offset
-      limit: $limit
-      order_by: $order
-    ) {
+    payments(offset: $offset, limit: $limit, order_by: $order) {
      id
+      amount
      created_at
-      jobid
-      paymentnum
      date
+      exportedat
+      jobid
      job {
        id
-        ro_number
+        ownerid
+        ownr_co_nm
        ownr_fn
        ownr_ln
-        ownr_co_nm
+        owner {
+          id
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+        }
+        ro_number
      }
-      transactionid
      memo
-      type
-      amount
-      stripeid
-      exportedat
-      stripeid
      payer
+      paymentnum
+      stripeid
+      transactionid
+      type
    }
-    search_payments_aggregate(args: { search: $search }) {
+    payments_aggregate {
      aggregate {
        count(distinct: true)
      }
@@ -57,16 +57,31 @@ export const UPDATE_PAYMENT = gql`
    update_payments(where: { id: { _eq: $paymentId } }, _set: $payment) {
      returning {
        id
-        transactionid
-        memo
-        type
        amount
-        stripeid
+        created_at
+        date
        exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
        payer
        paymentnum
-        date
+        stripeid
+        transactionid
+        type
      }
    }
  }
@@ -80,17 +95,31 @@ export const UPDATE_PAYMENTS = gql`
    update_payments(where: { id: { _in: $paymentIdList } }, _set: $payment) {
      returning {
        id
-        exportedat
-        transactionid
-        memo
-        type
        amount
-        stripeid
+        created_at
+        date
        exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
        payer
        paymentnum
-        date
+        stripeid
+        transactionid
+        type
      }
    }
  }
@@ -109,3 +138,36 @@ export const QUERY_JOB_PAYMENT_TOTALS = gql`
    }
  }
 `;
+
+export const QUERY_PAYMENT_BY_ID = gql`
+  query QUERY_PAYMENT_BY_ID($paymentId: uuid!) {
+    payments_by_pk(id: $paymentId) {
+      id
+      amount
+      created_at
+      exportedat
+      date
+      jobid
+      job {
+        id
+        ownerid
+        ownr_co_nm
+        ownr_fn
+        ownr_ln
+        owner {
+          id
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+        }
+        ro_number
+      }
+      memo
+      payer
+      paymentnum
+      stripeid
+      transactionid
+      type
+    }
+  }
+`;
--- a/client/src/graphql/scoreboard.queries.js
+++ b/client/src/graphql/scoreboard.queries.js
@@ -19,6 +19,7 @@ export const QUERY_SCOREBOARD = gql`
        v_make_desc
        v_model_desc
        v_model_yr
+        job_totals
      }
    }
  }
--- a/client/src/graphql/search.queries.js
+++ b/client/src/graphql/search.queries.js
@@ -2,22 +2,20 @@ import { gql } from "@apollo/client";

 export const GLOBAL_SEARCH_QUERY = gql`
  query GLOBAL_SEARCH_QUERY($search: String) {
-    search_jobs(args: { search: $search }) {
+    search_jobs(args: { search: $search }, limit: 25) {
      id
      ro_number
      status
-
      clm_no
      v_model_yr
      v_model_desc
      v_make_desc
      v_color
-
      ownr_fn
      ownr_ln
      ownr_co_nm
    }
-    search_owners(args: { search: $search }) {
+    search_owners(args: { search: $search }, limit: 25) {
      id
      ownr_fn
      ownr_ln
@@ -25,7 +23,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
      ownr_ph1
      ownr_ph2
    }
-    search_vehicles(args: { search: $search }) {
+    search_vehicles(args: { search: $search }, limit: 25) {
      id
      v_model_yr
      v_model_desc
@@ -34,7 +32,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
      v_vin
      plate_no
    }
-    search_payments(args: { search: $search }) {
+    search_payments(args: { search: $search }, limit: 25) {
      id
      amount
      paymentnum
@@ -45,7 +43,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
      memo
      transactionid
    }
-    search_bills(args: { search: $search }) {
+    search_bills(args: { search: $search }, limit: 25) {
      id
      date
      invoice_number
@@ -54,7 +52,7 @@ export const GLOBAL_SEARCH_QUERY = gql`
        name
      }
    }
-    search_phonebook(args: { search: $search }) {
+    search_phonebook(args: { search: $search }, limit: 25) {
      id
      firstname
      lastname
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -59,6 +59,81 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
  }
 `;

+export const QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE = gql`
+  query QUERY_TIME_TICKETS_TECHNICIAN_IN_RANGE(
+    $employeeid: uuid!
+    $start: date!
+    $end: date!
+    $fixedStart: date!
+    $fixedEnd: date!
+  ) {
+    timetickets(
+      where: {
+        date: { _gte: $start, _lte: $end }
+        employeeid: { _eq: $employeeid }
+      }
+      order_by: { date: desc_nulls_first }
+    ) {
+      actualhrs
+      ciecacode
+      clockoff
+      clockon
+      cost_center
+      created_at
+      date
+      id
+      rate
+      productivehrs
+      memo
+      jobid
+      flat_rate
+      job {
+        id
+        ro_number
+      }
+      employeeid
+      employee {
+        id
+        employee_number
+        first_name
+        last_name
+      }
+    }
+    fixedperiod: timetickets(
+      where: {
+        date: { _gte: $fixedStart, _lte: $fixedEnd }
+        employeeid: { _eq: $employeeid }
+      }
+      order_by: { date: desc_nulls_first }
+    ) {
+      actualhrs
+      ciecacode
+      clockoff
+      clockon
+      cost_center
+      created_at
+      date
+      id
+      rate
+      productivehrs
+      memo
+      jobid
+      flat_rate
+      job {
+        id
+        ro_number
+      }
+      employeeid
+      employee {
+        id
+        employee_number
+        first_name
+        last_name
+      }
+    }
+  }
+`;
+
 export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
  query QUERY_TIME_TICKETS_IN_RANGE_SB(
    $start: date!
--- a/client/src/graphql/vehicles.queries.js
+++ b/client/src/graphql/vehicles.queries.js
@@ -55,6 +55,14 @@ export const UPDATE_VEHICLE = gql`
  }
 `;

+export const DELETE_VEHICLE = gql`
+  mutation DELETE_VEHICLE($id: uuid!) {
+    delete_vehicles_by_pk(id: $id) {
+      id
+    }
+  }
+`;
+
 export const QUERY_ALL_VEHICLES = gql`
  query QUERY_ALL_VEHICLES {
    vehicles {