Merge branch 'feature/qbo' into test

2021-10-13 13:15:48 -07:00
parent 4d1d471a66 9ee8e9007a
commit 661b05d9e3
13 changed files with 425 additions and 125 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/jobs-export-all-button/jobs-export-all-button.component.jsx
+++ b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx
@@ -170,12 +170,7 @@ export function JobsExportAllButton({
  };

  return (
-    <Button
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={disabled}
-      type="dashed"
-    >
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {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
@@ -169,12 +169,7 @@ export function PayableExportAll({
  };

  return (
-    <Button
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={disabled}
-      type="dashed"
-    >
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {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
@@ -171,12 +171,7 @@ export function PayableExportButton({
  };

  return (
-    <Button
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={disabled}
-      type="dashed"
-    >
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {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
@@ -33,55 +33,64 @@ export function PaymentExportButton({

  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 {
-      PartnerResponse = await axios.post(
-        "http://localhost:1337/qb/",
-        //"http://609feaeae986.ngrok.io/qb/",
-        QbXmlResponse.data
-      );
-    } catch (error) {
-      console.log("Error connecting to quickbooks or partner.", error);
-      notification["error"]({
-        message: t("payments.errors.exporting-partner"),
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/payments`, {
+        withCredentials: true,
+        payments: [paymentId],
      });
-      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 +132,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(),
          },
@@ -155,12 +171,7 @@ export function PaymentExportButton({
  };

  return (
-    <Button
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={disabled}
-      type="dashed"
-    >
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {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
@@ -33,42 +33,50 @@ export function PaymentsExportAllButton({
  const handleQbxml = async () => {
    setLoading(true);
    if (!!loadingCallback) loadingCallback(true);
-
-    let QbXmlResponse;
-    try {
-      QbXmlResponse = await axios.post("/accounting/qbxml/payments", {
+    let PartnerResponse;
+    if (bodyshop.accountingconfig && bodyshop.accountingconfig.qbo) {
+      PartnerResponse = await axios.post(`/qbo/payments`, {
+        withCredentials: true,
        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;
+    } 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;
+      }
    }

-    let PartnerResponse;
-
-    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(
@@ -144,12 +152,7 @@ export function PaymentsExportAllButton({
  };

  return (
-    <Button
-      onClick={handleQbxml}
-      loading={loading}
-      disabled={disabled}
-      type="dashed"
-    >
+    <Button onClick={handleQbxml} loading={loading} disabled={disabled}>
      {t("jobs.actions.exportselected")}
    </Button>
  );