From 9b7c0af025ff47992f7c95c4d11312aaf66ccfa5 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 30 Oct 2023 16:51:26 -0700 Subject: [PATCH 1/5] IO-2431 Created By for Appointments --- .../schedule-job-modal/schedule-job-modal.container.jsx | 8 +++++++- hasura/metadata/tables.yaml | 3 +++ .../down.sql | 4 ++++ .../up.sql | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/down.sql create mode 100644 hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/up.sql diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx index ed3eace05..c8b85be38 100644 --- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx +++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx @@ -16,13 +16,17 @@ import { QUERY_LBR_HRS_BY_PK, UPDATE_JOBS } from "../../graphql/jobs.queries"; import { setEmailOptions } from "../../redux/email/email.actions"; import { toggleModalVisible } from "../../redux/modals/modals.actions"; import { selectSchedule } from "../../redux/modals/modals.selectors"; -import { selectBodyshop } from "../../redux/user/user.selectors"; +import { + selectBodyshop, + selectCurrentUser, +} from "../../redux/user/user.selectors"; import { TemplateList } from "../../utils/TemplateConstants"; import ScheduleJobModalComponent from "./schedule-job-modal.component"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, scheduleModal: selectSchedule, + currentUser: selectCurrentUser, }); const mapDispatchToProps = (dispatch) => ({ toggleModalVisible: () => dispatch(toggleModalVisible("schedule")), @@ -34,6 +38,7 @@ export function ScheduleJobModalContainer({ bodyshop, toggleModalVisible, setEmailOptions, + currentUser, }) { const { visible, context, actions } = scheduleModal; const { jobId, job, previousEvent } = context; @@ -122,6 +127,7 @@ export function ScheduleJobModalContainer({ end: moment(values.start).add(bodyshop.appt_length || 60, "minutes"), color: values.color, note: values.note, + created_by: currentUser.email, }, jobId: jobId, altTransport: values.alt_transport, diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index 701637a9c..69f30251b 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -110,6 +110,7 @@ - canceled - color - created_at + - created_by - end - id - isintake @@ -128,6 +129,7 @@ - canceled - color - created_at + - created_by - end - id - isintake @@ -156,6 +158,7 @@ - canceled - color - created_at + - created_by - end - id - isintake diff --git a/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/down.sql b/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/down.sql new file mode 100644 index 000000000..9562a8171 --- /dev/null +++ b/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/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"."appointments" add column "created_by" text +-- null; diff --git a/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/up.sql b/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/up.sql new file mode 100644 index 000000000..ef7952cf3 --- /dev/null +++ b/hasura/migrations/1698709322872_alter_table_public_appointments_add_column_created_by/up.sql @@ -0,0 +1,2 @@ +alter table "public"."appointments" add column "created_by" text + null; From 2e93238b5cde66026019a10a173b3cb9c6888bd3 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Mon, 30 Oct 2023 17:08:22 -0700 Subject: [PATCH 2/5] IO-2430 Open Orders by Referral --- client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + client/src/utils/TemplateConstants.js | 23 ++++++++++++++++++----- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 978bc7ccd..4950b5944 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -2597,6 +2597,7 @@ "open_orders_csr": "Open Orders by CSR", "open_orders_estimator": "Open Orders by Estimator", "open_orders_ins_co": "Open Orders by Insurance Company", + "open_orders_referral": "Open Orders by Referral Source", "open_orders_specific_csr": "Open Orders filtered by CSR", "open_orders_status": "Open Orders by Status", "parts_backorder": "IOU Parts List", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index c687b79d5..2f3fca133 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -2597,6 +2597,7 @@ "open_orders_csr": "", "open_orders_estimator": "", "open_orders_ins_co": "", + "open_orders_referral": "", "open_orders_specific_csr": "", "open_orders_status": "", "parts_backorder": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index d11d96044..4dba2e141 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -2597,6 +2597,7 @@ "open_orders_csr": "", "open_orders_estimator": "", "open_orders_ins_co": "", + "open_orders_referral": "", "open_orders_specific_csr": "", "open_orders_status": "", "parts_backorder": "", diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index cc1c4011a..79d9aa353 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -1502,6 +1502,19 @@ export const TemplateList = (type, context) => { }, group: "jobs", }, + open_orders_specific_csr: { + title: i18n.t("reportcenter.templates.open_orders_specific_csr"), + description: "", + subject: i18n.t("reportcenter.templates.open_orders_specific_csr"), + key: "open_orders_specific_csr", + idtype: "employee", + disabled: false, + rangeFilter: { + object: i18n.t("reportcenter.labels.objects.jobs"), + field: i18n.t("jobs.fields.date_open"), + }, + group: "jobs", + }, open_orders_estimator: { title: i18n.t("reportcenter.templates.open_orders_estimator"), description: "", @@ -1528,12 +1541,12 @@ export const TemplateList = (type, context) => { }, group: "jobs", }, - open_orders_specific_csr: { - title: i18n.t("reportcenter.templates.open_orders_specific_csr"), + open_orders_referral: { + title: i18n.t("reportcenter.templates.open_orders_referral"), description: "", - subject: i18n.t("reportcenter.templates.open_orders_specific_csr"), - key: "open_orders_specific_csr", - idtype: "employee", + subject: i18n.t("reportcenter.templates.open_orders_referral"), + key: "open_orders_referral", + //idtype: "vendor", disabled: false, rangeFilter: { object: i18n.t("reportcenter.labels.objects.jobs"), From b649ca1f004e5c3a0fdc81db2cf2b3c755bf001a Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 31 Oct 2023 12:35:18 -0700 Subject: [PATCH 3/5] IO-1559 Additional XML Tag adjustments --- server/data/claimscorp.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/data/claimscorp.js b/server/data/claimscorp.js index 03ca7d6c4..eddc45a74 100644 --- a/server/data/claimscorp.js +++ b/server/data/claimscorp.js @@ -397,7 +397,7 @@ const CreateRepairOrderTag = (job, errorCallback) => { Paint: Dinero(job.job_totals.rates.lar.total).toFormat(CCDineroFormat), Prep: Dinero().toFormat(CCDineroFormat), Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat), - Mechanical: Dinero(job.job_totals.rates.lam.total).toFormat( + Mech: Dinero(job.job_totals.rates.lam.total).toFormat( CCDineroFormat ), Glass: Dinero(job.job_totals.rates.lag.total).toFormat(CCDineroFormat), @@ -481,7 +481,7 @@ const CreateRepairOrderTag = (job, errorCallback) => { .filter((line) => repairOpCodes.includes(line.lbr_op)) .reduce((acc, val) => acc + val.mod_lb_hrs, 0) .toFixed(2), - BodyReplaceHours: job.joblines + BodyReplacehours: job.joblines .filter((line) => replaceOpCodes.includes(line.lbr_op)) .reduce((acc, val) => acc + val.mod_lb_hrs, 0) .toFixed(2), @@ -523,7 +523,7 @@ const CreateRepairOrderTag = (job, errorCallback) => { AM: repairCosts.PartsAMCost.toFormat(CCDineroFormat), MechParts: Dinero().toFormat(CCDineroFormat), OtherParts: Dinero().toFormat(CCDineroFormat), //Check Synergy - OtherCosts: repairCosts.PartsOtherCost.toFormat(CCDineroFormat), + OtherCost: repairCosts.PartsOtherCost.toFormat(CCDineroFormat), Sublet: repairCosts.SubletTotalCost.toFormat(CCDineroFormat), Towing: repairCosts.TowingTotalCost.toFormat(CCDineroFormat), Storage: repairCosts.StorageTotalCost.toFormat(CCDineroFormat), From cf8280590ce3706f08d9060c0b5564f67d8fc547 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 31 Oct 2023 12:36:39 -0700 Subject: [PATCH 4/5] IO-1559 Prettyier --- server/data/claimscorp.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/data/claimscorp.js b/server/data/claimscorp.js index eddc45a74..3f154eef9 100644 --- a/server/data/claimscorp.js +++ b/server/data/claimscorp.js @@ -397,9 +397,7 @@ const CreateRepairOrderTag = (job, errorCallback) => { Paint: Dinero(job.job_totals.rates.lar.total).toFormat(CCDineroFormat), Prep: Dinero().toFormat(CCDineroFormat), Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat), - Mech: Dinero(job.job_totals.rates.lam.total).toFormat( - CCDineroFormat - ), + Mech: Dinero(job.job_totals.rates.lam.total).toFormat(CCDineroFormat), Glass: Dinero(job.job_totals.rates.lag.total).toFormat(CCDineroFormat), Elec: Dinero(job.job_totals.rates.lae.total).toFormat(CCDineroFormat), Detail: detailAdjustments.amount.toFormat(CCDineroFormat), From a27092dbcce1232218f8096d24354bed80b96400 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 1 Nov 2023 10:28:10 -0700 Subject: [PATCH 5/5] IO-1559 Change File name as per Koyel --- server/data/claimscorp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/data/claimscorp.js b/server/data/claimscorp.js index 3f154eef9..60943aed3 100644 --- a/server/data/claimscorp.js +++ b/server/data/claimscorp.js @@ -104,7 +104,7 @@ exports.default = async (req, res) => { allxmlsToUpload.push({ count: claimsCorpObject.DataFeed.ShopInfo.RO.length, xml: ret, - filename: `${bodyshop.claimscorpid}-MIS-${moment().format( + filename: `${bodyshop.claimscorpid}-${moment().format( "YYYYMMDDTHHMMss" )}.xml`, });