From 6bd49a461e1a7aac21204677c91a22efabe4c5ee Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 16 Jul 2021 09:25:03 -0700 Subject: [PATCH 1/3] IO-1264 Add CSR reports --- bodyshop_translations.babel | 42 +++++++++++++++++++++++ client/src/translations/en_us/common.json | 2 ++ client/src/translations/es/common.json | 2 ++ client/src/translations/fr/common.json | 2 ++ client/src/utils/TemplateConstants.js | 24 +++++++++++++ 5 files changed, 72 insertions(+) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 0bb1588a7..9dfdef3fa 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -32526,6 +32526,27 @@ + + gsr_by_csr + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + gsr_by_delivery_date false @@ -32967,6 +32988,27 @@ + + open_orders_csr + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + open_orders_estimator false diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index b0ee18084..e956deaa0 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1962,6 +1962,7 @@ "export_payables": "Export Log - Payables", "export_payments": "Export Log - Payments", "export_receivables": "Export Log - Receivables", + "gsr_by_csr": "Gross Sales by CSR", "gsr_by_delivery_date": "Gross Sales by Delivery Date", "gsr_by_estimator": "Gross Sales by Estimator", "gsr_by_exported_date": "Gross Sales by Export Date", @@ -1983,6 +1984,7 @@ "job_costing_ro_estimator": "Job Costing by Estimator", "job_costing_ro_ins_co": "Job Costing by RO Source", "open_orders": "Open Orders by Date", + "open_orders_csr": "Open Orders by CSR", "open_orders_estimator": "Open Orders by Estimator", "open_orders_ins_co": "Open Orders by Insurance Company", "parts_backorder": "Backordered Parts", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 951a34d18..40aedd433 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1962,6 +1962,7 @@ "export_payables": "", "export_payments": "", "export_receivables": "", + "gsr_by_csr": "", "gsr_by_delivery_date": "", "gsr_by_estimator": "", "gsr_by_exported_date": "", @@ -1983,6 +1984,7 @@ "job_costing_ro_estimator": "", "job_costing_ro_ins_co": "", "open_orders": "", + "open_orders_csr": "", "open_orders_estimator": "", "open_orders_ins_co": "", "parts_backorder": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 476f4280f..ca5b196f8 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1962,6 +1962,7 @@ "export_payables": "", "export_payments": "", "export_receivables": "", + "gsr_by_csr": "", "gsr_by_delivery_date": "", "gsr_by_estimator": "", "gsr_by_exported_date": "", @@ -1983,6 +1984,7 @@ "job_costing_ro_estimator": "", "job_costing_ro_ins_co": "", "open_orders": "", + "open_orders_csr": "", "open_orders_estimator": "", "open_orders_ins_co": "", "parts_backorder": "", diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index d123cc6cd..e35b48f47 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -840,6 +840,18 @@ export const TemplateList = (type, context) => { field: i18n.t("jobs.fields.date_open"), }, }, + gsr_by_csr: { + title: i18n.t("reportcenter.templates.gsr_by_csr"), + description: "", + subject: i18n.t("reportcenter.templates.gsr_by_csr"), + key: "gsr_by_csr", + //idtype: "vendor", + disabled: false, + rangeFilter: { + object: i18n.t("reportcenter.labels.objects.jobs"), + field: i18n.t("jobs.fields.date_invoiced"), + }, + }, gsr_by_make: { title: i18n.t("reportcenter.templates.gsr_by_make"), description: "", @@ -949,6 +961,18 @@ export const TemplateList = (type, context) => { field: i18n.t("jobs.fields.date_open"), }, }, + open_orders_csr: { + title: i18n.t("reportcenter.templates.open_orders_csr"), + description: "", + subject: i18n.t("reportcenter.templates.open_orders_csr"), + key: "open_orders_csr", + //idtype: "vendor", + disabled: false, + rangeFilter: { + object: i18n.t("reportcenter.labels.objects.jobs"), + field: i18n.t("jobs.fields.date_open"), + }, + }, open_orders_estimator: { title: i18n.t("reportcenter.templates.open_orders_estimator"), description: "", From 990ec1a553a013b68581678f83fdf2a4251cd4dc Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 16 Jul 2021 10:13:50 -0700 Subject: [PATCH 2/3] IO-1189 IO-1190 IO-1259 Added gen doc keys. --- bodyshop_translations.babel | 63 +++++++++++++++++++++++ client/src/translations/en_us/common.json | 3 ++ client/src/translations/es/common.json | 3 ++ client/src/translations/fr/common.json | 3 ++ client/src/utils/TemplateConstants.js | 24 +++++++++ 5 files changed, 96 insertions(+) diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 9dfdef3fa..3bc1ff5f1 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -30462,6 +30462,48 @@ + + key_tag + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + paint_grid + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + parts_label_single false @@ -30756,6 +30798,27 @@ + + stolen_recovery_checklist + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + supplement_request false diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index e956deaa0..20653eb85 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1832,6 +1832,8 @@ "invoice_total_payable": "Invoice (Total Payable)", "job_costing_ro": "Job Costing", "job_notes": "Job Notes", + "key_tag": "Key Tag", + "paint_grid": "Paint Grid", "parts_label_single": "Parts Label - Single", "parts_list": "Parts List", "parts_order": "Parts Order Confirmation", @@ -1846,6 +1848,7 @@ "qc_sheet": "Quality Control Sheet", "ro_totals": "RO Totals", "ro_with_description": "RO Summary with Descriptions", + "stolen_recovery_checklist": "Stolen Recovery Checklist", "supplement_request": "Supplement Request", "thank_you_ro": "Thank You Letter", "thirdpartypayer": "Third Party Payer", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 40aedd433..2b093063c 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1832,6 +1832,8 @@ "invoice_total_payable": "", "job_costing_ro": "", "job_notes": "", + "key_tag": "", + "paint_grid": "", "parts_label_single": "", "parts_list": "", "parts_order": "", @@ -1846,6 +1848,7 @@ "qc_sheet": "", "ro_totals": "", "ro_with_description": "", + "stolen_recovery_checklist": "", "supplement_request": "", "thank_you_ro": "", "thirdpartypayer": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index ca5b196f8..a25172c23 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1832,6 +1832,8 @@ "invoice_total_payable": "", "job_costing_ro": "", "job_notes": "", + "key_tag": "", + "paint_grid": "", "parts_label_single": "", "parts_list": "", "parts_order": "", @@ -1846,6 +1848,7 @@ "qc_sheet": "", "ro_totals": "", "ro_with_description": "", + "stolen_recovery_checklist": "", "supplement_request": "", "thank_you_ro": "", "thirdpartypayer": "", diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index e35b48f47..b6627b452 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -69,6 +69,14 @@ export const TemplateList = (type, context) => { disabled: false, group: "pre", }, + stolen_recovery_checklist: { + title: i18n.t("printcenter.jobs.stolen_recovery_checklist"), + description: "All Jobs Notes", + subject: i18n.t("printcenter.jobs.stolen_recovery_checklist"), + key: "stolen_recovery_checklist", + disabled: false, + group: "pre", + }, vehicle_check_in: { title: i18n.t("printcenter.jobs.vehicle_check_in"), description: "All Jobs Notes", @@ -150,6 +158,22 @@ export const TemplateList = (type, context) => { disabled: false, group: "ro", }, + key_tag: { + title: i18n.t("printcenter.jobs.key_tag"), + description: "All Jobs Notes", + subject: i18n.t("printcenter.jobs.key_tag"), + key: "key_tag", + disabled: false, + group: "ro", + }, + paint_grid: { + title: i18n.t("printcenter.jobs.paint_grid"), + description: "All Jobs Notes", + subject: i18n.t("printcenter.jobs.paint_grid"), + key: "paint_grid", + disabled: false, + group: "ro", + }, worksheet_by_line_number: { title: i18n.t("printcenter.jobs.worksheet_by_line_number"), description: "All Jobs Notes", From 54b483333fa44d0eea0fc8fe708525f53ca6d2ab Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Fri, 16 Jul 2021 14:42:12 -0700 Subject: [PATCH 3/3] Revert "IO-1257 Accept special characters" This reverts commit a8ad65000de109e9c47ccbdb20d191b2871177b4. --- .../src/components/documents-upload/documents-upload.utility.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/documents-upload/documents-upload.utility.js b/client/src/components/documents-upload/documents-upload.utility.js index 7dfb925e4..bca78f094 100644 --- a/client/src/components/documents-upload/documents-upload.utility.js +++ b/client/src/components/documents-upload/documents-upload.utility.js @@ -24,7 +24,7 @@ export const handleUpload = (ev, context) => { const fileName = ev.file.name || ev.filename; let key = `${bodyshop.id}/${jobId}/${fileName.replace( - /[^a-zA-Z ]/g, + /\.[^/.]+$/, "" )}-${new Date().getTime()}`; let extension = fileName.split(".").pop();