+ {t("jobs.labels.reconciliation.removedpartsstrikethrough")}
+
+
+ );
}
diff --git a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx
index 11330c5b9..1a6aeabfe 100644
--- a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx
+++ b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx
@@ -1,121 +1,118 @@
-import { Button, Space, Statistic } from "antd";
+import {Button, Space, Statistic} from "antd";
import Dinero from "dinero.js";
import _ from "lodash";
-import React, { useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import {
- reconcileByAssocLine,
- reconcileByPrice,
-} from "./job-reconciliation-totals.utility";
+import React, {useMemo, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {reconcileByAssocLine, reconcileByPrice,} from "./job-reconciliation-totals.utility";
export default function JobReconciliationTotals({
- billLines,
- jobLines,
- jobLineState,
- billLineState,
-}) {
- const [errors, setErrors] = useState([]);
- const { t } = useTranslation();
- const selectedBillLines = billLineState[0];
- const selectedJobLines = jobLineState[0];
+ billLines,
+ jobLines,
+ jobLineState,
+ billLineState,
+ }) {
+ const [errors, setErrors] = useState([]);
+ const {t} = useTranslation();
+ const selectedBillLines = billLineState[0];
+ const selectedJobLines = jobLineState[0];
- const totals = useMemo(() => {
- const jlLookup = _.keyBy(selectedJobLines, (i) => i);
- const billLookup = _.keyBy(selectedBillLines, (i) => i);
+ const totals = useMemo(() => {
+ const jlLookup = _.keyBy(selectedJobLines, (i) => i);
+ const billLookup = _.keyBy(selectedBillLines, (i) => i);
- return {
- joblinesTotal: jobLines
- .filter((jl) => !!jlLookup[jl.id])
- .reduce((acc, val) => {
- return acc.add(
- Dinero({ amount: Math.round((val.act_price || 0) * 100) }).multiply(
- val.part_qty || 1
- )
- );
- }, Dinero()),
- billLinesTotal: billLines
- .filter((bl) => !!billLookup[bl.id])
- .reduce((acc, val) => {
- return acc.add(
- Dinero({
- amount: Math.round((val.actual_price || 0) * 100),
- })
- .multiply(val.quantity || 1)
- .multiply(val.bill.is_credit_memo ? -1 : 1)
- );
- }, Dinero()),
- };
- }, [billLines, jobLines, selectedBillLines, selectedJobLines]);
+ return {
+ joblinesTotal: jobLines
+ .filter((jl) => !!jlLookup[jl.id])
+ .reduce((acc, val) => {
+ return acc.add(
+ Dinero({amount: Math.round((val.act_price || 0) * 100)}).multiply(
+ val.part_qty || 1
+ )
+ );
+ }, Dinero()),
+ billLinesTotal: billLines
+ .filter((bl) => !!billLookup[bl.id])
+ .reduce((acc, val) => {
+ return acc.add(
+ Dinero({
+ amount: Math.round((val.actual_price || 0) * 100),
+ })
+ .multiply(val.quantity || 1)
+ .multiply(val.bill.is_credit_memo ? -1 : 1)
+ );
+ }, Dinero()),
+ };
+ }, [billLines, jobLines, selectedBillLines, selectedJobLines]);
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {errors.length > 0 && (
-
- {t("general.labels.errors")}
-
- {errors.map((error, idx) => (
- - {error}
- ))}
-
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {errors.length > 0 && (
+
+ {t("general.labels.errors")}
+
+ {errors.map((error, idx) => (
+ - {error}
+ ))}
+
+
+ )}
- )}
-
- );
+ );
}
diff --git a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js
index 6a6e1a0f6..129188996 100644
--- a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js
+++ b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.utility.js
@@ -2,111 +2,111 @@ import i18next from "i18next";
import _ from "lodash";
export const reconcileByAssocLine = (
- jobLines,
- jobLineState,
- billLines,
- billLineState,
- setErrors
+ jobLines,
+ jobLineState,
+ billLines,
+ billLineState,
+ setErrors
) => {
- const [selectedBillLines, setSelectedBillLines] = billLineState;
- const [selectedJobLines, setSelectedJobLines] = jobLineState;
+ const [selectedBillLines, setSelectedBillLines] = billLineState;
+ const [selectedJobLines, setSelectedJobLines] = jobLineState;
- const allJoblinesFromBills = billLines
- .filter((bl) => bl.joblineid && bl.jobline && !bl.jobline.removed)
- .map((bl) => bl.joblineid);
+ const allJoblinesFromBills = billLines
+ .filter((bl) => bl.joblineid && bl.jobline && !bl.jobline.removed)
+ .map((bl) => bl.joblineid);
- const duplicatedJobLinesbyInvoiceId = _.filter(
- allJoblinesFromBills,
- (val, i, iteratee) => _.includes(iteratee, val, i + 1)
- );
+ const duplicatedJobLinesbyInvoiceId = _.filter(
+ allJoblinesFromBills,
+ (val, i, iteratee) => _.includes(iteratee, val, i + 1)
+ );
- if (duplicatedJobLinesbyInvoiceId.length > 0)
- setErrors((errors) => [
- ...errors,
- ..._.uniqBy(duplicatedJobLinesbyInvoiceId).map((dupedId) => {
- return i18next.t("jobs.labels.reconciliation.multiplebilllines", {
- line_desc: jobLines.find((j) => j.id === dupedId)?.line_desc,
- });
- }),
- ]);
+ if (duplicatedJobLinesbyInvoiceId.length > 0)
+ setErrors((errors) => [
+ ...errors,
+ ..._.uniqBy(duplicatedJobLinesbyInvoiceId).map((dupedId) => {
+ return i18next.t("jobs.labels.reconciliation.multiplebilllines", {
+ line_desc: jobLines.find((j) => j.id === dupedId)?.line_desc,
+ });
+ }),
+ ]);
- setSelectedBillLines(
- _.union(
- selectedBillLines,
- billLines.filter((bl) => !!bl.joblineid).map((bl) => bl.id)
- )
- );
+ setSelectedBillLines(
+ _.union(
+ selectedBillLines,
+ billLines.filter((bl) => !!bl.joblineid).map((bl) => bl.id)
+ )
+ );
- setSelectedJobLines(
- _.union(selectedJobLines, _.uniqBy(allJoblinesFromBills))
- );
+ setSelectedJobLines(
+ _.union(selectedJobLines, _.uniqBy(allJoblinesFromBills))
+ );
};
export const reconcileByPrice = (
- jobLines,
- jobLineState,
- billLines,
- billLineState,
- setErrors
+ jobLines,
+ jobLineState,
+ billLines,
+ billLineState,
+ setErrors
) => {
- const [selectedBillLines, setSelectedBillLines] = billLineState;
- const [selectedJobLines, setSelectedJobLines] = jobLineState;
+ const [selectedBillLines, setSelectedBillLines] = billLineState;
+ const [selectedJobLines, setSelectedJobLines] = jobLineState;
- const allActPricesFromJobs = jobLines.map((jl) => jl.act_price);
- const duplicateActPrices = _.filter(
- allActPricesFromJobs,
- (val, i, iteratee) => _.includes(iteratee, val, i + 1)
- );
+ const allActPricesFromJobs = jobLines.map((jl) => jl.act_price);
+ const duplicateActPrices = _.filter(
+ allActPricesFromJobs,
+ (val, i, iteratee) => _.includes(iteratee, val, i + 1)
+ );
+
+ if (duplicateActPrices.length > 0)
+ setErrors((errors) => [
+ ...errors,
+ ..._.uniqBy(duplicateActPrices).map((dupeAp) =>
+ i18next.t("jobs.labels.reconciliation.multipleactprices", {
+ act_price: dupeAp,
+ })
+ ),
+ ]);
+
+ const foundJobLines = [];
+ var foundBillLines = [];
+ const actPricesWithMoreThan1MatchingBill = [];
+
+ jobLines.forEach((jl) => {
+ const matchingBillLineIds = billLines
+ .filter(
+ (bl) =>
+ bl.actual_price === jl.act_price &&
+ bl.quantity === jl.part_qty &&
+ !jl.removed
+ )
+ .map((bl) => bl.id);
+
+ if (matchingBillLineIds.length > 1) {
+ actPricesWithMoreThan1MatchingBill.push(jl.act_price);
+ }
+
+ foundBillLines = [...foundBillLines, ...matchingBillLineIds];
+ if (matchingBillLineIds.length > 0) {
+ foundJobLines.push(jl.id);
+ }
+ });
- if (duplicateActPrices.length > 0)
setErrors((errors) => [
- ...errors,
- ..._.uniqBy(duplicateActPrices).map((dupeAp) =>
- i18next.t("jobs.labels.reconciliation.multipleactprices", {
- act_price: dupeAp,
- })
- ),
+ ...errors,
+ ..._.uniqBy(duplicateActPrices).map((dupeAp) =>
+ i18next.t("jobs.labels.reconciliation.multipleactprices", {
+ act_price: dupeAp,
+ })
+ ),
+ ..._.uniqBy(actPricesWithMoreThan1MatchingBill).map((act_price) =>
+ i18next.t("jobs.labels.reconciliation.multiplebillsforactprice", {
+ act_price: act_price,
+ })
+ ),
]);
- const foundJobLines = [];
- var foundBillLines = [];
- const actPricesWithMoreThan1MatchingBill = [];
+ setSelectedBillLines(_.union(selectedBillLines, _.uniqBy(foundBillLines)));
- jobLines.forEach((jl) => {
- const matchingBillLineIds = billLines
- .filter(
- (bl) =>
- bl.actual_price === jl.act_price &&
- bl.quantity === jl.part_qty &&
- !jl.removed
- )
- .map((bl) => bl.id);
-
- if (matchingBillLineIds.length > 1) {
- actPricesWithMoreThan1MatchingBill.push(jl.act_price);
- }
-
- foundBillLines = [...foundBillLines, ...matchingBillLineIds];
- if (matchingBillLineIds.length > 0) {
- foundJobLines.push(jl.id);
- }
- });
-
- setErrors((errors) => [
- ...errors,
- ..._.uniqBy(duplicateActPrices).map((dupeAp) =>
- i18next.t("jobs.labels.reconciliation.multipleactprices", {
- act_price: dupeAp,
- })
- ),
- ..._.uniqBy(actPricesWithMoreThan1MatchingBill).map((act_price) =>
- i18next.t("jobs.labels.reconciliation.multiplebillsforactprice", {
- act_price: act_price,
- })
- ),
- ]);
-
- setSelectedBillLines(_.union(selectedBillLines, _.uniqBy(foundBillLines)));
-
- setSelectedJobLines(_.union(selectedJobLines, _.uniqBy(foundJobLines)));
+ setSelectedJobLines(_.union(selectedJobLines, _.uniqBy(foundJobLines)));
};
diff --git a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
index a0c95fad8..f7dd7b00b 100644
--- a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
+++ b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
@@ -1,37 +1,37 @@
-import { useMutation } from "@apollo/client";
-import { Checkbox, notification, Space, Spin } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import {useMutation} from "@apollo/client";
+import {Checkbox, notification, Space, Spin} from "antd";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
+import {UPDATE_JOB} from "../../graphql/jobs.queries";
-export default function JobRemoveFromPartsQueue({ checked, jobId }) {
- const [updateJob] = useMutation(UPDATE_JOB);
- const { t } = useTranslation();
+export default function JobRemoveFromPartsQueue({checked, jobId}) {
+ const [updateJob] = useMutation(UPDATE_JOB);
+ const {t} = useTranslation();
- const [loading, setLoading] = useState(false);
+ const [loading, setLoading] = useState(false);
- const handleChange = async (e) => {
- setLoading(true);
- const result = await updateJob({
- variables: { jobId: jobId, job: { queued_for_parts: e.target.checked } },
- });
+ const handleChange = async (e) => {
+ setLoading(true);
+ const result = await updateJob({
+ variables: {jobId: jobId, job: {queued_for_parts: e.target.checked}},
+ });
- if (!!!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- };
+ if (!!!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ };
- return (
-
-
- {loading && }
-
- );
+ return (
+
+
+ {loading && }
+
+ );
}
diff --git a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
index 0e1343438..5287c3271 100644
--- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
+++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
@@ -1,200 +1,192 @@
-import { useMutation, useLazyQuery } from "@apollo/client";
-import { CheckCircleOutlined } from "@ant-design/icons";
+import {useLazyQuery, useMutation} from "@apollo/client";
+import {CheckCircleOutlined} from "@ant-design/icons";
+import {Button, Card, Form, InputNumber, notification, Popover, Space,} from "antd";
+import dayjs from "../../utils/day";
+import React, {useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {logImEXEvent} from "../../firebase/firebase.utils";
import {
- Button,
- Card,
- Form,
- InputNumber,
- notification,
- Popover,
- Space,
-} from "antd";
-import moment from "moment";
-import React, { useState, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import {
- INSERT_SCOREBOARD_ENTRY,
- QUERY_SCOREBOARD_ENTRY,
- UPDATE_SCOREBOARD_ENTRY,
+ INSERT_SCOREBOARD_ENTRY,
+ QUERY_SCOREBOARD_ENTRY,
+ UPDATE_SCOREBOARD_ENTRY,
} from "../../graphql/scoreboard.queries";
import FormDatePicker from "../form-date-picker/form-date-picker.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
export default function ScoreboardAddButton({
- job,
- disabled,
- ...otherBtnProps
-}) {
- const { t } = useTranslation();
- const [insertScoreboardEntry] = useMutation(INSERT_SCOREBOARD_ENTRY);
- const [updateScoreboardEntry] = useMutation(UPDATE_SCOREBOARD_ENTRY);
- const [loading, setLoading] = useState(false);
- const [form] = Form.useForm();
- const [visibility, setVisibility] = useState(false);
- const [callQuery, { loading: entryLoading, data: entryData }] = useLazyQuery(
- QUERY_SCOREBOARD_ENTRY
- );
-
- useEffect(() => {
- if (visibility) {
- callQuery({ variables: { jobid: job.id } });
- }
- }, [visibility, job.id, callQuery]);
-
- useEffect(() => {
- if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
- form.setFieldsValue(entryData.scoreboard[0]);
- }
- }, [entryData, form]);
-
- const handleFinish = async (values) => {
- logImEXEvent("job_close_add_to_scoreboard");
-
- setLoading(true);
- let result;
-
- if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
- result = await updateScoreboardEntry({
- variables: {
- sbId: entryData.scoreboard[0].id,
- sbInput: values,
- },
- });
- } else {
- result = await insertScoreboardEntry({
- variables: { sbInput: [{ jobid: job.id, ...values }] },
- });
- }
-
- if (!!result.errors) {
- notification["error"]({
- message: t("scoreboard.errors.adding", {
- message: JSON.stringify(result.errors),
- }),
- });
- } else {
- notification["success"]({
- message: t("scoreboard.successes.added"),
- });
- }
- setLoading(false);
- setVisibility(false);
- };
-
- const overlay = (
-
-
- {entryLoading ? (
-
- ) : (
-
- )}
-
- {entryData && entryData.scoreboard && entryData.scoreboard[0] && (
-
-
- {t("jobs.labels.alreadyaddedtoscoreboard")}
-
- )}
-
- );
-
- const handleClick = (e) => {
- setLoading(true);
- const v = job.joblines.reduce(
- (acc, val) => {
- if (val.mod_lbr_ty !== "LAR")
- acc = { ...acc, bodyhrs: acc.bodyhrs + val.mod_lb_hrs };
- if (val.mod_lbr_ty === "LAR")
- acc = { ...acc, painthrs: acc.painthrs + val.mod_lb_hrs };
- return acc;
- },
- {
- bodyhrs: 0,
- painthrs: 0,
- }
+ job,
+ disabled,
+ ...otherBtnProps
+ }) {
+ const {t} = useTranslation();
+ const [insertScoreboardEntry] = useMutation(INSERT_SCOREBOARD_ENTRY);
+ const [updateScoreboardEntry] = useMutation(UPDATE_SCOREBOARD_ENTRY);
+ const [loading, setLoading] = useState(false);
+ const [form] = Form.useForm();
+ const [visibility, setVisibility] = useState(false);
+ const [callQuery, {loading: entryLoading, data: entryData}] = useLazyQuery(
+ QUERY_SCOREBOARD_ENTRY
);
- //Add Labor Adjustments
- v.painthrs = v.painthrs + (job.lbr_adjustments.LAR || 0);
- v.bodyhrs =
- v.bodyhrs +
- Object.keys(job.lbr_adjustments)
- .filter((key) => key !== "LAR")
- .reduce((acc, val) => {
- return acc + job.lbr_adjustments[val];
- }, 0);
- form.setFieldsValue({
- date: new moment(),
- bodyhrs: Math.round(v.bodyhrs * 10) / 10,
- painthrs: Math.round(v.painthrs * 10) / 10,
- });
- setVisibility(true);
- setLoading(false);
- };
+ useEffect(() => {
+ if (visibility) {
+ callQuery({variables: {jobid: job.id}});
+ }
+ }, [visibility, job.id, callQuery]);
- return (
-
-
-
- );
+ useEffect(() => {
+ if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
+ form.setFieldsValue(entryData.scoreboard[0]);
+ }
+ }, [entryData, form]);
+
+ const handleFinish = async (values) => {
+ logImEXEvent("job_close_add_to_scoreboard");
+
+ setLoading(true);
+ let result;
+
+ if (entryData && entryData.scoreboard && entryData.scoreboard[0]) {
+ result = await updateScoreboardEntry({
+ variables: {
+ sbId: entryData.scoreboard[0].id,
+ sbInput: values,
+ },
+ });
+ } else {
+ result = await insertScoreboardEntry({
+ variables: {sbInput: [{jobid: job.id, ...values}]},
+ });
+ }
+
+ if (!!result.errors) {
+ notification["error"]({
+ message: t("scoreboard.errors.adding", {
+ message: JSON.stringify(result.errors),
+ }),
+ });
+ } else {
+ notification["success"]({
+ message: t("scoreboard.successes.added"),
+ });
+ }
+ setLoading(false);
+ setVisibility(false);
+ };
+
+ const overlay = (
+
+
+ {entryLoading ? (
+
+ ) : (
+
+ )}
+
+ {entryData && entryData.scoreboard && entryData.scoreboard[0] && (
+
+
+ {t("jobs.labels.alreadyaddedtoscoreboard")}
+
+ )}
+
+ );
+
+ const handleClick = (e) => {
+ setLoading(true);
+ const v = job.joblines.reduce(
+ (acc, val) => {
+ if (val.mod_lbr_ty !== "LAR")
+ acc = {...acc, bodyhrs: acc.bodyhrs + val.mod_lb_hrs};
+ if (val.mod_lbr_ty === "LAR")
+ acc = {...acc, painthrs: acc.painthrs + val.mod_lb_hrs};
+ return acc;
+ },
+ {
+ bodyhrs: 0,
+ painthrs: 0,
+ }
+ );
+
+ //Add Labor Adjustments
+ v.painthrs = v.painthrs + (job.lbr_adjustments.LAR || 0);
+ v.bodyhrs =
+ v.bodyhrs +
+ Object.keys(job.lbr_adjustments)
+ .filter((key) => key !== "LAR")
+ .reduce((acc, val) => {
+ return acc + job.lbr_adjustments[val];
+ }, 0);
+ form.setFieldsValue({
+ date: new dayjs(),
+ bodyhrs: Math.round(v.bodyhrs * 10) / 10,
+ painthrs: Math.round(v.painthrs * 10) / 10,
+ });
+ setVisibility(true);
+ setLoading(false);
+ };
+
+ return (
+
+
+
+ );
}
diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx
index 0ec418bca..59f96d7a3 100644
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -1,118 +1,116 @@
-import { useLazyQuery } from "@apollo/client";
-import { Select, Space, Tag } from "antd";
+import {useLazyQuery} from "@apollo/client";
+import {Select, Space, Tag} from "antd";
import _ from "lodash";
-import React, { forwardRef, useState, useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import {
- SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE,
- SEARCH_JOBS_FOR_AUTOCOMPLETE,
-} from "../../graphql/jobs.queries";
+import React, {forwardRef, useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE, SEARCH_JOBS_FOR_AUTOCOMPLETE,} from "../../graphql/jobs.queries";
import AlertComponent from "../alert/alert.component";
-import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
-const { Option } = Select;
+import {OwnerNameDisplayFunction} from "../owner-name-display/owner-name-display.component";
+
+const {Option} = Select;
const JobSearchSelect = (
- {
- disabled,
- convertedOnly = false,
- notInvoiced = false,
- notExported = true,
- clm_no = false,
- ...restProps
- },
- ref
+ {
+ disabled,
+ convertedOnly = false,
+ notInvoiced = false,
+ notExported = true,
+ clm_no = false,
+ ...restProps
+ },
+ ref
) => {
- const { t } = useTranslation();
- const [theOptions, setTheOptions] = useState([]);
- const [callSearch, { loading, error, data }] = useLazyQuery(
- SEARCH_JOBS_FOR_AUTOCOMPLETE,
- {}
- );
-
- const [callIdSearch, { loading: idLoading, error: idError, data: idData }] =
- useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);
-
- const executeSearch = (v) => {
- console.log(v);
- if (v && v.variables?.search !== "" && v.variables.search.length >= 2)
- callSearch(v);
- };
- const debouncedExecuteSearch = _.debounce(executeSearch, 500);
-
- const handleSearch = (value) => {
- debouncedExecuteSearch({
- variables: {
- search: value,
- ...(convertedOnly || notExported
- ? {
- ...(convertedOnly ? { isConverted: true } : {}),
- ...(notExported ? { notExported: true } : {}),
- ...(notInvoiced ? { notInvoiced: true } : {}),
- }
- : {}),
- },
- });
- };
-
- useEffect(() => {
- if (restProps.value) {
- callIdSearch({ variables: { id: restProps.value } }); // Sometimes results in a no-op. Not sure how to fix.
- }
- }, [restProps.value, callIdSearch]);
-
- useEffect(() => {
- setTheOptions(
- _.uniqBy(
- [
- ...(idData && idData.jobs_by_pk ? [idData.jobs_by_pk] : []),
- ...(data && data.search_jobs ? data.search_jobs : []),
- ],
- "id"
- )
+ const {t} = useTranslation();
+ const [theOptions, setTheOptions] = useState([]);
+ const [callSearch, {loading, error, data}] = useLazyQuery(
+ SEARCH_JOBS_FOR_AUTOCOMPLETE,
+ {}
);
- }, [data, idData]);
- return (
-
-
:
}
- {...restProps}
- >
- {theOptions
- ? theOptions.map((o) => (
-
+ ))
+ : null}
+
+ {error ?
: null}
+ {idError ? (
+
+ ) : null}
+
+ );
};
export default forwardRef(JobSearchSelect);
diff --git a/client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx b/client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx
index 04609f98b..7f218520c 100644
--- a/client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx
+++ b/client/src/components/job-send-parts-price-change/job-send-parts-price-change.component.jsx
@@ -1,31 +1,31 @@
-import { Button, notification } from "antd";
+import {Button, notification} from "antd";
import axios from "axios";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
-export default function JobSendPartPriceChangeComponent({ job }) {
- const { t } = useTranslation();
- const [loading, setLoading] = useState(false);
- const handleClick = async () => {
- setLoading(true);
- try {
- const ppcData = await axios.post("/job/ppc", { jobid: job.id });
- await axios.post("http://localhost:1337/ppc/", ppcData.data);
- } catch (error) {
- notification.open({
- type: "error",
- message: t("jobs.errors.partspricechange", {
- error: JSON.stringify(error),
- }),
- });
- } finally {
- setLoading(false);
- }
- };
+export default function JobSendPartPriceChangeComponent({job}) {
+ const {t} = useTranslation();
+ const [loading, setLoading] = useState(false);
+ const handleClick = async () => {
+ setLoading(true);
+ try {
+ const ppcData = await axios.post("/job/ppc", {jobid: job.id});
+ await axios.post("http://localhost:1337/ppc/", ppcData.data);
+ } catch (error) {
+ notification.open({
+ type: "error",
+ message: t("jobs.errors.partspricechange", {
+ error: JSON.stringify(error),
+ }),
+ });
+ } finally {
+ setLoading(false);
+ }
+ };
- return (
-
- );
+ return (
+
+ );
}
diff --git a/client/src/components/job-sync-button/job-sync-button.component.jsx b/client/src/components/job-sync-button/job-sync-button.component.jsx
index 042664c49..08c294b1f 100644
--- a/client/src/components/job-sync-button/job-sync-button.component.jsx
+++ b/client/src/components/job-sync-button/job-sync-button.component.jsx
@@ -1,23 +1,23 @@
-import { Button } from "antd";
+import {Button} from "antd";
import React from "react";
-import { useTranslation } from "react-i18next";
-import { SyncOutlined } from "@ant-design/icons";
-import { useHistory } from "react-router-dom";
+import {useTranslation} from "react-i18next";
+import {SyncOutlined} from "@ant-design/icons";
+import {useNavigate} from "react-router-dom";
-export default function JobSyncButton({ job }) {
- const { t } = useTranslation();
- const history = useHistory();
- const handleClick = () => {
- history.push(
- `/manage/available?availableJobId=${job.available_jobs[0].id}&clm_no=${job.clm_no}`
- );
- };
- if (job && job.available_jobs && job.available_jobs.length > 0)
- return (
-
- );
- else return null;
+export default function JobSyncButton({job}) {
+ const {t} = useTranslation();
+ const history = useNavigate();
+ const handleClick = () => {
+ history(
+ `/manage/available?availableJobId=${job.available_jobs[0].id}&clm_no=${job.clm_no}`
+ );
+ };
+ if (job && job.available_jobs && job.available_jobs.length > 0)
+ return (
+
+ );
+ else return null;
}
diff --git a/client/src/components/job-totals-table/job-totals-table.component.jsx b/client/src/components/job-totals-table/job-totals-table.component.jsx
index 49536ce22..f56322c75 100644
--- a/client/src/components/job-totals-table/job-totals-table.component.jsx
+++ b/client/src/components/job-totals-table/job-totals-table.component.jsx
@@ -1,12 +1,12 @@
-import { Card, Col, Collapse, Result, Row } from "antd";
+import {Card, Col, Collapse, Result, Row} from "antd";
//import { JsonEditor as Editor } from "jsoneditor-react";
//import "jsoneditor-react/es/editor.min.css";
import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectJobReadOnly} from "../../redux/application/application.selectors";
+import {selectCurrentUser} from "../../redux/user/user.selectors";
import JobCalculateTotals from "../job-calculate-totals/job-calculate-totals.component";
import "./job-totals-table.styles.scss";
import JobTotalsTableLabor from "./job-totals.table.labor.component";
@@ -15,87 +15,88 @@ import JobTotalsTableParts from "./job-totals.table.parts.component";
import JobTotalsTableTotals from "./job-totals.table.totals.component";
const mapStateToProps = createStructuredSelector({
- currentUser: selectCurrentUser,
- jobRO: selectJobReadOnly,
+ currentUser: selectCurrentUser,
+ jobRO: selectJobReadOnly,
});
const colSpan = {
- md: { span: 24 },
- lg: { span: 12 },
+ md: {span: 24},
+ lg: {span: 12},
};
-export function JobsTotalsTableComponent({ jobRO, currentUser, job }) {
- const { t } = useTranslation();
+export function JobsTotalsTableComponent({jobRO, currentUser, job}) {
+ const {t} = useTranslation();
+
+ if (!!!job.job_totals) {
+ return (
+
+ }
+ />
+
+ );
+ }
- if (!!!job.job_totals) {
return (
-
- }
- />
-
- );
- }
-
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- {(currentUser.email.includes("@imex.") ||
- currentUser.email.includes("@rome.")) && (
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {(currentUser.email.includes("@imex.") ||
+ currentUser.email.includes("@rome.")) && (
+
+
+
+
+
+
{JSON.stringify(
- {
- CIECA: job.cieca_ttl && job.cieca_ttl.data,
- CIECASTL: job.cieca_stl && job.cieca_stl.data,
- ImEXCalc: job.job_totals,
- },
- null,
- 2
+ {
+ CIECA: job.cieca_ttl && job.cieca_ttl.data,
+ CIECASTL: job.cieca_stl && job.cieca_stl.data,
+ ImEXCalc: job.job_totals,
+ },
+ null,
+ 2
)}
-
-
-
-
-
- )}
-
-
-
-
+
+
+
+ );
}
+
export default connect(mapStateToProps, null)(JobsTotalsTableComponent);
diff --git a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
index 42cfe7c66..bb92988a7 100644
--- a/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.labor.component.jsx
@@ -1,185 +1,185 @@
-import { Space, Table } from "antd";
+import {Space, Table} from "antd";
import Dinero from "dinero.js";
-import React, { useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
+import React, {useMemo, useState} from "react";
+import {useTranslation} from "react-i18next";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { alphaSort } from "../../utils/sorters";
+import {alphaSort} from "../../utils/sorters";
-export default function JobTotalsTableLabor({ job }) {
- const { t } = useTranslation();
- const [state, setState] = useState({
- sortedInfo: {
- columnKey: "profitcenter_labor",
- field: "profitcenter_labor",
- order: "ascend",
- },
- filteredInfo: {},
- });
+export default function JobTotalsTableLabor({job}) {
+ const {t} = useTranslation();
+ const [state, setState] = useState({
+ sortedInfo: {
+ columnKey: "profitcenter_labor",
+ field: "profitcenter_labor",
+ order: "ascend",
+ },
+ filteredInfo: {},
+ });
- const data = useMemo(() => {
- return Object.keys(job.job_totals.rates)
- .filter(
- (key) =>
- key !== "mapa" &&
- key !== "mash" &&
- key !== "subtotal" &&
- key !== "rates_subtotal"
- )
- .map((key) => {
- return {
- id: key,
- ...job.job_totals.rates[key],
- };
- });
- }, [job.job_totals.rates]);
+ const data = useMemo(() => {
+ return Object.keys(job.job_totals.rates)
+ .filter(
+ (key) =>
+ key !== "mapa" &&
+ key !== "mash" &&
+ key !== "subtotal" &&
+ key !== "rates_subtotal"
+ )
+ .map((key) => {
+ return {
+ id: key,
+ ...job.job_totals.rates[key],
+ };
+ });
+ }, [job.job_totals.rates]);
- const columns = [
- {
- title: t("joblines.fields.profitcenter_labor"),
- dataIndex: "profitcenter_labor",
- key: "profitcenter_labor",
- defaultSortOrder: "ascend",
- sorter: (a, b) =>
- alphaSort(
- t(`jobs.fields.rate_${a.id.toLowerCase()}`),
- t(`jobs.fields.rate_${b.id.toLowerCase()}`)
- ),
- sortOrder:
- state.sortedInfo.columnKey === "profitcenter_labor" &&
- state.sortedInfo.order,
- render: (text, record) =>
- t(`jobs.fields.rate_${record.id.toLowerCase()}`),
- },
- {
- title: t("jobs.labels.rates"),
- dataIndex: "rate",
- key: "rate",
- align: "right",
- sorter: (a, b) => a.rate - b.rate,
- sortOrder:
- state.sortedInfo.columnKey === "rate" && state.sortedInfo.order,
- render: (text, record) => (
-
{record.rate}
- ),
- },
- {
- title: t("joblines.fields.mod_lb_hrs"),
- dataIndex: "mod_lb_hrs",
+ const columns = [
+ {
+ title: t("joblines.fields.profitcenter_labor"),
+ dataIndex: "profitcenter_labor",
+ key: "profitcenter_labor",
+ defaultSortOrder: "ascend",
+ sorter: (a, b) =>
+ alphaSort(
+ t(`jobs.fields.rate_${a.id.toLowerCase()}`),
+ t(`jobs.fields.rate_${b.id.toLowerCase()}`)
+ ),
+ sortOrder:
+ state.sortedInfo.columnKey === "profitcenter_labor" &&
+ state.sortedInfo.order,
+ render: (text, record) =>
+ t(`jobs.fields.rate_${record.id.toLowerCase()}`),
+ },
+ {
+ title: t("jobs.labels.rates"),
+ dataIndex: "rate",
+ key: "rate",
+ align: "right",
+ sorter: (a, b) => a.rate - b.rate,
+ sortOrder:
+ state.sortedInfo.columnKey === "rate" && state.sortedInfo.order,
+ render: (text, record) => (
+
{record.rate}
+ ),
+ },
+ {
+ title: t("joblines.fields.mod_lb_hrs"),
+ dataIndex: "mod_lb_hrs",
- key: "mod_lb_hrs",
- sorter: (a, b) => a.mod_lb_hrs - b.mod_lb_hrs,
- sortOrder:
- state.sortedInfo.columnKey === "mod_lb_hrs" && state.sortedInfo.order,
+ key: "mod_lb_hrs",
+ sorter: (a, b) => a.mod_lb_hrs - b.mod_lb_hrs,
+ sortOrder:
+ state.sortedInfo.columnKey === "mod_lb_hrs" && state.sortedInfo.order,
- render: (text, record) => record.hours.toFixed(1),
- },
- {
- title: t("joblines.fields.total"),
- dataIndex: "total",
- key: "total",
- align: "right",
- sorter: (a, b) => a.total.amount - b.total.amount,
- sortOrder:
- state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+ render: (text, record) => record.hours.toFixed(1),
+ },
+ {
+ title: t("joblines.fields.total"),
+ dataIndex: "total",
+ key: "total",
+ align: "right",
+ sorter: (a, b) => a.total.amount - b.total.amount,
+ sortOrder:
+ state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
- render: (text, record) => Dinero(record.total).toFormat(),
- },
- ];
+ render: (text, record) => Dinero(record.total).toFormat(),
+ },
+ ];
- const handleTableChange = (pagination, filters, sorter) => {
- setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
- };
- return (
-
(
- <>
-
-
- {t("jobs.labels.labor_rates_subtotal")}
-
-
-
- {(
- job.job_totals.rates.mapa.hours +
- job.job_totals.rates.mash.hours
- ).toFixed(1)}
-
-
-
- {Dinero(job.job_totals.rates.rates_subtotal).toFormat()}
-
-
-
-
-
-
- {t("jobs.labels.mapa")}
- {job.materials &&
- job.materials.MAPA &&
- job.materials.MAPA.cal_maxdlr !== undefined &&
- t("jobs.labels.threshhold", {
- amount: job.materials.MAPA.cal_maxdlr,
- })}
-
-
-
-
- {job.job_totals.rates.mapa.rate}
-
-
-
- {job.job_totals.rates.mapa.hours.toFixed(1)}
-
-
- {Dinero(job.job_totals.rates.mapa.total).toFormat()}
-
-
-
-
-
- {t("jobs.labels.mash")}
- {job.materials &&
- job.materials.MASH &&
- job.materials.MASH.cal_maxdlr !== undefined &&
- t("jobs.labels.threshhold", {
- amount: job.materials.MASH.cal_maxdlr,
- })}
-
-
-
-
- {job.job_totals.rates.mash.rate}
-
-
-
- {job.job_totals.rates.mash.hours.toFixed(1)}
-
-
- {Dinero(job.job_totals.rates.mash.total).toFormat()}
-
-
-
-
- {t("jobs.labels.rates_subtotal")}
-
-
-
-
-
- {Dinero(job.job_totals.rates.subtotal).toFormat()}
-
-
-
-
- )}
- />
- );
+ const handleTableChange = (pagination, filters, sorter) => {
+ setState({...state, filteredInfo: filters, sortedInfo: sorter});
+ };
+ return (
+ (
+ <>
+
+
+ {t("jobs.labels.labor_rates_subtotal")}
+
+
+
+ {(
+ job.job_totals.rates.mapa.hours +
+ job.job_totals.rates.mash.hours
+ ).toFixed(1)}
+
+
+
+ {Dinero(job.job_totals.rates.rates_subtotal).toFormat()}
+
+
+
+
+
+
+ {t("jobs.labels.mapa")}
+ {job.materials &&
+ job.materials.MAPA &&
+ job.materials.MAPA.cal_maxdlr !== undefined &&
+ t("jobs.labels.threshhold", {
+ amount: job.materials.MAPA.cal_maxdlr,
+ })}
+
+
+
+
+ {job.job_totals.rates.mapa.rate}
+
+
+
+ {job.job_totals.rates.mapa.hours.toFixed(1)}
+
+
+ {Dinero(job.job_totals.rates.mapa.total).toFormat()}
+
+
+
+
+
+ {t("jobs.labels.mash")}
+ {job.materials &&
+ job.materials.MASH &&
+ job.materials.MASH.cal_maxdlr !== undefined &&
+ t("jobs.labels.threshhold", {
+ amount: job.materials.MASH.cal_maxdlr,
+ })}
+
+
+
+
+ {job.job_totals.rates.mash.rate}
+
+
+
+ {job.job_totals.rates.mash.hours.toFixed(1)}
+
+
+ {Dinero(job.job_totals.rates.mash.total).toFormat()}
+
+
+
+
+ {t("jobs.labels.rates_subtotal")}
+
+
+
+
+
+ {Dinero(job.job_totals.rates.subtotal).toFormat()}
+
+
+
+
+ )}
+ />
+ );
}
diff --git a/client/src/components/job-totals-table/job-totals.table.other.component.jsx b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
index ac132f1a6..3fed60af3 100644
--- a/client/src/components/job-totals-table/job-totals.table.other.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.other.component.jsx
@@ -1,106 +1,106 @@
-import { Table } from "antd";
+import {Table} from "antd";
import Dinero from "dinero.js";
-import React, { useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { alphaSort } from "../../utils/sorters";
+import React, {useMemo, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {alphaSort} from "../../utils/sorters";
-export default function JobTotalsTableOther({ job }) {
- const { t } = useTranslation();
- const [state, setState] = useState({
- sortedInfo: {},
- filteredInfo: {},
- });
+export default function JobTotalsTableOther({job}) {
+ const {t} = useTranslation();
+ const [state, setState] = useState({
+ sortedInfo: {},
+ filteredInfo: {},
+ });
- const data = useMemo(() => {
- return [
- ...((job.job_totals.additional.additionalCostItems &&
- job.job_totals.additional.additionalCostItems.map((i) => {
- return {
- key: i.key,
- total: i.total,
- };
- })) ||
- []),
- {
- key: t("jobs.fields.adjustment_bottom_line"),
- total: job.job_totals.additional.adjustments,
- },
- {
- key: t("jobs.fields.towing_payable"),
- total: job.job_totals.additional.towing,
- },
- {
- key: t("jobs.fields.storage_payable"),
- total: job.job_totals.additional.storage,
- },
- // {
- // key: t("jobs.fields.ca_bc_pvrt"),
- // total: job.job_totals.additional.pvrt,
- // },
+ const data = useMemo(() => {
+ return [
+ ...((job.job_totals.additional.additionalCostItems &&
+ job.job_totals.additional.additionalCostItems.map((i) => {
+ return {
+ key: i.key,
+ total: i.total,
+ };
+ })) ||
+ []),
+ {
+ key: t("jobs.fields.adjustment_bottom_line"),
+ total: job.job_totals.additional.adjustments,
+ },
+ {
+ key: t("jobs.fields.towing_payable"),
+ total: job.job_totals.additional.towing,
+ },
+ {
+ key: t("jobs.fields.storage_payable"),
+ total: job.job_totals.additional.storage,
+ },
+ // {
+ // key: t("jobs.fields.ca_bc_pvrt"),
+ // total: job.job_totals.additional.pvrt,
+ // },
+ ];
+ }, [job.job_totals, t]);
+
+ const columns = [
+ {
+ title: t("general.labels.item"),
+ dataIndex: "key",
+ key: "key",
+ sorter: (a, b) => alphaSort(a.key, b.key),
+ sortOrder: state.sortedInfo.columnKey === "key" && state.sortedInfo.order,
+ width: "0%",
+ },
+ {
+ title: t("joblines.fields.total"),
+ dataIndex: "total",
+ key: "total",
+ sorter: (a, b) => a.total.amount - b.total.amount,
+ sortOrder:
+ state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+ width: "20%",
+ align: "right",
+ render: (text, record) => Dinero(record.total).toFormat(),
+ },
];
- }, [job.job_totals, t]);
- const columns = [
- {
- title: t("general.labels.item"),
- dataIndex: "key",
- key: "key",
- sorter: (a, b) => alphaSort(a.key, b.key),
- sortOrder: state.sortedInfo.columnKey === "key" && state.sortedInfo.order,
- width: "0%",
- },
- {
- title: t("joblines.fields.total"),
- dataIndex: "total",
- key: "total",
- sorter: (a, b) => a.total.amount - b.total.amount,
- sortOrder:
- state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
- width: "20%",
- align: "right",
- render: (text, record) => Dinero(record.total).toFormat(),
- },
- ];
+ const handleTableChange = (pagination, filters, sorter) => {
+ setState({...state, filteredInfo: filters, sortedInfo: sorter});
+ };
+ return (
+ (
+ <>
+
+
+ {t("jobs.labels.additionaltotal")}
+
- const handleTableChange = (pagination, filters, sorter) => {
- setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
- };
- return (
- (
- <>
-
-
- {t("jobs.labels.additionaltotal")}
-
+
+
+ {Dinero(job.job_totals.additional.total).toFormat()}
+
+
+
+
+
+ {t("jobs.labels.subletstotal")}
+
-
-
- {Dinero(job.job_totals.additional.total).toFormat()}
-
-
-
-
-
- {t("jobs.labels.subletstotal")}
-
-
-
-
- {Dinero(job.job_totals.parts.sublets.total).toFormat()}
-
-
-
-
- )}
- />
- );
+
+
+ {Dinero(job.job_totals.parts.sublets.total).toFormat()}
+
+
+
+
+ )}
+ />
+ );
}
diff --git a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
index afcf9e14a..313de9e61 100644
--- a/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.parts.component.jsx
@@ -1,131 +1,131 @@
-import { Table } from "antd";
+import {Table} from "antd";
import Dinero from "dinero.js";
-import React, { useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { alphaSort } from "../../utils/sorters";
+import React, {useMemo, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {alphaSort} from "../../utils/sorters";
-export default function JobTotalsTableParts({ job }) {
- const { t } = useTranslation();
- const [state, setState] = useState({
- sortedInfo: {},
- filteredInfo: {},
- });
-
- const insuranceAdjustments = useMemo(() => {
- if (!job.job_totals) return [];
- if (!job.job_totals?.parts?.adjustments) return [];
- const adjs = [];
- Object.keys(job.job_totals?.parts?.adjustments).forEach((key) => {
- if (Dinero(job.job_totals?.parts?.adjustments[key]).getAmount() !== 0) {
- adjs.push({
- id: key,
- amount: Dinero(job.job_totals.parts.adjustments[key]),
- });
- }
+export default function JobTotalsTableParts({job}) {
+ const {t} = useTranslation();
+ const [state, setState] = useState({
+ sortedInfo: {},
+ filteredInfo: {},
});
- return adjs;
- }, [job.job_totals]);
+ const insuranceAdjustments = useMemo(() => {
+ if (!job.job_totals) return [];
+ if (!job.job_totals?.parts?.adjustments) return [];
+ const adjs = [];
+ Object.keys(job.job_totals?.parts?.adjustments).forEach((key) => {
+ if (Dinero(job.job_totals?.parts?.adjustments[key]).getAmount() !== 0) {
+ adjs.push({
+ id: key,
+ amount: Dinero(job.job_totals.parts.adjustments[key]),
+ });
+ }
+ });
- const data = useMemo(() => {
- return Object.keys(job.job_totals.parts.parts.list)
- .filter(
- (key) =>
- key !== "mapa" &&
- key !== "mash" &&
- key !== "subtotal" &&
- key !== "rates_subtotal"
- )
- .map((key) => {
- return {
- id: key,
- ...job.job_totals.parts.parts.list[key],
- };
- });
- }, [job.job_totals.parts.parts.list]);
+ return adjs;
+ }, [job.job_totals]);
- const columns = [
- {
- title: t("joblines.fields.part_type"),
- dataIndex: "id",
- key: "id",
- sorter: (a, b) =>
- alphaSort(
- t(`jobs.fields.${a.id.toLowerCase()}`),
- t(`jobs.fields.${b.id.toLowerCase()}`)
- ),
- width: "80%",
- sortOrder: state.sortedInfo.columnKey === "id" && state.sortedInfo.order,
- render: (text, record) => t(`jobs.fields.${record.id.toLowerCase()}`),
- },
- {
- title: t("joblines.fields.total"),
- dataIndex: "total",
- key: "total",
- sorter: (a, b) => a.total.amount - b.total.amount,
- sortOrder:
- state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
- width: "20%",
- align: "right",
- render: (text, record) => Dinero(record.total).toFormat(),
- },
- ];
+ const data = useMemo(() => {
+ return Object.keys(job.job_totals.parts.parts.list)
+ .filter(
+ (key) =>
+ key !== "mapa" &&
+ key !== "mash" &&
+ key !== "subtotal" &&
+ key !== "rates_subtotal"
+ )
+ .map((key) => {
+ return {
+ id: key,
+ ...job.job_totals.parts.parts.list[key],
+ };
+ });
+ }, [job.job_totals.parts.parts.list]);
- const handleTableChange = (pagination, filters, sorter) => {
- setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
- };
- return (
- (
- <>
-
-
- {t("jobs.labels.prt_dsmk_total")}
-
-
- {Dinero(job.job_totals.parts.parts.prt_dsmk_total).toFormat()}
-
-
+ const columns = [
+ {
+ title: t("joblines.fields.part_type"),
+ dataIndex: "id",
+ key: "id",
+ sorter: (a, b) =>
+ alphaSort(
+ t(`jobs.fields.${a.id.toLowerCase()}`),
+ t(`jobs.fields.${b.id.toLowerCase()}`)
+ ),
+ width: "80%",
+ sortOrder: state.sortedInfo.columnKey === "id" && state.sortedInfo.order,
+ render: (text, record) => t(`jobs.fields.${record.id.toLowerCase()}`),
+ },
+ {
+ title: t("joblines.fields.total"),
+ dataIndex: "total",
+ key: "total",
+ sorter: (a, b) => a.total.amount - b.total.amount,
+ sortOrder:
+ state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+ width: "20%",
+ align: "right",
+ render: (text, record) => Dinero(record.total).toFormat(),
+ },
+ ];
-
-
- {t("jobs.labels.partstotal")}
-
+ const handleTableChange = (pagination, filters, sorter) => {
+ setState({...state, filteredInfo: filters, sortedInfo: sorter});
+ };
+ return (
+ (
+ <>
+
+
+ {t("jobs.labels.prt_dsmk_total")}
+
+
+ {Dinero(job.job_totals.parts.parts.prt_dsmk_total).toFormat()}
+
+
-
-
- {Dinero(job.job_totals.parts.parts.total).toFormat()}
-
-
-
- {insuranceAdjustments.length > 0 && (
-
-
- {t("jobs.labels.profileadjustments")}
-
-
- )}
- {insuranceAdjustments.map((adj, idx) => (
-
-
- {t(`jobs.fields.${adj.id.toLowerCase()}`)}
-
+
+
+ {t("jobs.labels.partstotal")}
+
-
- {adj.amount.toFormat()}
-
-
- ))}
-
- )}
- />
- );
+
+
+ {Dinero(job.job_totals.parts.parts.total).toFormat()}
+
+
+
+ {insuranceAdjustments.length > 0 && (
+
+
+ {t("jobs.labels.profileadjustments")}
+
+
+ )}
+ {insuranceAdjustments.map((adj, idx) => (
+
+
+ {t(`jobs.fields.${adj.id.toLowerCase()}`)}
+
+
+
+ {adj.amount.toFormat()}
+
+
+ ))}
+
+ )}
+ />
+ );
}
diff --git a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
index ee9645bc5..415df9695 100644
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -1,204 +1,205 @@
-import { Table } from "antd";
+import {Table} from "antd";
import Dinero from "dinero.js";
-import React, { useMemo } from "react";
-import { useTranslation } from "react-i18next";
+import React, {useMemo} from "react";
+import {useTranslation} from "react-i18next";
+
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop} from "../../redux/user/user.selectors";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
- //currentUser: selectCurrentUser
- bodyshop: selectBodyshop,
+ //currentUser: selectCurrentUser
+ bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
- //setUserLanguage: language => dispatch(setUserLanguage(language))
+ //setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(
- mapStateToProps,
- mapDispatchToProps
+ mapStateToProps,
+ mapDispatchToProps
)(JobTotalsTableTotals);
-export function JobTotalsTableTotals({ bodyshop, job }) {
- const { t } = useTranslation();
+export function JobTotalsTableTotals({bodyshop, job}) {
+ const {t} = useTranslation();
- const data = useMemo(() => {
- return [
- {
- key: t("jobs.labels.subtotal"),
- total: job.job_totals.totals.subtotal,
- bold: true,
- },
+ const data = useMemo(() => {
+ return [
+ {
+ key: t("jobs.labels.subtotal"),
+ total: job.job_totals.totals.subtotal,
+ bold: true,
+ },
- ...(job.job_totals.totals.us_sales_tax_breakdown
- ? [
- {
- key: `${
- bodyshop.md_responsibility_centers.taxes.tax_ty1?.tax_type1 ||
- "T1"
- } - ${[
- job.cieca_pft.ty1_rate1,
- job.cieca_pft.ty1_rate2,
- job.cieca_pft.ty1_rate3,
- job.cieca_pft.ty1_rate4,
- job.cieca_pft.ty1_rate5,
- ]
- .filter((i) => i > 0)
- .join(", ")}%`,
- total: job.job_totals.totals.us_sales_tax_breakdown.ty1Tax,
- },
- {
- key: `${
- bodyshop.md_responsibility_centers.taxes.tax_ty2?.tax_type2 ||
- "T2"
- } - ${[
- job.cieca_pft.ty2_rate1,
- job.cieca_pft.ty2_rate2,
- job.cieca_pft.ty2_rate3,
- job.cieca_pft.ty2_rate4,
- job.cieca_pft.ty2_rate5,
- ]
- .filter((i) => i > 0)
- .join(", ")}%`,
- total: job.job_totals.totals.us_sales_tax_breakdown.ty2Tax,
- },
- {
- key: `${
- bodyshop.md_responsibility_centers.taxes.tax_ty3?.tax_type3 ||
- "T3"
- } - ${[
- job.cieca_pft.ty3_rate1,
- job.cieca_pft.ty3_rate2,
- job.cieca_pft.ty3_rate3,
- job.cieca_pft.ty3_rate4,
- job.cieca_pft.ty3_rate5,
- ]
- .filter((i) => i > 0)
- .join(", ")}%`,
- total: job.job_totals.totals.us_sales_tax_breakdown.ty3Tax,
- },
- {
- key: `${
- bodyshop.md_responsibility_centers.taxes.tax_ty4?.tax_type4 ||
- "T4"
- } - ${[
- job.cieca_pft.ty4_rate1,
- job.cieca_pft.ty4_rate2,
- job.cieca_pft.ty4_rate3,
- job.cieca_pft.ty4_rate4,
- job.cieca_pft.ty4_rate5,
- ]
- .filter((i) => i > 0)
- .join(", ")}%`,
- total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax,
- },
- {
- key: `${
- bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 ||
- "TT"
- } - ${[
- job.cieca_pft.ty5_rate1,
- job.cieca_pft.ty5_rate2,
- job.cieca_pft.ty5_rate3,
- job.cieca_pft.ty5_rate4,
- job.cieca_pft.ty5_rate5,
- ]
- .filter((i) => i > 0)
- .join(", ")}%`,
- total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax,
- },
- {
- key: t("jobs.labels.total_sales_tax"),
- bold: true,
- total: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty1Tax)
- .add(
- Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty2Tax)
- )
- .add(
- Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty3Tax)
- )
- .add(
- Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty4Tax)
- )
- .add(
- Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty5Tax)
- ).toJSON(),
- },
- ].filter((item) => item.total.amount !== 0)
- : [
- {
- key: t("jobs.labels.state_tax_amt"),
- total: job.job_totals.totals.state_tax,
- },
- ]),
+ ...(job.job_totals.totals.us_sales_tax_breakdown
+ ? [
+ {
+ key: `${
+ bodyshop.md_responsibility_centers.taxes.tax_ty1?.tax_type1 ||
+ "T1"
+ } - ${[
+ job.cieca_pft.ty1_rate1,
+ job.cieca_pft.ty1_rate2,
+ job.cieca_pft.ty1_rate3,
+ job.cieca_pft.ty1_rate4,
+ job.cieca_pft.ty1_rate5,
+ ]
+ .filter((i) => i > 0)
+ .join(", ")}%`,
+ total: job.job_totals.totals.us_sales_tax_breakdown.ty1Tax,
+ },
+ {
+ key: `${
+ bodyshop.md_responsibility_centers.taxes.tax_ty2?.tax_type2 ||
+ "T2"
+ } - ${[
+ job.cieca_pft.ty2_rate1,
+ job.cieca_pft.ty2_rate2,
+ job.cieca_pft.ty2_rate3,
+ job.cieca_pft.ty2_rate4,
+ job.cieca_pft.ty2_rate5,
+ ]
+ .filter((i) => i > 0)
+ .join(", ")}%`,
+ total: job.job_totals.totals.us_sales_tax_breakdown.ty2Tax,
+ },
+ {
+ key: `${
+ bodyshop.md_responsibility_centers.taxes.tax_ty3?.tax_type3 ||
+ "T3"
+ } - ${[
+ job.cieca_pft.ty3_rate1,
+ job.cieca_pft.ty3_rate2,
+ job.cieca_pft.ty3_rate3,
+ job.cieca_pft.ty3_rate4,
+ job.cieca_pft.ty3_rate5,
+ ]
+ .filter((i) => i > 0)
+ .join(", ")}%`,
+ total: job.job_totals.totals.us_sales_tax_breakdown.ty3Tax,
+ },
+ {
+ key: `${
+ bodyshop.md_responsibility_centers.taxes.tax_ty4?.tax_type4 ||
+ "T4"
+ } - ${[
+ job.cieca_pft.ty4_rate1,
+ job.cieca_pft.ty4_rate2,
+ job.cieca_pft.ty4_rate3,
+ job.cieca_pft.ty4_rate4,
+ job.cieca_pft.ty4_rate5,
+ ]
+ .filter((i) => i > 0)
+ .join(", ")}%`,
+ total: job.job_totals.totals.us_sales_tax_breakdown.ty4Tax,
+ },
+ {
+ key: `${
+ bodyshop.md_responsibility_centers.taxes.tax_ty5?.tax_type5 ||
+ "TT"
+ } - ${[
+ job.cieca_pft.ty5_rate1,
+ job.cieca_pft.ty5_rate2,
+ job.cieca_pft.ty5_rate3,
+ job.cieca_pft.ty5_rate4,
+ job.cieca_pft.ty5_rate5,
+ ]
+ .filter((i) => i > 0)
+ .join(", ")}%`,
+ total: job.job_totals.totals.us_sales_tax_breakdown.ty5Tax,
+ },
+ {
+ key: t("jobs.labels.total_sales_tax"),
+ bold: true,
+ total: Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty1Tax)
+ .add(
+ Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty2Tax)
+ )
+ .add(
+ Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty3Tax)
+ )
+ .add(
+ Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty4Tax)
+ )
+ .add(
+ Dinero(job.job_totals.totals.us_sales_tax_breakdown.ty5Tax)
+ ).toJSON(),
+ },
+ ].filter((item) => item.total.amount !== 0)
+ : [
+ {
+ key: t("jobs.labels.state_tax_amt"),
+ total: job.job_totals.totals.state_tax,
+ },
+ ]),
- {
- key: t("jobs.labels.total_repairs"),
- total: job.job_totals.totals.total_repairs,
- bold: true,
- },
- {
- key: t("jobs.fields.ded_amt"),
- total: job.job_totals.totals.custPayable.deductible,
- },
- // {
- // key: t("jobs.fields.federal_tax_payable"),
- // total: job.job_totals.totals.custPayable.federal_tax,
- // },
- {
- key: t("jobs.fields.other_amount_payable"),
- total: job.job_totals.totals.custPayable.other_customer_amount,
- },
- {
- key: t("jobs.fields.depreciation_taxes"),
- total: job.job_totals.totals.custPayable.dep_taxes,
- },
+ {
+ key: t("jobs.labels.total_repairs"),
+ total: job.job_totals.totals.total_repairs,
+ bold: true,
+ },
+ {
+ key: t("jobs.fields.ded_amt"),
+ total: job.job_totals.totals.custPayable.deductible,
+ },
+ // {
+ // key: t("jobs.fields.federal_tax_payable"),
+ // total: job.job_totals.totals.custPayable.federal_tax,
+ // },
+ {
+ key: t("jobs.fields.other_amount_payable"),
+ total: job.job_totals.totals.custPayable.other_customer_amount,
+ },
+ {
+ key: t("jobs.fields.depreciation_taxes"),
+ total: job.job_totals.totals.custPayable.dep_taxes,
+ },
- {
- key: t("jobs.labels.total_cust_payable"),
- total: job.job_totals.totals.custPayable.total,
- bold: true,
- },
- {
- key: t("jobs.labels.net_repairs"),
- total: job.job_totals.totals.net_repairs,
- bold: true,
- },
+ {
+ key: t("jobs.labels.total_cust_payable"),
+ total: job.job_totals.totals.custPayable.total,
+ bold: true,
+ },
+ {
+ key: t("jobs.labels.net_repairs"),
+ total: job.job_totals.totals.net_repairs,
+ bold: true,
+ },
+ ];
+ }, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
+
+ const columns = [
+ {
+ //title: t("joblines.fields.part_type"),
+ dataIndex: "key",
+ key: "key",
+ width: "80%",
+ onCell: (record, rowIndex) => {
+ return {style: {fontWeight: record.bold && "bold"}};
+ },
+ },
+ {
+ title: t("joblines.fields.total"),
+ dataIndex: "total",
+ key: "total",
+ align: "right",
+ render: (text, record) => Dinero(record.total).toFormat(),
+ width: "20%",
+ onCell: (record, rowIndex) => {
+ return {style: {fontWeight: record.bold && "bold"}};
+ },
+ },
];
- }, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
- const columns = [
- {
- //title: t("joblines.fields.part_type"),
- dataIndex: "key",
- key: "key",
- width: "80%",
- onCell: (record, rowIndex) => {
- return { style: { fontWeight: record.bold && "bold" } };
- },
- },
- {
- title: t("joblines.fields.total"),
- dataIndex: "total",
- key: "total",
- align: "right",
- render: (text, record) => Dinero(record.total).toFormat(),
- width: "20%",
- onCell: (record, rowIndex) => {
- return { style: { fontWeight: record.bold && "bold" } };
- },
- },
- ];
-
- return (
-
- );
+ return (
+
+ );
}
diff --git a/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx b/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
index edef81343..63133a18d 100644
--- a/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
+++ b/client/src/components/jobs-admin-change-status/jobs-admin-change.status.component.jsx
@@ -1,64 +1,62 @@
-import { DownCircleFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
-import { Button, Dropdown, Menu, notification } from "antd";
+import {DownCircleFilled} from "@ant-design/icons";
+import {useMutation} from "@apollo/client";
+import {Button, Dropdown, notification} from "antd";
import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {UPDATE_JOB_STATUS} from "../../graphql/jobs.queries";
+import {insertAuditTrail} from "../../redux/application/application.actions";
+import {selectBodyshop} from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
+ bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
- insertAuditTrail: ({ jobid, operation }) =>
- dispatch(insertAuditTrail({ jobid, operation })),
+ insertAuditTrail: ({jobid, operation}) =>
+ dispatch(insertAuditTrail({jobid, operation})),
});
export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminStatus);
-export function JobsAdminStatus({ insertAuditTrail, bodyshop, job }) {
- const { t } = useTranslation();
+export function JobsAdminStatus({insertAuditTrail, bodyshop, job}) {
+ const {t} = useTranslation();
- const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
- const updateJobStatus = (status) => {
- mutationUpdateJobstatus({
- variables: { jobId: job.id, status: status },
- })
- .then((r) => {
- notification["success"]({ message: t("jobs.successes.save") });
- insertAuditTrail({
- jobid: job.id,
- operation: AuditTrailMapping.admin_jobstatuschange(status),
- });
- // refetch();
- })
- .catch((error) => {
- notification["error"]({ message: t("jobs.errors.saving") });
- });
- };
+ const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
+ const updateJobStatus = (status) => {
+ mutationUpdateJobstatus({
+ variables: {jobId: job.id, status: status},
+ })
+ .then((r) => {
+ notification["success"]({message: t("jobs.successes.save")});
+ insertAuditTrail({
+ jobid: job.id,
+ operation: AuditTrailMapping.admin_jobstatuschange(status),
+ });
+ // refetch();
+ })
+ .catch((error) => {
+ notification["error"]({message: t("jobs.errors.saving")});
+ });
+ };
- const statusmenu = (
-
- );
+ const statusMenu = {
+ items: bodyshop.md_ro_statuses.statuses.map((item) => ({
+ key: item,
+ label: item,
+ })),
+ onClick: (e) => {
+ updateJobStatus(e.key);
+ },
+ }
- return (
-
-
+
+ );
}
diff --git a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
index 55142344e..4d5b80541 100644
--- a/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
+++ b/client/src/components/jobs-admin-class/jobs-admin-class.component.jsx
@@ -1,84 +1,84 @@
-import { useMutation } from "@apollo/client";
-import { Button, Form, notification, Popconfirm, Select } from "antd";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {useMutation} from "@apollo/client";
+import {Button, Form, notification, Popconfirm, Select} from "antd";
+import React, {useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {UPDATE_JOB} from "../../graphql/jobs.queries";
+import {selectBodyshop} from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
+ bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
- //setUserLanguage: language => dispatch(setUserLanguage(language))
+ //setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(JobsAdminClass);
-export function JobsAdminClass({ bodyshop, job }) {
- const { t } = useTranslation();
- const [loading, setLoading] = useState(false);
- const [form] = Form.useForm();
- const [updateJob] = useMutation(UPDATE_JOB);
+export function JobsAdminClass({bodyshop, job}) {
+ const {t} = useTranslation();
+ const [loading, setLoading] = useState(false);
+ const [form] = Form.useForm();
+ const [updateJob] = useMutation(UPDATE_JOB);
- const handleFinish = async (values) => {
- setLoading(true);
- const result = await updateJob({
- variables: { jobId: job.id, job: values },
- });
+ const handleFinish = async (values) => {
+ setLoading(true);
+ const result = await updateJob({
+ variables: {jobId: job.id, job: values},
+ });
- if (!!!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- //Get the owner details, populate it all back into the job.
- };
+ if (!!!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ //Get the owner details, populate it all back into the job.
+ };
- useEffect(() => {
- //form.resetFields();
- }, [form, job]);
+ useEffect(() => {
+ //form.resetFields();
+ }, [form, job]);
- return (
-
-
+ return (
+
+
-
form.submit()}
- >
-
-
-
- );
+
form.submit()}
+ >
+
+
+
+
+
+
+
);
-
- Object.keys(changedAuditFields).forEach((key) => {
- insertAuditTrail({
- jobid: job.id,
- operation: AuditTrailMapping.admin_jobfieldchange(
- key,
- changedAuditFields[key] instanceof moment
- ? DateTimeFormat(changedAuditFields[key])
- : changedAuditFields[key]
- ),
- });
- });
-
- if (!!!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- form.resetFields();
- form.resetFields();
- setLoading(false);
- //Get the owner details, populate it all back into the job.
- };
-
- useEffect(() => {
- //form.resetFields();
- }, [form, job]);
-
- return (
-
-
-
-
-
- );
}
diff --git a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
index 190778437..68b50c3c2 100644
--- a/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
+++ b/client/src/components/jobs-admin-delete-intake/jobs-admin-delete-intake.component.jsx
@@ -1,79 +1,79 @@
-import { useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
-import { gql } from "@apollo/client";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-export default function JobAdminDeleteIntake({ job }) {
- const { t } = useTranslation();
- const [loading, setLoading] = useState(false);
- const [deleteIntake] = useMutation(gql`
- mutation DELETE_INTAKE($jobId: uuid!) {
- update_jobs_by_pk(
- pk_columns: { id: $jobId }
- _set: { intakechecklist: null }
- ) {
- id
- intakechecklist
- }
- }
- `);
+import {gql, useMutation} from "@apollo/client";
+import {Button, notification} from "antd";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
- const [DELETE_DELIVERY] = useMutation(gql`
- mutation DELETE_DELIVERY($jobId: uuid!) {
- update_jobs_by_pk(
- pk_columns: { id: $jobId }
- _set: { deliverchecklist: null }
- ) {
- id
- deliverchecklist
- }
- }
- `);
+export default function JobAdminDeleteIntake({job}) {
+ const {t} = useTranslation();
+ const [loading, setLoading] = useState(false);
+ const [deleteIntake] = useMutation(gql`
+ mutation DELETE_INTAKE($jobId: uuid!) {
+ update_jobs_by_pk(
+ pk_columns: { id: $jobId }
+ _set: { intakechecklist: null }
+ ) {
+ id
+ intakechecklist
+ }
+ }
+ `);
- const handleDelete = async (values) => {
- setLoading(true);
- const result = await deleteIntake({
- variables: { jobId: job.id },
- });
+ const [DELETE_DELIVERY] = useMutation(gql`
+ mutation DELETE_DELIVERY($jobId: uuid!) {
+ update_jobs_by_pk(
+ pk_columns: { id: $jobId }
+ _set: { deliverchecklist: null }
+ ) {
+ id
+ deliverchecklist
+ }
+ }
+ `);
- if (!!!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- };
+ const handleDelete = async (values) => {
+ setLoading(true);
+ const result = await deleteIntake({
+ variables: {jobId: job.id},
+ });
- const handleDeleteDelivery = async (values) => {
- setLoading(true);
- const result = await DELETE_DELIVERY({
- variables: { jobId: job.id },
- });
+ if (!!!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ };
- if (!!!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- };
+ const handleDeleteDelivery = async (values) => {
+ setLoading(true);
+ const result = await DELETE_DELIVERY({
+ variables: {jobId: job.id},
+ });
- return (
- <>
-
-
-
- );
+ if (!!!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ };
+
+ return (
+ <>
+
+
+
+ );
}
diff --git a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
index c47c30def..3b4cbe9bd 100644
--- a/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
+++ b/client/src/components/jobs-admin-mark-reexport/jobs-admin-mark-reexport.component.jsx
@@ -1,191 +1,189 @@
-import { gql, useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import {gql, useMutation} from "@apollo/client";
+import {Button, notification} from "antd";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
-import moment from "moment";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import {
- selectBodyshop,
- selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import dayjs from "../../utils/day";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {INSERT_EXPORT_LOG} from "../../graphql/accounting.queries";
+import {insertAuditTrail} from "../../redux/application/application.actions";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
- currentUser: selectCurrentUser,
+ bodyshop: selectBodyshop,
+ currentUser: selectCurrentUser,
});
const mapDispatchToProps = (dispatch) => ({
- insertAuditTrail: ({ jobid, operation }) =>
- dispatch(insertAuditTrail({ jobid, operation })),
+ insertAuditTrail: ({jobid, operation}) =>
+ dispatch(insertAuditTrail({jobid, operation})),
});
export default connect(
- mapStateToProps,
- mapDispatchToProps
+ mapStateToProps,
+ mapDispatchToProps
)(JobAdminMarkReexport);
export function JobAdminMarkReexport({
- insertAuditTrail,
- bodyshop,
- currentUser,
- job,
-}) {
- const { t } = useTranslation();
- const [loading, setLoading] = useState(false);
- const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
- const [markJobForReexport] = useMutation(gql`
- mutation MARK_JOB_FOR_REEXPORT($jobId: uuid!) {
- update_jobs_by_pk(
- pk_columns: { id: $jobId }
- _set: { date_exported: null
- status: "${bodyshop.md_ro_statuses.default_invoiced}"
+ insertAuditTrail,
+ bodyshop,
+ currentUser,
+ job,
+ }) {
+ const {t} = useTranslation();
+ const [loading, setLoading] = useState(false);
+ const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+ const [markJobForReexport] = useMutation(gql`
+ mutation MARK_JOB_FOR_REEXPORT($jobId: uuid!) {
+ update_jobs_by_pk(
+ pk_columns: { id: $jobId }
+ _set: { date_exported: null
+ status: "${bodyshop.md_ro_statuses.default_invoiced}"
+ }
+ ) {
+ id
+ date_exported
+ status
+ date_invoiced
+ }
}
- ) {
- id
- date_exported
- status
- date_invoiced
- }
- }
- `);
+ `);
- const [markJobExported] = useMutation(gql`
- mutation MARK_JOB_AS_EXPORTED($jobId: uuid!, $date_exported: timestamptz!) {
- update_jobs_by_pk(
- pk_columns: { id: $jobId }
- _set: { date_exported: $date_exported
- status: "${bodyshop.md_ro_statuses.default_exported}"
+ const [markJobExported] = useMutation(gql`
+ mutation MARK_JOB_AS_EXPORTED($jobId: uuid!, $date_exported: timestamptz!) {
+ update_jobs_by_pk(
+ pk_columns: { id: $jobId }
+ _set: { date_exported: $date_exported
+ status: "${bodyshop.md_ro_statuses.default_exported}"
+ }
+ ) {
+ id
+ date_exported
+ date_invoiced
+ status
+ }
}
- ) {
- id
- date_exported
- date_invoiced
- status
- }
- }
- `);
- const [markJobUninvoiced] = useMutation(gql`
- mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, ) {
- update_jobs_by_pk(
- pk_columns: { id: $jobId }
- _set: { date_exported: null
- date_invoiced: null
- status: "${bodyshop.md_ro_statuses.default_delivered}"
+ `);
+ const [markJobUninvoiced] = useMutation(gql`
+ mutation MARK_JOB_AS_UNINVOICED($jobId: uuid!, ) {
+ update_jobs_by_pk(
+ pk_columns: { id: $jobId }
+ _set: { date_exported: null
+ date_invoiced: null
+ status: "${bodyshop.md_ro_statuses.default_delivered}"
+ }
+ ) {
+ id
+ date_exported
+ date_invoiced
+ status
+ }
}
- ) {
- id
- date_exported
- date_invoiced
- status
- }
- }
- `);
+ `);
- const handleMarkForExport = async () => {
- setLoading(true);
- const result = await markJobForReexport({
- variables: { jobId: job.id },
- });
+ const handleMarkForExport = async () => {
+ setLoading(true);
+ const result = await markJobForReexport({
+ variables: {jobId: job.id},
+ });
- if (!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- insertAuditTrail({
- jobid: job.id,
- operation: AuditTrailMapping.admin_jobmarkforreexport(),
- });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- };
+ if (!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ insertAuditTrail({
+ jobid: job.id,
+ operation: AuditTrailMapping.admin_jobmarkforreexport(),
+ });
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ };
- const handleMarkExported = async () => {
- setLoading(true);
- const result = await markJobExported({
- variables: { jobId: job.id, date_exported: moment() },
- });
+ const handleMarkExported = async () => {
+ setLoading(true);
+ const result = await markJobExported({
+ variables: {jobId: job.id, date_exported: dayjs()},
+ });
- await insertExportLog({
- variables: {
- logs: [
- {
- bodyshopid: bodyshop.id,
- jobid: job.id,
- successful: true,
- message: JSON.stringify([t("general.labels.markedexported")]),
- useremail: currentUser.email,
- },
- ],
- },
- });
+ await insertExportLog({
+ variables: {
+ logs: [
+ {
+ bodyshopid: bodyshop.id,
+ jobid: job.id,
+ successful: true,
+ message: JSON.stringify([t("general.labels.markedexported")]),
+ useremail: currentUser.email,
+ },
+ ],
+ },
+ });
- if (!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- insertAuditTrail({
- jobid: job.id,
- operation: AuditTrailMapping.admin_jobmarkexported(),
- });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- };
+ if (!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ insertAuditTrail({
+ jobid: job.id,
+ operation: AuditTrailMapping.admin_jobmarkexported(),
+ });
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ };
- const handleUninvoice = async () => {
- setLoading(true);
- const result = await markJobUninvoiced({
- variables: { jobId: job.id },
- });
+ const handleUninvoice = async () => {
+ setLoading(true);
+ const result = await markJobUninvoiced({
+ variables: {jobId: job.id},
+ });
- if (!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- insertAuditTrail({
- jobid: job.id,
- operation: AuditTrailMapping.admin_jobuninvoice(),
- });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- };
+ if (!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ insertAuditTrail({
+ jobid: job.id,
+ operation: AuditTrailMapping.admin_jobuninvoice(),
+ });
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ };
- return (
- <>
-
-
-
-
- );
+ return (
+ <>
+
+
+
+
+ );
}
diff --git a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
index 27f468526..737753cdb 100644
--- a/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
+++ b/client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx
@@ -1,63 +1,64 @@
-import { useMutation } from "@apollo/client";
-import { Button, Form, notification } from "antd";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import {useMutation} from "@apollo/client";
+import {Button, Form, notification} from "antd";
+import React, {useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {UPDATE_JOB} from "../../graphql/jobs.queries";
import OwnerSearchSelect from "../owner-search-select/owner-search-select.component";
-export default function JobAdminOwnerReassociate({ job }) {
- const { t } = useTranslation();
- const [loading, setLoading] = useState(false);
- const [form] = Form.useForm();
- const [updateJob] = useMutation(UPDATE_JOB);
- const handleFinish = async (values) => {
- setLoading(true);
- const result = await updateJob({
- variables: { jobId: job.id, job: { ownerid: values.ownerid } },
- });
- if (!!!result.errors) {
- notification["success"]({ message: t("jobs.successes.save") });
- } else {
- notification["error"]({
- message: t("jobs.errors.saving", {
- error: JSON.stringify(result.errors),
- }),
- });
- }
- setLoading(false);
- //Get the owner details, populate it all back into the job.
- };
+export default function JobAdminOwnerReassociate({job}) {
+ const {t} = useTranslation();
+ const [loading, setLoading] = useState(false);
+ const [form] = Form.useForm();
+ const [updateJob] = useMutation(UPDATE_JOB);
+ const handleFinish = async (values) => {
+ setLoading(true);
+ const result = await updateJob({
+ variables: {jobId: job.id, job: {ownerid: values.ownerid}},
+ });
- useEffect(() => {
- //form.resetFields();
- }, [form, job]);
+ if (!!!result.errors) {
+ notification["success"]({message: t("jobs.successes.save")});
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.saving", {
+ error: JSON.stringify(result.errors),
+ }),
+ });
+ }
+ setLoading(false);
+ //Get the owner details, populate it all back into the job.
+ };
- return (
-
-
{t("jobs.labels.ownerassociation")}
-
-
{t("jobs.labels.associationwarning")}
-
-
+
{t("jobs.labels.ownerassociation")}
+
+
{t("jobs.labels.associationwarning")}
+
+
-
{t("jobs.labels.vehicleassociation")}
-
-
{t("jobs.labels.associationwarning")}
-
-
+
{t("jobs.labels.vehicleassociation")}
+
+
{t("jobs.labels.associationwarning")}
+
+
- {(record.job && record.job.ro_number) || t("general.labels.na")}
-
- ),
- },
- {
- title: t("jobs.fields.owner"),
- dataIndex: "ownr_name",
- key: "ownr_name",
- ellipsis: true,
- sorter: (a, b) => alphaSort(a.ownr_name, b.ownr_name),
- sortOrder:
- state.sortedInfo.columnKey === "ownr_name" && state.sortedInfo.order,
- },
- {
- title: t("jobs.fields.vehicle"),
- dataIndex: "vehicle_info",
- key: "vehicle_info",
- sorter: (a, b) => alphaSort(a.vehicle_info, b.vehicle_info),
- sortOrder:
- state.sortedInfo.columnKey === "vehicle_info" && state.sortedInfo.order,
- },
- {
- title: t("jobs.fields.clm_no"),
- dataIndex: "clm_no",
- key: "clm_no",
- sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
- sortOrder:
- state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
- },
- {
- title: t("jobs.fields.ins_co_nm"),
- dataIndex: "ins_co_nm",
- key: "ins_co_nm",
- sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
- sortOrder:
- state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
- },
- {
- title: t("jobs.fields.clm_total"),
- dataIndex: "clm_amt",
- key: "clm_amt",
- sorter: (a, b) => a.clm_amt - b.clm_amt,
- sortOrder:
- state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order,
- render: (text, record) => (
- {record.clm_amt}
- ),
- },
- {
- title: t("jobs.fields.uploaded_by"),
- dataIndex: "uploaded_by",
- key: "uploaded_by",
- sorter: (a, b) => alphaSort(a.uploaded_by, b.uploaded_by),
- sortOrder:
- state.sortedInfo.columnKey === "uploaded_by" && state.sortedInfo.order,
- },
- {
- title: t("jobs.fields.updated_at"),
- dataIndex: "updated_at",
- key: "updated_at",
- sorter: (a, b) => new Date(a.updated_at) - new Date(b.updated_at),
- sortOrder:
- state.sortedInfo.columnKey === "updated_at" && state.sortedInfo.order,
- render: (text, record) => (
- {record.updated_at}
- ),
- },
- {
- title: t("general.labels.actions"),
- key: "actions",
- render: (text, record) => {
- const isClosed =
- record.job &&
- (record.job.status === bodyshop.md_ro_statuses.default_exported ||
- record.job.status === bodyshop.md_ro_statuses.default_invoiced);
- return (
-
-
- {!isClosed && (
- <>
-
-
-
- )}
- {isClosed && (
-
- )}
-
- );
- },
- },
- ];
+ const columns = [
+ {
+ title: t("jobs.fields.cieca_id"),
+ dataIndex: "cieca_id",
+ key: "cieca_id",
+ sorter: (a, b) => alphaSort(a.cieca_id, b.cieca_id),
+ sortOrder:
+ state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
+ },
+ {
+ title: t("jobs.fields.ro_number"),
+ dataIndex: "job_id",
+ key: "job_id",
+ //width: "8%",
+ // onFilter: (value, record) => record.ro_number.includes(value),
+ // filteredValue: state.filteredInfo.text || null,
+ sorter: (a, b) =>
+ alphaSort(a.job && a.job.ro_number, b.job && b.job.ro_number),
+ sortOrder:
+ state.sortedInfo.columnKey === "job_id" && state.sortedInfo.order,
+ render: (text, record) =>
+ record.job ? (
+
+ {(record.job && record.job.ro_number) || t("general.labels.na")}
+
+ ) : (
+
+ {(record.job && record.job.ro_number) || t("general.labels.na")}
+
+ ),
+ },
+ {
+ title: t("jobs.fields.owner"),
+ dataIndex: "ownr_name",
+ key: "ownr_name",
+ ellipsis: true,
+ sorter: (a, b) => alphaSort(a.ownr_name, b.ownr_name),
+ sortOrder:
+ state.sortedInfo.columnKey === "ownr_name" && state.sortedInfo.order,
+ },
+ {
+ title: t("jobs.fields.vehicle"),
+ dataIndex: "vehicle_info",
+ key: "vehicle_info",
+ sorter: (a, b) => alphaSort(a.vehicle_info, b.vehicle_info),
+ sortOrder:
+ state.sortedInfo.columnKey === "vehicle_info" && state.sortedInfo.order,
+ },
+ {
+ title: t("jobs.fields.clm_no"),
+ dataIndex: "clm_no",
+ key: "clm_no",
+ sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
+ sortOrder:
+ state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+ },
+ {
+ title: t("jobs.fields.ins_co_nm"),
+ dataIndex: "ins_co_nm",
+ key: "ins_co_nm",
+ sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+ sortOrder:
+ state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
+ },
+ {
+ title: t("jobs.fields.clm_total"),
+ dataIndex: "clm_amt",
+ key: "clm_amt",
+ sorter: (a, b) => a.clm_amt - b.clm_amt,
+ sortOrder:
+ state.sortedInfo.columnKey === "clm_amt" && state.sortedInfo.order,
+ render: (text, record) => (
+ {record.clm_amt}
+ ),
+ },
+ {
+ title: t("jobs.fields.uploaded_by"),
+ dataIndex: "uploaded_by",
+ key: "uploaded_by",
+ sorter: (a, b) => alphaSort(a.uploaded_by, b.uploaded_by),
+ sortOrder:
+ state.sortedInfo.columnKey === "uploaded_by" && state.sortedInfo.order,
+ },
+ {
+ title: t("jobs.fields.updated_at"),
+ dataIndex: "updated_at",
+ key: "updated_at",
+ sorter: (a, b) => new Date(a.updated_at) - new Date(b.updated_at),
+ sortOrder:
+ state.sortedInfo.columnKey === "updated_at" && state.sortedInfo.order,
+ render: (text, record) => (
+ {record.updated_at}
+ ),
+ },
+ {
+ title: t("general.labels.actions"),
+ key: "actions",
+ render: (text, record) => {
+ const isClosed =
+ record.job &&
+ (record.job.status === bodyshop.md_ro_statuses.default_exported ||
+ record.job.status === bodyshop.md_ro_statuses.default_invoiced);
+ return (
+
+
+ {!isClosed && (
+ <>
+
+
+
+ )}
+ {isClosed && (
+
+ )}
+
+ );
+ },
+ },
+ ];
- const availableJobs = data
- ? searchText
- ? data.available_jobs.filter(
- (j) =>
- (j.ownr_name || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.vehicle_info || "")
- .toLowerCase()
- .includes(searchText.toLowerCase()) ||
- (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase())
- )
- : data.available_jobs
- : [];
+ const availableJobs = data
+ ? searchText
+ ? data.available_jobs.filter(
+ (j) =>
+ (j.ownr_name || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.vehicle_info || "")
+ .toLowerCase()
+ .includes(searchText.toLowerCase()) ||
+ (j.clm_no || "").toLowerCase().includes(searchText.toLowerCase())
+ )
+ : data.available_jobs
+ : [];
- return (
-
-
-
+ return (
+
+
+
- {
- setSearchText(e.currentTarget.value);
- }}
- />
-
- }
- >
-
-
- );
+ {
+ setSearchText(e.currentTarget.value);
+ }}
+ />
+
+ }
+ >
+
+
+ );
}
diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
index 5f6443775..74ffb54b1 100644
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -1,35 +1,26 @@
-import {
- gql,
- useApolloClient,
- useLazyQuery,
- useMutation,
- useQuery,
-} from "@apollo/client";
-import { useTreatments } from "@splitsoftware/splitio-react";
-import { Button, Col, Row, notification } from "antd";
+import {gql, useApolloClient, useLazyQuery, useMutation, useQuery,} from "@apollo/client";
+import {useSplitTreatments} from "@splitsoftware/splitio-react";
+import {Button, Col, notification, Row} from "antd";
import Axios from "axios";
import _ from "lodash";
-import moment from "moment";
+import dayjs from "../../utils/day";
import queryString from "query-string";
-import React, { useCallback, useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { useHistory, useLocation } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
+import React, {useCallback, useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {useLocation, useNavigate} from "react-router-dom";
+import {createStructuredSelector} from "reselect";
+import {logImEXEvent} from "../../firebase/firebase.utils";
import {
- DELETE_AVAILABLE_JOB,
- QUERY_AVAILABLE_JOBS,
- QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
+ DELETE_AVAILABLE_JOB,
+ QUERY_AVAILABLE_JOBS,
+ QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK,
} from "../../graphql/available-jobs.queries";
-import { INSERT_NEW_JOB, UPDATE_JOB } from "../../graphql/jobs.queries";
-import { INSERT_NEW_NOTE } from "../../graphql/notes.queries";
-import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import {
- selectBodyshop,
- selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import {INSERT_NEW_JOB, UPDATE_JOB} from "../../graphql/jobs.queries";
+import {INSERT_NEW_NOTE} from "../../graphql/notes.queries";
+import {SEARCH_VEHICLE_BY_VIN} from "../../graphql/vehicles.queries";
+import {insertAuditTrail} from "../../redux/application/application.actions";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
import CriticalPartsScan from "../../utils/criticalPartsScan";
import AlertComponent from "../alert/alert.component";
@@ -37,581 +28,581 @@ import JobsAvailableScan from "../jobs-available-scan/jobs-available-scan.compon
import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.container";
-import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util";
+import {GetSupplementDelta} from "./jobs-available-supplement.estlines.util";
import HeaderFields from "./jobs-available-supplement.headerfields";
import JobsAvailableTableComponent from "./jobs-available-table.component";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
- currentUser: selectCurrentUser,
+ bodyshop: selectBodyshop,
+ currentUser: selectCurrentUser,
});
const mapDispatchToProps = (dispatch) => ({
- insertAuditTrail: ({ jobid, operation }) =>
- dispatch(insertAuditTrail({ jobid, operation })),
+ insertAuditTrail: ({jobid, operation}) =>
+ dispatch(insertAuditTrail({jobid, operation})),
});
-export function JobsAvailableContainer({
- bodyshop,
- currentUser,
- insertAuditTrail,
-}) {
- const { CriticalPartsScanning } = useTreatments(
- ["CriticalPartsScanning"],
- {},
- bodyshop.imexshopid
- );
- const { loading, error, data, refetch } = useQuery(QUERY_AVAILABLE_JOBS, {
- fetchPolicy: "network-only",
- nextFetchPolicy: "network-only",
- });
- const { clm_no, availableJobId } = queryString.parse(useLocation().search);
- const history = useHistory();
- const { t } = useTranslation();
- const [ownerModalVisible, setOwnerModalVisible] = useState(false);
- const [jobModalVisible, setJobModalVisible] = useState(false);
+export function JobsAvailableContainer({bodyshop, currentUser, insertAuditTrail,}) {
- const [selectedJob, setSelectedJob] = useState(null);
- const [selectedOwner, setSelectedOwner] = useState(null);
- const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
+ const {treatments: {CriticalPartsScanning}} = useSplitTreatments({
+ attributes: {},
+ names: ["CriticalPartsScanning"],
+ splitKey: bodyshop.imexshopid,
+ });
- const [insertLoading, setInsertLoading] = useState(false);
+ const {loading, error, data, refetch} = useQuery(QUERY_AVAILABLE_JOBS, {
+ fetchPolicy: "network-only",
+ nextFetchPolicy: "network-only",
+ });
+ const {clm_no, availableJobId} = queryString.parse(useLocation().search);
+ const history = useNavigate();
+ const {t} = useTranslation();
- const [insertNote] = useMutation(INSERT_NEW_NOTE);
- const [deleteJob] = useMutation(DELETE_AVAILABLE_JOB);
- const [updateJob] = useMutation(UPDATE_JOB);
+ const [ownerModalVisible, setOwnerModalVisible] = useState(false);
+ const [jobModalVisible, setJobModalVisible] = useState(false);
- const [insertNewJob] = useMutation(INSERT_NEW_JOB);
- const client = useApolloClient();
+ const [selectedJob, setSelectedJob] = useState(null);
+ const [selectedOwner, setSelectedOwner] = useState(null);
+ const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
- const estDataLazyLoad = useLazyQuery(QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK);
- const [loadEstData, estDataRaw] = estDataLazyLoad;
+ const [insertLoading, setInsertLoading] = useState(false);
- const importOptionsState = useState({ overrideHeaders: false });
- const importOptions = importOptionsState[0];
- const modalSearchState = useState("");
+ const [insertNote] = useMutation(INSERT_NEW_NOTE);
+ const [deleteJob] = useMutation(DELETE_AVAILABLE_JOB);
+ const [updateJob] = useMutation(UPDATE_JOB);
- //Import Scenario
- const onOwnerFindModalOk = async (lazyData) => {
- logImEXEvent("job_import_new");
+ const [insertNewJob] = useMutation(INSERT_NEW_JOB);
+ const client = useApolloClient();
- setOwnerModalVisible(false);
+ const estDataLazyLoad = useLazyQuery(QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK);
+ const [loadEstData, estDataRaw] = estDataLazyLoad;
- setInsertLoading(true);
- const estData = replaceEmpty(
- lazyData?.available_jobs_by_pk || estDataRaw.data.available_jobs_by_pk
- );
+ const importOptionsState = useState({overrideHeaders: false});
+ const importOptions = importOptionsState[0];
+ const modalSearchState = useState("");
- if (!(estData && estData.est_data)) {
- //We don't have the right data. Error!
- setInsertLoading(false);
- notification["error"]({
- message: t("jobs.errors.creating", { error: "No job data present." }),
- });
- return;
- }
- // if (process.env.REACT_APP_COUNTRY === "USA") {
- //Massage the CCC file set to remove duplicate UNQ_SEQ.
- await ResolveCCCLineIssues(estData.est_data, bodyshop);
- // } else {
- //IO-539 Check for Parts Rate on PAL for SGI use case.
- await CheckTaxRates(estData.est_data, bodyshop);
- // }
- // const newTotals = (
- // await Axios.post("/job/totals", {
- // job: {
- // ...estData.est_data,
- // joblines: estData.est_data.joblines.data,
- // },
- // })
- // ).data;
+ //Import Scenario
+ const onOwnerFindModalOk = async (lazyData) => {
+ logImEXEvent("job_import_new");
- let existingVehicles;
- if (estData.est_data.v_vin) {
- //There's vehicle data, need to double-check the VIN.
- existingVehicles = await client.query({
- query: SEARCH_VEHICLE_BY_VIN,
- variables: {
- vin: estData.est_data.v_vin || estData.est_data.vehicle.data.v_vin,
- },
- });
- }
+ setOwnerModalVisible(false);
- const newJob = {
- ...estData.est_data,
- // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
- // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
- // job_totals: newTotals,
- date_open: moment(),
- status: bodyshop.md_ro_statuses.default_imported,
- notes: {
- data: {
- created_by: currentUser.email,
- audit: true,
- text: t("jobs.labels.importnote"),
- },
- },
- queued_for_parts: partsQueueToggle,
- ...(existingVehicles && existingVehicles.data.vehicles.length > 0
- ? { vehicleid: existingVehicles.data.vehicles[0].id, vehicle: null }
- : {}),
+ setInsertLoading(true);
+ const estData = replaceEmpty(
+ lazyData?.available_jobs_by_pk || estDataRaw.data.available_jobs_by_pk
+ );
+
+ if (!(estData && estData.est_data)) {
+ //We don't have the right data. Error!
+ setInsertLoading(false);
+ notification["error"]({
+ message: t("jobs.errors.creating", {error: "No job data present."}),
+ });
+ return;
+ }
+ // if (process.env.REACT_APP_COUNTRY === "USA") {
+ //Massage the CCC file set to remove duplicate UNQ_SEQ.
+ await ResolveCCCLineIssues(estData.est_data, bodyshop);
+ // } else {
+ //IO-539 Check for Parts Rate on PAL for SGI use case.
+ await CheckTaxRates(estData.est_data, bodyshop);
+ // }
+ // const newTotals = (
+ // await Axios.post("/job/totals", {
+ // job: {
+ // ...estData.est_data,
+ // joblines: estData.est_data.joblines.data,
+ // },
+ // })
+ // ).data;
+
+ let existingVehicles;
+ if (estData.est_data.v_vin) {
+ //There's vehicle data, need to double-check the VIN.
+ existingVehicles = await client.query({
+ query: SEARCH_VEHICLE_BY_VIN,
+ variables: {
+ vin: estData.est_data.v_vin || estData.est_data.vehicle.data.v_vin,
+ },
+ });
+ }
+
+ const newJob = {
+ ...estData.est_data,
+ // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+ // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat("0.00"),
+ // job_totals: newTotals,
+ date_open: dayjs(),
+ status: bodyshop.md_ro_statuses.default_imported,
+ notes: {
+ data: {
+ created_by: currentUser.email,
+ audit: true,
+ text: t("jobs.labels.importnote"),
+ },
+ },
+ queued_for_parts: partsQueueToggle,
+ ...(existingVehicles && existingVehicles.data.vehicles.length > 0
+ ? {vehicleid: existingVehicles.data.vehicles[0].id, vehicle: null}
+ : {}),
+ };
+
+ if (selectedOwner) {
+ newJob.ownerid = selectedOwner;
+ delete newJob.owner;
+ }
+ if (newJob.vehicleid) {
+ delete newJob.vehicle;
+ }
+
+ if (typeof newJob.kmin === "string") {
+ newJob.kmin = null;
+ }
+
+ try {
+ const r = await insertNewJob({
+ variables: {
+ job: newJob,
+ },
+ });
+ await Axios.post("/job/totalsssu", {
+ id: r.data.insert_jobs.returning[0].id,
+ });
+
+ if (CriticalPartsScanning.treatment === "on") {
+ CriticalPartsScan(r.data.insert_jobs.returning[0].id);
+ }
+ notification["success"]({
+ message: t("jobs.successes.created"),
+ onClick: () => {
+ history(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
+ },
+ });
+ //Job has been inserted. Clean up the available jobs record.
+
+ insertAuditTrail({
+ jobid: r.data.insert_jobs.returning[0].id,
+ operation: AuditTrailMapping.jobimported(),
+ });
+
+ await deleteJob({
+ variables: {id: estData.id},
+ }).then((r) => {
+ refetch();
+ setInsertLoading(false);
+ });
+
+ setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+ } catch (r) {
+ //error while inserting
+ notification["error"]({
+ message: t("jobs.errors.creating", {error: r.message}),
+ });
+ refetch();
+ setInsertLoading(false);
+ setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
+ }
};
- if (selectedOwner) {
- newJob.ownerid = selectedOwner;
- delete newJob.owner;
- }
- if (newJob.vehicleid) {
- delete newJob.vehicle;
- }
+ //Supplement scenario
+ const onJobFindModalOk = async () => {
+ logImEXEvent("job_import_supplement");
- if (typeof newJob.kmin === "string") {
- newJob.kmin = null;
- }
+ setJobModalVisible(false);
+ setInsertLoading(true);
- try {
- const r = await insertNewJob({
- variables: {
- job: newJob,
- },
- });
- await Axios.post("/job/totalsssu", {
- id: r.data.insert_jobs.returning[0].id,
- });
+ const estData = estDataRaw.data.available_jobs_by_pk;
- if (CriticalPartsScanning.treatment === "on") {
- CriticalPartsScan(r.data.insert_jobs.returning[0].id);
- }
- notification["success"]({
- message: t("jobs.successes.created"),
- onClick: () => {
- history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
- },
- });
- //Job has been inserted. Clean up the available jobs record.
+ if (!(estData && estData.est_data)) {
+ //We don't have the right data. Error!
+ setInsertLoading(false);
+ notification["error"]({
+ message: t("jobs.errors.creating", {error: "No job data present."}),
+ });
+ } else {
+ //create upsert job
+ let supp = replaceEmpty({...estData.est_data});
+ //IO-539 Check for Parts Rate on PAL for SGI use case.
+ await CheckTaxRates(supp, bodyshop);
+ await ResolveCCCLineIssues(supp, bodyshop);
- insertAuditTrail({
- jobid: r.data.insert_jobs.returning[0].id,
- operation: AuditTrailMapping.jobimported(),
- });
-
- await deleteJob({
- variables: { id: estData.id },
- }).then((r) => {
- refetch();
- setInsertLoading(false);
- });
-
- setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
- } catch (r) {
- //error while inserting
- notification["error"]({
- message: t("jobs.errors.creating", { error: r.message }),
- });
- refetch();
- setInsertLoading(false);
- setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
-
- }
- };
-
- //Supplement scenario
- const onJobFindModalOk = async () => {
- logImEXEvent("job_import_supplement");
-
- setJobModalVisible(false);
- setInsertLoading(true);
-
- const estData = estDataRaw.data.available_jobs_by_pk;
-
- if (!(estData && estData.est_data)) {
- //We don't have the right data. Error!
- setInsertLoading(false);
- notification["error"]({
- message: t("jobs.errors.creating", { error: "No job data present." }),
- });
- } else {
- //create upsert job
- let supp = replaceEmpty({ ...estData.est_data });
- //IO-539 Check for Parts Rate on PAL for SGI use case.
- await CheckTaxRates(supp, bodyshop);
- await ResolveCCCLineIssues(supp, bodyshop);
-
- delete supp.owner;
- delete supp.vehicle;
- delete supp.ins_co_nm;
- if (!importOptions.overrideHeaders) {
- HeaderFields.forEach((item) => delete supp[item]);
- }
-
- let suppDelta = await GetSupplementDelta(
- client,
- selectedJob,
- supp.joblines.data
- );
-
- delete supp.joblines;
- if (suppDelta !== null) {
- await client.mutate({
- mutation: gql`
- ${suppDelta}
- `,
- });
- }
- const updateResult = await updateJob({
- variables: {
- jobId: selectedJob,
- job: {
- ...supp,
- // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
- // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
- // "0.00"
- // ),
- // job_totals: newTotals,
- queued_for_parts: partsQueueToggle,
- },
- },
- });
-
- setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
-
- if (CriticalPartsScanning.treatment === "on") {
- CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
- }
- if (updateResult.errors) {
- //error while inserting
- notification["error"]({
- message: t("jobs.errors.creating", {
- error: JSON.stringify(updateResult.errors),
- }),
- });
- refetch();
- setInsertLoading(false);
- return;
- }
-
- const newTotals = await Axios.post("/job/totalsssu", {
- id: selectedJob,
- });
-
- if (newTotals.status !== 200) {
- notification["error"]({
- message: t("jobs.errors.totalscalc"),
- });
- setInsertLoading(false);
- return;
- }
- notification["success"]({
- message: t("jobs.successes.supplemented"),
- onClick: () => {
- history.push(
- `/manage/jobs/${updateResult.data.update_jobs.returning[0].id}`
- );
- },
- });
- //Job has been inserted. Clean up the available jobs record.
-
- deleteJob({
- variables: { id: estData.id },
- }).then((r) => {
- refetch();
- setInsertLoading(false);
- });
-
- await insertNote({
- variables: {
- noteInput: [
- {
- jobid: selectedJob,
- created_by: currentUser.email,
- audit: true,
- text: t("jobs.labels.supplementnote"),
- },
- ],
- },
- });
- insertAuditTrail({
- jobid: selectedJob,
- operation: AuditTrailMapping.jobsupplement(),
- });
- }
- };
-
- const owner =
- estDataRaw.data &&
- estDataRaw.data.available_jobs_by_pk &&
- estDataRaw.data.available_jobs_by_pk.est_data &&
- estDataRaw.data.available_jobs_by_pk.est_data.owner &&
- estDataRaw.data.available_jobs_by_pk.est_data.owner.data &&
- !estDataRaw.data.available_jobs_by_pk.issupplement
- ? estDataRaw.data.available_jobs_by_pk.est_data.owner.data
- : null;
-
- const onOwnerModalCancel = () => {
- setOwnerModalVisible(false);
- setSelectedOwner(null);
- setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
- };
-
- const onJobModalCancel = () => {
- setJobModalVisible(false);
- modalSearchState[1]("");
- setSelectedJob(null);
- setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
- };
-
- const addJobAsNew = (record) => {
- loadEstData({ variables: { id: record.id } });
- setOwnerModalVisible(true);
- };
-
- const addJobAsSupp = useCallback((record) => {
- loadEstData({ variables: { id: record.id } });
- modalSearchState[1](record.clm_no);
- setJobModalVisible(true);
- // eslint-disable-next-line react-hooks/exhaustive-deps
- }, []);
-
- useEffect(() => {
- if (availableJobId && clm_no)
- addJobAsSupp({ id: availableJobId, clm_no: clm_no });
- }, [addJobAsSupp, availableJobId, clm_no]);
-
- if (error) return ;
-
-
- return (
-
-
-
- {currentUser.email.includes("@rome.") ||
- currentUser.email.includes("@imex.") ? (
-
- ) : null}
-
-
-
-
-
-
-
-
-
- );
+ let suppDelta = await GetSupplementDelta(
+ client,
+ selectedJob,
+ supp.joblines.data
+ );
+
+ delete supp.joblines;
+ if (suppDelta !== null) {
+ await client.mutate({
+ mutation: gql`
+ ${suppDelta}
+ `,
+ });
+ }
+ const updateResult = await updateJob({
+ variables: {
+ jobId: selectedJob,
+ job: {
+ ...supp,
+ // clm_total: Dinero(newTotals.totals.total_repairs).toFormat("0.00"),
+ // owner_owing: Dinero(newTotals.totals.custPayable.total).toFormat(
+ // "0.00"
+ // ),
+ // job_totals: newTotals,
+ queued_for_parts: partsQueueToggle,
+ },
+ },
+ });
+
+ setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
+ if (CriticalPartsScanning.treatment === "on") {
+ CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
+ }
+ if (updateResult.errors) {
+ //error while inserting
+ notification["error"]({
+ message: t("jobs.errors.creating", {
+ error: JSON.stringify(updateResult.errors),
+ }),
+ });
+ refetch();
+ setInsertLoading(false);
+ return;
+ }
+
+ const newTotals = await Axios.post("/job/totalsssu", {
+ id: selectedJob,
+ });
+
+ if (newTotals.status !== 200) {
+ notification["error"]({
+ message: t("jobs.errors.totalscalc"),
+ });
+ setInsertLoading(false);
+ return;
+ }
+ notification["success"]({
+ message: t("jobs.successes.supplemented"),
+ onClick: () => {
+ history(
+ `/manage/jobs/${updateResult.data.update_jobs.returning[0].id}`
+ );
+ },
+ });
+ //Job has been inserted. Clean up the available jobs record.
+
+ deleteJob({
+ variables: {id: estData.id},
+ }).then((r) => {
+ refetch();
+ setInsertLoading(false);
+ });
+
+ await insertNote({
+ variables: {
+ noteInput: [
+ {
+ jobid: selectedJob,
+ created_by: currentUser.email,
+ audit: true,
+ text: t("jobs.labels.supplementnote"),
+ },
+ ],
+ },
+ });
+ insertAuditTrail({
+ jobid: selectedJob,
+ operation: AuditTrailMapping.jobsupplement(),
+ });
+ }
+ };
+
+ const owner =
+ estDataRaw.data &&
+ estDataRaw.data.available_jobs_by_pk &&
+ estDataRaw.data.available_jobs_by_pk.est_data &&
+ estDataRaw.data.available_jobs_by_pk.est_data.owner &&
+ estDataRaw.data.available_jobs_by_pk.est_data.owner.data &&
+ !estDataRaw.data.available_jobs_by_pk.issupplement
+ ? estDataRaw.data.available_jobs_by_pk.est_data.owner.data
+ : null;
+
+ const onOwnerModalCancel = () => {
+ setOwnerModalVisible(false);
+ setSelectedOwner(null);
+ setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+ };
+
+ const onJobModalCancel = () => {
+ setJobModalVisible(false);
+ modalSearchState[1]("");
+ setSelectedJob(null);
+ setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+ };
+
+ const addJobAsNew = (record) => {
+ loadEstData({variables: {id: record.id}});
+ setOwnerModalVisible(true);
+ };
+
+ const addJobAsSupp = useCallback((record) => {
+ loadEstData({variables: {id: record.id}});
+ modalSearchState[1](record.clm_no);
+ setJobModalVisible(true);
+ // eslint-disable-next-line react-hooks/exhaustive-deps
+ }, []);
+
+ useEffect(() => {
+ if (availableJobId && clm_no)
+ addJobAsSupp({id: availableJobId, clm_no: clm_no});
+ }, [addJobAsSupp, availableJobId, clm_no]);
+
+ if (error) return ;
+
+
+ return (
+
+
+
+ {currentUser.email.includes("@rome.") ||
+ currentUser.email.includes("@imex.") ? (
+
+ ) : null}
+
+
+
+
+
+
+
+
+
+
+ );
}
+
export default connect(
- mapStateToProps,
- mapDispatchToProps
+ mapStateToProps,
+ mapDispatchToProps
)(JobsAvailableContainer);
function replaceEmpty(someObj, replaceValue = null) {
- const replacer = (key, value) =>
- value === "" ? replaceValue || null : value;
- //^ because you seem to want to replace (strings) "null" or "undefined" too
- const temp = JSON.stringify(someObj, replacer);
- return JSON.parse(temp);
+ const replacer = (key, value) =>
+ value === "" ? replaceValue || null : value;
+ //^ because you seem to want to replace (strings) "null" or "undefined" too
+ const temp = JSON.stringify(someObj, replacer);
+ return JSON.parse(temp);
}
async function CheckTaxRates(estData, bodyshop) {
- // //LKQ Check
- // if (
- // !estData.parts_tax_rates?.PAL ||
- // estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
- // estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
- // ) {
- // const res = await confirmDialog(
- // `Rome Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
- // );
- // if (res) {
- // if (!estData.parts_tax_rates.PAL) {
- // estData.parts_tax_rates.PAL = {
- // prt_discp: 0,
- // prt_mktyp: true,
- // prt_mkupp: 0,
- // prt_type: "PAL",
- // };
- // }
- // estData.parts_tax_rates.PAL.prt_tax_rt =
- // bodyshop.bill_tax_rates.state_tax_rate / 100;
- // estData.parts_tax_rates.PAL.prt_tax_in = true;
- // }
- // }
- // //PAC Check
- // if (
- // !estData.parts_tax_rates?.PAC ||
- // estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
- // estData.parts_tax_rates?.PAC?.prt_tax_rt === 0
- // ) {
- // const res = await confirmDialog(
- // `Rome Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
- // );
- // if (res) {
- // if (!estData.parts_tax_rates.PAC) {
- // estData.parts_tax_rates.PAC = {
- // prt_discp: 0,
- // prt_mktyp: true,
- // prt_mkupp: 0,
- // prt_type: "PAC",
- // };
- // }
- // estData.parts_tax_rates.PAC.prt_tax_rt =
- // bodyshop.bill_tax_rates.state_tax_rate / 100;
- // estData.parts_tax_rates.PAC.prt_tax_in = true;
- // }
- // }
+ // //LKQ Check
+ // if (
+ // !estData.parts_tax_rates?.PAL ||
+ // estData.parts_tax_rates?.PAL?.prt_tax_rt === null ||
+ // estData.parts_tax_rates?.PAL?.prt_tax_rt === 0
+ // ) {
+ // const res = await confirmDialog(
+ // `Rome Online has detected that there is a missing tax rate for LKQ parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+ // );
+ // if (res) {
+ // if (!estData.parts_tax_rates.PAL) {
+ // estData.parts_tax_rates.PAL = {
+ // prt_discp: 0,
+ // prt_mktyp: true,
+ // prt_mkupp: 0,
+ // prt_type: "PAL",
+ // };
+ // }
+ // estData.parts_tax_rates.PAL.prt_tax_rt =
+ // bodyshop.bill_tax_rates.state_tax_rate / 100;
+ // estData.parts_tax_rates.PAL.prt_tax_in = true;
+ // }
+ // }
+ // //PAC Check
+ // if (
+ // !estData.parts_tax_rates?.PAC ||
+ // estData.parts_tax_rates?.PAC?.prt_tax_rt === null ||
+ // estData.parts_tax_rates?.PAC?.prt_tax_rt === 0
+ // ) {
+ // const res = await confirmDialog(
+ // `Rome Online has detected that there is a missing tax rate for rechromed parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+ // );
+ // if (res) {
+ // if (!estData.parts_tax_rates.PAC) {
+ // estData.parts_tax_rates.PAC = {
+ // prt_discp: 0,
+ // prt_mktyp: true,
+ // prt_mkupp: 0,
+ // prt_type: "PAC",
+ // };
+ // }
+ // estData.parts_tax_rates.PAC.prt_tax_rt =
+ // bodyshop.bill_tax_rates.state_tax_rate / 100;
+ // estData.parts_tax_rates.PAC.prt_tax_in = true;
+ // }
+ // }
- //PAM Check
- if (!estData.parts_tax_rates?.PAM) {
- estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
- }
+ //PAM Check
+ if (!estData.parts_tax_rates?.PAM) {
+ estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
+ }
- // //PAM Check
- // if (
- // !estData.parts_tax_rates?.PAM ||
- // estData.parts_tax_rates?.PAM?.prt_tax_rt === null ||
- // estData.parts_tax_rates?.PAM?.prt_tax_rt === 0
- // ) {
- // const res = await confirmDialog(
- // `Rome Online has detected that there is a missing tax rate for remanufactured parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
- // );
- // if (res) {
- // if (!estData.parts_tax_rates.PAM) {
- // estData.parts_tax_rates.PAM = {
- // prt_discp: 0,
- // prt_mktyp: true,
- // prt_mkupp: 0,
- // prt_type: "PAM",
- // };
- // }
- // estData.parts_tax_rates.PAM.prt_tax_rt =
- // bodyshop.bill_tax_rates.state_tax_rate / 100;
- // estData.parts_tax_rates.PAM.prt_tax_in = true;
- // }
- // }
+ // //PAM Check
+ // if (
+ // !estData.parts_tax_rates?.PAM ||
+ // estData.parts_tax_rates?.PAM?.prt_tax_rt === null ||
+ // estData.parts_tax_rates?.PAM?.prt_tax_rt === 0
+ // ) {
+ // const res = await confirmDialog(
+ // `Rome Online has detected that there is a missing tax rate for remanufactured parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+ // );
+ // if (res) {
+ // if (!estData.parts_tax_rates.PAM) {
+ // estData.parts_tax_rates.PAM = {
+ // prt_discp: 0,
+ // prt_mktyp: true,
+ // prt_mkupp: 0,
+ // prt_type: "PAM",
+ // };
+ // }
+ // estData.parts_tax_rates.PAM.prt_tax_rt =
+ // bodyshop.bill_tax_rates.state_tax_rate / 100;
+ // estData.parts_tax_rates.PAM.prt_tax_in = true;
+ // }
+ // }
- // if (
- // !estData.parts_tax_rates?.PAR ||
- // estData.parts_tax_rates?.PAR?.prt_tax_rt === null ||
- // estData.parts_tax_rates?.PAR?.prt_tax_rt === 0
- // ) {
- // const res = await confirmDialog(
- // `Rome Online has detected that there is a missing tax rate for recored parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
- // );
- // if (res) {
- // if (!estData.parts_tax_rates.PAR) {
- // estData.parts_tax_rates.PAR = {
- // prt_discp: 0,
- // prt_mktyp: true,
- // prt_mkupp: 0,
- // prt_type: "PAR",
- // };
- // }
- // estData.parts_tax_rates.PAR.prt_tax_rt =
- // bodyshop.bill_tax_rates.state_tax_rate / 100;
- // estData.parts_tax_rates.PAR.prt_tax_in = true;
- // }
- // }
+ // if (
+ // !estData.parts_tax_rates?.PAR ||
+ // estData.parts_tax_rates?.PAR?.prt_tax_rt === null ||
+ // estData.parts_tax_rates?.PAR?.prt_tax_rt === 0
+ // ) {
+ // const res = await confirmDialog(
+ // `Rome Online has detected that there is a missing tax rate for recored parts. Pressing OK will set the tax rate to ${bodyshop.bill_tax_rates.state_tax_rate}% and enable the rate. Pressing cancel will keep the tax rate as is.`
+ // );
+ // if (res) {
+ // if (!estData.parts_tax_rates.PAR) {
+ // estData.parts_tax_rates.PAR = {
+ // prt_discp: 0,
+ // prt_mktyp: true,
+ // prt_mkupp: 0,
+ // prt_type: "PAR",
+ // };
+ // }
+ // estData.parts_tax_rates.PAR.prt_tax_rt =
+ // bodyshop.bill_tax_rates.state_tax_rate / 100;
+ // estData.parts_tax_rates.PAR.prt_tax_in = true;
+ // }
+ // }
- //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
- //Currently limited to SK shops only.
- if (bodyshop.region_config === "CA_SK") {
- estData.joblines.data.forEach((jl, index) => {
- if (
- (jl.part_type === "PASL" || jl.part_type === "PAS") &&
- jl.lbr_op !== "OP11"
- ) {
- estData.joblines.data[index].tax_part = jl.lbr_tax;
- }
+ //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
+ //Currently limited to SK shops only.
+ if (bodyshop.region_config === "CA_SK") {
+ estData.joblines.data.forEach((jl, index) => {
+ if (
+ (jl.part_type === "PASL" || jl.part_type === "PAS") &&
+ jl.lbr_op !== "OP11"
+ ) {
+ estData.joblines.data[index].tax_part = jl.lbr_tax;
+ }
- //Set markup lines and tax lines as taxable.
- //900510 is a mark up. 900510 is a discount.
- if (jl.db_ref === "900510") {
- estData.joblines.data[index].tax_part = true;
- }
- });
- }
+ //Set markup lines and tax lines as taxable.
+ //900510 is a mark up. 900510 is a discount.
+ if (jl.db_ref === "900510") {
+ estData.joblines.data[index].tax_part = true;
+ }
+ });
+ }
}
async function ResolveCCCLineIssues(estData, bodyshop) {
- //Find all misc amounts, populate them to the act price.
- //TODO Ensure that this doesnt get violated
- //This needs to be done before cleansing unq_seq since some misc prices could move over.
- estData.joblines.data.forEach((line) => {
- if (line.misc_amt && line.misc_amt !== 0) {
- line.act_price = line.act_price + line.misc_amt;
- line.tax_part = !!line.misc_tax;
- }
- });
+ //Find all misc amounts, populate them to the act price.
+ //TODO Ensure that this doesnt get violated
+ //This needs to be done before cleansing unq_seq since some misc prices could move over.
+ estData.joblines.data.forEach((line) => {
+ if (line.misc_amt && line.misc_amt !== 0) {
+ line.act_price = line.act_price + line.misc_amt;
+ line.tax_part = !!line.misc_tax;
+ }
+ });
- //Generate the list of duplicated UNQ_SEQ that will feed into the next section to scrub the lines.
- const unqSeqHash = _.groupBy(estData.joblines.data, "unq_seq");
- const duplicatedUnqSeq = Object.keys(unqSeqHash).filter(
- (key) => unqSeqHash[key].length > 1
- );
-
- duplicatedUnqSeq.forEach((unq_seq) => {
- //Keys are strings, convert to int.
- const int_unq_seq = parseInt(unq_seq);
-
- //When line splitting, the first line is always the non-refinish line. We will keep it as is.
- //We will cleanse the second line, which is always the next line.
- const nonRefLineIndex = estData.joblines.data.findIndex(
- (line) => line.unq_seq === int_unq_seq
+ //Generate the list of duplicated UNQ_SEQ that will feed into the next section to scrub the lines.
+ const unqSeqHash = _.groupBy(estData.joblines.data, "unq_seq");
+ const duplicatedUnqSeq = Object.keys(unqSeqHash).filter(
+ (key) => unqSeqHash[key].length > 1
);
- estData.joblines.data[nonRefLineIndex + 1] = {
- ...estData.joblines.data[nonRefLineIndex + 1],
- part_type: null,
- act_price: 0,
- db_price: 0,
- prt_dsmk_p: 0,
- prt_dsmk_m: 0,
- };
- });
+
+ duplicatedUnqSeq.forEach((unq_seq) => {
+ //Keys are strings, convert to int.
+ const int_unq_seq = parseInt(unq_seq);
+
+ //When line splitting, the first line is always the non-refinish line. We will keep it as is.
+ //We will cleanse the second line, which is always the next line.
+ const nonRefLineIndex = estData.joblines.data.findIndex(
+ (line) => line.unq_seq === int_unq_seq
+ );
+ estData.joblines.data[nonRefLineIndex + 1] = {
+ ...estData.joblines.data[nonRefLineIndex + 1],
+ part_type: null,
+ act_price: 0,
+ db_price: 0,
+ prt_dsmk_p: 0,
+ prt_dsmk_m: 0,
+ };
+ });
}
diff --git a/client/src/components/jobs-change-status/jobs-change-status.component.jsx b/client/src/components/jobs-change-status/jobs-change-status.component.jsx
index aa5f61fc2..daf384d9d 100644
--- a/client/src/components/jobs-change-status/jobs-change-status.component.jsx
+++ b/client/src/components/jobs-change-status/jobs-change-status.component.jsx
@@ -1,119 +1,119 @@
-import { DownCircleFilled } from "@ant-design/icons";
-import { useMutation } from "@apollo/client";
-import { Button, Dropdown, Menu, notification } from "antd";
-import React, { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {DownCircleFilled} from "@ant-design/icons";
+import {useMutation} from "@apollo/client";
+import {Button, Dropdown, notification} from "antd";
+import React, {useEffect, useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {UPDATE_JOB_STATUS} from "../../graphql/jobs.queries";
+import {insertAuditTrail} from "../../redux/application/application.actions";
+import {selectJobReadOnly} from "../../redux/application/application.selectors";
+import {selectBodyshop} from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
- jobRO: selectJobReadOnly,
+ bodyshop: selectBodyshop,
+ jobRO: selectJobReadOnly,
});
const mapDispatchToProps = (dispatch) => ({
- insertAuditTrail: ({ jobid, operation }) =>
- dispatch(insertAuditTrail({ jobid, operation })),
+ insertAuditTrail: ({jobid, operation}) =>
+ dispatch(insertAuditTrail({jobid, operation})),
});
-export function JobsChangeStatus({ job, bodyshop, jobRO, insertAuditTrail }) {
- const { t } = useTranslation();
+export function JobsChangeStatus({job, bodyshop, jobRO, insertAuditTrail}) {
+ const {t} = useTranslation();
- const [availableStatuses, setAvailableStatuses] = useState([]);
- const [otherStages, setOtherStages] = useState([]);
- const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
- const updateJobStatus = (status) => {
- mutationUpdateJobstatus({
- variables: { jobId: job.id, status: status },
- })
- .then((r) => {
- notification["success"]({ message: t("jobs.successes.save") });
- insertAuditTrail({
- jobid: job.id,
- operation: AuditTrailMapping.jobstatuschange(status),
- });
- // refetch();
- })
- .catch((error) => {
- notification["error"]({ message: t("jobs.errors.saving") });
- });
- };
+ const [availableStatuses, setAvailableStatuses] = useState([]);
+ const [otherStages, setOtherStages] = useState([]);
+ const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
+ const updateJobStatus = (status) => {
+ mutationUpdateJobstatus({
+ variables: {jobId: job.id, status: status},
+ })
+ .then((r) => {
+ notification["success"]({message: t("jobs.successes.save")});
+ insertAuditTrail({
+ jobid: job.id,
+ operation: AuditTrailMapping.jobstatuschange(status),
+ });
+ // refetch();
+ })
+ .catch((error) => {
+ notification["error"]({message: t("jobs.errors.saving")});
+ });
+ };
- useEffect(() => {
- //Figure out what scenario were in, populate accodingly
- if (job && bodyshop) {
- if (
- bodyshop.md_ro_statuses.pre_production_statuses.includes(job.status)
- ) {
- setAvailableStatuses(bodyshop.md_ro_statuses.pre_production_statuses);
- if (bodyshop.md_ro_statuses.production_statuses[0])
- setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
- } else if (
- bodyshop.md_ro_statuses.production_statuses.includes(job.status)
- ) {
- setAvailableStatuses(bodyshop.md_ro_statuses.production_statuses);
- setOtherStages([
- bodyshop.md_ro_statuses.default_imported,
- bodyshop.md_ro_statuses.default_delivered,
- ]);
- } else if (
- bodyshop.md_ro_statuses.post_production_statuses.includes(job.status)
- ) {
- setAvailableStatuses(
- bodyshop.md_ro_statuses.post_production_statuses.filter(
- (s) =>
- s !== bodyshop.md_ro_statuses.default_invoiced &&
- s !== bodyshop.md_ro_statuses.default_exported
- )
- );
- if (bodyshop.md_ro_statuses.production_statuses[0])
- setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
- } else {
- console.log(
- "Status didn't match any restrictions. Allowing all status changes."
- );
- setAvailableStatuses(bodyshop.md_ro_statuses.statuses);
- }
+ useEffect(() => {
+ //Figure out what scenario were in, populate accodingly
+ if (job && bodyshop) {
+ if (
+ bodyshop.md_ro_statuses.pre_production_statuses.includes(job.status)
+ ) {
+ setAvailableStatuses(bodyshop.md_ro_statuses.pre_production_statuses);
+ if (bodyshop.md_ro_statuses.production_statuses[0])
+ setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
+ } else if (
+ bodyshop.md_ro_statuses.production_statuses.includes(job.status)
+ ) {
+ setAvailableStatuses(bodyshop.md_ro_statuses.production_statuses);
+ setOtherStages([
+ bodyshop.md_ro_statuses.default_imported,
+ bodyshop.md_ro_statuses.default_delivered,
+ ]);
+ } else if (
+ bodyshop.md_ro_statuses.post_production_statuses.includes(job.status)
+ ) {
+ setAvailableStatuses(
+ bodyshop.md_ro_statuses.post_production_statuses.filter(
+ (s) =>
+ s !== bodyshop.md_ro_statuses.default_invoiced &&
+ s !== bodyshop.md_ro_statuses.default_exported
+ )
+ );
+ if (bodyshop.md_ro_statuses.production_statuses[0])
+ setOtherStages([bodyshop.md_ro_statuses.production_statuses[0]]);
+ } else {
+ console.log(
+ "Status didn't match any restrictions. Allowing all status changes."
+ );
+ setAvailableStatuses(bodyshop.md_ro_statuses.statuses);
+ }
+ }
+ }, [job, setAvailableStatuses, bodyshop]);
+
+ const statusMenu = {
+ items: [
+ ...availableStatuses.map((item) => ({
+ key: item,
+ label: item,
+ })),
+ ...(job.converted
+ ? [
+ {type: "divider"},
+ ...otherStages.map((item) => ({
+ key: item,
+ label: item,
+ })),
+ ]
+ : []),
+ ],
+ onClick: (e) => updateJobStatus(e.key)
}
- }, [job, setAvailableStatuses, bodyshop]);
- const statusmenu = (
-
- );
+ return (
+
+
+
+ );
}
+
export default connect(mapStateToProps, mapDispatchToProps)(JobsChangeStatus);
diff --git a/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx b/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx
index c315cf009..346c88d55 100644
--- a/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx
+++ b/client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx
@@ -1,87 +1,90 @@
-import { Button, Dropdown, Menu } from "antd";
+import {Button, Dropdown} from "antd";
import _ from "lodash";
import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { logImEXEvent } from "../../firebase/firebase.utils";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {logImEXEvent} from "../../firebase/firebase.utils";
+import {selectBodyshop} from "../../redux/user/user.selectors";
+
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
+ bodyshop: selectBodyshop,
});
-export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
- const { t } = useTranslation();
+export function JobsCloseAutoAllocate({bodyshop, joblines, form, disabled}) {
+ const {t} = useTranslation();
- const handleAllocate = (defaults) => {
- form.setFieldsValue({
- joblines: joblines.map((jl) => {
- const ret = _.cloneDeep(jl);
- if (jl.part_type) {
- ret.profitcenter_part = defaults.profits[jl.part_type.toUpperCase()];
- } else {
- }
- if (jl.mod_lbr_ty) {
- ret.profitcenter_labor =
- defaults.profits[jl.mod_lbr_ty.toUpperCase()];
- } else {
- ret.profitcenter_labor = null;
- }
- //Verify that this is also manually updated in server/job-costing
- if (!jl.part_type && !jl.mod_lbr_ty) {
- const lineDesc = jl.line_desc ? jl.line_desc.toLowerCase() : "";
- if (lineDesc.includes("shop materials")) {
- ret.profitcenter_part = defaults.profits["MASH"];
- } else if (lineDesc.includes("paint/materials")) {
- ret.profitcenter_part = defaults.profits["MAPA"];
- } else if (lineDesc.includes("ats amount")) {
- ret.profitcenter_part = defaults.profits["ATS"];
- } else if (jl.act_price > 0) {
- ret.profitcenter_part = defaults.profits["PAO"];
- } else {
- ret.profitcenter_part = null;
- }
- }
- return ret;
- }),
- });
- };
+ const handleAllocate = (defaults) => {
+ form.setFieldsValue({
+ joblines: joblines.map((jl) => {
+ const ret = _.cloneDeep(jl);
+ if (jl.part_type) {
+ ret.profitcenter_part = defaults.profits[jl.part_type.toUpperCase()];
+ } else {
+ }
+ if (jl.mod_lbr_ty) {
+ ret.profitcenter_labor =
+ defaults.profits[jl.mod_lbr_ty.toUpperCase()];
+ } else {
+ ret.profitcenter_labor = null;
+ }
+ //Verify that this is also manually updated in server/job-costing
+ if (!jl.part_type && !jl.mod_lbr_ty) {
+ const lineDesc = jl.line_desc ? jl.line_desc.toLowerCase() : "";
+ if (lineDesc.includes("shop materials")) {
+ ret.profitcenter_part = defaults.profits["MASH"];
+ } else if (lineDesc.includes("paint/materials")) {
+ ret.profitcenter_part = defaults.profits["MAPA"];
+ } else if (lineDesc.includes("ats amount")) {
+ ret.profitcenter_part = defaults.profits["ATS"];
+ } else if (jl.act_price > 0) {
+ ret.profitcenter_part = defaults.profits["PAO"];
+ } else {
+ ret.profitcenter_part = null;
+ }
+ }
+ return ret;
+ }),
+ });
+ };
- const handleAutoAllocateClick = () => {
- logImEXEvent("jobs_close_allocate_auto");
+ const handleAutoAllocateClick = () => {
+ logImEXEvent("jobs_close_allocate_auto");
- const { defaults } = bodyshop.md_responsibility_centers;
- handleAllocate(defaults);
- };
+ const {defaults} = bodyshop.md_responsibility_centers;
+ handleAllocate(defaults);
+ };
- const handleMenuClick = ({ item, key, keyPath, domEvent }) => {
- logImEXEvent("jobs_close_allocate_auto_dms");
- form.setFieldsValue({ dms_allocation: key });
- handleAllocate(
- bodyshop.md_responsibility_centers.dms_defaults.find(
- (x) => x.name === key
- )
+ const handleMenuClick = ({item, key, keyPath, domEvent}) => {
+ logImEXEvent("jobs_close_allocate_auto_dms");
+ form.setFieldsValue({dms_allocation: key});
+ handleAllocate(
+ bodyshop.md_responsibility_centers.dms_defaults.find(
+ (x) => x.name === key
+ )
+ );
+ };
+
+ const menu = bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? {
+ items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
+ key: mapping.name,
+ label: mapping.name,
+ disabled: disabled,
+ })),
+ onClick: handleMenuClick,
+ } : {
+ items: []
+ }
+
+ return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
+
+
+
+ ) : (
+
);
- };
-
- const overlay = (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
-
- );
-
- return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
-
-
-
- ) : (
-
- );
}
+
export default connect(mapStateToProps, null)(JobsCloseAutoAllocate);
diff --git a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
index 8bbda03e1..8245af6d1 100644
--- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
+++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx
@@ -1,230 +1,227 @@
-import { useMutation } from "@apollo/client";
-import { Button, notification } from "antd";
+import {useMutation} from "@apollo/client";
+import {Button, notification} from "antd";
import axios from "axios";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { useHistory } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import { auth, logImEXEvent } from "../../firebase/firebase.utils";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
-import {
- selectBodyshop,
- selectCurrentUser,
-} from "../../redux/user/user.selectors";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {useNavigate} from "react-router-dom";
+import {createStructuredSelector} from "reselect";
+import {auth, logImEXEvent} from "../../firebase/firebase.utils";
+import {INSERT_EXPORT_LOG} from "../../graphql/accounting.queries";
+import {UPDATE_JOB} from "../../graphql/jobs.queries";
+import {selectBodyshop, selectCurrentUser,} from "../../redux/user/user.selectors";
import client from "../../utils/GraphQLClient";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
- currentUser: selectCurrentUser,
+ bodyshop: selectBodyshop,
+ currentUser: selectCurrentUser,
});
function updateJobCache(items) {
- client.cache.modify({
- id: "ROOT_QUERY",
- fields: {
- jobs(existingJobs = []) {
- return existingJobs.filter(
- (jobRef) => jobRef.__ref.includes(items) === false
- );
- },
- },
- });
+ client.cache.modify({
+ id: "ROOT_QUERY",
+ fields: {
+ jobs(existingJobs = []) {
+ return existingJobs.filter(
+ (jobRef) => jobRef.__ref.includes(items) === false
+ );
+ },
+ },
+ });
}
export function JobsCloseExportButton({
- bodyshop,
- currentUser,
- jobId,
- disabled,
- setSelectedJobs,
- refetch,
-}) {
- const history = useHistory();
- const { t } = useTranslation();
- const [updateJob] = useMutation(UPDATE_JOB);
- const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
- const [loading, setLoading] = useState(false);
+ bodyshop,
+ currentUser,
+ jobId,
+ disabled,
+ setSelectedJobs,
+ refetch,
+ }) {
+ const history = useNavigate();
+ const {t} = useTranslation();
+ const [updateJob] = useMutation(UPDATE_JOB);
+ const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+ const [loading, setLoading] = useState(false);
- const handleQbxml = async () => {
- //Check if it's a CDK setup.
- if (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) {
- history.push(`/manage/dms?jobId=${jobId}`);
- return;
- }
- logImEXEvent("jobs_close_export");
-
- setLoading(true);
- //Check if it's a QBO Setup.
- let PartnerResponse;
- if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
- PartnerResponse = await axios.post(`/qbo/receivables`, {
- jobIds: [jobId],
- elgen: true,
- });
- } else {
- //Default is QBD
-
- let QbXmlResponse;
- try {
- QbXmlResponse = await axios.post(
- "/accounting/qbxml/receivables",
- { jobIds: [jobId] },
- {
- headers: {
- Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
- },
- }
- );
- console.log("handle -> XML", QbXmlResponse);
- } catch (error) {
- console.log("Error getting QBXML from Server.", error);
- notification["error"]({
- message: t("jobs.errors.exporting", {
- error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
- }),
- });
- setLoading(false);
- return;
- }
-
- try {
- PartnerResponse = await axios.post(
- "http://localhost:1337/qb/",
- // "http://609feaeae986.ngrok.io/qb/",
- QbXmlResponse.data,
- {
- headers: {
- Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
- },
- }
- );
- } catch (error) {
- console.log("Error connecting to quickbooks or partner.", error);
- notification["error"]({
- message: t("jobs.errors.exporting-partner"),
- });
- setLoading(false);
- return;
- }
- }
-
- console.log("PartnerResponse", PartnerResponse);
-
- //Check to see if any of them failed. If they didn't don't execute the update.
- const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
- const successfulTransactions = PartnerResponse.data.filter(
- (r) => r.success
- );
- if (failedTransactions.length > 0) {
- //Uh oh. At least one was no good.
- failedTransactions.forEach((ft) => {
- //insert failed export log
- notification.open({
- // key: "failedexports",
- type: "error",
- message: t("jobs.errors.exporting", {
- error: ft.errorMessage || "",
- }),
- });
- });
-
- if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
- //QBO Logs are handled server side.
- await insertExportLog({
- variables: {
- logs: [
- {
- bodyshopid: bodyshop.id,
- jobid: jobId,
- successful: false,
- message: JSON.stringify(
- failedTransactions.map((ft) => ft.errorMessage)
- ),
- useremail: currentUser.email,
- },
- ],
- },
- });
- }
- } else {
- //Insert success export log.
- if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
- //QBO Logs are handled server side.
- await insertExportLog({
- variables: {
- logs: [
- {
- bodyshopid: bodyshop.id,
- jobid: jobId,
- successful: true,
- useremail: currentUser.email,
- },
- ],
- },
- });
-
- const jobUpdateResponse = await updateJob({
- variables: {
- jobId: jobId,
- job: {
- status: bodyshop.md_ro_statuses.default_exported || "Exported*",
- date_exported: new Date(),
- },
- },
- });
-
- if (!!!jobUpdateResponse.errors) {
- notification.open({
- type: "success",
- key: "jobsuccessexport",
- message: t("jobs.successes.exported"),
- });
- updateJobCache(
- jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
- );
- } else {
- notification["error"]({
- message: t("jobs.errors.exporting", {
- error: JSON.stringify(jobUpdateResponse.error),
- }),
- });
+ const handleQbxml = async () => {
+ //Check if it's a CDK setup.
+ if (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) {
+ history(`/manage/dms?jobId=${jobId}`);
+ return;
}
- }
- if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
- notification.open({
- type: "success",
- key: "jobsuccessexport",
- message: t("jobs.successes.exported"),
- });
- updateJobCache([
- ...new Set(
- successfulTransactions.map(
- (st) =>
- st[
- bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
- ? "jobid"
- : "id"
- ]
- )
- ),
- ]);
- }
- if (setSelectedJobs) {
- setSelectedJobs((selectedJobs) => {
- return selectedJobs.filter((i) => i !== jobId);
- });
- }
- }
- setLoading(false);
- };
+ logImEXEvent("jobs_close_export");
- return (
-
- );
+ setLoading(true);
+ //Check if it's a QBO Setup.
+ let PartnerResponse;
+ if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+ PartnerResponse = await axios.post(`/qbo/receivables`, {
+ jobIds: [jobId],
+ elgen: true,
+ });
+ } else {
+ //Default is QBD
+
+ let QbXmlResponse;
+ try {
+ QbXmlResponse = await axios.post(
+ "/accounting/qbxml/receivables",
+ {jobIds: [jobId]},
+ {
+ headers: {
+ Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+ },
+ }
+ );
+ console.log("handle -> XML", QbXmlResponse);
+ } catch (error) {
+ console.log("Error getting QBXML from Server.", error);
+ notification["error"]({
+ message: t("jobs.errors.exporting", {
+ error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+ }),
+ });
+ setLoading(false);
+ return;
+ }
+
+ try {
+ PartnerResponse = await axios.post(
+ "http://localhost:1337/qb/",
+ // "http://609feaeae986.ngrok.io/qb/",
+ QbXmlResponse.data,
+ {
+ headers: {
+ Authorization: `Bearer ${await auth.currentUser.getIdToken()}`,
+ },
+ }
+ );
+ } catch (error) {
+ console.log("Error connecting to quickbooks or partner.", error);
+ notification["error"]({
+ message: t("jobs.errors.exporting-partner"),
+ });
+ setLoading(false);
+ return;
+ }
+ }
+
+ console.log("PartnerResponse", PartnerResponse);
+
+ //Check to see if any of them failed. If they didn't don't execute the update.
+ const failedTransactions = PartnerResponse.data.filter((r) => !r.success);
+ const successfulTransactions = PartnerResponse.data.filter(
+ (r) => r.success
+ );
+ if (failedTransactions.length > 0) {
+ //Uh oh. At least one was no good.
+ failedTransactions.forEach((ft) => {
+ //insert failed export log
+ notification.open({
+ // key: "failedexports",
+ type: "error",
+ message: t("jobs.errors.exporting", {
+ error: ft.errorMessage || "",
+ }),
+ });
+ });
+
+ if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
+ //QBO Logs are handled server side.
+ await insertExportLog({
+ variables: {
+ logs: [
+ {
+ bodyshopid: bodyshop.id,
+ jobid: jobId,
+ successful: false,
+ message: JSON.stringify(
+ failedTransactions.map((ft) => ft.errorMessage)
+ ),
+ useremail: currentUser.email,
+ },
+ ],
+ },
+ });
+ }
+ } else {
+ //Insert success export log.
+ if (!(bodyshop.accountingconfig && bodyshop.accountingconfig.qbo)) {
+ //QBO Logs are handled server side.
+ await insertExportLog({
+ variables: {
+ logs: [
+ {
+ bodyshopid: bodyshop.id,
+ jobid: jobId,
+ successful: true,
+ useremail: currentUser.email,
+ },
+ ],
+ },
+ });
+
+ const jobUpdateResponse = await updateJob({
+ variables: {
+ jobId: jobId,
+ job: {
+ status: bodyshop.md_ro_statuses.default_exported || "Exported*",
+ date_exported: new Date(),
+ },
+ },
+ });
+
+ if (!!!jobUpdateResponse.errors) {
+ notification.open({
+ type: "success",
+ key: "jobsuccessexport",
+ message: t("jobs.successes.exported"),
+ });
+ updateJobCache(
+ jobUpdateResponse.data.update_jobs.returning.map((job) => job.id)
+ );
+ } else {
+ notification["error"]({
+ message: t("jobs.errors.exporting", {
+ error: JSON.stringify(jobUpdateResponse.error),
+ }),
+ });
+ }
+ }
+ if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
+ notification.open({
+ type: "success",
+ key: "jobsuccessexport",
+ message: t("jobs.successes.exported"),
+ });
+ updateJobCache([
+ ...new Set(
+ successfulTransactions.map(
+ (st) =>
+ st[
+ bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+ ? "jobid"
+ : "id"
+ ]
+ )
+ ),
+ ]);
+ }
+ if (setSelectedJobs) {
+ setSelectedJobs((selectedJobs) => {
+ return selectedJobs.filter((i) => i !== jobId);
+ });
+ }
+ }
+ setLoading(false);
+ };
+
+ return (
+
+ );
}
export default connect(mapStateToProps, null)(JobsCloseExportButton);
diff --git a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
index bbb3f978e..98acce7e2 100644
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -1,215 +1,216 @@
-import { Form, Select, Space, Tooltip } from "antd";
+import {Form, Select, Space, Tooltip} from "antd";
import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectJobReadOnly} from "../../redux/application/application.selectors";
+import {selectBodyshop} from "../../redux/user/user.selectors";
import LaborTypeFormItem from "../form-items-formatted/labor-type-form-item.component";
import PartTypeFormItem from "../form-items-formatted/part-type-form-item.component";
import ReadOnlyFormItem from "../form-items-formatted/read-only-form-item.component";
-import { WarningOutlined } from "@ant-design/icons";
+import {WarningOutlined} from "@ant-design/icons";
import "./jobs-close-lines.styles.scss";
const mapStateToProps = createStructuredSelector({
- bodyshop: selectBodyshop,
- jobRO: selectJobReadOnly,
+ bodyshop: selectBodyshop,
+ jobRO: selectJobReadOnly,
});
const mapDispatchToProps = (dispatch) => ({
- //setUserLanguage: language => dispatch(setUserLanguage(language))
+ //setUserLanguage: language => dispatch(setUserLanguage(language))
});
-export function JobsCloseLines({ bodyshop, job, jobRO }) {
- const { t } = useTranslation();
- return (
-
-
- {(fields, { add, remove, move }) => {
- return (
-
-
-
- | {t("joblines.fields.line_desc")} |
- {t("joblines.fields.part_type")} |
- {t("joblines.fields.act_price")} |
- {t("joblines.fields.prt_dsmk_m")} |
- {t("joblines.fields.op_code_desc")} |
- {t("joblines.fields.mod_lbr_ty")} |
- {t("joblines.fields.mod_lb_hrs")} |
- {t("joblines.fields.profitcenter_part")} |
- {t("joblines.fields.profitcenter_labor")} |
-
-
-
- {fields.map((field, index) => (
-
- |
-
-
-
- |
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
-
-
-
- |
-
- ))}
-
-
- );
- }}
-
-
+
+ {(fields, {add, remove, move}) => {
+ return (
+
+
+
+ | {t("joblines.fields.line_desc")} |
+ {t("joblines.fields.part_type")} |
+ {t("joblines.fields.act_price")} |
+ {t("joblines.fields.prt_dsmk_m")} |
+ {t("joblines.fields.op_code_desc")} |
+ {t("joblines.fields.mod_lbr_ty")} |
+ {t("joblines.fields.mod_lb_hrs")} |
+ {t("joblines.fields.profitcenter_part")} |
+ {t("joblines.fields.profitcenter_labor")} |
+
+
+
+ {fields.map((field, index) => (
+
+ |
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ ))}
+
+
+ );
+ }}
+
+
-
-
- );
+ },
+ });
- if (job.converted) return <>;
+ if (values.ca_gst_registrant) {
+ await axios.post("/job/totalsssu", {
+ id: job.id,
+ });
+ }
- return (
-
-
-
- );
+ if (!res.errors) {
+ refetch();
+ notification["success"]({
+ message: t("jobs.successes.converted"),
+ });
+
+ insertAuditTrail({
+ jobid: job.id,
+ operation: AuditTrailMapping.jobconverted(
+ res.data.update_jobs.returning[0].ro_number
+ ),
+ });
+
+ setOpen(false);
+ }
+ setLoading(false);
+ };
+
+ const popMenu = (
+
+
+
+ );
+
+ if (job.converted) return <>;
+
+ return (
+
+
+
+ );
}
+
export default connect(mapStateToProps, mapDispatchToProps)(JobsConvertButton);
diff --git a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
index 31fa53a23..cdac7ee84 100644
--- a/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
+++ b/client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx
@@ -1,15 +1,13 @@
-import { Collapse, Form, Input, Select, Switch } from "antd";
+import {Collapse, Form, Input, Select, Switch} from "antd";
import React from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {useTranslation} from "react-i18next";
+import {connect} from "react-redux";
+import {createStructuredSelector} from "reselect";
+import {selectBodyshop} from "../../redux/user/user.selectors";
import FormDatePicker from "../form-date-picker/form-date-picker.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import FormItemEmail from "../form-items-formatted/email-form-item.component";
-import FormItemPhone, {
- PhoneItemFormatterValidation,
-} from "../form-items-formatted/phone-form-item.component";
+import FormItemPhone, {PhoneItemFormatterValidation,} from "../form-items-formatted/phone-form-item.component";
import JobsDetailRatesChangeButton from "../jobs-detail-rates-change-button/jobs-detail-rates-change-button.component";
import JobsDetailRatesParts from "../jobs-detail-rates/jobs-detail-rates.parts.component";
@@ -20,355 +18,357 @@ import JobsDetailRatesTaxes from "../jobs-detail-rates/jobs-detail-rates.taxes.c
import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+
const mapStateToProps = createStructuredSelector({
- //currentUser: selectCurrentUser
- bodyshop: selectBodyshop,
+ //currentUser: selectCurrentUser
+ bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
- //setUserLanguage: language => dispatch(setUserLanguage(language))
+ //setUserLanguage: language => dispatch(setUserLanguage(language))
});
-export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
- const { t } = useTranslation();
- const { getFieldValue } = form;
- return (
-
+ );
}
+
export default connect(mapStateToProps, mapDispatchToProps)(JobsCreateJobsInfo);
diff --git a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.component.jsx b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.component.jsx
index 0b75e6826..af0fd57b8 100644
--- a/client/src/components/jobs-create-owner-info/jobs-create-owner-info.component.jsx
+++ b/client/src/components/jobs-create-owner-info/jobs-create-owner-info.component.jsx
@@ -1,52 +1,52 @@
-import { Checkbox, Col, Row } from "antd";
-import React, { useContext } from "react";
-import { useTranslation } from "react-i18next";
+import {Checkbox, Col, Row} from "antd";
+import React, {useContext} from "react";
+import {useTranslation} from "react-i18next";
import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
import JobsCreateOwnerInfoNewComponent from "./jobs-create-owner-info.new.component";
import JobsCreateOwnerInfoSearchComponent from "./jobs-create-owner-info.search.component";
const colSpan = {
- sm: { span: 24 },
- lg: { span: 12 },
+ sm: {span: 24},
+ lg: {span: 12},
};
-export default function JobsCreateOwnerInfoComponent({ loading, owners }) {
- const { t } = useTranslation();
- const [state, setState] = useContext(JobCreateContext);
+export default function JobsCreateOwnerInfoComponent({loading, owners}) {
+ const {t} = useTranslation();
+ const [state, setState] = useContext(JobCreateContext);
- return (
-
-
-
- {
- setState({
- ...state,
- owner: {
- ...state.owner,
- new: !state.owner.new,
- selectedid: null,
- },
- });
- }}
- >
- {t("jobs.labels.create.newowner")}
-
-
+ return (
+
+
+
+ {
+ setState({
+ ...state,
+ owner: {
+ ...state.owner,
+ new: !state.owner.new,
+ selectedid: null,
+ },
+ });
+ }}
+ >
+ {t("jobs.labels.create.newowner")}
+
+
-
-
-
+
+
+
-
-
-
-
-
- );
+
+
+
+
+
-
-
-
-
-
-
-
-
+ const {t} = useTranslation();
+ return (
+
+
+ ({
+ required:
+ state.owner.new &&
+ (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+ getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
+ //message: t("general.validation.required"),
+ }),
+ ]}
+ >
+
+
+ ({
+ required:
+ state.owner.new &&
+ (!getFieldValue(["owner", "data", "ownr_co_nm"]) ||
+ getFieldValue(["owner", "data", "ownr_co_nm"]) === ""),
+ //message: t("general.validation.required"),
+ }),
+ ]}
+ >
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+ ({
+ required:
+ state.owner.new &&
+ (!getFieldValue(["owner", "data", "ownr_ln"]) ||
+ !getFieldValue(["owner", "data", "ownr_fn"]) ||
+ getFieldValue(["owner", "data", "ownr_ln"]) === "" ||
+ getFieldValue(["owner", "data", "ownr_fn"]) === ""),
+ //message: t("general.validation.required"),
+ }),
+ ]}
+ >
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
- PhoneItemFormatterValidation(
- getFieldValue,
- "owner.data.ownr_ph1"
- ),
- ]}
- >
-
-
-
- PhoneItemFormatterValidation(
- getFieldValue,
- "owner.data.ownr_ph2"
- ),
- ]}
- >
-
-
-
-
-
-
-
-
-
-
-
-
- );
+
+
+
+
+
+ PhoneItemFormatterValidation(
+ getFieldValue,
+ "owner.data.ownr_ph1"
+ ),
+ ]}
+ >
+
+
+
+ PhoneItemFormatterValidation(
+ getFieldValue,
+ "owner.data.ownr_ph2"
+ ),
+ ]}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
{
- setState({
- ...state,
- owner: { ...state.owner, new: false, selectedid: props.id },
- });
- },
- type: "radio",
- selectedRowKeys: [state.owner.selectedid],
- }}
- onRow={(record, rowIndex) => {
- return {
- onClick: (event) => {
- if (record) {
- if (record.id) {
- setState({
- ...state,
- owner: {
- ...state.owner,
- new: false,
- selectedid: record.id,
+ return (
+ {
+ setState({
+ ...state,
+ owner: {...state.owner, search: value},
+ });
+ }}
+ enterButton
+ />
+ }
+ >
+ {
+ setState({
+ ...state,
+ owner: {...state.owner, new: false, selectedid: props.id},
+ });
},
- });
+ type: "radio",
+ selectedRowKeys: [state.owner.selectedid],
+ }}
+ onRow={(record, rowIndex) => {
+ return {
+ onClick: (event) => {
+ if (record) {
+ if (record.id) {
+ setState({
+ ...state,
+ owner: {
+ ...state.owner,
+ new: false,
+ selectedid: record.id,
+ },
+ });
- return;
- }
- }
- setState({
- ...state,
- owner: { ...state.owner, selectedid: null },
- });
- },
- };
- }}
- />
-
- );
+ return;
+ }
+ }
+ setState({
+ ...state,
+ owner: {...state.owner, selectedid: null},
+ });
+ },
+ };
+ }}
+ />
+
+ );
}
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.component.jsx
index b3cbe0fdd..4cdad32bf 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.component.jsx
@@ -1,70 +1,71 @@
-import { Checkbox, Col, Row } from "antd";
-import React, { useContext } from "react";
+import {Checkbox, Col, Row} from "antd";
+import React, {useContext} from "react";
import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
import JobsCreateVehicleInfoNewComponent from "./jobs-create-vehicle-info.new.component";
import JobsCreateVehicleInfoSearchComponent from "./jobs-create-vehicle-info.search.component";
-import { useTranslation } from "react-i18next";
+import {useTranslation} from "react-i18next";
+
const colSpan = {
- sm: { span: 24 },
- lg: { span: 12 },
+ sm: {span: 24},
+ lg: {span: 12},
};
export default function JobsCreateVehicleInfoComponent({
- loading,
- vehicles,
- form,
-}) {
- const [state, setState] = useContext(JobCreateContext);
- const { t } = useTranslation();
- return (
-
-
-
- {
- setState({
- ...state,
- vehicle: {
- ...state.vehicle,
- none: false,
- new: !state.vehicle.new,
- selectedid: null,
- },
- });
- }}
- >
- {t("jobs.labels.create.newvehicle")}
-
- {
- setState({
- ...state,
- vehicle: {
- ...state.vehicle,
- new: false,
- none: !state.vehicle.none,
- selectedid: null,
- },
- });
- }}
- >
- {t("jobs.labels.create.novehicle")}
-
-
-
-
-
-
-
-
-
-
- );
+ loading,
+ vehicles,
+ form,
+ }) {
+ const [state, setState] = useContext(JobCreateContext);
+ const {t} = useTranslation();
+ return (
+
+
+
+ {
+ setState({
+ ...state,
+ vehicle: {
+ ...state.vehicle,
+ none: false,
+ new: !state.vehicle.new,
+ selectedid: null,
+ },
+ });
+ }}
+ >
+ {t("jobs.labels.create.newvehicle")}
+
+ {
+ setState({
+ ...state,
+ vehicle: {
+ ...state.vehicle,
+ new: false,
+ none: !state.vehicle.none,
+ selectedid: null,
+ },
+ });
+ }}
+ >
+ {t("jobs.labels.create.novehicle")}
+
+
+
+
+
+
+
+
+
+
+ );
}
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx
index 072930164..a9bfa39c0 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.container.jsx
@@ -1,26 +1,26 @@
-import { useQuery } from "@apollo/client";
-import React, { useContext } from "react";
-import { SEARCH_VEHICLES } from "../../graphql/vehicles.queries";
+import {useQuery} from "@apollo/client";
+import React, {useContext} from "react";
+import {SEARCH_VEHICLES} from "../../graphql/vehicles.queries";
import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
import AlertComponent from "../alert/alert.component";
import JobsCreateVehicleInfoComponent from "./jobs-create-vehicle-info.component";
-export default function JobsCreateVehicleInfoContainer({ form }) {
- const [state] = useContext(JobCreateContext);
- const { loading, error, data } = useQuery(SEARCH_VEHICLES, {
- variables: { search: `%${state.vehicle.search}%` },
- skip: !state.vehicle.search,
- fetchPolicy: "network-only",
- nextFetchPolicy: "network-only",
- });
+export default function JobsCreateVehicleInfoContainer({form}) {
+ const [state] = useContext(JobCreateContext);
+ const {loading, error, data} = useQuery(SEARCH_VEHICLES, {
+ variables: {search: `%${state.vehicle.search}%`},
+ skip: !state.vehicle.search,
+ fetchPolicy: "network-only",
+ nextFetchPolicy: "network-only",
+ });
- if (error) return ;
+ if (error) return ;
- return (
-
- );
+ return (
+
+ );
}
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx
index 0813f9f21..dad4385cd 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.new.component.jsx
@@ -1,202 +1,202 @@
-import { Form, Input } from "antd";
-import React, { useContext } from "react";
-import { useTranslation } from "react-i18next";
+import {Form, Input} from "antd";
+import React, {useContext} from "react";
+import {useTranslation} from "react-i18next";
import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
import FormDatePicker from "../form-date-picker/form-date-picker.component";
import LayoutFormRow from "../layout-form-row/layout-form-row.component";
import JobsCreateVehicleInfoPredefined from "./jobs-create-vehicle-info.predefined.component";
-export default function JobsCreateVehicleInfoNewComponent({ form }) {
- const [state] = useContext(JobCreateContext);
+export default function JobsCreateVehicleInfoNewComponent({form}) {
+ const [state] = useContext(JobCreateContext);
- const { t } = useTranslation();
- return (
-
+ );
}
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
index c2c2404ac..a8e577419 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
@@ -1,81 +1,81 @@
-import { PlusOutlined, SearchOutlined } from "@ant-design/icons";
-import { Button, Input, Popover, Table } from "antd";
-import React, { useState } from "react";
-import { useTranslation } from "react-i18next";
+import {PlusOutlined, SearchOutlined} from "@ant-design/icons";
+import {Button, Input, Popover, Table} from "antd";
+import React, {useState} from "react";
+import {useTranslation} from "react-i18next";
import PredefinedVehicles from "./predefined-vehicles.js";
-export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
- const [open, setOpen] = useState(false);
- const [search, setSearch] = useState("");
- const { t } = useTranslation();
- const handleOpenChange = (newOpen) => {
- setOpen(newOpen);
- setSearch("");
- };
- const filteredPredefinedVehicles =
- search === ""
- ? PredefinedVehicles
- : PredefinedVehicles.filter(
- (v) =>
- v.make.toLowerCase().includes(search.toLowerCase()) ||
- v.model.toLowerCase().includes(search.toLowerCase())
- );
+export default function JobsCreateVehicleInfoPredefined({disabled, form}) {
+ const [open, setOpen] = useState(false);
+ const [search, setSearch] = useState("");
+ const {t} = useTranslation();
+ const handleOpenChange = (newOpen) => {
+ setOpen(newOpen);
+ setSearch("");
+ };
+ const filteredPredefinedVehicles =
+ search === ""
+ ? PredefinedVehicles
+ : PredefinedVehicles.filter(
+ (v) =>
+ v.make.toLowerCase().includes(search.toLowerCase()) ||
+ v.model.toLowerCase().includes(search.toLowerCase())
+ );
- const popContent = () => (
-
-
setSearch(value)} />}
- dataSource={filteredPredefinedVehicles}
- columns={[
- {
- dataIndex: "make",
- key: "make",
- title: t("vehicles.fields.v_make_desc"),
- },
- {
- dataIndex: "model",
- key: "model",
- title: t("vehicles.fields.v_model_desc"),
- },
- {
- dataIndex: "select",
- key: "select",
- title: t("general.labels.actions"),
- render: (value, record) => (
-