Merge branch 'release/2023-04-28' into feature/america

server/graphql-client/queries.js

@@ -661,7 +661,6 @@ exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employee
 
 exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
   bodyshops_by_pk(id: $bodyshopid){
-
       id
       shopname
       address1
@@ -677,6 +676,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       jc_hourly_rates
       cdk_dealerid
       pbs_serialnumber
+      use_paint_scale_data
     timezone
   }
   jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {updated_at: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {
@@ -832,6 +832,10 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       employee_number
       id
     }
+    mixdata(limit: 1, order_by: {updated_at: desc}) {
+      jobid
+      totalliquidcost
+    }
   }
 }
 `;
@@ -1227,12 +1231,17 @@ exports.QUERY_JOB_COSTING_DETAILS = ` query QUERY_JOB_COSTING_DETAILS($id: uuid!
         flat_rate
         ciecacode
       }
+      mixdata(limit: 1, order_by: {updated_at: desc}) {
+        jobid
+        totalliquidcost
+      }
       bodyshop{
         id
         md_responsibility_centers
         jc_hourly_rates
         cdk_dealerid
         pbs_serialnumber
+        use_paint_scale_data
       }
     }
   }`;
@@ -1335,12 +1344,17 @@ exports.QUERY_JOB_COSTING_DETAILS_MULTI = ` query QUERY_JOB_COSTING_DETAILS_MULT
       flat_rate
       ciecacode
     }
+    mixdata(limit: 1, order_by: {updated_at: desc}) {
+      jobid
+      totalliquidcost
+    }
     bodyshop {
       id
       md_responsibility_centers
       jc_hourly_rates
       cdk_dealerid
-        pbs_serialnumber
+      pbs_serialnumber
+      use_paint_scale_data
     }
   }
 }
@@ -1798,3 +1812,11 @@ exports.UPDATE_PARTS_CRITICAL = `mutation UPDATE_PARTS_CRITICAL ($IdsToMarkCriti
     affected_rows
   }
 }`;
+
+exports.ACTIVE_SHOP_BY_USER = `query ACTIVE_SHOP_BY_USER($user: String) {
+  associations(where: {active: {_eq: true}, useremail: {_eq: $user}}) {
+    id
+    shopid
+  }
+}
+`;