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

Merge branch 'release/2021-10-29' into test

Browse Source
This commit is contained in:
Patrick Fic
2021-10-27 08:30:03 -07:00
parent 9e3a2e920d 331b2c517b
commit ff53355b4a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-detail-general/jobs-detail-general.component.jsx
View File

@@ -135,7 +135,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
label={t("jobs.fields.referral_source_extra")} label={t("jobs.fields.referral_source_extra")}
name="referral_source_extra" name="referral_source_extra"
> >
<Input /> <Input disabled={jobRO}/>
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.alt_transport")} name="alt_transport"> <Form.Item label={t("jobs.fields.alt_transport")} name="alt_transport">
<Select disabled={jobRO} allowClear> <Select disabled={jobRO} allowClear>

12
server/cdk/cdk-job-export.js
View File

@@ -584,15 +584,21 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
addressLine: addressLine:
socket.JobData.ownr_addr1 && socket.JobData.ownr_addr1 &&
socket.JobData.ownr_addr1.replace(replaceSpecialRegex, ""), socket.JobData.ownr_addr1.replace(replaceSpecialRegex, ""),
city: socket.JobData.ownr_city&& socket.JobData.ownr_city.replace(replaceSpecialRegex, ""), city:
country: null, socket.JobData.ownr_city &&
socket.JobData.ownr_city.replace(replaceSpecialRegex, ""),
country:
socket.JobData.ownr_ctry &&
socket.JobData.ownr_ctry.replace(replaceSpecialRegex, ""),
postalCode: postalCode:
socket.JobData.ownr_zip && socket.JobData.ownr_zip &&
socket.JobData.ownr_zip //TODO Need to remove for US Based customers. socket.JobData.ownr_zip //TODO Need to remove for US Based customers.
.toUpperCase() .toUpperCase()
.replace(/\W/g, "") .replace(/\W/g, "")
.replace(/(...)/, "$1 "), .replace(/(...)/, "$1 "),
stateOrProvince: socket.JobData.ownr_st&&socket.JobData.ownr_st.replace(replaceSpecialRegex, ""), stateOrProvince:
socket.JobData.ownr_st &&
socket.JobData.ownr_st.replace(replaceSpecialRegex, ""),
}, },
contactInfo: { contactInfo: {
mainTelephoneNumber: { mainTelephoneNumber: {