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

Merged in release/2023-07-07 (pull request #870)

Browse Source 
IO-2340 CDK New Unsold Vehicle adjustments
This commit is contained in:
Allan Carr
2023-06-22 22:46:52 +00:00
parent 3512905264 0652404334
commit b0df5fa91c
3 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/dms-post-form/dms-post-form.component.jsx
View File

@@ -187,8 +187,9 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
<Form.Item <Form.Item
name="dms_unsold" name="dms_unsold"
label={t("jobs.fields.dms.dms_unsold")} label={t("jobs.fields.dms.dms_unsold")}
initialValue={false}
> >
<Switch defaultChecked={false} /> <Switch />
</Form.Item> </Form.Item>
</Space> </Space>
</div> </div>

3
client/src/pages/dms/dms.container.jsx
View File

@@ -45,7 +45,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
export const socket = SocketIO( export const socket = SocketIO(
process.env.NODE_ENV === "production" process.env.NODE_ENV === "production"
? process.env.REACT_APP_AXIOS_BASE_API_URL ? process.env.REACT_APP_AXIOS_BASE_API_URL
: window.location.origin, //"http://localhost:4000" for dev testing, : window.location.origin,
// "http://localhost:4000", // for dev testing,
{ {
path: "/ws", path: "/ws",
withCredentials: true, withCredentials: true,

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

@@ -717,22 +717,24 @@ async function InsertDmsVehicle(socket) {
dealer: { dealer: {
dealerNumber: socket.JobData.bodyshop.cdk_dealerid, dealerNumber: socket.JobData.bodyshop.cdk_dealerid,
...(socket.txEnvelope.inservicedate && { ...(socket.txEnvelope.inservicedate && {
inServiceDate: socket.txEnvelope.dms_unsold === true inServiceDate:
? "" socket.txEnvelope.dms_unsold === true
: moment(socket.txEnvelope.inservicedate) ? ""
//.tz(socket.JobData.bodyshop.timezone) : moment(socket.txEnvelope.inservicedate)
.startOf("day") //.tz(socket.JobData.bodyshop.timezone)
.toISOString(), .startOf("day")
.toISOString(),
}), }),
vehicleId: socket.DMSVid.vehiclesVehId, vehicleId: socket.DMSVid.vehiclesVehId,
}, },
manufacturer: {}, manufacturer: {},
vehicle: { vehicle: {
deliveryDate: socket.txEnvelope.dms_unsold === true deliveryDate:
? "" socket.txEnvelope.dms_unsold === true
: moment() ? ""
// .tz(socket.JobData.bodyshop.timezone) : moment()
.format("YYYYMMDD"), // .tz(socket.JobData.bodyshop.timezone)
.format("YYYYMMDD"),
licensePlateNo: licensePlateNo:
socket.JobData.plate_no === null socket.JobData.plate_no === null
? null ? null
@@ -864,19 +866,25 @@ async function UpdateDmsVehicle(socket) {
...socket.DMSVeh.dealer, ...socket.DMSVeh.dealer,
...((socket.txEnvelope.inservicedate || ...((socket.txEnvelope.inservicedate ||
socket.DMSVeh.dealer.inServiceDate) && { socket.DMSVeh.dealer.inServiceDate) && {
inServiceDate: moment( inServiceDate:
socket.DMSVeh.dealer.inServiceDate || socket.txEnvelope.dms_unsold === true
socket.txEnvelope.inservicedate ? ""
) : moment(
// .tz(socket.JobData.bodyshop.timezone) socket.DMSVeh.dealer.inServiceDate ||
.toISOString(), socket.txEnvelope.inservicedate
)
// .tz(socket.JobData.bodyshop.timezone)
.toISOString(),
}), }),
}, },
vehicle: { vehicle: {
...socket.DMSVeh.vehicle, ...socket.DMSVeh.vehicle,
deliveryDate: moment(socket.DMSVeh.vehicle.deliveryDate) deliveryDate:
//.tz(socket.JobData.bodyshop.timezone) socket.txEnvelope.dms_unsold === true
.toISOString(), ? ""
: moment(socket.DMSVeh.vehicle.deliveryDate)
//.tz(socket.JobData.bodyshop.timezone)
.toISOString(),
}, },
owners: ids, owners: ids,
}, },