Compare commits
10 Commits
rrScratch3
...
feature/IO
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d94ce7e5c | ||
|
|
182a8d59ab | ||
|
|
6ea1c291e6 | ||
|
|
05d5c96491 | ||
|
|
35a566cbe5 | ||
|
|
f12e40e4c6 | ||
|
|
bb4e671c83 | ||
|
|
d1637d2432 | ||
|
|
1c79628613 | ||
|
|
521a7084b7 |
@@ -138,7 +138,7 @@ export function App({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentEula && !currentUser.eulaIsAccepted) {
|
if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
|
||||||
return <Eula />;
|
return <Eula />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,8 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
|
|||||||
const useremail = currentUser.email;
|
const useremail = currentUser.email;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { ...otherFormValues } = formValues;
|
// eslint-disable-next-line no-unused-vars
|
||||||
|
const { accepted_terms, ...otherFormValues } = formValues;
|
||||||
|
|
||||||
// Trim the values of the fields before submitting
|
// Trim the values of the fields before submitting
|
||||||
const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {
|
const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {
|
||||||
|
|||||||
@@ -609,7 +609,7 @@ export function JobsDetailHeaderActions({
|
|||||||
<FormDateTimePickerComponent
|
<FormDateTimePickerComponent
|
||||||
onBlur={() => {
|
onBlur={() => {
|
||||||
const start = form.getFieldValue("start");
|
const start = form.getFieldValue("start");
|
||||||
form.setFieldsValue({ end: start.add(30, "minutes") });
|
form.setFieldsValue({ end: start?.add(30, "minutes") });
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|||||||
@@ -144,7 +144,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
|
|||||||
<Spin spinning={loading}>
|
<Spin spinning={loading}>
|
||||||
{record[type] ? (
|
{record[type] ? (
|
||||||
<div>
|
<div>
|
||||||
<span>{`${theEmployee.first_name || ""} ${theEmployee.last_name || ""}`}</span>
|
<span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
|
||||||
<DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
|
<DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { getFirestore } from "@firebase/firestore";
|
|||||||
import { getMessaging, getToken, onMessage } from "@firebase/messaging";
|
import { getMessaging, getToken, onMessage } from "@firebase/messaging";
|
||||||
import { store } from "../redux/store";
|
import { store } from "../redux/store";
|
||||||
//import * as amplitude from '@amplitude/analytics-browser';
|
//import * as amplitude from '@amplitude/analytics-browser';
|
||||||
import posthog from 'posthog-js'
|
// import posthog from 'posthog-js'
|
||||||
|
|
||||||
const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
|
const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
|
||||||
initializeApp(config);
|
initializeApp(config);
|
||||||
@@ -74,7 +74,6 @@ onMessage(messaging, (payload) => {
|
|||||||
|
|
||||||
export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
|
export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
const state = stateProp || store.getState();
|
const state = stateProp || store.getState();
|
||||||
|
|
||||||
const eventParams = {
|
const eventParams = {
|
||||||
@@ -99,8 +98,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
|
|||||||
// );
|
// );
|
||||||
logEvent(analytics, eventName, eventParams);
|
logEvent(analytics, eventName, eventParams);
|
||||||
//amplitude.track(eventName, eventParams);
|
//amplitude.track(eventName, eventParams);
|
||||||
posthog.capture(eventName, eventParams);
|
//posthog.capture(eventName, eventParams);
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
//If it fails, just keep going.
|
//If it fails, just keep going.
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,8 @@ if (!import.meta.env.DEV) {
|
|||||||
"Module specifier, 'fs' does not start",
|
"Module specifier, 'fs' does not start",
|
||||||
"Module specifier, 'zlib' does not start with",
|
"Module specifier, 'zlib' does not start with",
|
||||||
"Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
|
"Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
|
||||||
"Failed to update a ServiceWorker for scope"
|
"Failed to update a ServiceWorker for scope",
|
||||||
|
"Network Error"
|
||||||
],
|
],
|
||||||
integrations: [
|
integrations: [
|
||||||
// See docs for support of different versions of variation of react router
|
// See docs for support of different versions of variation of react router
|
||||||
|
|||||||
@@ -24,11 +24,13 @@ const lightningCssTargets = browserslistToTargets(
|
|||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
|
||||||
const currentDatePST = new Date()
|
const pstFormatter = new Intl.DateTimeFormat("en-CA", {
|
||||||
.toLocaleDateString("en-US", { timeZone: "America/Los_Angeles", year: "numeric", month: "2-digit", day: "2-digit" })
|
timeZone: "America/Los_Angeles",
|
||||||
.split("/")
|
year: "numeric",
|
||||||
.reverse()
|
month: "2-digit",
|
||||||
.join("-");
|
day: "2-digit"
|
||||||
|
});
|
||||||
|
const currentDatePST = pstFormatter.format(new Date());
|
||||||
|
|
||||||
const getFormattedTimestamp = () =>
|
const getFormattedTimestamp = () =>
|
||||||
new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");
|
new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");
|
||||||
|
|||||||
@@ -117,44 +117,46 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
|
|||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
json: JSON.stringify(carfaxObject, null, 2),
|
json: JSON.stringify(carfaxObject, null, 2),
|
||||||
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
||||||
count: carfaxObject.job.length
|
count: carfaxObject?.job?.length || 0
|
||||||
};
|
};
|
||||||
|
|
||||||
if (skipUpload) {
|
if (skipUpload) {
|
||||||
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
||||||
uploadToS3(jsonObj, S3_BUCKET_NAME);
|
uploadToS3(jsonObj, S3_BUCKET_NAME);
|
||||||
} else {
|
} else {
|
||||||
await uploadViaSFTP(jsonObj);
|
if (jsonObj.count > 0) {
|
||||||
|
await uploadViaSFTP(jsonObj);
|
||||||
|
|
||||||
await sendMexicoBillingEmail({
|
await sendMexicoBillingEmail({
|
||||||
subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
||||||
text: `Errors:\n${JSON.stringify(
|
text: `Errors:\n${JSON.stringify(
|
||||||
erroredJobs.map((ej) => ({
|
erroredJobs.map((ej) => ({
|
||||||
jobid: ej.job?.id,
|
jobid: ej.job?.id,
|
||||||
error: ej.error
|
error: ej.error
|
||||||
})),
|
})),
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}\n\nUploaded:\n${JSON.stringify(
|
)}\n\nUploaded:\n${JSON.stringify(
|
||||||
{
|
{
|
||||||
bodyshopid: bodyshop.id,
|
bodyshopid: bodyshop.id,
|
||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}`
|
)}`
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allJSONResults.push({
|
jsonObj.count > 0 && allJSONResults.push({
|
||||||
bodyshopid: bodyshop.id,
|
bodyshopid: bodyshop.id,
|
||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result || "No Upload Result Available"
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
||||||
@@ -234,11 +236,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
|
|||||||
const ret = {
|
const ret = {
|
||||||
ro_number: crypto.createHash("md5").update(job.id, "utf8").digest("hex"),
|
ro_number: crypto.createHash("md5").update(job.id, "utf8").digest("hex"),
|
||||||
v_vin: job.v_vin || "",
|
v_vin: job.v_vin || "",
|
||||||
v_year: job.v_model_yr
|
v_year: (() => {
|
||||||
? parseInt(job.v_model_yr.match(/\d/g))
|
const y = parseInt(job.v_model_yr);
|
||||||
? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
|
return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
|
||||||
: ""
|
})(),
|
||||||
: "",
|
|
||||||
v_make: job.v_makedesc || "",
|
v_make: job.v_makedesc || "",
|
||||||
v_model: job.v_model || "",
|
v_model: job.v_model || "",
|
||||||
|
|
||||||
|
|||||||
@@ -160,40 +160,42 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
|
|||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
json: JSON.stringify(carfaxObject, null, 2),
|
json: JSON.stringify(carfaxObject, null, 2),
|
||||||
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
|
||||||
count: carfaxObject.job.length
|
count: carfaxObject?.job?.length || 0
|
||||||
};
|
};
|
||||||
|
|
||||||
if (skipUpload) {
|
if (skipUpload) {
|
||||||
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
|
||||||
uploadToS3(jsonObj);
|
uploadToS3(jsonObj);
|
||||||
} else {
|
} else {
|
||||||
await uploadViaSFTP(jsonObj);
|
if (jsonObj.count > 0) {
|
||||||
|
await uploadViaSFTP(jsonObj);
|
||||||
|
|
||||||
await sendMexicoBillingEmail({
|
await sendMexicoBillingEmail({
|
||||||
subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
|
subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
|
||||||
imex: "IO",
|
imex: "IO",
|
||||||
rome: "RO"
|
rome: "RO"
|
||||||
})}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
})}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
|
||||||
text: `Errors:\n${JSON.stringify(
|
text: `Errors:\n${JSON.stringify(
|
||||||
erroredJobs.map((ej) => ({
|
erroredJobs.map((ej) => ({
|
||||||
ro_number: ej.job?.ro_number,
|
ro_number: ej.job?.ro_number,
|
||||||
jobid: ej.job?.id,
|
jobid: ej.job?.id,
|
||||||
error: ej.error
|
error: ej.error
|
||||||
})),
|
})),
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}\n\nUploaded:\n${JSON.stringify(
|
)}\n\nUploaded:\n${JSON.stringify(
|
||||||
{
|
{
|
||||||
bodyshopid: bodyshop.id,
|
bodyshopid: bodyshop.id,
|
||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result
|
||||||
},
|
},
|
||||||
null,
|
null,
|
||||||
2
|
2
|
||||||
)}`
|
)}`
|
||||||
});
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
allJSONResults.push({
|
allJSONResults.push({
|
||||||
@@ -201,7 +203,7 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
|
|||||||
imexshopid: shopid,
|
imexshopid: shopid,
|
||||||
count: jsonObj.count,
|
count: jsonObj.count,
|
||||||
filename: jsonObj.filename,
|
filename: jsonObj.filename,
|
||||||
result: jsonObj.result
|
result: jsonObj.result || "No Upload Result Available"
|
||||||
});
|
});
|
||||||
|
|
||||||
logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, {
|
||||||
@@ -286,11 +288,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
|
|||||||
const ret = {
|
const ret = {
|
||||||
ro_number: crypto.createHash("md5").update(job.ro_number, "utf8").digest("hex"),
|
ro_number: crypto.createHash("md5").update(job.ro_number, "utf8").digest("hex"),
|
||||||
v_vin: job.v_vin || "",
|
v_vin: job.v_vin || "",
|
||||||
v_year: job.v_model_yr
|
v_year: (() => {
|
||||||
? parseInt(job.v_model_yr.match(/\d/g))
|
const y = parseInt(job.v_model_yr);
|
||||||
? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
|
return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
|
||||||
: ""
|
})(),
|
||||||
: "",
|
|
||||||
v_make: job.v_make_desc || "",
|
v_make: job.v_make_desc || "",
|
||||||
v_model: job.v_model_desc || "",
|
v_model: job.v_model_desc || "",
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user