From e6dade120687681a8af44219d6f0bfae42864790 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 17 Oct 2024 17:03:40 -0700 Subject: [PATCH] IO-2988 Jobline Upsert Undefined handling Signed-off-by: Allan Carr --- .../job-lines-upsert-modal.container.jsx | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx index 39cf2a2af..76f8b52bb 100644 --- a/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx +++ b/client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx @@ -1,5 +1,8 @@ import { useMutation } from "@apollo/client"; +import { useSplitTreatments } from "@splitsoftware/splitio-react"; import { notification } from "antd"; +import Axios from "axios"; +import Dinero from "dinero.js"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -7,13 +10,10 @@ import { createStructuredSelector } from "reselect"; import { INSERT_NEW_JOB_LINE, UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries"; import { toggleModalVisible } from "../../redux/modals/modals.actions"; import { selectJobLineEditModal } from "../../redux/modals/modals.selectors"; +import { selectBodyshop } from "../../redux/user/user.selectors"; +import CriticalPartsScan from "../../utils/criticalPartsScan"; import UndefinedToNull from "../../utils/undefinedtonull"; import JobLinesUpdsertModal from "./job-lines-upsert-modal.component"; -import Axios from "axios"; -import Dinero from "dinero.js"; -import CriticalPartsScan from "../../utils/criticalPartsScan"; -import { selectBodyshop } from "../../redux/user/user.selectors"; -import { useSplitTreatments } from "@splitsoftware/splitio-react"; const mapStateToProps = createStructuredSelector({ jobLineEditModal: selectJobLineEditModal, @@ -82,13 +82,15 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo variables: { lineId: jobLineEditModal.context.id, line: { - ...values, - prt_dsmk_m: Dinero({ - amount: Math.round(values.act_price * 100) + ...UndefinedToNull({ + ...values, + prt_dsmk_m: Dinero({ + amount: Math.round(values.act_price * 100) + }) + .percentage(Math.abs(values.prt_dsmk_p || 0)) + .multiply(values.prt_dsmk_p >= 0 ? 1 : -1) + .toFormat(0.0) }) - .percentage(Math.abs(values.prt_dsmk_p || 0)) - .multiply(values.prt_dsmk_p >= 0 ? 1 : -1) - .toFormat(0.0) } }, refetchQueries: ["GET_LINE_TICKET_BY_PK"]