IO-2407 In House Invoice Audit Log correction for Invoice Number

Merged in release/2023-09-15 (pull request #980 )
Release/2023 09 15
2023-09-20 12:16:03 -07:00 · 2023-09-15 17:40:34 +00:00 · 2023-09-15 10:38:51 -07:00 · 2023-09-15 10:37:09 -07:00 · 2023-09-15 16:14:16 +00:00 · 2023-09-15 09:15:34 -07:00
29 changed files with 620 additions and 234 deletions
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -37301,6 +37301,27 @@
                                            </translation>
                                        </translations>
                                    </concept_node>
+                                    <concept_node>
+                                        <name>inserting</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                </children>
                            </folder_node>
                            <folder_node>
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -37,8 +37,8 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
  toggleModalVisible: () => dispatch(toggleModalVisible("billEnter")),
-  insertAuditTrail: ({ jobid, operation }) =>
-    dispatch(insertAuditTrail({ jobid, operation })),
+  insertAuditTrail: ({ jobid, billid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, billid, operation })),
 });

 const Templates = TemplateList("job_special");
@@ -316,7 +316,7 @@ function BillEnterModalContainer({
    insertAuditTrail({
      jobid: values.jobid,
      billid: billId,
-      operation: AuditTrailMapping.billposted(remainingValues.invoice_number),
+      operation: AuditTrailMapping.billposted(r1.data.insert_bills.returning[0].invoice_number),
    });

    if (enterAgain) {
--- a/client/src/components/card-payment-modal/card-payment-modal.component..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component..jsx
@@ -1,12 +1,15 @@
-import { useMutation, useQuery } from "@apollo/client";
+import { DeleteFilled } from "@ant-design/icons";
+import { useLazyQuery, useMutation } from "@apollo/client";
 import {
  Button,
  Card,
+  Col,
  Form,
  Input,
-  InputNumber,
  Row,
+  Space,
  Spin,
+  Statistic,
  notification,
 } from "antd";
 import axios from "axios";
@@ -17,7 +20,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import {
  INSERT_PAYMENT_RESPONSE,
-  QUERY_RO_AND_OWNER_BY_JOB_PK,
+  QUERY_RO_AND_OWNER_BY_JOB_PKS,
 } from "../../graphql/payment_response.queries";
 import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -25,9 +28,8 @@ import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectCardPayment } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import DataLabel from "../data-label/data-label.component";
+import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";

 const mapStateToProps = createStructuredSelector({
  cardPaymentModal: selectCardPayment,
@@ -49,18 +51,21 @@ const CardPaymentModalComponent = ({
  const { context } = cardPaymentModal;

  const [form] = Form.useForm();
-  const amount = Form.useWatch("amount", form);
-  const jobid = Form.useWatch("jobid", form);
+
  const [loading, setLoading] = useState(false);
  const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
  const { t } = useTranslation();

-  const { data, refetch } = useQuery(QUERY_RO_AND_OWNER_BY_JOB_PK, {
-    variables: { jobid: context?.jobid ?? "" },
-    skip: !context?.jobid,
-  });
+  const [, { data, refetch, queryLoading }] = useLazyQuery(
+    QUERY_RO_AND_OWNER_BY_JOB_PKS,
+    {
+      variables: { jobids: [context.jobid] },
+      skip: true,
+    }
+  );

+  console.log("🚀 ~ file: card-payment-modal.component..jsx:61 ~ data:", data);
  //Initialize the intellipay window.
  const SetIntellipayCallbackFunctions = () => {
    console.log("*** Set IntelliPay callback functions.");
@@ -76,69 +81,68 @@ const CardPaymentModalComponent = ({

    window.intellipay.runOnNonApproval(async function (response) {
      // Mutate unsuccessful payment
+
+      const { payments } = form.getFieldsValue();
+
      await insertPaymentResponse({
        variables: {
-          paymentResponse: {
-            amount: response.amount,
+          paymentResponse: payments.map((payment) => ({
+            amount: payment.amount,
            bodyshopid: bodyshop.id,
-            jobid: jobid || context.jobid,
+            jobid: payment.jobid,
            declinereason: response.declinereason,
            ext_paymentid: response.paymentid.toString(),
            successful: false,
            response,
-          },
+          })),
        },
      });
-      insertAuditTrail({
-        jobid: jobid || context?.jobid,
-        operation: AuditTrailMapping.failedpayment(),
-      });
+
+      payments.forEach((payment) =>
+        insertAuditTrail({
+          jobid: payment.jobid,
+          operation: AuditTrailMapping.failedpayment(),
+        })
+      );
    });
  };

  const handleFinish = async (values) => {
    try {
-      const paymentResult = await insertPayment({
+      await insertPayment({
        variables: {
-          paymentInput: {
-            amount: values.amount,
+          paymentInput: values.payments.map((payment) => ({
+            amount: payment.amount,
            transactionid: (values.paymentResponse.paymentid || "").toString(),
            payer: t("payments.labels.customer"),
            type: values.paymentResponse.cardbrand,
-            jobid: values.jobid,
+            jobid: payment.jobid,
            date: moment(Date.now()),
-          },
+            payment_responses: {
+              data: [
+                {
+                  amount: payment.amount,
+                  bodyshopid: bodyshop.id,
+
+                  jobid: payment.jobid,
+                  declinereason: values.paymentResponse.declinereason,
+                  ext_paymentid: values.paymentResponse.paymentid.toString(),
+                  successful: true,
+                  response: values.paymentResponse,
+                },
+              ],
+            },
+          })),
        },
        refetchQueries: ["GET_JOB_BY_PK"],
-        update(cache, { data }) {
-          cache.modify({
-            id: cache.identify({ id: values.jobid, __typename: "jobs" }),
-            fields: {
-              payments(cachedPayments) {
-                return [...data.insert_payments.returning, ...cachedPayments];
-              },
-            },
-          });
-        },
-      });
-
-      await insertPaymentResponse({
-        variables: {
-          paymentResponse: {
-            amount: values.amount,
-            bodyshopid: bodyshop.id,
-            paymentid: paymentResult.data.insert_payments.returning[0].id,
-            jobid: values.jobid,
-            declinereason: values.paymentResponse.declinereason,
-            ext_paymentid: values.paymentResponse.paymentid.toString(),
-            successful: true,
-            response: values.paymentResponse,
-          },
-        },
      });
      toggleModalVisible();
    } catch (error) {
      console.error(error);
+      notification.open({
+        type: "error",
+        message: t("payments.errors.inserting", { error: error.message }),
+      });
    } finally {
      setLoading(false);
    }
@@ -146,9 +150,16 @@ const CardPaymentModalComponent = ({

  const handleIntelliPayCharge = async () => {
    setLoading(true);
-    try {
-      console.warn("*** Window.Intellipay", !!window.intellipay);

+    //Validate
+    try {
+      await form.validateFields();
+    } catch (error) {
+      setLoading(false);
+      return;
+    }
+
+    try {
      const response = await axios.post("/intellipay/lightbox_credentials", {
        bodyshop,
        refresh: !!window.intellipay,
@@ -182,93 +193,175 @@ const CardPaymentModalComponent = ({
        <Form
          onFinish={handleFinish}
          form={form}
-          initialValues={{ jobid: context?.jobid }}
+          layout="vertical"
+          initialValues={{
+            payments: context.jobid ? [{ jobid: context.jobid }] : [],
+          }}
        >
-          <LayoutFormRow grow noDivider>
-            <Form.Item
-              name="jobid"
-              label={t("bills.fields.ro_number")}
-              rules={[
-                {
-                  required: true,
-                  // message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <JobSearchSelectComponent
-                disabled={context?.jobid}
-                notExported={false}
-                clm_no
-                onChange={(e) => {
-                  refetch({ jobid: e });
-                }}
-              />
-            </Form.Item>
-          </LayoutFormRow>
+          <Form.List name={["payments"]}>
+            {(fields, { add, remove, move }) => {
+              return (
+                <div>
+                  {fields.map((field, index) => (
+                    <Form.Item key={field.key}>
+                      <Row gutter={[16, 16]}>
+                        <Col span={16}>
+                          <Form.Item
+                            key={`${index}jobid`}
+                            label={t("jobs.fields.ro_number")}
+                            name={[field.name, "jobid"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <JobSearchSelectComponent
+                              notExported={false}
+                              clm_no
+                            />
+                          </Form.Item>
+                        </Col>
+                        <Col span={6}>
+                          <Form.Item
+                            key={`${index}amount`}
+                            label={t("payments.fields.amount")}
+                            name={[field.name, "amount"]}
+                            rules={[
+                              {
+                                required: true,
+                                //message: t("general.validation.required"),
+                              },
+                            ]}
+                          >
+                            <CurrencyFormItemComponent />
+                          </Form.Item>
+                        </Col>
+                        <Col span={2}>
+                          <DeleteFilled
+                            style={{ margin: "1rem" }}
+                            onClick={() => {
+                              remove(field.name);
+                            }}
+                          />
+                        </Col>
+                      </Row>
+                    </Form.Item>
+                  ))}
+                  <Form.Item>
+                    <Button
+                      type="dashed"
+                      onClick={() => {
+                        add();
+                      }}
+                      style={{ width: "100%" }}
+                    >
+                      {t("general.actions.add")}
+                    </Button>
+                  </Form.Item>
+                </div>
+              );
+            }}
+          </Form.List>

-          {/* Lighbox Input amount needs to be hidden */}
-          <Input
-            className="ipayfield"
-            data-ipayname="amount"
-            type="hidden"
-            value={amount}
-            hidden
-          />
-          <Input
-            className="ipayfield"
-            data-ipayname="account"
-            type="hidden"
-            value={data?.jobs_by_pk.ro_number}
-            hidden
-          />
-          <Input
-            className="ipayfield"
-            data-ipayname="email"
-            type="hidden"
-            value={data?.jobs_by_pk.owner.ownr_ea}
-            hidden
-          />
-          {/* Lightbox payment response when it is completed */}
-          <Form.Item name="paymentResponse" hidden>
-            <Input type="hidden" value={amount} />
+          <Form.Item
+            shouldUpdate={(prevValues, curValues) =>
+              prevValues.payments?.map((p) => p?.jobid).join() !==
+              curValues.payments?.map((p) => p?.jobid).join()
+            }
+          >
+            {() => {
+              console.log("Updating the owner info section.");
+              //If all of the job ids have been fileld in, then query and update the IP field.
+              const { payments } = form.getFieldsValue();
+              if (
+                payments?.length > 0 &&
+                payments?.filter((p) => p?.jobid).length === payments?.length
+              ) {
+                console.log("**Calling refetch.");
+                refetch({ jobids: payments.map((p) => p.jobid) });
+              }
+              console.log(
+                "Acc info",
+                data,
+                payments && data && data.jobs.length > 0
+                  ? data.jobs.map((j) => j.ro_number).join(", ")
+                  : null
+              );
+              return (
+                <>
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="account"
+                    //type="hidden"
+                    value={
+                      payments && data && data.jobs.length > 0
+                        ? data.jobs.map((j) => j.ro_number).join(", ")
+                        : null
+                    }
+                    hidden
+                  />
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="email"
+                    // type="hidden"
+                    value={
+                      payments && data && data.jobs.length > 0
+                        ? data.jobs.filter((j) => j.ownr_ea)[0]?.ownr_ea
+                        : null
+                    }
+                    hidden
+                  />
+                </>
+              );
+            }}
+          </Form.Item>
+          <Form.Item
+            shouldUpdate={(prevValues, curValues) =>
+              prevValues.payments?.map((p) => p?.amount).join() !==
+              curValues.payments?.map((p) => p?.amount).join()
+            }
+          >
+            {() => {
+              const { payments } = form.getFieldsValue();
+              const totalAmountToCharge = payments?.reduce((acc, val) => {
+                return acc + (val?.amount || 0);
+              }, 0);
+
+              return (
+                <Space style={{ float: "right" }}>
+                  <Statistic
+                    title="Amount To Charge"
+                    value={totalAmountToCharge}
+                    precision={2}
+                  />
+                  <Input
+                    className="ipayfield"
+                    data-ipayname="amount"
+                    //type="hidden"
+                    value={totalAmountToCharge?.toFixed(2)}
+                    hidden
+                  />
+                  <Button
+                    type="primary"
+                    //  data-ipayname="submit"
+                    className="ipayfield"
+                    loading={queryLoading || loading}
+                    disabled={!(totalAmountToCharge > 0)}
+                    onClick={handleIntelliPayCharge}
+                  >
+                    {t("job_payments.buttons.proceedtopayment")}
+                  </Button>
+                </Space>
+              );
+            }}
          </Form.Item>

-          <LayoutFormRow grow>
-            <Form.Item
-              label="Amount"
-              name="amount"
-              rules={[
-                {
-                  required: true,
-                  // message: t("general.validation.required"),
-                },
-              ]}
-            >
-              <InputNumber />
-            </Form.Item>
-
-            <Row justify="space-around">
-              <Button
-                type="primary"
-                //  data-ipayname="submit"
-                className="ipayfield"
-                disabled={!amount || !jobid}
-                onClick={handleIntelliPayCharge}
-              >
-                {t("job_payments.buttons.proceedtopayment")}
-              </Button>
-              {context?.balance && (
-                <DataLabel
-                  valueStyle={{
-                    color: context?.balance.getAmount() !== 0 ? "red" : "green",
-                  }}
-                  label={t("payments.labels.balance")}
-                >
-                  {context?.balance.toFormat()}
-                </DataLabel>
-              )}
-            </Row>
-          </LayoutFormRow>
+          {/* Lightbox payment response when it is completed */}
+          <Form.Item name="paymentResponse" hidden>
+            <Input type="hidden" />
+          </Form.Item>
        </Form>
      </Spin>
    </Card>
--- a/client/src/components/card-payment-modal/card-payment-modal.container..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.container..jsx
@@ -43,7 +43,7 @@ function CardPaymentModalContainer({
          {t("job_payments.buttons.goback")}
        </Button>,
      ]}
-      width="60%"
+      width="80%"
      destroyOnClose
    >
      <CardPaymentModalComponent />
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -254,7 +254,7 @@ function Header({
              onClick={() => {
                setCardPaymentContext({
                  actions: {},
-                  context: null,
+                  context: {},
                });
              }}
              icon={<Icon component={FaCreditCard} />}
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -401,7 +401,7 @@ export function JobLinesComponent({
      const markedTypes = [e.key];
      if (e.key === "PAN") markedTypes.push("PAP");
      if (e.key === "PAS") markedTypes.push("PASL");
-      setSelectedLines(
+      setSelectedLines((selectedLines) =>
        _.uniq([
          ...selectedLines,
          ...jobLines.filter((item) => markedTypes.includes(item.part_type)),
@@ -614,8 +614,17 @@ export function JobLinesComponent({
          onSelectAll: (selected, selectedRows, changeRows) => {
            setSelectedLines(selectedRows);
          },
-          onSelect: (record, selected, selectedRows, nativeEvent) =>
-            setSelectedLines(selectedRows),
+          onSelect: (record, selected, selectedRows, nativeEvent) => {
+            if (selected) {
+              setSelectedLines((selectedLines) =>
+                _.uniqBy([...selectedLines, record], "id")
+              );
+            } else {
+              setSelectedLines((selectedLines) =>
+                selectedLines.filter((l) => l.id !== record.id)
+              );
+            }
+          },
        }}
      />
    </div>
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -3,7 +3,7 @@ import {
  useApolloClient,
  useLazyQuery,
  useMutation,
-  useQuery
+  useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
 import { Col, notification, Row } from "antd";
@@ -20,7 +20,7 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
  DELETE_AVAILABLE_JOB,
  QUERY_AVAILABLE_JOBS,
-  QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK
+  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";
@@ -28,7 +28,7 @@ import { SEARCH_VEHICLE_BY_VIN } from "../../graphql/vehicles.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import {
  selectBodyshop,
-  selectCurrentUser
+  selectCurrentUser,
 } from "../../redux/user/user.selectors";
 import confirmDialog from "../../utils/asyncConfirm";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
@@ -135,6 +135,7 @@ export function JobsAvailableContainer({
      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,
--- 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
@@ -13,12 +13,26 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  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
+        );
+      },
+    },
+  });
+}
+
 export function JobsCloseExportButton({
  bodyshop,
  currentUser,
@@ -100,6 +114,9 @@ export function JobsCloseExportButton({

    //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) => {
@@ -158,12 +175,15 @@ export function JobsCloseExportButton({
          },
        });

-        if (!jobUpdateResponse.errors) {
+        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", {
@@ -172,12 +192,24 @@ export function JobsCloseExportButton({
          });
        }
      }
-      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      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) => {
@@ -185,7 +217,6 @@ export function JobsCloseExportButton({
        });
      }
    }
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
+++ b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
@@ -13,12 +13,26 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  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
+        );
+      },
+    },
+  });
+}
+
 export function JobsExportAllButton({
  bodyshop,
  currentUser,
@@ -96,7 +110,9 @@ export function JobsExportAllButton({
      Object.keys(groupedData).map(async (key) => {
        //Check to see if any of them failed. If they didn't don't execute the update.
        const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+        const successfulTransactions = groupedData[key].filter(
+          (r) => r.success
+        );
        if (failedTransactions.length > 0) {
          //Uh oh. At least one was no good.
          failedTransactions.forEach((ft) => {
@@ -155,12 +171,17 @@ export function JobsExportAllButton({
              },
            });

-            if (!jobUpdateResponse.errors) {
+            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", {
@@ -169,12 +190,24 @@ export function JobsExportAllButton({
              });
            }
          }
-          if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+          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"
+                    ]
+                )
+              ),
+            ]);
          }
        }
      })
@@ -182,7 +215,6 @@ export function JobsExportAllButton({

    if (!!completedCallback) completedCallback([]);
    if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
+++ b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx
@@ -14,12 +14,26 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updateBillCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      bills(existingJobs = []) {
+        return existingJobs.filter(
+          (billRef) => billRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PayableExportAll({
  bodyshop,
  currentUser,
@@ -96,7 +110,9 @@ export function PayableExportAll({
      proms.push(
        (async () => {
          const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+          const successfulTransactions = groupedData[key].filter(
+            (r) => r.success
+          );
          if (failedTransactions.length > 0) {
            //Uh oh. At least one was no good.
            failedTransactions.map((ft) =>
@@ -142,7 +158,15 @@ export function PayableExportAll({

              const billUpdateResponse = await updateBill({
                variables: {
-                  billIdList: [key],
+                  billIdList: successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "billid"
+                          : "id"
+                      ]
+                  ),
                  bill: {
                    exported: true,
                    exported_at: new Date(),
@@ -155,6 +179,11 @@ export function PayableExportAll({
                  key: "billsuccessexport",
                  message: t("bills.successes.exported"),
                });
+                updateBillCache(
+                  billUpdateResponse.data.update_bills.returning.map(
+                    (bill) => bill.id
+                  )
+                );
              } else {
                notification["error"]({
                  message: t("bills.errors.exporting", {
@@ -163,12 +192,25 @@ export function PayableExportAll({
                });
              }
            }
-            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
              notification.open({
                type: "success",
                key: "billsuccessexport",
                message: t("bills.successes.exported"),
              });
+              updateBillCache([
+                ...new Set(
+                  successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "billid"
+                          : "id"
+                      ]
+                  )
+                ),
+              ]);
            }
          }
        })()
@@ -178,7 +220,6 @@ export function PayableExportAll({
    await Promise.all(proms);
    if (!!completedCallback) completedCallback([]);
    if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/payable-export-button/payable-export-button.component.jsx
+++ b/client/src/components/payable-export-button/payable-export-button.component.jsx
@@ -13,12 +13,26 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updateBillCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      bills(existingJobs = []) {
+        return existingJobs.filter(
+          (billRef) => billRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PayableExportButton({
  bodyshop,
  currentUser,
@@ -158,6 +172,11 @@ export function PayableExportButton({
            key: "billsuccessexport",
            message: t("bills.successes.exported"),
          });
+          updateBillCache(
+            billUpdateResponse.data.update_bills.returning.map(
+              (bill) => bill.id
+            )
+          );
        } else {
          notification["error"]({
            message: t("bills.errors.exporting", {
@@ -166,12 +185,24 @@ export function PayableExportButton({
          });
        }
      }
-      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
        notification.open({
          type: "success",
          key: "billsuccessexport",
          message: t("bills.successes.exported"),
        });
+        updateBillCache([
+          ...new Set(
+            successfulTransactions.map(
+              (st) =>
+                st[
+                  bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                    ? "billid"
+                    : "id"
+                ]
+            )
+          ),
+        ]);
      }

      if (setSelectedBills) {
@@ -182,7 +213,6 @@ export function PayableExportButton({
    }

    if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
+++ b/client/src/components/payment-expanded-row/payment-expanded-row.component.jsx
@@ -1,15 +1,24 @@
-import React, { useState } from "react";
 import { useMutation, useQuery } from "@apollo/client";
+import {
+  Button,
+  Descriptions,
+  InputNumber,
+  Modal,
+  Space,
+  notification,
+} from "antd";
+import axios from "axios";
+import moment from "moment";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
 import {
  GET_REFUNDABLE_AMOUNT_BY_JOBID,
  INSERT_PAYMENT_RESPONSE,
  QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID,
 } from "../../graphql/payment_response.queries";
-import { Button, Descriptions, InputNumber, Modal, notification } from "antd";
-import moment from "moment";
-import axios from "axios";
 import { INSERT_NEW_PAYMENT } from "../../graphql/payments.queries";
-import { useTranslation } from "react-i18next";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { DateTimeFormatter } from "../../utils/DateFormatter";

 const { confirm } = Modal;

@@ -137,10 +146,10 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
          {payment_response?.response?.nameOnCard ?? ""}
        </Descriptions.Item>
        <Descriptions.Item label={t("job_payments.titles.amount")}>
-          {record.amount}
+          <CurrencyFormatter>{record.amount}</CurrencyFormatter>
        </Descriptions.Item>
        <Descriptions.Item label={t("job_payments.titles.dateOfPayment")}>
-          {moment(record.created_at).format("YYYY-MM-DD HH:mm:ss")}
+          {<DateTimeFormatter>{record.created_at}</DateTimeFormatter>}
        </Descriptions.Item>
        <Descriptions.Item label={t("job_payments.titles.transactionid")}>
          {record.transactionid}
@@ -151,17 +160,22 @@ const PaymentExpandedRowComponent = ({ record, bodyshop }) => {
        <Descriptions.Item label={t("job_payments.titles.paymenttype")}>
          {record.type}
        </Descriptions.Item>
+        <Descriptions.Item label={t("job_payments.titles.paymentnum")}>
+          {record.paymentnum}
+        </Descriptions.Item>
        {payment_response && (
          <Descriptions.Item label={t("job_payments.titles.refundamount")}>
-            <InputNumber
-              onChange={setRefundAmount}
-              max={max_refundable_amount}
-              min={0}
-            />
+            <Space>
+              <InputNumber
+                onChange={setRefundAmount}
+                max={max_refundable_amount}
+                min={0}
+              />

-            <Button onClick={() => showConfirm(payment_response)}>
-              {t("job_payments.buttons.refundpayment")}
-            </Button>
+              <Button onClick={() => showConfirm(payment_response)}>
+                {t("job_payments.buttons.refundpayment")}
+              </Button>
+            </Space>
          </Descriptions.Item>
        )}
      </Descriptions>
--- a/client/src/components/payment-export-button/payment-export-button.component.jsx
+++ b/client/src/components/payment-export-button/payment-export-button.component.jsx
@@ -13,12 +13,26 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updatePaymentCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      payments(existingJobs = []) {
+        return existingJobs.filter(
+          (paymentRef) => paymentRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PaymentExportButton({
  bodyshop,
  currentUser,
@@ -157,6 +171,11 @@ export function PaymentExportButton({
            key: "paymentsuccessexport",
            message: t("payments.successes.exported"),
          });
+          updatePaymentCache(
+            paymentUpdateResponse.data.update_payments.returning.map(
+              (payment) => payment.id
+            )
+          );
        } else {
          notification["error"]({
            message: t("payments.errors.exporting", {
@@ -172,15 +191,26 @@ export function PaymentExportButton({
        });
      }
    }
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
      notification.open({
        type: "success",
        key: "paymentsuccessexport",
        message: t("payments.successes.exported"),
      });
+      updatePaymentCache([
+        ...new Set(
+          successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "paymentid"
+                  : "id"
+              ]
+          )
+        ),
+      ]);
    }
    if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
+++ b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx
@@ -13,11 +13,25 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import client from "../../utils/GraphQLClient";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  currentUser: selectCurrentUser,
 });

+function updatePaymentCache(items) {
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      payments(existingJobs = []) {
+        return existingJobs.filter(
+          (paymentRef) => paymentRef.__ref.includes(items) === false
+        );
+      },
+    },
+  });
+}
+
 export function PaymentsExportAllButton({
  bodyshop,
  currentUser,
@@ -84,7 +98,9 @@ export function PaymentsExportAllButton({
      proms.push(
        (async () => {
          const failedTransactions = groupedData[key].filter((r) => !r.success);
-
+          const successfulTransactions = groupedData[key].filter(
+            (r) => r.success
+          );
          if (failedTransactions.length > 0) {
            //Uh oh. At least one was no good.
            failedTransactions.map((ft) =>
@@ -130,7 +146,15 @@ export function PaymentsExportAllButton({
              });
              const paymentUpdateResponse = await updatePayments({
                variables: {
-                  paymentIdList: [key],
+                  paymentIdList: successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "paymentid"
+                          : "id"
+                      ]
+                  ),
                  payment: {
                    exportedat: new Date(),
                  },
@@ -142,6 +166,11 @@ export function PaymentsExportAllButton({
                  key: "paymentsuccessexport",
                  message: t("payments.successes.exported"),
                });
+                updatePaymentCache(
+                  paymentUpdateResponse.data.update_payments.returning.map(
+                    (payment) => payment.id
+                  )
+                );
              } else {
                notification["error"]({
                  message: t("payments.errors.exporting", {
@@ -150,12 +179,25 @@ export function PaymentsExportAllButton({
                });
              }
            }
-            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+            if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && successfulTransactions.length > 0) {
              notification.open({
                type: "success",
                key: "paymentsuccessexport",
                message: t("payments.successes.exported"),
              });
+              updatePaymentCache([
+                ...new Set(
+                  successfulTransactions.map(
+                    (st) =>
+                      st[
+                        bodyshop.accountingconfig &&
+                        bodyshop.accountingconfig.qbo
+                          ? "paymentid"
+                          : "id"
+                      ]
+                  )
+                ),
+              ]);
            }
          }
        })()
@@ -164,7 +206,6 @@ export function PaymentsExportAllButton({
    await Promise.all(proms);
    if (!!completedCallback) completedCallback([]);
    if (!!loadingCallback) loadingCallback(false);
-    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) refetch();
    setLoading(false);
  };

--- 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
@@ -2,6 +2,7 @@ import { useMutation } from "@apollo/client";
 import { Button, Card, Form, notification, Space } from "antd";
 import axios from "axios";
 import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -49,14 +50,20 @@ export function TechClockInContainer({
  const handleFinish = async (values) => {
    setLoading(true);
    const theTime = (await axios.post("/utils/time")).data;
-
    const result = await insertTimeTicket({
      variables: {
        timeTicketInput: [
          {
            bodyshopid: bodyshop.id,
            employeeid: technician.id,
-            date: moment(theTime).format("YYYY-MM-DD"),
+            date:
+              typeof bodyshop.timezone === "string"
+                ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                : typeof bodyshop.timezone === "number"
+                ? moment(theTime)
+                    .format("YYYY-MM-DD")
+                    .utcOffset(bodyshop.timezone)
+                : moment(theTime).format("YYYY-MM-DD"),
            clockon: moment(theTime),
            jobid: values.jobid,
            cost_center: values.cost_center,
--- a/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
+++ b/client/src/components/time-ticket-shift-form/time-ticket-shift-form.container.jsx
@@ -2,6 +2,7 @@ import { useMutation } from "@apollo/client";
 import { Button, Form, Space, notification } from "antd";
 import axios from "axios";
 import moment from "moment";
+import momenttz from "moment-timezone";
 import React, { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -68,7 +69,14 @@ export function TimeTicektShiftContainer({
              employeeid: isTechConsole ? technician.id : employeeId,
              cost_center: "timetickets.labels.shift",
              clockon: theTime,
-              date: theTime,
+              date:
+                typeof bodyshop.timezone === "string"
+                  ? momenttz.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
+                  : typeof bodyshop.timezone === "number"
+                  ? moment(theTime)
+                      .utcOffset(bodyshop.timezone)
+                      .format("YYYY-MM-DD")
+                  : moment(theTime).format("YYYY-MM-DD"),
              memo: values.memo,
              created_by: isTechConsole
                ? currentUser.email.concat(
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -5,6 +5,7 @@ export const INSERT_NEW_BILL = gql`
    insert_bills(objects: $bill) {
      returning {
        id
+        invoice_number
      }
    }
  }
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -574,7 +574,6 @@ export const GET_JOB_BY_PK = gql`
      est_co_nm
      est_ct_fn
      est_ct_ln
-
      est_ph1
      est_ea
      selling_dealer
@@ -746,6 +745,7 @@ export const GET_JOB_BY_PK = gql`
        jobid
        amount
        payer
+        paymentnum
        created_at
        transactionid
        memo
--- a/client/src/graphql/payment_response.queries.js
+++ b/client/src/graphql/payment_response.queries.js
@@ -28,16 +28,14 @@ export const QUERY_PAYMENT_RESPONSE_BY_PAYMENT_ID = gql`
  }
 `;

-export const QUERY_RO_AND_OWNER_BY_JOB_PK = gql`
-  query QUERY_RO_AND_OWNER_BY_JOB_PK($jobid: uuid!) {
-    jobs_by_pk(id: $jobid) {
+export const QUERY_RO_AND_OWNER_BY_JOB_PKS = gql`
+  query QUERY_RO_AND_OWNER_BY_JOB_PKS($jobids: [uuid!]!) {
+    jobs(where: { id: { _in: $jobids } }) {
      ro_number
-      owner {
-        ownr_fn
-        ownr_ln
-        ownr_ea
-        ownr_zip
-      }
+      ownr_fn
+      ownr_ln
+      ownr_ea
+      ownr_zip
    }
  }
 `;
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -490,7 +490,7 @@
 					"lam": "Mechanical",
 					"lar": "Refinish",
 					"las": "Structural",
-					"lau": "Detail",
+					"lau": "User Defined",
 					"local_tax": "Local Tax",
 					"mapa": "Paint Materials",
 					"mash": "Shop Materials",
@@ -1211,6 +1211,7 @@
 				"payer": "Payer",
 				"payername": "Payer Name",
 				"paymentid": "Payment Reference ID",
+				"paymentnum": "Payment Number",
 				"paymenttype": "Payment Type",
 				"refundamount": "Refund Amount",
 				"transactionid": "Transaction ID"
@@ -2207,7 +2208,8 @@
 			},
 			"errors": {
 				"exporting": "Error exporting payment(s). {{error}}",
-				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors."
+				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors.",
+				"inserting": "Error inserting payment. {{error}}"
 			},
 			"fields": {
 				"amount": "Amount",
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1211,6 +1211,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -2207,7 +2208,8 @@
 			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1211,6 +1211,7 @@
 				"payer": "",
 				"payername": "",
 				"paymentid": "",
+				"paymentnum": "",
 				"paymenttype": "",
 				"refundamount": "",
 				"transactionid": ""
@@ -2207,7 +2208,8 @@
 			},
 			"errors": {
 				"exporting": "",
-				"exporting-partner": ""
+				"exporting-partner": "",
+				"inserting": ""
 			},
 			"fields": {
 				"amount": "",
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -3274,6 +3274,7 @@
          - cat_no
          - category
          - cieca_pfl
+          - cieca_pft
          - cieca_stl
          - cieca_ttl
          - ciecaid
@@ -3541,6 +3542,7 @@
          - cat_no
          - category
          - cieca_pfl
+          - cieca_pft
          - cieca_stl
          - cieca_ttl
          - ciecaid
@@ -3819,6 +3821,7 @@
          - cat_no
          - category
          - cieca_pfl
+          - cieca_pft
          - cieca_stl
          - cieca_ttl
          - ciecaid
--- a/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/down.sql
+++ b/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "cieca_pfl" jsonb
+--  null default jsonb_build_object();
--- a/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/up.sql
+++ b/hasura/migrations/1693249238670_alter_table_public_jobs_add_column_cieca_pfl/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "cieca_pfl" jsonb
+ null default jsonb_build_object();
--- a/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/down.sql
+++ b/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "cieca_pft" jsonb
+--  null default jsonb_build_object();
--- a/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/up.sql
+++ b/hasura/migrations/1694457793769_alter_table_public_jobs_add_column_cieca_pft/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "cieca_pft" jsonb
+ null default jsonb_build_object();
--- a/server.js
+++ b/server.js
@@ -42,13 +42,13 @@ const io = new Server(server, {
 });
 exports.io = io;
 require("./server/web-sockets/web-socket");
-
-//app.use(fb.validateFirebaseIdToken);
+// app.set('trust proxy', true)
+// app.use(fb.validateFirebaseIdToken);
 app.use(compression());
 app.use(cookieParser());
 app.use(bodyParser.json({ limit: "50mb" }));
 app.use(bodyParser.urlencoded({ limit: "50mb", extended: true }));
-//app.use(enforce.HTTPS({ trustProtoHeader: true }));
+// app.use(enforce.HTTPS({ trustProtoHeader: true }));
 app.use(
  cors({ credentials: true, exposedHeaders: ["set-cookie"] })
  // cors({
@@ -71,10 +71,17 @@ app.get("/test", async function (req, res) {
  const commit = require("child_process").execSync(
    "git rev-parse --short HEAD"
  );
+  // console.log(app.get('trust proxy'));
+  // console.log("remoteAddress", req.socket.remoteAddress);
+  // console.log("X-Forwarded-For", req.header('x-forwarded-for'));
  logger.log("test-api-status", "DEBUG", "api", { commit });
+  // sendEmail.sendServerEmail({
+  //   subject: `API Check - ${process.env.NODE_ENV}`,
+  //   text: `Server API check has come in. Remote IP: ${req.socket.remoteAddress}, X-Forwarded-For: ${req.header('x-forwarded-for')}`,
+  // });
  sendEmail.sendServerEmail({
    subject: `API Check - ${process.env.NODE_ENV}`,
-    text: `Server API check has come in.    `,
+    text: `Server API check has come in.`,
  });
  res.status(200).send(`OK - ${commit}`);
 });
--- a/server/data/claimscorp.js
+++ b/server/data/claimscorp.js
@@ -17,7 +17,7 @@ let Client = require("ssh2-sftp-client");
 const client = require("../graphql-client/graphql-client").client;
 const { sendServerEmail } = require("../email/sendemail");
 const CCDineroFormat = "0,0.00";
-const AhDateFormat = "MM/DD/YYYY";
+const AhDateFormat = "MMDDYYYY";

 const repairOpCodes = ["OP4", "OP9", "OP10"];
 const replaceOpCodes = ["OP2", "OP5", "OP11", "OP12"];
@@ -62,24 +62,22 @@ exports.default = async (req, res) => {
            start: start
              ? moment(start).startOf("day")
              : moment().subtract(5, "days").startOf("day"),
-            ...(end && { end: moment(end).endOf("day") }),
+            ...(end && { end: moment(end).startOf("day") }),
          }
        );

        const claimsCorpObject = {
-          DataFeed: {
-            ShopInfo: {
-              ShopID: bodyshops_by_pk.claimscorpid,
-              ShopName: bodyshops_by_pk.shopname,
-              RO: jobs.map((j) =>
-                CreateRepairOrderTag(
-                  { ...j, bodyshop: bodyshops_by_pk },
-                  function ({ job, error }) {
-                    erroredJobs.push({ job: job, error: error.toString() });
-                  }
-                )
-              ),
-            },
+          ClaimsCorpExport: {
+            ShopID: bodyshops_by_pk.claimscorpid,
+            ShopName: bodyshops_by_pk.shopname,
+            RO: jobs.map((j) =>
+              CreateRepairOrderTag(
+                { ...j, bodyshop: bodyshops_by_pk },
+                function ({ job, error }) {
+                  erroredJobs.push({ job: job, error: error.toString() });
+                }
+              )
+            ),
          },
        };

@@ -102,9 +100,9 @@ exports.default = async (req, res) => {
          .end({ allowEmptyTags: true });

        allxmlsToUpload.push({
-          count: claimsCorpObject.DataFeed.ShopInfo.RO.length,
+          count: claimsCorpObject.ClaimsCorpExport.RO.length,
          xml: ret,
-          filename: `${bodyshop.claimscorpid}-${moment().format(
+          filename: `${bodyshop.claimscorpid}-MIS-${moment().format(
            "YYYYMMDDTHHMMss"
          )}.xml`,
        });
@@ -245,7 +243,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {

  try {
    const ret = {
-      RoNumber: job.ro_number,
+      RONumber: job.ro_number,
      Customer: {
        CustomerZip: (job.ownr_zip && job.ownr_zip.substring(0, 3)) || "",
        CustomerState: job.ownr_st || "",
@@ -263,8 +261,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
        VIN: job.v_vin || "",
      },
      Carrier: {
-        UniqueID: job.ins_co_nm || "",
-        InsuranceCompany: job.ins_co_nm || "",
+        InsuranceCo: job.ins_co_nm || "",
+        CompanyName: job.ins_co_nm || "",
      },
      Claim: job.clm_no || "",
      Contacts: {
@@ -281,7 +279,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
          : "",
        Phone1: "",
        Phone2: "",
-        Estimator: `${job.est_ct_ln ? job.est_ct_ln : ""}${
+        EstimatorName: `${job.est_ct_ln ? job.est_ct_ln : ""}${
          job.est_ct_ln ? ", " : ""
        }${job.est_ct_fn ? job.est_ct_fn : ""}`,
        BodyTechnician: job.employee_body_rel
@@ -312,7 +310,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
          (job.date_estimated &&
            moment(job.date_estimated).format(AhDateFormat)) ||
          "",
-        DateLoss:
+        DateofLoss:
          (job.loss_date && moment(job.loss_date).format(AhDateFormat)) || "",
        DateFNOL: "",
        DateContact: "",
@@ -339,7 +337,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
              .tz(job.bodyshop.timezone)
              .format(AhDateFormat)) ||
          "",
-        DateStart: job.date_repairstarted
+        StartDate: job.date_repairstarted
          ? (job.date_repairstarted &&
              moment(job.date_repairstarted)
                .tz(job.bodyshop.timezone)
@@ -384,7 +382,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
          "",
        BilledDate: "",
        PaidInFullDate: "",
-        ROStatus: job.tlos_ind
+        RoStatus: job.tlos_ind
          ? "TOT"
          : StatusMapping(job.status, job.bodyshop.md_ro_statuses),
      },
@@ -394,10 +392,14 @@ const CreateRepairOrderTag = (job, errorCallback) => {
          .add(Dinero(job.job_totals.rates.lad.total))
          .add(Dinero(job.job_totals.rates.las.total))
          .toFormat(CCDineroFormat),
-        Paint: Dinero(job.job_totals.rates.lar.total).toFormat(CCDineroFormat),
+        Refinish: Dinero(job.job_totals.rates.lar.total).toFormat(
+          CCDineroFormat
+        ),
        Prep: Dinero().toFormat(CCDineroFormat),
        Frame: Dinero(job.job_totals.rates.laf.total).toFormat(CCDineroFormat),
-        Mech: Dinero(job.job_totals.rates.lam.total).toFormat(CCDineroFormat),
+        Mechanical: Dinero(job.job_totals.rates.lam.total).toFormat(
+          CCDineroFormat
+        ),
        Glass: Dinero(job.job_totals.rates.lag.total).toFormat(CCDineroFormat),
        Elec: Dinero(job.job_totals.rates.lae.total).toFormat(CCDineroFormat),
        Detail: detailAdjustments.amount.toFormat(CCDineroFormat),
@@ -444,7 +446,6 @@ const CreateRepairOrderTag = (job, errorCallback) => {
        Towing: Dinero(job.job_totals.additional.towing).toFormat(
          CCDineroFormat
        ),
-        Storage: "0.00",
        Rental:
          job.job_totals.additional.additionalCostItems.includes(
            "ATS Amount"
@@ -479,17 +480,17 @@ const CreateRepairOrderTag = (job, errorCallback) => {
          .filter((line) => repairOpCodes.includes(line.lbr_op))
          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
          .toFixed(2),
-        BodyReplacehours: job.joblines
+        BodyReplaceHours: job.joblines
          .filter((line) => replaceOpCodes.includes(line.lbr_op))
          .reduce((acc, val) => acc + val.mod_lb_hrs, 0)
          .toFixed(2),
        Paint: job.job_totals.rates.lar.hours.toFixed(2),
        Prep: "0.00",
-        Frame: job.job_totals.rates.laf.hours.toFixed(2),
-        Mech: job.job_totals.rates.lam.hours.toFixed(2),
-        Glass: job.job_totals.rates.lag.hours.toFixed(2),
-        Elec: job.job_totals.rates.lae.hours.toFixed(2),
-        Detail: detailAdjustments.hours,
+        FrameHours: job.job_totals.rates.laf.hours.toFixed(2),
+        MechanicalHours: job.job_totals.rates.lam.hours.toFixed(2),
+        GlassHours: job.job_totals.rates.lag.hours.toFixed(2),
+        ElectricalHours: job.job_totals.rates.lae.hours.toFixed(2),
+        DetailHours: detailAdjustments.hours,
        Reassem: "0.00",
        Other: (
          job.job_totals.rates.la1.hours +
@@ -521,7 +522,7 @@ const CreateRepairOrderTag = (job, errorCallback) => {
        AM: repairCosts.PartsAMCost.toFormat(CCDineroFormat),
        MechParts: Dinero().toFormat(CCDineroFormat),
        OtherParts: Dinero().toFormat(CCDineroFormat), //Check Synergy
-        OtherCost: repairCosts.PartsOtherCost.toFormat(CCDineroFormat),
+        OtherCosts: repairCosts.PartsOtherCost.toFormat(CCDineroFormat),
        Sublet: repairCosts.SubletTotalCost.toFormat(CCDineroFormat),
        Towing: repairCosts.TowingTotalCost.toFormat(CCDineroFormat),
        Storage: repairCosts.StorageTotalCost.toFormat(CCDineroFormat),
Author	SHA1	Message	Date
Allan Carr	6319fd20fa	IO-2407 In House Invoice Audit Log correction for Invoice Number	2023-09-20 12:16:03 -07:00
Patrick Fic	64851047bf	Merged in release/2023-09-15 (pull request #980 ) Release/2023 09 15	2023-09-15 17:40:34 +00:00
Patrick Fic	73fac34ef4	Merge branch 'feature/intellipay' into release/2023-09-15	2023-09-15 10:38:51 -07:00
Patrick Fic	5ca34105ef	Refactor payments for intellipay.	2023-09-15 10:37:09 -07:00
Allan Carr	fcfa1a9be8	Merged in feature/IO-2395-Payment-Expansion-Formating (pull request #976 ) IO-2395 Adjust Payment Number Label	2023-09-15 16:14:16 +00:00
Allan Carr	41849644f3	IO-2395 Adjust Payment Number Label	2023-09-15 09:15:34 -07:00
Allan Carr	f36fb06dd6	Merged in feature/IO-2368-QBO-Successful-Export (pull request #972 ) IO-2368 Confirm that there are successful transaction	2023-09-15 16:04:15 +00:00
Allan Carr	af4c4a4fa3	Merged in feature/IO-2395-Payment-Expansion-Formating (pull request #973 ) IO-2395 Payment Expansion Formatting	2023-09-15 16:03:59 +00:00
Patrick Fic	d6045a9334	Merge branch 'feature/IO-2399-import-status' into release/2023-09-15	2023-09-14 11:19:05 -07:00
Patrick Fic	dcc29f23d4	Respect default import status on new creation.	2023-09-14 11:18:40 -07:00
Patrick Fic	638a9fc76b	Add CIECA PFT to job.	2023-09-11 11:45:35 -07:00
Allan Carr	53e3b3fa03	IO-2395 Payment Expansion Formatting	2023-09-11 11:15:50 -07:00
Allan Carr	56c1b6f992	IO-2368 Confirm that there are successful transaction	2023-09-11 09:07:38 -07:00
Allan Carr	22f9a7ee3d	Merged in release/2023-09-01 (pull request #971 ) Release/2023 09 01	2023-09-08 20:50:50 +00:00
Allan Carr	cfcad472fd	Merged in feature/IO-2391-IP-Address-for-Check (pull request #969 ) IO-2391 Remote IP comment out till proxy for X-Forwarded-For can be figured out from AWS Load balancer	2023-09-08 20:17:19 +00:00
Allan Carr	1a622f1b2c	IO-2391 Remote IP comment out till proxy for X-Forwarded-For can be figured out from AWS Load balancer	2023-09-08 13:18:20 -07:00
Allan Carr	87e3adf579	IO-2368 Move Cache update to function and just pass in keys array	2023-09-08 10:17:42 -07:00
Allan Carr	aa7a4ccdd0	Merged in feature/IO-2368-QBO-Successful-Export (pull request #967 ) IO-2368 Move Cache update to function and just pass in keys array	2023-09-08 17:16:50 +00:00
Allan Carr	28dc10f5a1	Merged in feature/IO-2368-QBO-Successful-Export (pull request #966 ) IO-2368 Update Cache on success	2023-09-08 00:23:57 +00:00
Allan Carr	b2d615b9c1	Merged in feature/IO-2392-Ticket-Date-UTCOffset (pull request #965 ) IO-2392 Ticket Date UTCOffset	2023-09-08 00:22:28 +00:00
Allan Carr	1e40a22762	IO-2392 Ticket Date UTCOffset	2023-09-07 17:23:08 -07:00
Allan Carr	d1407162d9	IO-2368 Update Cache on success	2023-09-07 17:21:21 -07:00
Allan Carr	7a1984d037	IO-2368 Update Cache on QBD posting success	2023-09-06 16:23:58 -07:00
Allan Carr	9bcc449f20	Merged in feature/IO-2368-QBO-Successful-Export (pull request #964 ) IO-2368 Update Cache on QBD posting success	2023-09-06 23:23:53 +00:00
Allan Carr	bc7d0ef171	IO-2391 Add IP address to Server API Check	2023-09-06 09:06:05 -07:00
Allan Carr	3e9b046476	Merged in feature/IO-2391-IP-Address-for-Check (pull request #963 ) IO-2391 Add IP address to Server API Check	2023-09-06 16:05:57 +00:00
Allan Carr	e0ccd62c82	Merged in feature/IO-1559-ClaimsCorp-Datapump (pull request #956 ) IO-1559 ClaimsCorp Datapump	2023-09-01 15:47:25 +00:00
Allan Carr	fd0970aef2	Merged in feature/IO-2365-Correct-LAU-Transation (pull request #961 ) IO-2365 LAU Translation adjust from Detail to User Defined	2023-09-01 15:47:08 +00:00
Allan Carr	b673bcae7a	IO-2365 LAU Translation adjust from Detail to User Defined	2023-09-01 08:46:52 -07:00
Patrick Fic	29b74a8c0e	Resolve issue when selecting lines.	2023-08-29 14:12:38 -07:00
Patrick Fic	2658626c7e	Add CIECA PFL info.	2023-08-28 12:05:36 -07:00