diff --git a/client/src/App/App.jsx b/client/src/App/App.jsx index e51fb2dfd..54808973e 100644 --- a/client/src/App/App.jsx +++ b/client/src/App/App.jsx @@ -153,9 +153,9 @@ export function App({ fallback={ } diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx index d23343a89..23d73b203 100644 --- a/client/src/components/header/header.component.jsx +++ b/client/src/components/header/header.component.jsx @@ -587,8 +587,9 @@ function Header({ label: ( diff --git a/client/src/components/partner-ping/partner-ping.component.jsx b/client/src/components/partner-ping/partner-ping.component.jsx index 299f52aed..23a877e81 100644 --- a/client/src/components/partner-ping/partner-ping.component.jsx +++ b/client/src/components/partner-ping/partner-ping.component.jsx @@ -57,7 +57,7 @@ export async function checkPartnerStatus(bodyshop) { // }); // } } catch (error) { - console.log("ImEX Online Partner is not running.", error); + console.log("Partner is not running.", error); // notification["error"]({ // title: "", // message: i18n.t("general.messages.partnernotrunning"), diff --git a/client/src/components/sign-in-form/sign-in-form.component.jsx b/client/src/components/sign-in-form/sign-in-form.component.jsx index 8b57e2995..644b01ab2 100644 --- a/client/src/components/sign-in-form/sign-in-form.component.jsx +++ b/client/src/components/sign-in-form/sign-in-form.component.jsx @@ -53,7 +53,7 @@ export function SignInComponent({ return (
- Rome Online + {InstanceRenderManager({imex:t("titles.imexonline"), { InstanceRenderManager({imex: t("titles.imexonline"), rome: t("titles.romeonline"), promanager:t("titles.promanager")}) } diff --git a/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx b/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx index 5da1b2339..a7eb6847a 100644 --- a/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx +++ b/client/src/components/user-request-pw-reset/user-request-reset-pw.component.jsx @@ -54,7 +54,7 @@ export function UserRequestResetPw({
{InstanceRenderManager({imex: + alt={InstanceRenderManager({imex: t("titles.imexonline"), rome:t("titles.romeonline"), promanager: t("titles.promanager")})}/> {InstanceRenderManager({imex: t("titles.imexonline"), rome: t("titles.romeonline"), promanager:t("titles.promanager")})}
{t("titles.resetpassword")} diff --git a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx index 902836e84..7f1d47534 100644 --- a/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx +++ b/client/src/components/user-validate-pw-reset/user-validate-pw-reset.component.jsx @@ -5,6 +5,7 @@ import {useTranslation} from "react-i18next"; import {connect} from "react-redux"; import {Link} from "react-router-dom"; import {createStructuredSelector} from "reselect"; +import RomeLogo from "../../assets/RomeOnlineBlue.png"; import ImEXOnlineLogo from "../../assets/logo192.png"; import {auth} from "../../firebase/firebase.utils"; import {checkActionCode} from "@firebase/auth"; @@ -74,7 +75,8 @@ export function UserValidatePwReset({ return (
- ImEX Online + {InstanceRenderManager({imex:t("titles.imexonline"), + {InstanceRenderManager({imex: t("titles.imexonline"), rome: t("titles.romeonline"), promanager:t("titles.promanager")})}
diff --git a/client/src/pages/disclaimer/disclaimer.page.jsx b/client/src/pages/disclaimer/disclaimer.page.jsx index f2c49144b..c56fc6728 100644 --- a/client/src/pages/disclaimer/disclaimer.page.jsx +++ b/client/src/pages/disclaimer/disclaimer.page.jsx @@ -1,14 +1,16 @@ import React from "react"; import { Typography } from "antd"; import InstanceRenderMgr from "../../utils/instanceRenderMgr"; +import { useTranslation } from "react-i18next"; export default function AboutPage() { + const { t } = useTranslation(); return (
{`${InstanceRenderMgr({ - imex: "ImEX Online", - rome: "Rome Online", - promanager: "ProManager", + imex: t("titles.imexonline"), + rome: t("titles.romeonline"), + promanager: t("titles.promanager"), })}Rome Online V.${import.meta.env.MODE}-${ import.meta.env.VITE_APP_GIT_SHA }`} diff --git a/server/accounting/pbs/pbs-ap-allocations.js b/server/accounting/pbs/pbs-ap-allocations.js index a8b08ad85..3d3402956 100644 --- a/server/accounting/pbs/pbs-ap-allocations.js +++ b/server/accounting/pbs/pbs-ap-allocations.js @@ -85,7 +85,7 @@ async function PbsCalculateAllocationsAp(socket, billids) { TransactionDate: moment().tz(socket.bodyshop.timezone).toISOString(), //"0001-01-01T00:00:00.0000000Z", //Description: "Bulk AP posting.", //AdditionalInfo: "String", - Source: "ImEX Online", + Source: "ImEX Online", //TODO:AIO Resolve this for rome online. Lines: [], //socket.apAllocations, }, }; diff --git a/server/accounting/pbs/pbs-job-export.js b/server/accounting/pbs/pbs-job-export.js index 64af23503..3e0a3e991 100644 --- a/server/accounting/pbs/pbs-job-export.js +++ b/server/accounting/pbs/pbs-job-export.js @@ -661,7 +661,7 @@ async function InsertAccountPostingData(socket) { .toISOString(), //"0001-01-01T00:00:00.0000000Z", Description: socket.txEnvelope.story, //AdditionalInfo: "String", - Source: InstanceManager({imex: "ImEX Online", rome:"Rome Online"}), + Source: InstanceManager({imex: t("titles.imexonline"), rome:t("titles.romeonline")}), Lines: wips, }, }, diff --git a/server/firebase/firebase-handler.js b/server/firebase/firebase-handler.js index d8cf63fb6..049569881 100644 --- a/server/firebase/firebase-handler.js +++ b/server/firebase/firebase-handler.js @@ -160,7 +160,7 @@ exports.sendNotification = async (req, res) => { .send({ topic: "PRD_PATRICK-messaging", notification: { - title: `ImEX Online Message - +16049992002`, + title: `ImEX Online Message - , body: "Test Noti.", //imageUrl: "https://thinkimex.com/img/io-fcm.png", }, diff --git a/server/sms/receive.js b/server/sms/receive.js index 424e82767..ee50ce296 100644 --- a/server/sms/receive.js +++ b/server/sms/receive.js @@ -109,7 +109,7 @@ exports.receive = async (req, res) => { InstanceManager({ imex:`ImEX Online Message - ${data.phone_num}` , rome: `Rome Online Message - ${data.phone_num}`, - promanager: `Pro Manager Message - ${data.phone_num}` + promanager: `ProManager Message - ${data.phone_num}` }) , body: message.image_path ? `Image ${message.text}` : message.text,