IO-3450 Grammer Correction

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -26,6 +26,7 @@ import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -450,7 +451,9 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           setEnterAgain(false);
         }}
       >
-        <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        <RbacWrapper action="bills:enter">
+          <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        </RbacWrapper>
       </Form>
     </Modal>
   );

client/src/components/shop-info/shop-info.speedprint.component.jsx

@@ -4,10 +4,18 @@ import { useTranslation } from "react-i18next";
 import { TemplateList } from "../../utils/TemplateConstants";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
 
 export default function ShopInfoSpeedPrint() {
   const { t } = useTranslation();
-  const TemplateListGenerated = TemplateList("job");
+  const allTemplates = TemplateList("job");
+  const TemplateListGenerated = InstanceRenderManager({
+    imex: Object.fromEntries(
+      Object.entries(allTemplates).filter(([, { enhanced_payroll }]) => !enhanced_payroll)
+    ),
+    rome: allTemplates
+  });
+
   return (
     <Form.List name={["speedprint"]}>
       {(fields, { add, remove, move }) => {

client/src/redux/user/user.sagas.js

@@ -50,7 +50,7 @@ import {
 } from "./user.actions";
 import UserActionTypes from "./user.types";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from 'posthog-js';
+import posthog from "posthog-js";
 
 const fpPromise = FingerprintJS.load();
 
@@ -269,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
         instanceSeg,
         ...(isParts
           ? [
-            InstanceRenderManager({
-              imex: "ImexPartsManagement",
-              rome: "RomePartsManagement"
-            })
-          ]
+              InstanceRenderManager({
+                imex: "ImexPartsManagement",
+                rome: "RomePartsManagement"
+              })
+            ]
           : [])
       ];
       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 instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
 
-      let featureSegments;
-      if (payload.features?.allAccess === true) {
-        featureSegments = ["allAccess"];
-      } else {
-        const featureKeys = Object.keys(payload.features).filter(
-          (key) =>
-            payload.features[key] === true ||
-            (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
-        );
-        featureSegments = ["basic", ...featureKeys];
-      }
+      const featureSegments =
+        payload.features?.allAccess === true
+          ? ["allAccess"]
+          : [
+              "basic",
+              ...Object.keys(payload.features).filter(
+                (key) =>
+                  payload.features[key] === true ||
+                  (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
+              )
+            ];
+
+      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 segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];

client/src/translations/en_us/common.json

@@ -3209,6 +3209,7 @@
         "parts_not_recieved_vendor": "Parts Not Received by Vendor",
         "parts_received_not_scheduled": "Parts Received for Jobs Not Scheduled",
         "payments_by_date": "Payments by Date",
+        "payments_by_date_excel": "Payments by Date - Excel",
         "payments_by_date_payment": "Payments by Date and Payment Type",
         "payments_by_date_type": "Payments by Date and Customer Type",
         "production_by_category": "Production by Category",

client/src/translations/es/common.json

@@ -3209,6 +3209,7 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
+        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

client/src/translations/fr/common.json

@@ -3209,6 +3209,7 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
+        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

client/src/utils/TemplateConstants.js

@@ -1218,6 +1218,18 @@ export const TemplateList = (type, context) => {
             },
             group: "customers"
           },
+          payments_by_date_excel: {
+            title: i18n.t("reportcenter.templates.payments_by_date_excel"),
+            subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
+            key: "payments_by_date_excel",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.payments"),
+              field: i18n.t("payments.fields.date")
+            },
+            group: "customers"
+          },
           schedule: {
             title: i18n.t("reportcenter.templates.schedule"),
             subject: i18n.t("reportcenter.templates.schedule"),

hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/down.sql

@@ -0,0 +1,5 @@
+alter table "public"."media_analytics_detail" drop constraint "media_analytics_detail_jobid_fkey",
+  add constraint "media_analytics_detail_jobid_fkey"
+  foreign key ("jobid")
+  references "public"."jobs"
+  ("id") on update restrict on delete restrict;

hasura/migrations/1762815418708_set_fk_public_media_analytics_detail_jobid/up.sql

@@ -0,0 +1,5 @@
+alter table "public"."media_analytics_detail" drop constraint "media_analytics_detail_jobid_fkey",
+  add constraint "media_analytics_detail_jobid_fkey"
+  foreign key ("jobid")
+  references "public"."jobs"
+  ("id") on update set null on delete set null;

hasura/migrations/1762816491980_media_analytics_fk_trigger/down.sql

@@ -0,0 +1,23 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- CREATE OR REPLACE FUNCTION set_fk_to_null_if_invalid_media_analytics()
+-- RETURNS TRIGGER AS $$
+-- BEGIN
+--     -- Check if the foreign key value is not NULL
+--     IF NEW.jobid IS NOT NULL THEN
+--         -- Check if the corresponding record exists in the parent table
+--         IF NOT EXISTS (SELECT 1 FROM jobs WHERE id = NEW.jobid) THEN
+--             -- If it doesn't exist, set the foreign key to NULL
+--             NEW.jobid = NULL;
+--         END IF;
+--     END IF;
+--
+--     -- Return the (potentially modified) record to be inserted/updated
+--     RETURN NEW;
+-- END;
+-- $$ LANGUAGE plpgsql;
+--
+-- CREATE TRIGGER media_analytics_fk_null
+-- BEFORE INSERT OR UPDATE ON media_analytics_detail
+-- FOR EACH ROW
+-- EXECUTE FUNCTION set_fk_to_null_if_invalid_media_analytics();

hasura/migrations/1762816491980_media_analytics_fk_trigger/up.sql

@@ -0,0 +1,21 @@
+CREATE OR REPLACE FUNCTION set_fk_to_null_if_invalid_media_analytics()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Check if the foreign key value is not NULL
+    IF NEW.jobid IS NOT NULL THEN
+        -- Check if the corresponding record exists in the parent table
+        IF NOT EXISTS (SELECT 1 FROM jobs WHERE id = NEW.jobid) THEN
+            -- If it doesn't exist, set the foreign key to NULL
+            NEW.jobid = NULL;
+        END IF;
+    END IF;
+    
+    -- Return the (potentially modified) record to be inserted/updated
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER media_analytics_fk_null
+BEFORE INSERT OR UPDATE ON media_analytics_detail
+FOR EACH ROW
+EXECUTE FUNCTION set_fk_to_null_if_invalid_media_analytics();

hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."media_analytics_detail_bodyshopid";

hasura/migrations/1762823244230_create_index_media_analytics_detail_bodyshopid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "media_analytics_detail_bodyshopid" on
+  "public"."media_analytics_detail" using btree ("bodyshopid");

hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."media_analytics_detail_jobid";

hasura/migrations/1762823258200_create_index_media_analytics_detail_jobid/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "media_analytics_detail_jobid" on
+  "public"."media_analytics_detail" using btree ("jobid");

hasura/migrations/1762823298618_create_index_media_analytics_detail_media_analytics/down.sql

@@ -0,0 +1 @@
+DROP INDEX IF EXISTS "public"."media_analytics_detail_media_analytics";

hasura/migrations/1762823298618_create_index_media_analytics_detail_media_analytics/up.sql

@@ -0,0 +1,2 @@
+CREATE  INDEX "media_analytics_detail_media_analytics" on
+  "public"."media_analytics_detail" using btree ("media_analytics_id");

hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "unique_documents" numeric
+--  null;

hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "unique_documents" numeric
+ null;

hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "duplicate_documents" numeric
+--  null;

hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "duplicate_documents" numeric
+ null;

hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics_detail" add column "unique_documents" numeric
+--  null;

hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics_detail" add column "unique_documents" numeric
+ null;

hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics_detail" add column "duplicate_documents" numeric
+--  null;

hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics_detail" add column "duplicate_documents" numeric
+ null;

hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/down.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "unique_document_count" to "unique_documents";

hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/up.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "unique_documents" to "unique_document_count";

hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/down.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "duplicate_count" to "duplicate_documents";

hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/up.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "duplicate_documents" to "duplicate_count";

server/notifications/scenarioBuilders.js

@@ -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: *[]}}}
  */
 const billPostedBuilder = (data) => {
-  const facing = data?.data?.isinhouse ? "in-house" : "vendor";
-  const body = `An ${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
+  const facing = data?.data?.isinhouse ? "An In House" : "A Vendor";
+  const body = `${facing} ${data?.data?.is_credit_memo ? "credit memo" : "bill"} has been posted.`.trim();
 
   return buildNotification(data, "notifications.job.billPosted", body, {
     isInHouse: data?.data?.isinhouse,