diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 76f6984b1..e16e8e34d 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -8580,6 +8580,200 @@ + + lbr_types + + + LAA + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAB + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAD + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAE + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAF + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAG + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAM + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAR + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + LAS + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + line_desc false @@ -8811,6 +9005,137 @@ + + part_types + + + PAA + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + PAE + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + PAL + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + PAN + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + PAS + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + PASL + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + status false diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx index fbc9e289e..db22cc7ee 100644 --- a/client/src/components/job-detail-lines/job-lines.component.jsx +++ b/client/src/components/job-detail-lines/job-lines.component.jsx @@ -8,12 +8,12 @@ import { setModalContext } from "../../redux/modals/modals.actions"; import { onlyUnique } from "../../utils/arrayHelper"; import CurrencyFormatter from "../../utils/CurrencyFormatter"; import { alphaSort } from "../../utils/sorters"; +import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component"; +import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component"; // import AllocationsAssignmentContainer from "../allocations-assignment/allocations-assignment.container"; // import AllocationsBulkAssignmentContainer from "../allocations-bulk-assignment/allocations-bulk-assignment.container"; // import AllocationsEmployeeLabelContainer from "../allocations-employee-label/allocations-employee-label.container"; import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container"; -import JobLineNotePopup from "../job-line-note-popup/job-line-note-popup.component"; -import JobLineLocationPopup from "../job-line-location-popup/job-line-location-popup.component"; const mapDispatchToProps = (dispatch) => ({ setJobLineEditContext: (context) => @@ -97,23 +97,27 @@ export function JobLinesComponent({ value: ["PAN", "PAL", "PAA", "PAS", "PASL"], }, { - text: "PAN", + text: t("joblines.fields.part_types.PAN"), value: ["PAN"], }, { - text: "PAL", + text: t("joblines.fields.part_types.PAL"), value: ["PAL"], }, { - text: "PAA", + text: t("joblines.fields.part_types.PAA"), value: ["PAA"], }, { - text: "PAS/PASL", + text: t("joblines.fields.part_types.PAS"), value: ["PAS", "PASL"], }, ], onFilter: (value, record) => value.includes(record.part_type), + render: (text, record) => + record.part_type + ? t(`joblines.fields.part_types.${record.part_type}`) + : null, }, { @@ -155,6 +159,10 @@ export function JobLinesComponent({ sorter: (a, b) => alphaSort(a.mod_lbr_ty, b.mod_lbr_ty), sortOrder: state.sortedInfo.columnKey === "mod_lbr_ty" && state.sortedInfo.order, + render: (text, record) => + record.mod_lbr_ty + ? t(`joblines.fields.lbr_types.${record.mod_lbr_ty}`) + : null, }, { title: t("joblines.fields.mod_lb_hrs"), diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 104979b40..f1ecfbfae 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -568,6 +568,17 @@ "fields": { "act_price": "Actual Price", "db_price": "Database Price", + "lbr_types": { + "LAA": "Aluminum", + "LAB": "Body", + "LAD": "Diagnostic", + "LAE": "Electrical", + "LAF": "Frame", + "LAG": "Glass", + "LAM": "Mechanical", + "LAR": "Refinish", + "LAS": "Structural" + }, "line_desc": "Line Desc.", "line_ind": "S#", "line_no": "Line #", @@ -579,6 +590,14 @@ "op_code_desc": "Operation Code Description", "part_qty": "Qty.", "part_type": "Part Type", + "part_types": { + "PAA": "Aftermarket", + "PAE": "Existing", + "PAL": "LKQ", + "PAN": "New/OEM", + "PAS": "Sublet", + "PASL": "Sublet" + }, "status": "Status", "total": "Total", "unq_seq": "Seq #" diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index a869c0f56..d2b2fa502 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -568,6 +568,17 @@ "fields": { "act_price": "Precio actual", "db_price": "Precio de base de datos", + "lbr_types": { + "LAA": "", + "LAB": "", + "LAD": "", + "LAE": "", + "LAF": "", + "LAG": "", + "LAM": "", + "LAR": "", + "LAS": "" + }, "line_desc": "Descripción de línea", "line_ind": "S#", "line_no": "", @@ -579,6 +590,14 @@ "op_code_desc": "", "part_qty": "", "part_type": "Tipo de parte", + "part_types": { + "PAA": "", + "PAE": "", + "PAL": "", + "PAN": "", + "PAS": "", + "PASL": "" + }, "status": "Estado", "total": "", "unq_seq": "Seq #" diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 4786d2c21..5e2d6d247 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -568,6 +568,17 @@ "fields": { "act_price": "Prix actuel", "db_price": "Prix de la base de données", + "lbr_types": { + "LAA": "", + "LAB": "", + "LAD": "", + "LAE": "", + "LAF": "", + "LAG": "", + "LAM": "", + "LAR": "", + "LAS": "" + }, "line_desc": "Description de la ligne", "line_ind": "S#", "line_no": "", @@ -579,6 +590,14 @@ "op_code_desc": "", "part_qty": "", "part_type": "Type de pièce", + "part_types": { + "PAA": "", + "PAE": "", + "PAL": "", + "PAN": "", + "PAS": "", + "PASL": "" + }, "status": "Statut", "total": "", "unq_seq": "Seq #"