IO-2727 Payment Re-export/Export button

Send data back to page

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/jobs-create-jobs-info/jobs-create-jobs-info.component.jsx

@@ -1,12 +1,4 @@
-import {
-  Collapse,
-  Form,
-  Input,
-  InputNumber,
-  Select,
-  Space,
-  Switch,
-} from "antd";
+import { Collapse, Form, Input, InputNumber, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -18,8 +10,6 @@ import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import FormItemPhone, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
-import JobsDetailChangeEstimator from "../jobs-detail-change-estimator/jobs-detail-change-estimator.component";
-import JobsDetailChangeFilehandler from "../jobs-detail-change-filehandler/jobs-detail-change-filehandler.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";
 import JobsMarkPstExempt from "../jobs-mark-pst-exempt/jobs-mark-pst-exempt.component";
@@ -35,15 +25,6 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
   const { t } = useTranslation();
   const { getFieldValue } = form;
-
-  const handleInsCoChange = (value) => {
-    const selectedCompany = bodyshop.md_ins_cos.find((s) => s.name === value);
-    if (selectedCompany) {
-      form.setFieldValue("ins_addr1", selectedCompany.street1);
-      form.setFieldValue("ins_city", selectedCompany.city);
-    }
-  };
-
   return (
     <div>
       <Collapse defaultActiveKey="insurance">
@@ -53,20 +34,26 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
           forceRender
         >
           <LayoutFormRow>
-            <Form.Item label={t("jobs.fields.clm_no")} name="clm_no">
+            <Form.Item label={t("jobs.fields.ins_co_id")} name="ins_co_id">
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.policy_no")} name="policy_no">
               <Input />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.clm_no")} name="clm_no">
+              <Input />
+            </Form.Item>
             <Form.Item
               label={t("jobs.fields.regie_number")}
               name="regie_number"
             >
               <Input />
             </Form.Item>
+            <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
+              <FormDatePicker />
+            </Form.Item>
             <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-              <Select onChange={handleInsCoChange}>
+              <Select>
                 {bodyshop.md_ins_cos.map((s) => (
                   <Select.Option key={s.name} value={s.name}>
                     {s.name}
@@ -80,15 +67,7 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             <Form.Item label={t("jobs.fields.ins_city")} name="ins_city">
               <Input />
             </Form.Item>
-            <Form.Item
-              label={
-                <Space>
-                  {t("jobs.fields.ins_ct_ln")}
-                  <JobsDetailChangeFilehandler form={form} />
-                </Space>
-              }
-              name="ins_ct_ln"
-            >
+            <Form.Item label={t("jobs.fields.ins_ct_ln")} name="ins_ct_ln">
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.ins_ct_fn")} name="ins_ct_fn">
@@ -116,24 +95,11 @@ export function JobsCreateJobsInfo({ bodyshop, form, selected }) {
             >
               <FormItemEmail email={getFieldValue("ins_ea")} />
             </Form.Item>
-            <Form.Item label={t("jobs.fields.loss_date")} name="loss_date">
-              <FormDatePicker />
-            </Form.Item>
-            <Form.Item label={t("jobs.fields.kmin")} name="kmin">
-              <Input />
-            </Form.Item>
+
             <Form.Item label={t("jobs.fields.est_co_nm")} name="est_co_nm">
               <Input />
             </Form.Item>
-            <Form.Item
-              label={
-                <Space>
-                  {t("jobs.fields.est_ct_fn")}
-                  <JobsDetailChangeEstimator form={form} />
-                </Space>
-              }
-              name="est_ct_fn"
-            >
+            <Form.Item label={t("jobs.fields.est_ct_fn")} name="est_ct_fn">
               <Input />
             </Form.Item>
             <Form.Item label={t("jobs.fields.est_ct_ln")} name="est_ct_ln">

client/src/components/jobs-detail-general/jobs-detail-general.component.jsx

@@ -37,15 +37,6 @@ const lossColDamage = { sm: { span: 24 }, md: { span: 6 }, lg: { span: 4 } };
 export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
   const { getFieldValue } = form;
   const { t } = useTranslation();
-
-  const handleInsCoChange = (value) => {
-    const selectedCompany = bodyshop.md_ins_cos.find((s) => s.name === value);
-    if (selectedCompany) {
-      form.setFieldValue("ins_addr1", selectedCompany.street1);
-      form.setFieldValue("ins_city", selectedCompany.city);
-    }
-  };
-
   return (
     <div>
       <FormRow header={t("jobs.forms.claiminfo")}>
@@ -80,7 +71,7 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         </Form.Item>
 
         <Form.Item label={t("jobs.fields.ins_co_nm")} name="ins_co_nm">
-          <Select disabled={jobRO} onChange={handleInsCoChange}>
+          <Select disabled={jobRO}>
             {bodyshop.md_ins_cos.map((s) => (
               <Select.Option key={s.name} value={s.name}>
                 {s.name}

client/src/components/payment-mark-export-button/payment-mark-export-button-component.jsx

@@ -1,13 +1,13 @@
-import React from "react";
-import { Button, notification } from "antd";
 import { useMutation } from "@apollo/client";
+import { Button, notification } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
-import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
-import { setModalContext } from "../../redux/modals/modals.actions";
 import { connect } from "react-redux";
-import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
 import { createStructuredSelector } from "reselect";
+import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectCurrentUser } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -46,7 +46,6 @@ const PaymentMarkForExportButton = ({
         ],
       },
     });
-
     const paymentUpdateResponse = await updatePayment({
       variables: {
         paymentId: payment.id,
@@ -55,16 +54,12 @@ const PaymentMarkForExportButton = ({
         },
       },
     });
-
     if (!!!paymentUpdateResponse.errors) {
       notification.open({
         type: "success",
         key: "paymentsuccessmarkforexport",
         message: t("payments.successes.markexported"),
       });
-
-      if (refetch) refetch();
-
       setPaymentContext({
         actions: {
           refetch,
@@ -74,6 +69,12 @@ const PaymentMarkForExportButton = ({
           exportedat: today,
         },
       });
+
+      if (refetch)
+        refetch(
+          paymentUpdateResponse &&
+            paymentUpdateResponse.data.update_payments.returning[0]
+        );
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {

client/src/components/payment-reexport-button/payment-reexport-button.component.jsx

@@ -1,10 +1,10 @@
-import React from "react";
-import { Button, notification } from "antd";
-import { useTranslation } from "react-i18next";
-import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
 import { useMutation } from "@apollo/client";
-import { setModalContext } from "../../redux/modals/modals.actions";
+import { Button, notification } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { UPDATE_PAYMENT } from "../../graphql/payments.queries";
+import { setModalContext } from "../../redux/modals/modals.actions";
 
 const mapDispatchToProps = (dispatch) => ({
   setPaymentContext: (context) =>
@@ -24,16 +24,12 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
         },
       },
     });
-
     if (!!!paymentUpdateResponse.errors) {
       notification.open({
         type: "success",
         key: "paymentsuccessexport",
         message: t("payments.successes.markreexported"),
       });
-
-      if (refetch) refetch();
-
       setPaymentContext({
         actions: {
           refetch,
@@ -43,6 +39,11 @@ const PaymentReexportButton = ({ payment, refetch, setPaymentContext }) => {
           exportedat: null,
         },
       });
+      if (refetch)
+        refetch(
+          paymentUpdateResponse &&
+            paymentUpdateResponse.data.update_payments.returning[0]
+        );
     } else {
       notification["error"]({
         message: t("payments.errors.exporting", {

client/src/translations/en_us/common.json

@@ -1573,7 +1573,7 @@
 				"federal_tax_payable": "Federal Tax Payable",
 				"federal_tax_rate": "Federal Tax Rate",
 				"ins_addr1": "Insurance Co. Address",
-				"ins_city": "Insurance Co. City",
+				"ins_city": "Insurance City",
 				"ins_co_id": "Insurance Co. ID",
 				"ins_co_nm": "Insurance Company Name",
 				"ins_co_nm_short": "Ins.  Co.",