admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/2021-07-16 (pull request #143)

Browse Source 
Feature/2021 07 16
This commit is contained in:
Patrick Fic
2021-07-16 21:51:15 +00:00
parent c9ed8a9360 54b483333f
commit 11cfef904b
6 changed files with 169 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
bodyshop_translations.babel
View File

@@ -30462,6 +30462,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>key_tag</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>paint_grid</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>parts_label_single</name> <name>parts_label_single</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -30756,6 +30798,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>stolen_recovery_checklist</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>supplement_request</name> <name>supplement_request</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -32526,6 +32589,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>gsr_by_csr</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>gsr_by_delivery_date</name> <name>gsr_by_delivery_date</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -32967,6 +33051,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>open_orders_csr</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>open_orders_estimator</name> <name>open_orders_estimator</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

2
client/src/components/documents-upload/documents-upload.utility.js
View File

@@ -24,7 +24,7 @@ export const handleUpload = (ev, context) => {
const fileName = ev.file.name || ev.filename; const fileName = ev.file.name || ev.filename;
let key = `${bodyshop.id}/${jobId}/${fileName.replace( let key = `${bodyshop.id}/${jobId}/${fileName.replace(
/[^a-zA-Z ]/g, /\.[^/.]+$/,
"" ""
)}-${new Date().getTime()}`; )}-${new Date().getTime()}`;
let extension = fileName.split(".").pop(); let extension = fileName.split(".").pop();

5
client/src/translations/en_us/common.json
View File

@@ -1832,6 +1832,8 @@
"invoice_total_payable": "Invoice (Total Payable)", "invoice_total_payable": "Invoice (Total Payable)",
"job_costing_ro": "Job Costing", "job_costing_ro": "Job Costing",
"job_notes": "Job Notes", "job_notes": "Job Notes",
"key_tag": "Key Tag",
"paint_grid": "Paint Grid",
"parts_label_single": "Parts Label - Single", "parts_label_single": "Parts Label - Single",
"parts_list": "Parts List", "parts_list": "Parts List",
"parts_order": "Parts Order Confirmation", "parts_order": "Parts Order Confirmation",
@@ -1846,6 +1848,7 @@
"qc_sheet": "Quality Control Sheet", "qc_sheet": "Quality Control Sheet",
"ro_totals": "RO Totals", "ro_totals": "RO Totals",
"ro_with_description": "RO Summary with Descriptions", "ro_with_description": "RO Summary with Descriptions",
"stolen_recovery_checklist": "Stolen Recovery Checklist",
"supplement_request": "Supplement Request", "supplement_request": "Supplement Request",
"thank_you_ro": "Thank You Letter", "thank_you_ro": "Thank You Letter",
"thirdpartypayer": "Third Party Payer", "thirdpartypayer": "Third Party Payer",
@@ -1962,6 +1965,7 @@
"export_payables": "Export Log - Payables", "export_payables": "Export Log - Payables",
"export_payments": "Export Log - Payments", "export_payments": "Export Log - Payments",
"export_receivables": "Export Log - Receivables", "export_receivables": "Export Log - Receivables",
"gsr_by_csr": "Gross Sales by CSR",
"gsr_by_delivery_date": "Gross Sales by Delivery Date", "gsr_by_delivery_date": "Gross Sales by Delivery Date",
"gsr_by_estimator": "Gross Sales by Estimator", "gsr_by_estimator": "Gross Sales by Estimator",
"gsr_by_exported_date": "Gross Sales by Export Date", "gsr_by_exported_date": "Gross Sales by Export Date",
@@ -1983,6 +1987,7 @@
"job_costing_ro_estimator": "Job Costing by Estimator", "job_costing_ro_estimator": "Job Costing by Estimator",
"job_costing_ro_ins_co": "Job Costing by RO Source", "job_costing_ro_ins_co": "Job Costing by RO Source",
"open_orders": "Open Orders by Date", "open_orders": "Open Orders by Date",
"open_orders_csr": "Open Orders by CSR",
"open_orders_estimator": "Open Orders by Estimator", "open_orders_estimator": "Open Orders by Estimator",
"open_orders_ins_co": "Open Orders by Insurance Company", "open_orders_ins_co": "Open Orders by Insurance Company",
"parts_backorder": "Backordered Parts", "parts_backorder": "Backordered Parts",

5
client/src/translations/es/common.json
View File

@@ -1832,6 +1832,8 @@
"invoice_total_payable": "", "invoice_total_payable": "",
"job_costing_ro": "", "job_costing_ro": "",
"job_notes": "", "job_notes": "",
"key_tag": "",
"paint_grid": "",
"parts_label_single": "", "parts_label_single": "",
"parts_list": "", "parts_list": "",
"parts_order": "", "parts_order": "",
@@ -1846,6 +1848,7 @@
"qc_sheet": "", "qc_sheet": "",
"ro_totals": "", "ro_totals": "",
"ro_with_description": "", "ro_with_description": "",
"stolen_recovery_checklist": "",
"supplement_request": "", "supplement_request": "",
"thank_you_ro": "", "thank_you_ro": "",
"thirdpartypayer": "", "thirdpartypayer": "",
@@ -1962,6 +1965,7 @@
"export_payables": "", "export_payables": "",
"export_payments": "", "export_payments": "",
"export_receivables": "", "export_receivables": "",
"gsr_by_csr": "",
"gsr_by_delivery_date": "", "gsr_by_delivery_date": "",
"gsr_by_estimator": "", "gsr_by_estimator": "",
"gsr_by_exported_date": "", "gsr_by_exported_date": "",
@@ -1983,6 +1987,7 @@
"job_costing_ro_estimator": "", "job_costing_ro_estimator": "",
"job_costing_ro_ins_co": "", "job_costing_ro_ins_co": "",
"open_orders": "", "open_orders": "",
"open_orders_csr": "",
"open_orders_estimator": "", "open_orders_estimator": "",
"open_orders_ins_co": "", "open_orders_ins_co": "",
"parts_backorder": "", "parts_backorder": "",

5
client/src/translations/fr/common.json
View File

@@ -1832,6 +1832,8 @@
"invoice_total_payable": "", "invoice_total_payable": "",
"job_costing_ro": "", "job_costing_ro": "",
"job_notes": "", "job_notes": "",
"key_tag": "",
"paint_grid": "",
"parts_label_single": "", "parts_label_single": "",
"parts_list": "", "parts_list": "",
"parts_order": "", "parts_order": "",
@@ -1846,6 +1848,7 @@
"qc_sheet": "", "qc_sheet": "",
"ro_totals": "", "ro_totals": "",
"ro_with_description": "", "ro_with_description": "",
"stolen_recovery_checklist": "",
"supplement_request": "", "supplement_request": "",
"thank_you_ro": "", "thank_you_ro": "",
"thirdpartypayer": "", "thirdpartypayer": "",
@@ -1962,6 +1965,7 @@
"export_payables": "", "export_payables": "",
"export_payments": "", "export_payments": "",
"export_receivables": "", "export_receivables": "",
"gsr_by_csr": "",
"gsr_by_delivery_date": "", "gsr_by_delivery_date": "",
"gsr_by_estimator": "", "gsr_by_estimator": "",
"gsr_by_exported_date": "", "gsr_by_exported_date": "",
@@ -1983,6 +1987,7 @@
"job_costing_ro_estimator": "", "job_costing_ro_estimator": "",
"job_costing_ro_ins_co": "", "job_costing_ro_ins_co": "",
"open_orders": "", "open_orders": "",
"open_orders_csr": "",
"open_orders_estimator": "", "open_orders_estimator": "",
"open_orders_ins_co": "", "open_orders_ins_co": "",
"parts_backorder": "", "parts_backorder": "",

48
client/src/utils/TemplateConstants.js
View File

@@ -69,6 +69,14 @@ export const TemplateList = (type, context) => {
disabled: false, disabled: false,
group: "pre", 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: { vehicle_check_in: {
title: i18n.t("printcenter.jobs.vehicle_check_in"), title: i18n.t("printcenter.jobs.vehicle_check_in"),
description: "All Jobs Notes", description: "All Jobs Notes",
@@ -150,6 +158,22 @@ export const TemplateList = (type, context) => {
disabled: false, disabled: false,
group: "ro", 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: { worksheet_by_line_number: {
title: i18n.t("printcenter.jobs.worksheet_by_line_number"), title: i18n.t("printcenter.jobs.worksheet_by_line_number"),
description: "All Jobs Notes", description: "All Jobs Notes",
@@ -840,6 +864,18 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_open"), 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: { gsr_by_make: {
title: i18n.t("reportcenter.templates.gsr_by_make"), title: i18n.t("reportcenter.templates.gsr_by_make"),
description: "", description: "",
@@ -949,6 +985,18 @@ export const TemplateList = (type, context) => {
field: i18n.t("jobs.fields.date_open"), 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: { open_orders_estimator: {
title: i18n.t("reportcenter.templates.open_orders_estimator"), title: i18n.t("reportcenter.templates.open_orders_estimator"),
description: "", description: "",