diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index b72fcab76..7745bf1aa 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -4577,6 +4577,27 @@ + + supplemented + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + diff --git a/client/src/components/jobs-available-new/jobs-available-new.component.jsx b/client/src/components/jobs-available-new/jobs-available-new.component.jsx index 07cb073db..e411a125c 100644 --- a/client/src/components/jobs-available-new/jobs-available-new.component.jsx +++ b/client/src/components/jobs-available-new/jobs-available-new.component.jsx @@ -4,6 +4,8 @@ import { useTranslation } from "react-i18next"; import { DateTimeFormatter } from "../../utils/DateFormatter"; import { alphaSort } from "../../utils/sorters"; import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.container"; +import CurrencyFormatter from "../../utils/CurrencyFormatter"; + export default function JobsAvailableComponent({ loading, data, @@ -77,7 +79,10 @@ export default function JobsAvailableComponent({ key: "clm_amt", sorter: (a, b) => a.clm_amt - b.clm_amt, sortOrder: - state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order + state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order, + render: (text, record) => ( + {record.clm_amt} + ) //width: "12%", //ellipsis: true }, diff --git a/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx b/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx index 69d1b7462..aaf396f37 100644 --- a/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx +++ b/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx @@ -4,6 +4,7 @@ import { useTranslation } from "react-i18next"; import { alphaSort } from "../../utils/sorters"; import { DateTimeFormatter } from "../../utils/DateFormatter"; import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container"; +import CurrencyFormatter from "../../utils/CurrencyFormatter"; export default function JobsAvailableSupplementComponent({ loading, @@ -92,7 +93,10 @@ export default function JobsAvailableSupplementComponent({ key: "clm_amt", sorter: (a, b) => a.clm_amt - b.clm_amt, sortOrder: - state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order + state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order, + render: (text, record) => ( + {record.clm_amt} + ) //width: "12%", //ellipsis: true }, @@ -162,7 +166,6 @@ export default function JobsAvailableSupplementComponent({ visible={modalVisible} onOk={onModalOk} onCancel={onModalCancel} - /> { setModalVisible(false); setInsertLoading(true); @@ -51,16 +51,27 @@ const importOptionsState = useState({overrideHeaders: false,}) message: t("jobs.errors.creating", { error: "No job data present." }) }); } else { + //create upsert job + let supp = estData.data.available_jobs_by_pk.est_data; + delete supp.joblines; + delete supp.owner; + delete supp.vehicle; + + if (!importOptions.overrideHeaders) { + delete supp["ins_ea"]; + //Strip out the header options + } + updateJob({ variables: { - job: estData.data.available_jobs_by_pk.est_data //STRAIGHT DATA PLACE, SHOULD REMOVE + jobId: selectedJob, + job: supp } }) .then(r => { notification["success"]({ - message: t("jobs.successes.created"), + message: t("jobs.successes.supplemented"), onClick: () => { - console.log("r", r); history.push( `/manage/jobs/${r.data.update_jobs.returning[0].id}` ); diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx index 9e223f3fd..26d9fc3be 100644 --- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx +++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx @@ -35,7 +35,6 @@ export default function OwnerFindModalContainer({ {loading ? : null} diff --git a/client/src/graphql/apollo-error-handling.js b/client/src/graphql/apollo-error-handling.js index 90affb1e9..a3e067908 100644 --- a/client/src/graphql/apollo-error-handling.js +++ b/client/src/graphql/apollo-error-handling.js @@ -25,8 +25,6 @@ const errorLink = onError( } if (expired) { //User access token has expired - //props.history.push("/network-error"); - console.log("We need a new token!"); console.log("Old Token", window.localStorage.getItem("token")); // Let's refresh token through async request @@ -35,15 +33,15 @@ const errorLink = onError( console.log("Got the new token.", token); window.localStorage.setItem("token", token); - const oldHeaders = operation.getContext().headers; - operation.setContext({ - headers: { - ...oldHeaders, - authorization: token ? `Bearer ${token}` : "" - } - }); - console.log("forward", forward); - console.log("operation", operation); + // const oldHeaders = operation.getContext().headers; + // operation.setContext({ + // headers: { + // ...oldHeaders, + // authorization: token ? `Bearer ${token}` : "" + // } + // }); + // console.log("forward", forward); + // console.log("operation", operation); return forward(operation).subscribe(); // return new Observable(observer => { diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 80c6bd491..3649c0737 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -120,6 +120,7 @@ export const GET_JOB_BY_PK = gql` ins_co_id policy_no loss_date + clm_no area_of_damage ins_co_nm ins_addr1 diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 48f4db41f..9df5c2b7f 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -283,7 +283,8 @@ "created": "Job created successfully. Click to view.", "deleted": "Job deleted successfully.", "save": "Job saved successfully.", - "savetitle": "Record saved successfully." + "savetitle": "Record saved successfully.", + "supplemented": "Job supplemented successfully. " } }, "menus": { diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 5778c5d11..efd2f2fa0 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -283,7 +283,8 @@ "created": "Trabajo creado con éxito. Click para ver.", "deleted": "Trabajo eliminado con éxito.", "save": "Trabajo guardado con éxito.", - "savetitle": "Registro guardado con éxito." + "savetitle": "Registro guardado con éxito.", + "supplemented": "Trabajo complementado con éxito." } }, "menus": { diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 4371cd8f2..182af3c7c 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -283,7 +283,8 @@ "created": "Le travail a été créé avec succès. Clique pour voir.", "deleted": "Le travail a bien été supprimé.", "save": "Le travail a été enregistré avec succès.", - "savetitle": "Enregistrement enregistré avec succès." + "savetitle": "Enregistrement enregistré avec succès.", + "supplemented": "Travail complété avec succès." } }, "menus": {