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

Merge remote-tracking branch 'origin/release/2025-12-05' into feature/IO-3357-Reynolds-and-Reynolds-DMS-API-Integration

Browse Source
This commit is contained in:
Dave
2025-11-26 11:30:33 -05:00
parent 910d388e05 7bc137fa79
commit 3d6498f938
3 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
client/src/redux/user/user.sagas.js
View File

@@ -50,7 +50,7 @@ import {
} from "./user.actions"; } from "./user.actions";
import UserActionTypes from "./user.types"; import UserActionTypes from "./user.types";
//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 fpPromise = FingerprintJS.load(); const fpPromise = FingerprintJS.load();
@@ -269,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
instanceSeg, instanceSeg,
...(isParts ...(isParts
? [ ? [
InstanceRenderManager({ InstanceRenderManager({
imex: "ImexPartsManagement", imex: "ImexPartsManagement",
rome: "RomePartsManagement" rome: "RomePartsManagement"
}) })
] ]
: []) : [])
]; ];
window.$crisp.push(["set", "session:segments", [segs]]); window.$crisp.push(["set", "session:segments", [segs]]);
@@ -375,17 +375,31 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
const isParts = yield select((state) => state.application.isPartsEntry === true); const isParts = yield select((state) => state.application.isPartsEntry === true);
const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" }); const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
let featureSegments; const featureSegments =
if (payload.features?.allAccess === true) { payload.features?.allAccess === true
featureSegments = ["allAccess"]; ? ["allAccess"]
} else { : [
const featureKeys = Object.keys(payload.features).filter( "basic",
(key) => ...Object.keys(payload.features).filter(
payload.features[key] === true || (key) =>
(typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key]))) payload.features[key] === true ||
); (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
featureSegments = ["basic", ...featureKeys]; )
} ];
const additionalSegments = [
payload.cdk_dealerid && "CDK",
payload.pbs_serialnumber && "PBS",
// payload.rr_dealerid && "Reynolds",
payload.accountingconfig.qbo === true && "QBO",
payload.accountingconfig.qbo === false &&
!payload.cdk_dealerid &&
!payload.pbs_serialnumber &&
// !payload.rr_dealerid &&
"QBD"
].filter(Boolean);
featureSegments.push(...additionalSegments);
const regionSeg = payload.region_config ? `region:${payload.region_config}` : null; const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments]; const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];

2
client/src/utils/TemplateConstants.js
View File

@@ -1221,7 +1221,7 @@ export const TemplateList = (type, context) => {
payments_by_date_excel: { payments_by_date_excel: {
title: i18n.t("reportcenter.templates.payments_by_date_excel"), title: i18n.t("reportcenter.templates.payments_by_date_excel"),
subject: i18n.t("reportcenter.templates.payments_by_date_excel"), subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
key: "payments_by_date", key: "payments_by_date_excel",
reporttype: "excel", reporttype: "excel",
disabled: false, disabled: false,
rangeFilter: { rangeFilter: {

4
server/notifications/scenarioBuilders.js
View File

@@ -81,8 +81,8 @@ const alternateTransportChangedBuilder = (data) => {
* @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}} * @returns {{app: {jobId, jobRoNumber: *, bodyShopId: *, key: string, body: string, variables: Object, recipients: *[]}, email: {jobId, jobRoNumber: *, bodyShopName: *, body: string, recipients: *[]}, fcm: {recipients: *[]}}}
*/ */
const billPostedBuilder = (data) => { const billPostedBuilder = (data) => {
const facing = data?.data?.isinhouse ? "in-house" : "vendor"; const facing = data?.data?.isinhouse ? "An In House" : "A Vendor";
const body = `An ${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim(); const body = `${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
return buildNotification(data, "notifications.job.billPosted", body, { return buildNotification(data, "notifications.job.billPosted", body, {
isInHouse: data?.data?.isinhouse, isInHouse: data?.data?.isinhouse,