diff --git a/client/src/components/shop-employees/shop-employees-form.component.jsx b/client/src/components/shop-employees/shop-employees-form.component.jsx index 782c0dff8..3cedf6512 100644 --- a/client/src/components/shop-employees/shop-employees-form.component.jsx +++ b/client/src/components/shop-employees/shop-employees-form.component.jsx @@ -36,6 +36,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component"; import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component"; import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component"; +import { useTreatments } from "@splitsoftware/splitio-react"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -56,7 +57,11 @@ export function ShopEmployeesFormComponent({ bodyshop }) { fetchPolicy: "network-only", nextFetchPolicy: "network-only", }); - + const { Enhanced_Payroll } = useTreatments( + ["Enhanced_Payroll"], + {}, + bodyshop.imexshopid + ); const client = useApolloClient(); useEffect(() => { if (data && data.employees_by_pk) form.setFieldsValue(data.employees_by_pk); @@ -362,7 +367,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) { {t("timetickets.labels.shift")} - {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber + {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on" ? CiecaSelect(false, true) : bodyshop.md_responsibility_centers.costs.map( (c) => ( diff --git a/client/src/components/shop-info/shop-info.task-presets.component.jsx b/client/src/components/shop-info/shop-info.task-presets.component.jsx index 82d49227d..0ebdf5815 100644 --- a/client/src/components/shop-info/shop-info.task-presets.component.jsx +++ b/client/src/components/shop-info/shop-info.task-presets.component.jsx @@ -143,14 +143,6 @@ export function ShopInfoTaskPresets({ bodyshop, form }) { {t("joblines.fields.lbr_types.LAM")} - - - {t("joblines.fields.lbr_types.LAM")} - - e.id === technician.id)[0]; return (
@@ -53,7 +59,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) { {item.cost_center === "timetickets.labels.shift" ? t(item.cost_center) - : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber + : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on" ? t( `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}` ) diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx index 7754c07f2..838c83851 100644 --- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx +++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx @@ -12,6 +12,7 @@ import TechClockInComponent from "./tech-job-clock-in-form.component"; import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component"; import moment from "moment"; import { setModalContext } from "../../redux/modals/modals.actions"; +import { useTreatments } from "@splitsoftware/splitio-react"; const mapStateToProps = createStructuredSelector({ technician: selectTechnician, @@ -26,9 +27,10 @@ export function TechClockInContainer({ technician, bodyshop, }) { - console.log( - "🚀 ~ file: tech-job-clock-in-form.container.jsx:29 ~ technician:", - technician + const { Enhanced_Payroll } = useTreatments( + ["Enhanced_Payroll"], + {}, + bodyshop.imexshopid ); const [form] = Form.useForm(); const [loading, setLoading] = useState(false); @@ -56,7 +58,7 @@ export function TechClockInContainer({ jobid: values.jobid, cost_center: values.cost_center, ciecacode: - bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber + bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === 'on' ? values.cost_center : Object.keys( bodyshop.md_responsibility_centers.defaults.costs diff --git a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx index d1c5c3528..321ef903d 100644 --- a/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx +++ b/client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx @@ -24,6 +24,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors"; import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility"; import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-out-delete.component"; import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component"; +import { useTreatments } from "@splitsoftware/splitio-react"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -43,6 +44,12 @@ export function TechClockOffButton({ const [updateTimeticket] = useMutation(UPDATE_TIME_TICKET); const [updateJobStatus] = useMutation(UPDATE_JOB_STATUS); const [form] = Form.useForm(); + const { Enhanced_Payroll } = useTreatments( + ["Enhanced_Payroll"], + {}, + bodyshop.imexshopid + ); + const { queryLoading, data: lineTicketData } = useQuery( GET_LINE_TICKET_BY_PK, { @@ -76,7 +83,9 @@ export function TechClockOffButton({ ?.rate, flat_rate: emps && emps.flat_rate, ciecacode: - bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber + bodyshop.cdk_dealerid || + bodyshop.pbs_serialnumber || + Enhanced_Payroll.treatment === "on" ? values.cost_center : Object.keys( bodyshop.md_responsibility_centers.defaults.costs diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index fcf4ac4e8..2325e4e66 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -20,6 +20,7 @@ import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component"; import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component"; import TimeTicketList from "../time-ticket-list/time-ticket-list.component"; import TimeTicketCalculatorComponent from "../time-ticket-calculator/time-ticket-calculator.component"; +import { useTreatments } from "@splitsoftware/splitio-react"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -41,6 +42,11 @@ export function TimeTicketModalComponent({ employeeSelectDisabled, }) { const { t } = useTranslation(); + const { Enhanced_Payroll } = useTreatments( + ["Enhanced_Payroll"], + {}, + bodyshop.imexshopid + ); const [loadLineTicketData, { called, loading, data: lineTicketData }] = useLazyQuery(GET_LINE_TICKET_BY_PK, { fetchPolicy: "network-only", @@ -58,7 +64,7 @@ export function TimeTicketModalComponent({ {item.cost_center === "timetickets.labels.shift" ? t(item.cost_center) - : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber + : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === 'on' ? t( `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}` ) diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx index 4ae2913b6..e70cc4e5c 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx @@ -15,6 +15,7 @@ import { selectTimeTicket } from "../../redux/modals/modals.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors"; import TimeTicketModalComponent from "./time-ticket-modal.component"; import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component"; +import { useTreatments } from "@splitsoftware/splitio-react"; const mapStateToProps = createStructuredSelector({ timeTicketModal: selectTimeTicket, @@ -35,7 +36,11 @@ export function TimeTicketModalContainer({ const [enterAgain, setEnterAgain] = useState(false); const [insertTicket] = useMutation(INSERT_NEW_TIME_TICKET); const [updateTicket] = useMutation(UPDATE_TIME_TICKET); - + const { Enhanced_Payroll } = useTreatments( + ["Enhanced_Payroll"], + {}, + bodyshop.imexshopid + ); const { data: EmployeeAutoCompleteData } = useQuery(QUERY_ACTIVE_EMPLOYEES, { skip: !timeTicketModal.visible, fetchPolicy: "network-only", @@ -147,7 +152,7 @@ export function TimeTicketModalContainer({ if (!!changedFields.cost_center && !!EmployeeAutoCompleteData) { form.setFieldsValue({ ciecacode: - bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber + bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatments === 'on' ? changedFields.cost_center : Object.keys( bodyshop.md_responsibility_centers.defaults.costs