Merge branch 'test' into feature/pbs

2021-10-14 17:20:15 -07:00
parent c4e59c1a5e ce84a89cf3
commit 3989d0f1e2
29 changed files with 762 additions and 203 deletions
--- a/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
+++ b/client/src/components/accounting-payments-table/accounting-payments-table.component.jsx
@@ -8,8 +8,26 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import PaymentExportButton from "../payment-export-button/payment-export-button.component";
 import PaymentsExportAllButton from "../payments-export-all-button/payments-export-all-button.component";
+import QboAuthorizeComponent from "../qbo-authorize/qbo-authorize.component";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";

-export default function AccountingPayablesTableComponent({
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(AccountingPayablesTableComponent);
+
+export function AccountingPayablesTableComponent({
+  bodyshop,
  loading,
  payments,
 }) {
@@ -163,6 +181,9 @@ export default function AccountingPayablesTableComponent({
            loadingCallback={setTransInProgress}
            completedCallback={setSelectedPayments}
          />
+          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && (
+            <QboAuthorizeComponent />
+          )}
          <Input
            value={state.search}
            onChange={handleSearch}
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -259,7 +259,6 @@ export function DmsPostForm({ bodyshop, socket, job }) {
                ))}
                <Form.Item>
                  <Button
-                    type="dashed"
                    disabled={!(fields.length < 3)}
                    onClick={() => {
                      if (fields.length < 3) add();
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -162,7 +162,11 @@ export function JobLinesComponent({
      ellipsis: true,
      render: (text, record) => (
        <>
-          <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
+          <CurrencyFormatter>
+            {record.db_ref === "900510" || record.db_ref === "900511"
+              ? record.prt_dsmk_m
+              : record.act_price}
+          </CurrencyFormatter>
          {record.prt_dsmk_p && record.prt_dsmk_p !== 0 ? (
            <span
              style={{ marginLeft: ".2rem" }}
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -498,6 +498,12 @@ async function CheckTaxRates(estData, bodyshop) {
    ) {
      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;
+    }
  });
  //}
 }
--- 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
@@ -14,6 +14,7 @@ import {
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { useHistory } from "react-router-dom";
+import { useCookies } from "react-cookie";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -32,6 +33,7 @@ export function JobsCloseExportButton({
  const [updateJob] = useMutation(UPDATE_JOB);
  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
  const [loading, setLoading] = useState(false);
+  const [cookies] = useCookies();

  const handleQbxml = async () => {
    //Check if it's a CDK setup.
@@ -45,10 +47,13 @@ export function JobsCloseExportButton({
    //Check if it's a QBO Setup.
    let PartnerResponse;
    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(`/qbo/receivables`, {
-        withCredentials: true,
-        jobIds: [jobId],
-      });
+      PartnerResponse = await axios.post(
+        `/qbo/receivables`,
+        {
+          jobIds: [jobId],
+        },
+        { withCredentials: true }
+      );
    } else {
      //Default is QBD

@@ -177,7 +182,16 @@ export function JobsCloseExportButton({
  };

  return (
-    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
+    <Button
+      onClick={handleQbxml}
+      loading={loading}
+      disabled={
+        disabled ||
+        (bodyshop.accountingconfig &&
+          bodyshop.accountingconfig.qbo &&
+          !cookies.qbo_realmId)
+      }
+    >
      {t("jobs.actions.export")}
    </Button>
  );
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -31,6 +31,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                  <th>{t("joblines.fields.line_desc")}</th>
                  <th>{t("joblines.fields.part_type")}</th>
                  <th>{t("joblines.fields.act_price")}</th>
+                  <th>{t("joblines.fields.prt_dsmk_m")}</th>
                  <th>{t("joblines.fields.op_code_desc")}</th>
                  <th>{t("joblines.fields.mod_lbr_ty")}</th>
                  <th>{t("joblines.fields.mod_lb_hrs")}</th>
@@ -70,6 +71,16 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                        <ReadOnlyFormItem type="currency" />
                      </Form.Item>
                    </td>
+                    <td>
+                      <Form.Item
+                        span={2}
+                        //  label={t("joblines.fields.prt_dsmk_m")}
+                        key={`${index}prt_dsmk_m`}
+                        name={[field.name, "prt_dsmk_m"]}
+                      >
+                        <ReadOnlyFormItem type="currency" />
+                      </Form.Item>
+                    </td>
                    <td>
                      <Form.Item
                        span={2}
@@ -108,7 +119,9 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                        labelCol={{ span: 0 }}
                        rules={[
                          {
-                            required: !!job.joblines[index].act_price,
+                            required:
+                              !!job.joblines[index].act_price ||
+                              !!job.joblines[index].prt_dsmk_m,
                            //message: t("general.validation.required"),
                          },
                        ]}
--- 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,6 +13,7 @@ import {
  selectBodyshop,
  selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import { useCookies } from "react-cookie";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -30,6 +31,7 @@ export function JobsExportAllButton({
  const { t } = useTranslation();
  const [updateJob] = useMutation(UPDATE_JOBS);
  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const [cookies] = useCookies();

  const [loading, setLoading] = useState(false);
  const handleQbxml = async () => {
@@ -37,10 +39,13 @@ export function JobsExportAllButton({
    let PartnerResponse;
    setLoading(true);
    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(`/qbo/receivables`, {
-        withCredentials: true,
-        jobIds: jobIds,
-      });
+      PartnerResponse = await axios.post(
+        `/qbo/receivables`,
+        {
+          jobIds: jobIds,
+        },
+        { withCredentials: true }
+      );
    } else {
      let QbXmlResponse;
      try {
@@ -173,8 +178,12 @@ export function JobsExportAllButton({
    <Button
      onClick={handleQbxml}
      loading={loading}
-      disabled={disabled}
-      type="dashed"
+      disabled={
+        disabled ||
+        (bodyshop.accountingconfig &&
+          bodyshop.accountingconfig.qbo &&
+          !cookies.qbo_realmId)
+      }
    >
      {t("jobs.actions.export")}
    </Button>
--- 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,6 +14,7 @@ import {
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import _ from "lodash";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { useCookies } from "react-cookie";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -32,6 +33,7 @@ export function PayableExportAll({
  const [updateBill] = useMutation(UPDATE_BILLS);
  const [loading, setLoading] = useState(false);
  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const [cookies] = useCookies();

  const handleQbxml = async () => {
    logImEXEvent("accounting_payables_export_all");
@@ -40,10 +42,13 @@ export function PayableExportAll({
    setLoading(true);
    if (!!loadingCallback) loadingCallback(true);
    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(`/qbo/receivables`, {
-        withCredentials: true,
-        bills: billids,
-      });
+      PartnerResponse = await axios.post(
+        `/qbo/receivables`,
+        {
+          bills: billids,
+        },
+        { withCredentials: true }
+      );
    } else {
      let QbXmlResponse;
      try {
@@ -172,8 +177,12 @@ export function PayableExportAll({
    <Button
      onClick={handleQbxml}
      loading={loading}
-      disabled={disabled}
-      type="dashed"
+      disabled={
+        disabled ||
+        (bodyshop.accountingconfig &&
+          bodyshop.accountingconfig.qbo &&
+          !cookies.qbo_realmId)
+      }
    >
      {t("jobs.actions.exportselected")}
    </Button>
--- 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,6 +13,7 @@ import {
 } from "../../redux/user/user.selectors";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
+import { useCookies } from "react-cookie";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -31,6 +32,7 @@ export function PayableExportButton({
  const [updateBill] = useMutation(UPDATE_BILLS);
  const [loading, setLoading] = useState(false);
  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const [cookies] = useCookies();

  const handleQbxml = async () => {
    logImEXEvent("accounting_export_payable");
@@ -41,10 +43,13 @@ export function PayableExportButton({
    //Check if it's a QBO Setup.
    let PartnerResponse;
    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
-      PartnerResponse = await axios.post(`/qbo/payables`, {
-        withCredentials: true,
-        bills: [billId],
-      });
+      PartnerResponse = await axios.post(
+        `/qbo/payables`,
+        {
+          bills: [billId],
+        },
+        { withCredentials: true }
+      );
    } else {
      //Default is QBD

@@ -174,8 +179,12 @@ export function PayableExportButton({
    <Button
      onClick={handleQbxml}
      loading={loading}
-      disabled={disabled}
-      type="dashed"
+      disabled={
+        disabled ||
+        (bodyshop.accountingconfig &&
+          bodyshop.accountingconfig.qbo &&
+          !cookies.qbo_realmId)
+      }
    >
      {t("jobs.actions.export")}
    </Button>
--- a/client/src/components/payment-export-button/payment-export-button.component.jsx
+++ b/client/src/components/payment-export-button/payment-export-button.component.jsx
@@ -8,6 +8,8 @@ import { createStructuredSelector } from "reselect";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
+import { useCookies } from "react-cookie";
+
 import {
  selectBodyshop,
  selectCurrentUser,
@@ -30,58 +32,71 @@ export function PaymentExportButton({
  const [updatePayment] = useMutation(UPDATE_PAYMENTS);
  const [loading, setLoading] = useState(false);
  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const [cookies] = useCookies();

  const handleQbxml = async () => {
    logImEXEvent("accounting_payment_export");
-
    setLoading(true);
-    if (!!loadingCallback) loadingCallback(true);
-
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post(
-        "/accounting/qbxml/payments",
-        { payments: [paymentId] },
-        {
-          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("payments.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
-      });
-      if (loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
-    }
-
+    //Check if it's a QBO Setup.
    let PartnerResponse;
-
-    try {
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        //"http://609feaeae986.ngrok.io/qb/",
-        QbXmlResponse.data
+        `/qbo/payments`,
+        {
+          payments: [paymentId],
+        },
+        { withCredentials: true }
      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("payments.errors.exporting-partner"),
-      });
-      if (!!loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
+    } else {
+      //Default is QBD
+
+      if (!!loadingCallback) loadingCallback(true);
+
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post(
+          "/accounting/qbxml/payments",
+          { payments: [paymentId] },
+          {
+            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("payments.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        if (loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
+
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          QbXmlResponse.data
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("payments.errors.exporting-partner"),
+        });
+        if (!!loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
    }

    console.log("handleQbxml -> PartnerResponse", PartnerResponse);
    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.map((ft) =>
@@ -123,7 +138,14 @@ export function PaymentExportButton({

      const paymentUpdateResponse = await updatePayment({
        variables: {
-          paymentIdList: [paymentId],
+          paymentIdList: successfulTransactions.map(
+            (st) =>
+              st[
+                bodyshop.accountingconfig && bodyshop.accountingconfig.qbo
+                  ? "paymentid"
+                  : "id"
+              ]
+          ),
          payment: {
            exportedat: new Date(),
          },
@@ -158,8 +180,12 @@ export function PaymentExportButton({
    <Button
      onClick={handleQbxml}
      loading={loading}
-      disabled={disabled}
-      type="dashed"
+      disabled={
+        disabled ||
+        (bodyshop.accountingconfig &&
+          bodyshop.accountingconfig.qbo &&
+          !cookies.qbo_realmId)
+      }
    >
      {t("jobs.actions.export")}
    </Button>
--- 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
@@ -8,6 +8,8 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_PAYMENTS } from "../../graphql/payments.queries";
+import { useCookies } from "react-cookie";
+
 import {
  selectBodyshop,
  selectCurrentUser,
@@ -29,46 +31,58 @@ export function PaymentsExportAllButton({
  const [updatePayments] = useMutation(UPDATE_PAYMENTS);
  const [loading, setLoading] = useState(false);
  const [insertExportLog] = useMutation(INSERT_EXPORT_LOG);
+  const [cookies] = useCookies();

  const handleQbxml = async () => {
    setLoading(true);
    if (!!loadingCallback) loadingCallback(true);
-
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
-        payments: paymentIds,
-      });
-    } catch (error) {
-      console.log("Error getting QBXML from Server.", error);
-      notification["error"]({
-        message: t("payments.errors.exporting", {
-          error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
-        }),
-      });
-      if (loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
-    }
-
    let PartnerResponse;
-
-    try {
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        QbXmlResponse.data
+        `/qbo/payments`,
+        {
+          payments: paymentIds,
+        },
+        { withCredentials: true }
      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("payments.errors.exporting-partner"),
-      });
-      if (!!loadingCallback) loadingCallback(false);
-      setLoading(false);
-      return;
+    } else {
+      let QbXmlResponse;
+      try {
+        QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
+          payments: paymentIds,
+        });
+      } catch (error) {
+        console.log("Error getting QBXML from Server.", error);
+        notification["error"]({
+          message: t("payments.errors.exporting", {
+            error: "Unable to retrieve QBXML. " + JSON.stringify(error.message),
+          }),
+        });
+        if (loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
+
+      try {
+        PartnerResponse = await axios.post(
+          "http://localhost:1337/qb/",
+          QbXmlResponse.data
+        );
+      } catch (error) {
+        console.log("Error connecting to quickbooks or partner.", error);
+        notification["error"]({
+          message: t("payments.errors.exporting-partner"),
+        });
+        if (!!loadingCallback) loadingCallback(false);
+        setLoading(false);
+        return;
+      }
    }

-    const groupedData = _.groupBy(PartnerResponse.data, "id");
+    const groupedData = _.groupBy(
+      PartnerResponse.data,
+      bodyshop.accountingconfig.qbo ? "paymentid" : "id"
+    );
    const proms = [];
    Object.keys(groupedData).forEach((key) => {
      proms.push(
@@ -147,8 +161,12 @@ export function PaymentsExportAllButton({
    <Button
      onClick={handleQbxml}
      loading={loading}
-      disabled={disabled}
-      type="dashed"
+      disabled={
+        disabled ||
+        (bodyshop.accountingconfig &&
+          bodyshop.accountingconfig.qbo &&
+          !cookies.qbo_realmId)
+      }
    >
      {t("jobs.actions.exportselected")}
    </Button>
--- a/client/src/components/production-list-columns/production-list-columns.add.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.add.component.jsx
@@ -6,9 +6,11 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
  technician: selectTechnician,
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -21,6 +23,7 @@ export default connect(
 export function ProductionColumnsComponent({
  columnState,
  technician,
+  bodyshop,
  tableState,
 }) {
  const [columns, setColumns] = columnState;
@@ -29,9 +32,11 @@ export function ProductionColumnsComponent({
  const handleAdd = (e) => {
    setColumns([
      ...columns,
-      ...dataSource({ technician, state: tableState }).filter(
-        (i) => i.key === e.key
-      ),
+      ...dataSource({
+        technician,
+        state: tableState,
+        activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+      }).filter((i) => i.key === e.key),
    ]);
  };

@@ -39,7 +44,11 @@ export function ProductionColumnsComponent({

  const menu = (
    <Menu onClick={handleAdd}>
-      {dataSource({ technician, state: tableState })
+      {dataSource({
+        technician,
+        state: tableState,
+        activeStatuses: bodyshop.md_ro_statuses.active_statuses,
+      })
        .filter((i) => !columnKeys.includes(i.key))
        .map((item) => (
          <Menu.Item key={item.key}>{item.title}</Menu.Item>
--- a/client/src/components/qbo-authorize/qbo-authorize.component.jsx
+++ b/client/src/components/qbo-authorize/qbo-authorize.component.jsx
@@ -33,6 +33,10 @@ export default function QboAuthorizeComponent() {
      setCookie("qbo_realmId", realmId, {
        path: "/",
        expires,
+
+        ...(process.env.NODE_ENV !== "development"
+          ? { domain: `.${window.location.host}` }
+          : {}),
      });

      history.push({ pathname: `/manage/accounting/receivables` });