From 417958e1e8b91d248ffaebab154878fea6da0eae Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 16 Mar 2022 15:50:03 -0700
Subject: [PATCH 1/3] Additional Autohouse Updates.

---
 server/data/autohouse.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 217f68c60..6a1c3efea 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -96,7 +96,7 @@ exports.default = async (req, res) => {
           count: autoHouseObject.AutoHouseExport.RepairOrder.length,
           xml: ret,
           filename: `IM_${bodyshop.autohouseid}_${moment().format(
-            "DDMMYYYY_HHMMSS"
+            "DDMMYYYY_HHMMss"
           )}.xml`,
         });
 
@@ -332,6 +332,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
             moment(job.scheduled_delivery)
               .tz(job.bodyshop.timezone)
               .format(AhDateFormat)) ||
+          (job.scheduled_completion &&
+            moment(job.scheduled_completion)
+              .tz(job.bodyshop.timezone)
+              .format(AhDateFormat)) ||
           "",
         DateClosed:
           (job.date_invoiced &&
@@ -538,7 +542,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         ),
         GlassLaborTotalCost:
           repairCosts.GlassLaborTotalCost.toFormat(AHDineroFormat),
-        DetailLaborTotal: Dinero(job.job_totals.rates.lag.total).toFormat(
+        DetailLaborTotal: Dinero(job.job_totals.rates.lad.total).toFormat(
           AHDineroFormat
         ),
         DetailLaborTotalCost:
@@ -590,7 +594,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
           AHDineroFormat
         ),
         InsurancePay: Dinero(job.job_totals.totals.total_repairs)
-          .subtract(Dinero(job.job_totals.totals.custPayable))
+          .subtract(Dinero(job.job_totals.totals.custPayable.total))
           .toFormat(AHDineroFormat),
         Deposit: 0,
         AmountDue: 0,

From f59911d5ab366e1f3bc634a49e4090d325bbb9a5 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 16 Mar 2022 16:38:41 -0700
Subject: [PATCH 2/3] Autohouse Adjustment

---
 server/data/autohouse.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 6a1c3efea..8e0befe51 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -328,10 +328,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
               .format(AhDateFormat)) ||
           "",
         DeliveryAppointmentDate:
-          (job.scheduled_delivery &&
-            moment(job.scheduled_delivery)
-              .tz(job.bodyshop.timezone)
-              .format(AhDateFormat)) ||
+          // (job.scheduled_delivery &&
+          //   moment(job.scheduled_delivery)
+          //     .tz(job.bodyshop.timezone)
+          //     .format(AhDateFormat)) ||
           (job.scheduled_completion &&
             moment(job.scheduled_completion)
               .tz(job.bodyshop.timezone)

From 71f161ec2756cb0ef8bbe23d53eaae08beec470a Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 17 Mar 2022 15:47:40 -0700
Subject: [PATCH 3/3] IO-1774 Remove scheduled completion date on void.

---
 .../jobs-detail-header-actions.component.jsx                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index 5a9715a96..4222addc2 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -402,6 +402,7 @@ export function JobsDetailHeaderActions({
                     status: bodyshop.md_ro_statuses.default_void,
                     voided: true,
                     scheduled_in: null,
+                    scheduled_completion: null,
                     inproduction: false,
                   },
                   note: [