Merge remote-tracking branch 'origin/master' into feature/payroll

2023-04-17 13:12:47 -07:00
parent 542eca5867 ed6eab4c38
commit 8465e7539f
25 changed files with 373 additions and 49 deletions
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -116,6 +116,7 @@ export const QUERY_BODYSHOP = gql`
      md_lost_sale_reasons
      md_parts_scan
      enforce_conversion_category
+      tt_enforce_hours_for_tech_console
      employees {
        user_email
        id
@@ -230,6 +231,7 @@ export const UPDATE_SHOP = gql`
        md_lost_sale_reasons
        md_parts_scan
        enforce_conversion_category
+        tt_enforce_hours_for_tech_console
        employees {
          id
          first_name
--- 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