Merge branch 'feature/payroll' into feature/america

2023-05-17 07:51:57 -07:00
parent 89bbf274e5 097dc06c65
commit cbb195a313
15 changed files with 470 additions and 32 deletions
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -117,6 +117,7 @@ export const QUERY_BODYSHOP = gql`
      md_parts_scan
      enforce_conversion_category
      tt_enforce_hours_for_tech_console
+      md_tasks_presets
      use_paint_scale_data
      employees {
        user_email
@@ -233,6 +234,7 @@ export const UPDATE_SHOP = gql`
        md_parts_scan
        enforce_conversion_category
        tt_enforce_hours_for_tech_console
+        md_tasks_presets
        employees {
          id
          first_name
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -67,7 +67,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
      clockoff
      rate
      committed_at
-      committed_by
+      commited_by
      employee {
        id
        first_name
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -159,7 +159,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
      memo
      jobid
      committed_at
-      committed_by
+      commited_by
      flat_rate
      job {
        id