IO-3020 IO-3036 Remove additional TODOs.

This commit is contained in:
Patrick Fic
2024-11-25 12:29:09 -08:00
parent eacadc01bd
commit 4433f0f57f
12 changed files with 43 additions and 49 deletions

View File

@@ -10,7 +10,7 @@ const InstanceMgr = require("../utils/instanceMgr").default;
//****************************************************** */
//****************************************************** */
//****************************************************** */
//THIS IS THE USA/PROMANAGER/ROME REQUIRED JOB TOTALS CALCULATION.
//THIS IS THE USA/ROME REQUIRED JOB TOTALS CALCULATION.
//****************************************************** */
//****************************************************** */
//****************************************************** */
@@ -995,8 +995,7 @@ function CalculateTaxesTotals(job, otherTotals) {
thresholdAmount === 9999.99 ||
InstanceMgr({
imex: false,
rome: thresholdAmount === 0 && parseInt(tyCounter) === 1,
promanager: "USE_ROME"
rome: thresholdAmount === 0 && parseInt(tyCounter) === 1
})
) {
//

View File

@@ -2,13 +2,11 @@ const RenderInstanceManager = require("../utils/instanceMgr").default;
exports.totals = RenderInstanceManager({
imex: require("./job-totals").default,
rome: require("./job-totals-USA").default,
promanager: require("./job-totals-USA").default
rome: require("./job-totals-USA").default
});
exports.totalsSsu = RenderInstanceManager({
imex: require("./job-totals").totalsSsu,
rome: require("./job-totals-USA").totalsSsu,
promanager: require("./job-totals-USA").totalsSsu
rome: require("./job-totals-USA").totalsSsu
});
exports.costing = require("./job-costing").JobCosting;
exports.costingmulti = require("./job-costing").JobCostingMulti;

View File

@@ -2,7 +2,7 @@ const express = require("express");
const router = express.Router();
const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
const { createAssociation, createShop, updateShop, updateCounter } = require("../admin/adminops");
const { updateUser, getUser, createUser, sendPromanagerWelcomeEmail } = require("../firebase/firebase-handler");
const { updateUser, getUser, createUser } = require("../firebase/firebase-handler");
const validateAdminMiddleware = require("../middleware/validateAdminMiddleware");
router.use(validateFirebaseIdTokenMiddleware);
@@ -15,6 +15,5 @@ router.post("/updatecounter", updateCounter);
router.post("/updateuser", updateUser);
router.post("/getuser", getUser);
router.post("/createuser", createUser);
router.post("/promanagerwelcome", sendPromanagerWelcomeEmail);
module.exports = router;

View File

@@ -95,8 +95,7 @@ exports.receive = async (req, res) => {
notification: {
title: InstanceManager({
imex: `ImEX Online Message - ${data.phone_num}`,
rome: `Rome Online Message - ${data.phone_num}`,
promanager: `ProManager Message - ${data.phone_num}`
rome: `Rome Online Message - ${data.phone_num}`
}),
body: message.image_path ? `Image ${message.text}` : message.text
//imageUrl: "https://thinkimex.com/img/io-fcm.png", //TODO:AIO Resolve addresses for other instances

View File

@@ -10,7 +10,7 @@
function InstanceManager({ args, instance, debug, executeFunction, rome, promanager, imex }) {
let propToReturn = null;
//TODO: Remove after debugging.
if (promanager) {
console.trace("ProManager Prop was used");
@@ -20,7 +20,11 @@ function InstanceManager({ args, instance, debug, executeFunction, rome, promana
propToReturn = imex;
break;
case "ROME":
propToReturn = rome; //TODO:AIO Implement USE_IMEX
if (rome === "USE_IMEX") {
propToReturn = imex;
} else {
propToReturn = rome;
}
break;
case "PROMANAGER":
//Return the rome prop if USE_ROME.