diff --git a/server/data/autohouse.js b/server/data/autohouse.js index 679a455b9..b30196153 100644 --- a/server/data/autohouse.js +++ b/server/data/autohouse.js @@ -334,12 +334,17 @@ const CreateRepairOrderTag = (job, errorCallback) => { .format(AhDateFormat)) || "", InsInspDate: null, - StartDate: - (job.actual_in && - moment(job.actual_in) - .tz(job.bodyshop.timezone) - .format(AhDateFormat)) || - "", + StartDate: job.date_repairstarted + ? (job.date_repairstarted && + moment(job.date_repairstarted) + .tz(job.bodyshop.timezone) + .format(AhDateFormat)) || + "" + : (job.date_repairstarted && + moment(job.actual_in) + .tz(job.bodyshop.timezone) + .format(AhDateFormat)) || + "", PartsOrder: null, TeardownHold: null, SupplementSubmittedDate: null, @@ -496,7 +501,13 @@ const CreateRepairOrderTag = (job, errorCallback) => { FrameHours: job.job_totals.rates.laf.hours.toFixed(2), GlassHours: job.job_totals.rates.lag.hours.toFixed(2), DetailHours: job.job_totals.rates.lad.hours.toFixed(2), - LaborMiscHours: 0, + LaborMiscHours: ( + job.job_totals.rates.la1.hours + + job.job_totals.rates.la2.hours + + job.job_totals.rates.la3.hours + + job.job_totals.rates.la4.hours + + job.job_totals.rates.lau.hours + ).toFixed(2), PartsTotal: Dinero(job.job_totals.parts.parts.total).toFormat( AHDineroFormat @@ -579,7 +590,12 @@ const CreateRepairOrderTag = (job, errorCallback) => { ), DetailLaborTotalCost: repairCosts.DetailLaborTotalCost.toFormat(AHDineroFormat), - LaborMiscTotal: 0, + LaborMiscTotal: Dinero(job.job_totals.rates.la1.total) + .add(Dinero(job.job_totals.rates.la2.total)) + .add(Dinero(job.job_totals.rates.la3.total)) + .add(Dinero(job.job_totals.rates.la4.total)) + .add(Dinero(job.job_totals.rates.lau.total)) + .toFormat(AHDineroFormat), LaborMiscTotalCost: 0, MiscellaneousChargeTotal: 0, MiscellaneousChargeTotalCost: 0, diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js index cc03153dd..e0c1509c7 100644 --- a/server/graphql-client/queries.js +++ b/server/graphql-client/queries.js @@ -695,6 +695,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop driveable parts_tax_rates ded_amt + date_repairstarted joblines(where: {removed: {_eq: false}}) { id line_no @@ -1010,6 +1011,7 @@ vehicle{ date_scheduled date_invoiced date_exported + date_repairstarted status owner_owing tax_registration_number