admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2022-03-18 (pull request #425)

Browse Source 
Release/2022 03 18
This commit is contained in:
Patrick Fic
2022-03-17 22:48:36 +00:00
parent ac8ae34e1d 71f161ec27
commit f9f1dbaf24
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
View File

@@ -402,6 +402,7 @@ export function JobsDetailHeaderActions({
status: bodyshop.md_ro_statuses.default_void, status: bodyshop.md_ro_statuses.default_void,
voided: true, voided: true,
scheduled_in: null, scheduled_in: null,
scheduled_completion: null,
inproduction: false, inproduction: false,
}, },
note: [ note: [

14
server/data/autohouse.js
View File

@@ -96,7 +96,7 @@ exports.default = async (req, res) => {
count: autoHouseObject.AutoHouseExport.RepairOrder.length, count: autoHouseObject.AutoHouseExport.RepairOrder.length,
xml: ret, xml: ret,
filename: `IM_${bodyshop.autohouseid}_${moment().format( filename: `IM_${bodyshop.autohouseid}_${moment().format(
"DDMMYYYY_HHMMSS" "DDMMYYYY_HHMMss"
)}.xml`, )}.xml`,
}); });
@@ -328,8 +328,12 @@ const CreateRepairOrderTag = (job, errorCallback) => {
.format(AhDateFormat)) || .format(AhDateFormat)) ||
"", "",
DeliveryAppointmentDate: DeliveryAppointmentDate:
(job.scheduled_delivery && // (job.scheduled_delivery &&
moment(job.scheduled_delivery) // moment(job.scheduled_delivery)
// .tz(job.bodyshop.timezone)
// .format(AhDateFormat)) ||
(job.scheduled_completion &&
moment(job.scheduled_completion)
.tz(job.bodyshop.timezone) .tz(job.bodyshop.timezone)
.format(AhDateFormat)) || .format(AhDateFormat)) ||
"", "",
@@ -538,7 +542,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
), ),
GlassLaborTotalCost: GlassLaborTotalCost:
repairCosts.GlassLaborTotalCost.toFormat(AHDineroFormat), repairCosts.GlassLaborTotalCost.toFormat(AHDineroFormat),
DetailLaborTotal: Dinero(job.job_totals.rates.lag.total).toFormat( DetailLaborTotal: Dinero(job.job_totals.rates.lad.total).toFormat(
AHDineroFormat AHDineroFormat
), ),
DetailLaborTotalCost: DetailLaborTotalCost:
@@ -590,7 +594,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
AHDineroFormat AHDineroFormat
), ),
InsurancePay: Dinero(job.job_totals.totals.total_repairs) 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), .toFormat(AHDineroFormat),
Deposit: 0, Deposit: 0,
AmountDue: 0, AmountDue: 0,