Compare commits

..

1 Commits

Author SHA1 Message Date
Allan Carr
a5f7ff3089 IO-3491 QBO SALESTERMSREF
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2025-12-31 09:25:12 -08:00
4 changed files with 20 additions and 28 deletions

View File

@@ -161,6 +161,7 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
dataIndex: "actual_in_time",
key: "actual_in_time",
ellipsis: true,
render: (text, record) => <TimeFormatter>{record.actual_in}</TimeFormatter>
},
{
@@ -180,22 +181,6 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
render: (text, record) => <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
},
{
title: i18n.t("jobs.fields.actual_completion"),
dataIndex: "actual_completion",
key: "actual_completion",
ellipsis: true,
sorter: (a, b) => dateSort(a.actual_completion, b.actual_completion),
sortOrder: state.sortedInfo.columnKey === "actual_completion" && state.sortedInfo.order,
render: (text, record) => <ProductionListDate record={record} field="actual_completion" time />
},
{
title: i18n.t("jobs.fields.actual_completion") + " (HH:MM)",
dataIndex: "actual_completion_time",
key: "actual_completion_time",
ellipsis: true,
render: (text, record) => <TimeFormatter>{record.actual_completion}</TimeFormatter>
},
{
title: i18n.t("jobs.fields.date_last_contacted"),
dataIndex: "date_last_contacted",

View File

@@ -1096,7 +1096,6 @@ export const UPDATE_JOB = gql`
scheduled_completion
scheduled_delivery
actual_in
actual_completion
date_repairstarted
date_void
date_lost_sale
@@ -2593,7 +2592,6 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
vehicleid
plate_no
actual_in
actual_completion
scheduled_completion
scheduled_delivery
date_last_contacted

View File

@@ -239,13 +239,22 @@ export function* signInSuccessSaga({ payload }) {
try {
window.$crisp.push(["set", "user:nickname", [payload.displayName || payload.email]]);
const currentUserSegment = InstanceRenderManager({
imex: "imex-online-user",
rome: "rome-online-user"
});
window.$crisp.push(["set", "session:segments", [[currentUserSegment]]]);
InstanceRenderManager({
executeFunction: true,
args: [],
imex: () => {
window.$crisp.push(["set", "session:segments", [["imex"]]]);
},
rome: () => {
window.$zoho.salesiq.visitor.name(payload.displayName || payload.email);
window.$zoho.salesiq.visitor.email(payload.email);
window.$crisp.push(["set", "session:segments", [["rome"]]]);
}
});
@@ -253,13 +262,11 @@ export function* signInSuccessSaga({ payload }) {
try {
const state = yield select();
const isParts = state?.application?.isPartsEntry === true;
const instanceSeg = InstanceRenderManager({
imex: ["imex-online-user", "imex"],
rome: ["rome-online-user", "rome"]
});
const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
// Always ensure segments include instance + user, and append partsManagement if applicable
const segs = [
...instanceSeg,
currentUserSegment,
instanceSeg,
...(isParts
? [
InstanceRenderManager({
@@ -366,10 +373,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
// Build consolidated Crisp segments including instance, region, features, and parts mode
const isParts = yield select((state) => state.application.isPartsEntry === true);
const instanceSeg = InstanceRenderManager({
imex: ["imex-online-user", "imex"],
rome: ["rome-online-user", "rome"]
});
const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
const featureSegments =
payload.features?.allAccess === true
@@ -398,7 +402,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
featureSegments.push(...additionalSegments);
const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
const segments = [...instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
if (isParts) {
segments.push(InstanceRenderManager({ imex: "ImexPartsManagement", rome: "RomePartsManagement" }));
}

View File

@@ -283,6 +283,11 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
VendorRef: {
value: vendor.Id
},
...(vendor.TermRef && {
SalesTermRef: {
value: vendor.TermRef.value
}
}),
TxnDate: moment(bill.date)
//.tz(bill.job.bodyshop.timezone)
.format("YYYY-MM-DD"),