IO-2261 Add missing fields to return querys

Customer info missing on return

client/.env.production

@@ -1,4 +1,3 @@
-GENERATE_SOURCEMAP=false
 REACT_APP_GRAPHQL_ENDPOINT=https://db.imex.online/v1/graphql
 REACT_APP_GRAPHQL_ENDPOINT_WS=wss://db.imex.online/v1/graphql
 REACT_APP_GA_CODE=231103507

client/src/components/bill-delete-button/bill-delete-button.component.jsx

@@ -6,7 +6,7 @@ import { useTranslation } from "react-i18next";
 import { DELETE_BILL } from "../../graphql/bills.queries";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 
-export default function BillDeleteButton({ bill }) {
+export default function BillDeleteButton({ bill, callback }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [deleteBill] = useMutation(DELETE_BILL);
@@ -36,6 +36,8 @@ export default function BillDeleteButton({ bill }) {
 
     if (!!!result.errors) {
       notification["success"]({ message: t("bills.successes.deleted") });
+
+      if (callback && typeof callback === "function") callback(bill.id);
     } else {
       //Check if it's an fkey violation.
       const error = JSON.stringify(result.errors);

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -109,8 +109,8 @@ export function JobsConvertButton({
           ]}
         >
           <Select>
-            {bodyshop.md_ins_cos.map((s, i) => (
-              <Select.Option key={i} value={s.name}>
+            {bodyshop.md_ins_cos.map((s) => (
+              <Select.Option key={s.name} value={s.name}>
                 {s.name}
               </Select.Option>
             ))}

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -1,8 +1,9 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Input, Space, Table, Typography } from "antd";
+import axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
@@ -21,6 +22,8 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
   const search = queryString.parse(useLocation().search);
+  const [openSearchResults, setOpenSearchResults] = useState([]);
+  const [searchLoading, setSearchLoading] = useState(false);
   const { page, sortcolumn, sortorder } = search;
   const history = useHistory();
 
@@ -193,6 +196,28 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
     history.push({ search: queryString.stringify(search) });
   };
 
+  useEffect(() => {
+    if (search.search && search.search.trim() !== "") {
+      searchJobs();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  async function searchJobs(value) {
+    try {
+      setSearchLoading(true);
+      const searchData = await axios.post("/search", {
+        search: value || search.search,
+        index: "jobs",
+      });
+      setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
+    } catch (error) {
+      console.log("Error while fetching search results", error);
+    } finally {
+      setSearchLoading(false);
+    }
+  }
+
   return (
     <Card
       extra={
@@ -205,6 +230,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
               <Button
                 onClick={() => {
                   delete search.search;
+                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -220,24 +246,32 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
             onSearch={(value) => {
               search.search = value;
               history.push({ search: queryString.stringify(search) });
+              searchJobs(value);
             }}
+            loading={loading || searchLoading}
             enterButton
           />
         </Space>
       }
     >
       <Table
-        loading={loading}
-        pagination={{
-          position: "top",
-          pageSize: 25,
-          current: parseInt(page || 1),
-          total: total,
-          showSizeChanger: false,
-        }}
+        loading={loading || searchLoading}
+        pagination={
+          search?.search
+            ? {
+                pageSize: 25,
+                showSizeChanger: false,
+              }
+            : {
+                pageSize: 25,
+                current: parseInt(page || 1),
+                total: total,
+                showSizeChanger: false,
+              }
+        }
         columns={columns}
         rowKey="id"
-        dataSource={jobs}
+        dataSource={search?.search ? openSearchResults : jobs}
         onChange={handleTableChange}
       />
     </Card>

client/src/components/payment-modal/payment-modal.container.jsx

@@ -52,7 +52,7 @@ function PaymentModalContainer({
     const { useStripe, sendby, ...paymentObj } = values;
 
     setLoading(true);
-
+    let updatedPayment; //Moved up from if statement for greater scope.
     try {
       if (!context || (context && !context.id)) {
         const newPayment = await insertPayment({
@@ -87,7 +87,7 @@ function PaymentModalContainer({
           );
         }
       } else {
-        const updatedPayment = await updatePayment({
+        updatedPayment = await updatePayment({
           variables: {
             paymentId: context.id,
             payment: paymentObj,
@@ -101,7 +101,11 @@ function PaymentModalContainer({
         }
       }
 
-      if (actions.refetch) actions.refetch();
+      if (actions.refetch)
+        actions.refetch(
+          updatedPayment && updatedPayment.data.update_payments.returning[0]
+        );
+
       if (enterAgain) {
         const prev = form.getFieldsValue(["date"]);
 

client/src/components/payments-list-paginated/payment-list-paginated.component.jsx

@@ -1,20 +1,23 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
+import { useApolloClient } from "@apollo/client";
 import { Button, Card, Input, Space, Table, Typography } from "antd";
+import axios from "axios";
 import queryString from "query-string";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { QUERY_PAYMENT_BY_ID } from "../../graphql/payments.queries";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort } from "../../utils/sorters";
 import CaBcEtfTableModalContainer from "../ca-bc-etf-table-modal/ca-bc-etf-table-modal.container";
-import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import PrintWrapperComponent from "../print-wrapper/print-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -39,7 +42,10 @@ export function PaymentsListPaginated({
   bodyshop,
 }) {
   const search = queryString.parse(useLocation().search);
+  const [openSearchResults, setOpenSearchResults] = useState([]);
+  const [searchLoading, setSearchLoading] = useState(false);
   const { page, sortcolumn, sortorder } = search;
+  const client = useApolloClient();
   const history = useHistory();
   const [state, setState] = useState({
     sortedInfo: {},
@@ -52,13 +58,17 @@ export function PaymentsListPaginated({
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-      sortOrder: sortcolumn === "ro_number" && sortorder,
-      render: (text, record) => (
-        <Link to={"/manage/jobs/" + record.job.id}>
-          {record.job.ro_number || t("general.labels.na")}
-        </Link>
-      ),
+      // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      // sortOrder: sortcolumn === "ro_number" && sortorder,
+      render: (text, record) => {
+        return record.job ? (
+          <Link to={"/manage/jobs/" + record.job.id}>
+            {record.job.ro_number || t("general.labels.na")}
+          </Link>
+        ) : (
+          <span>{t("general.labels.na")}</span>
+        );
+      },
     },
     {
       title: t("payments.fields.paymentnum"),
@@ -72,16 +82,16 @@ export function PaymentsListPaginated({
       dataIndex: "owner",
       key: "owner",
       ellipsis: true,
-      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
-      sortOrder: sortcolumn === "owner" && sortorder,
+      // sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+      // sortOrder: sortcolumn === "owner" && sortorder,
       render: (text, record) => {
-        return record.job.owner ? (
-          <Link to={"/manage/owners/" + record.job.owner.id}>
-            <OwnerNameDisplay ownerObject={record} />
+        return record.job?.owner ? (
+          <Link to={"/manage/owners/" + record.job?.owner?.id}>
+            <OwnerNameDisplay ownerObject={record.job} />
           </Link>
         ) : (
           <span>
-            <OwnerNameDisplay ownerObject={record} />
+            <OwnerNameDisplay ownerObject={record.job} />
           </span>
         );
       },
@@ -147,10 +157,33 @@ export function PaymentsListPaginated({
         <Space>
           <Button
             disabled={record.exportedat}
-            onClick={() => {
+            onClick={async () => {
+              let apolloResults;
+              if (search.search) {
+                const { data } = await client.query({
+                  query: QUERY_PAYMENT_BY_ID,
+                  variables: {
+                    paymentId: record.id,
+                  },
+                });
+                apolloResults = data.payments_by_pk;
+              }
               setPaymentContext({
-                actions: { refetch: refetch },
-                context: record,
+                actions: {
+                  refetch: apolloResults
+                    ? (updatedRecord) => {
+                        setOpenSearchResults((results) =>
+                          results.map((result) => {
+                            if (result.id !== record.id) {
+                              return result;
+                            }
+                            return updatedRecord;
+                          })
+                        );
+                      }
+                    : refetch,
+                },
+                context: apolloResults ? apolloResults : record,
               });
             }}
           >
@@ -177,6 +210,28 @@ export function PaymentsListPaginated({
     history.push({ search: queryString.stringify(search) });
   };
 
+  useEffect(() => {
+    if (search.search && search.search.trim() !== "") {
+      searchPayments();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  async function searchPayments(value) {
+    try {
+      setSearchLoading(true);
+      const searchData = await axios.post("/search", {
+        search: value || search.search,
+        index: "payments",
+      });
+      setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
+    } catch (error) {
+      console.log("Error while fetching search results", error);
+    } finally {
+      setSearchLoading(false);
+    }
+  }
+
   return (
     <Card
       extra={
@@ -189,6 +244,7 @@ export function PaymentsListPaginated({
               <Button
                 onClick={() => {
                   delete search.search;
+                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -212,24 +268,33 @@ export function PaymentsListPaginated({
             onSearch={(value) => {
               search.search = value;
               history.push({ search: queryString.stringify(search) });
+              searchPayments(value);
             }}
+            loading={loading || searchLoading}
             enterButton
           />
         </Space>
       }
     >
       <Table
-        loading={loading}
+        loading={loading || searchLoading}
         scroll={{ x: true }}
-        pagination={{
-          position: "top",
-          pageSize: 25,
-          current: parseInt(page || 1),
-          total: total,
-        }}
+        pagination={
+          search?.search
+            ? {
+                pageSize: 25,
+                showSizeChanger: false,
+              }
+            : {
+                pageSize: 25,
+                current: parseInt(page || 1),
+                total: total,
+                showSizeChanger: false,
+              }
+        }
         columns={columns}
         rowKey="id"
-        dataSource={payments}
+        dataSource={search?.search ? openSearchResults : payments}
         onChange={handleTableChange}
       />
     </Card>

client/src/graphql/bills.queries.js

@@ -20,13 +20,11 @@ export const DELETE_BILL = gql`
 
 export const QUERY_ALL_BILLS_PAGINATED = gql`
   query QUERY_ALL_BILLS_PAGINATED(
-    $search: String
     $offset: Int
     $limit: Int
     $order: [bills_order_by!]!
   ) {
-    search_bills(
-      args: { search: $search }
+    bills(
       offset: $offset
       limit: $limit
       order_by: $order
@@ -51,7 +49,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
         ro_number
       }
     }
-    search_bills_aggregate(args: { search: $search }) {
+    bills_aggregate {
       aggregate {
         count(distinct: true)
       }

client/src/graphql/jobs.queries.js

@@ -1781,14 +1781,12 @@ export const QUERY_ALL_JOB_FIELDS = gql`
 
 export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
   query QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED(
-    $search: String
     $offset: Int
     $limit: Int
     $order: [jobs_order_by!]
     $statusList: [String!]
   ) {
-    search_jobs(
-      args: { search: $search }
+    jobs(
       offset: $offset
       limit: $limit
       order_by: $order
@@ -1819,10 +1817,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       updated_at
       ded_amt
     }
-    search_jobs_aggregate(
-      args: { search: $search }
-      where: { status: { _in: $statusList } }
-    ) {
+    jobs_aggregate(where: { status: { _in: $statusList } }) {
       aggregate {
         count(distinct: true)
       }

client/src/graphql/payments.queries.js

@@ -12,39 +12,39 @@ export const INSERT_NEW_PAYMENT = gql`
 
 export const QUERY_ALL_PAYMENTS_PAGINATED = gql`
   query QUERY_ALL_PAYMENTS_PAGINATED(
-    $search: String
     $offset: Int
     $limit: Int
     $order: [payments_order_by!]!
   ) {
-    search_payments(
-      args: { search: $search }
-      offset: $offset
-      limit: $limit
-      order_by: $order
-    ) {
+    payments(offset: $offset, limit: $limit, order_by: $order) {
       id
+      amount
       created_at
-      jobid
-      paymentnum
       date
+      exportedat
+      jobid
       job {
         id
-        ro_number
+        ownerid
+        ownr_co_nm
         ownr_fn
         ownr_ln
-        ownr_co_nm
+        owner {
+          id
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+        }
+        ro_number
       }
-      transactionid
       memo
-      type
-      amount
-      stripeid
-      exportedat
-      stripeid
       payer
+      paymentnum
+      stripeid
+      transactionid
+      type
     }
-    search_payments_aggregate(args: { search: $search }) {
+    payments_aggregate {
       aggregate {
         count(distinct: true)
       }
@@ -57,16 +57,31 @@ export const UPDATE_PAYMENT = gql`
     update_payments(where: { id: { _eq: $paymentId } }, _set: $payment) {
       returning {
         id
-        transactionid
-        memo
-        type
         amount
-        stripeid
+        created_at
+        date
         exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
         payer
         paymentnum
-        date
+        stripeid
+        transactionid
+        type
       }
     }
   }
@@ -80,17 +95,31 @@ export const UPDATE_PAYMENTS = gql`
     update_payments(where: { id: { _in: $paymentIdList } }, _set: $payment) {
       returning {
         id
-        exportedat
-        transactionid
-        memo
-        type
         amount
-        stripeid
+        created_at
+        date
         exportedat
-        stripeid
+        jobid
+        job {
+          id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
+          ro_number
+        }
+        memo
         payer
         paymentnum
-        date
+        stripeid
+        transactionid
+        type
       }
     }
   }
@@ -109,3 +138,36 @@ export const QUERY_JOB_PAYMENT_TOTALS = gql`
     }
   }
 `;
+
+export const QUERY_PAYMENT_BY_ID = gql`
+  query QUERY_PAYMENT_BY_ID($paymentId: uuid!) {
+    payments_by_pk(id: $paymentId) {
+      id
+      amount
+      created_at
+      exportedat
+      date
+      jobid
+      job {
+        id
+        ownerid
+        ownr_co_nm
+        ownr_fn
+        ownr_ln
+        owner {
+          id
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+        }
+        ro_number
+      }
+      memo
+      payer
+      paymentnum
+      stripeid
+      transactionid
+      type
+    }
+  }
+`;

client/src/pages/bills/bills.page.component.jsx

@@ -1,7 +1,8 @@
-import { SyncOutlined, EditFilled } from "@ant-design/icons";
+import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Checkbox, Input, Space, Table, Typography } from "antd";
+import axios from "axios";
 import queryString from "query-string";
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
@@ -11,8 +12,8 @@ import PrintWrapperComponent from "../../components/print-wrapper/print-wrapper.
 import { setModalContext } from "../../redux/modals/modals.actions";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { alphaSort, dateSort } from "../../utils/sorters";
 import { TemplateList } from "../../utils/TemplateConstants";
+import { alphaSort, dateSort } from "../../utils/sorters";
 
 const mapDispatchToProps = (dispatch) => ({
   setPartsOrderContext: (context) =>
@@ -29,34 +30,36 @@ export function BillsListPage({
   setPartsOrderContext,
   setBillEnterContext,
 }) {
-  const { t } = useTranslation();
+  const search = queryString.parse(useLocation().search);
+  const [openSearchResults, setOpenSearchResults] = useState([]);
+  const [searchLoading, setSearchLoading] = useState(false);
+  const { page } = search;
+  const history = useHistory();
   const [state, setState] = useState({
     sortedInfo: {},
+    filteredInfo: { text: "" },
   });
-  const history = useHistory();
-  const search = queryString.parse(useLocation().search);
-  const { page } = search;
   const Templates = TemplateList("bill");
-
+  const { t } = useTranslation();
   const columns = [
     {
       title: t("bills.fields.vendorname"),
       dataIndex: "vendorname",
       key: "vendorname",
-      sortObject: (direction) => {
-        return {
-          vendor: {
-            name: direction
-              ? direction === "descend"
-                ? "desc"
-                : "asc"
-              : "desc",
-          },
-        };
-      },
-      sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
-      sortOrder:
-        state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
+      // sortObject: (direction) => {
+      //   return {
+      //     vendor: {
+      //       name: direction
+      //         ? direction === "descend"
+      //           ? "desc"
+      //           : "asc"
+      //         : "desc",
+      //     },
+      //   };
+      // },
+      // sorter: (a, b) => alphaSort(a.vendor.name, b.vendor.name),
+      // sortOrder:
+      //   state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
       render: (text, record) => <span>{record.vendor.name}</span>,
     },
     {
@@ -72,20 +75,20 @@ export function BillsListPage({
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      sortObject: (direction) => {
-        return {
-          job: {
-            ro_number: direction
-              ? direction === "descend"
-                ? "desc"
-                : "asc"
-              : "desc",
-          },
-        };
-      },
-      sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-      sortOrder:
-        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      // sortObject: (direction) => {
+      //   return {
+      //     job: {
+      //       ro_number: direction
+      //         ? direction === "descend"
+      //           ? "desc"
+      //           : "asc"
+      //         : "desc",
+      //     },
+      //   };
+      // },
+      // sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
+      // sortOrder:
+      //   state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
       render: (text, record) =>
         record.job && (
           <Link to={`/manage/jobs/${record.job.id}`}>
@@ -174,7 +177,15 @@ export function BillsListPage({
             //         {t("bills.actions.return")}
             //       </Button>
           }
-          <BillDeleteButton bill={record} />
+          <BillDeleteButton
+            bill={record}
+            callback={(deletedBillid) => {
+              //Filter out the state and set it again.
+              setOpenSearchResults((currentResults) =>
+                currentResults.filter((bill) => bill.id !== deletedBillid)
+              );
+            }}
+          />
           {record.isinhouse && (
             <PrintWrapperComponent
               templateObject={{
@@ -199,11 +210,32 @@ export function BillsListPage({
       search.sortcolumn = sorter.order ? sorter.columnKey : null;
       search.sortorder = sorter.order;
     }
-
     search.sort = JSON.stringify({ [sorter.columnKey]: sorter.order });
     history.push({ search: queryString.stringify(search) });
   };
 
+  useEffect(() => {
+    if (search.search && search.search.trim() !== "") {
+      searchBills();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  async function searchBills(value) {
+    try {
+      setSearchLoading(true);
+      const searchData = await axios.post("/search", {
+        search: value || search.search,
+        index: "bills",
+      });
+      setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
+    } catch (error) {
+      console.log("Error while fetching search results", error);
+    } finally {
+      setSearchLoading(false);
+    }
+  }
+
   return (
     <Card
       title={t("bills.labels.bills")}
@@ -217,6 +249,7 @@ export function BillsListPage({
               <Button
                 onClick={() => {
                   delete search.search;
+                  delete search.page;
                   history.push({ search: queryString.stringify(search) });
                 }}
               >
@@ -243,7 +276,10 @@ export function BillsListPage({
             onSearch={(value) => {
               search.search = value;
               history.push({ search: queryString.stringify(search) });
+              searchBills(value);
             }}
+            loading={loading || searchLoading}
+            enterButton
           />
         </Space>
       }
@@ -251,19 +287,27 @@ export function BillsListPage({
       <PartsOrderModalContainer />
 
       <Table
-        loading={loading}
-        scroll={{
-          x: "50%", // y: "40rem"
-        }}
-        pagination={{
-          position: "top",
-          pageSize: 25,
-          current: parseInt(page || 1),
-          total: total,
-        }}
+        loading={loading || searchLoading}
+        // scroll={{
+        //   x: "50%", // y: "40rem"
+        // }}
+        scroll={{ x: true }}
+        pagination={
+          search?.search
+            ? {
+                pageSize: 25,
+                showSizeChanger: false,
+              }
+            : {
+                pageSize: 25,
+                current: parseInt(page || 1),
+                total: total,
+                showSizeChanger: false,
+              }
+        }
         columns={columns}
         rowKey="id"
-        dataSource={data}
+        dataSource={search?.search ? openSearchResults : data}
         onChange={handleTableChange}
       />
     </Card>

client/src/pages/bills/bills.page.container.jsx

@@ -1,6 +1,6 @@
+import { useQuery } from "@apollo/client";
 import queryString from "query-string";
 import React, { useEffect } from "react";
-import { useQuery } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
@@ -22,7 +22,7 @@ const mapDispatchToProps = (dispatch) => ({
 export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
   const { t } = useTranslation();
   const searchParams = queryString.parse(useLocation().search);
-  const { page, sortcolumn, sortorder, search, searchObj } = searchParams;
+  const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
   useEffect(() => {
     document.title = t("titles.bills-list");
@@ -38,7 +38,6 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        search: search || "",
         offset: page ? (page - 1) * 25 : 0,
         limit: 25,
         order: [
@@ -61,10 +60,10 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
     <RbacWrapper action="bills:list">
       <div>
         <BillsPageComponent
-          data={data ? data.search_bills : []}
+          data={data ? data.bills : []}
           loading={loading}
           refetch={refetch}
-          total={data ? data.search_bills_aggregate.aggregate.count : 0}
+          total={data ? data.bills_aggregate.aggregate.count : 0}
         />
 
         <BillDetailEditContainer />

client/src/pages/jobs-all/jobs-all.container.jsx

@@ -25,7 +25,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
   const searchParams = queryString.parse(useLocation().search);
-  const { page, sortcolumn, sortorder, search, statusFilters } = searchParams;
+  const { page, sortcolumn, sortorder, statusFilters } = searchParams;
 
   const { loading, error, data, refetch } = useQuery(
     QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED,
@@ -33,7 +33,6 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        search: search || "",
         offset: page ? (page - 1) * 25 : 0,
         limit: 25,
         ...(statusFilters ? { statusList: JSON.parse(statusFilters) } : {}),
@@ -67,8 +66,8 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
         refetch={refetch}
         loading={loading}
         searchParams={searchParams}
-        total={data ? data.search_jobs_aggregate.aggregate.count : 0}
-        jobs={data ? data.search_jobs : []}
+        total={data ? data.jobs_aggregate.aggregate.count : 0}
+        jobs={data ? data.jobs : []}
       />
     </RbacWrapper>
   );

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -26,7 +26,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   const searchParams = queryString.parse(useLocation().search);
-  const { page, sortcolumn, sortorder, search } = searchParams;
+  const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
   const { loading, error, data, refetch } = useQuery(
     QUERY_ALL_PAYMENTS_PAGINATED,
@@ -34,11 +34,12 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
       variables: {
-        search: search || "",
         offset: page ? (page - 1) * 25 : 0,
         limit: 25,
         order: [
-          {
+          searchObj
+          ? JSON.parse(searchObj)
+          : {
             [sortcolumn || "date"]: sortorder
               ? sortorder === "descend"
                 ? "desc"
@@ -66,8 +67,8 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
         refetch={refetch}
         loading={loading}
         searchParams={searchParams}
-        total={data ? data.search_payments_aggregate.aggregate.count : 0}
-        payments={data ? data.search_payments : []}
+        total={data ? data.payments_aggregate.aggregate.count : 0}
+        payments={data ? data.payments : []}
       />
     </RbacWrapper>
   );

client/src/utils/RenderTemplate.js

@@ -1,5 +1,6 @@
 import { gql } from "@apollo/client";
 import { notification } from "antd";
+import axios from "axios";
 import jsreport from "@jsreport/browser-client";
 import _ from "lodash";
 import moment from "moment";
@@ -8,8 +9,7 @@ import { setEmailOptions } from "../redux/email/email.actions";
 import { store } from "../redux/store";
 import client from "../utils/GraphQLClient";
 import { TemplateList } from "./TemplateConstants";
-import cleanAxios from "./CleanAxios";
-import axios from "axios";
+
 const server = process.env.REACT_APP_REPORTS_SERVER_URL;
 
 jsreport.serverUrl = server;
@@ -26,14 +26,10 @@ export default async function RenderTemplate(
   if (window.jsr3) {
     jsreport.serverUrl = "https://reports3.test.imex.online/";
   }
-  const jsrAuth = (await axios.post("/utils/jsr")).data;
-
-  jsreport.headers["Authorization"] = jsrAuth;
 
   //Query assets that match the template name. Must be in format <<templateName>>.query
   let { contextData, useShopSpecificTemplate } = await fetchContextData(
-    templateObject,
-    jsrAuth
+    templateObject
   );
 
   const { ignoreCustomMargins } = Templates[templateObject.name];
@@ -141,15 +137,11 @@ export async function RenderTemplates(
   //Query assets that match the template name. Must be in format <<templateName>>.query
   let unsortedTemplatesAndData = [];
   let proms = [];
-  const jsrAuth = (await axios.post("/utils/jsr")).data;
-  jsreport.headers["Authorization"] = jsrAuth;
-
   templateObjects.forEach((template) => {
     proms.push(
       (async () => {
         let { contextData, useShopSpecificTemplate } = await fetchContextData(
-          template,
-          jsrAuth
+          template
         );
         unsortedTemplatesAndData.push({
           templateObject: template,
@@ -306,22 +298,19 @@ export const GenerateDocuments = async (templates) => {
   await RenderTemplates(templates, bodyshop);
 };
 
-const fetchContextData = async (templateObject, jsrAuth) => {
+const fetchContextData = async (templateObject) => {
   const bodyshop = store.getState().user.bodyshop;
 
-  jsreport.headers["FirebaseAuthorization"] =
+  jsreport.headers["Authorization"] =
     "Bearer " + (await auth.currentUser.getIdToken());
 
-  const folders = await cleanAxios.get(`${server}/odata/folders`, {
-    headers: { Authorization: jsrAuth },
-  });
+  const folders = await axios.get(`${server}/odata/folders`);
   const shopSpecificFolder = folders.data.value.find(
     (f) => f.name === bodyshop.imexshopid
   );
 
-  const jsReportQueries = await cleanAxios.get(
-    `${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`,
-    { headers: { Authorization: jsrAuth } }
+  const jsReportQueries = await axios.get(
+    `${server}/odata/assets?$filter=name eq '${templateObject.name}.query'`
   );
 
   let templateQueryToExecute;

hasura/metadata/tables.yaml

@@ -682,13 +682,7 @@
         insert:
           columns: '*'
         update:
-          columns:
-            - jobid
-            - invoice_number
-            - due_date
-            - vendorid
-            - id
-            - date
+          columns: '*'
       retry_conf:
         interval_sec: 10
         num_retries: 3
@@ -4094,22 +4088,7 @@
         insert:
           columns: '*'
         update:
-          columns:
-            - v_color
-            - ownerid
-            - ownr_fn
-            - v_model_desc
-            - ownr_ln
-            - id
-            - v_make_desc
-            - ownr_st
-            - clm_no
-            - voided
-            - status
-            - ownr_co_nm
-            - v_model_yr
-            - v_vin
-            - converted
+          columns: '*'
       retry_conf:
         interval_sec: 10
         num_retries: 3
@@ -4557,12 +4536,7 @@
         insert:
           columns: '*'
         update:
-          columns:
-            - shopid
-            - ownr_fn
-            - id
-            - ownr_co_nm
-            - ownr_ln
+          columns: '*'
       retry_conf:
         interval_sec: 10
         num_retries: 3
@@ -5009,16 +4983,7 @@
         insert:
           columns: '*'
         update:
-          columns:
-            - paymentnum
-            - type
-            - amount
-            - date
-            - transactionid
-            - memo
-            - payer
-            - id
-            - jobid
+          columns: '*'
       retry_conf:
         interval_sec: 10
         num_retries: 3
@@ -5956,14 +5921,7 @@
         insert:
           columns: '*'
         update:
-          columns:
-            - v_model_yr
-            - plate_no
-            - id
-            - v_vin
-            - v_model_desc
-            - plate_st
-            - shopid
+          columns: '*'
       retry_conf:
         interval_sec: 10
         num_retries: 3

hasura/migrations/1682703406197_run_sql_migration/down.sql

@@ -1,3 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- CREATE INDEX idx_associations_active_true ON associations(active) WHERE active = true;

hasura/migrations/1682703406197_run_sql_migration/up.sql

@@ -1 +0,0 @@
-CREATE INDEX idx_associations_active_true ON associations(active) WHERE active = true;

hasura/migrations/1682703475365_create_index_idx_associations_shopid_user/down.sql

@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_associations_shopid_user";

hasura/migrations/1682703475365_create_index_idx_associations_shopid_user/up.sql

@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_associations_shopid_user" on
-  "public"."associations" using btree ("shopid", "useremail", "active");

os-loader.js

@@ -50,7 +50,7 @@ const getClient = async () => {
 
 async function OpenSearchUpdateHandler(req, res) {
   try {
-     var osClient = await getClient();
+    var osClient = await getClient();
     // const osClient = new Client({
     //   node: `https://imex:password@search-imexonline-search-ixp2stfvwp6qocjsowzjzyreoy.ca-central-1.es.amazonaws.com`,
     // });
@@ -74,12 +74,19 @@ async function OpenSearchUpdateHandler(req, res) {
     const jobsData = await gqlclient.request(`query{jobs{
           id
           bodyshopid:shopid
-          ro_number
           clm_no
+          clm_total
+          comment
+          ins_co_nm
+          owner_owing
+          ownr_co_nm
           ownr_fn
           ownr_ln
+          ownr_ph1
+          ownr_ph2
+          plate_no
+          ro_number
           status
-          ownr_co_nm
           v_model_yr
           v_make_desc
           v_model_desc
@@ -128,12 +135,12 @@ async function OpenSearchUpdateHandler(req, res) {
       vehicles {
         id
         bodyshopid: shopid
-v_model_yr
-v_model_desc
-v_make_desc
-v_color
-v_vin
-plate_no
+        plate_no
+        v_model_yr
+        v_model_desc
+        v_make_desc
+        v_color
+        v_vin
       }
     }
     `);
@@ -155,11 +162,26 @@ plate_no
       payments {
         id
         amount
-        paymentnum
+        created_at
+        date
+        exportedat
         memo
+        payer
+        paymentnum
         transactionid
+        type
         job {
           id
+          ownerid
+          ownr_co_nm
+          ownr_fn
+          ownr_ln
+          owner {
+            id
+            ownr_co_nm
+            ownr_fn
+            ownr_ln
+          }
           ro_number
           bodyshopid: shopid
         }
@@ -187,9 +209,12 @@ plate_no
     const billsData = await gqlclient.request(`{
       bills {
         id
-        total
-        invoice_number
         date
+        exported
+        exported_at
+        invoice_number
+        is_credit_memo
+        total
         vendor {
           name
           id
@@ -200,9 +225,7 @@ plate_no
           bodyshopid: shopid
         }
       }
-    }
-    
-        `);
+    }`);
     for (let i = 0; i <= billsData.bills.length / batchSize; i++) {
       const slicedArray = billsData.bills.slice(
         i * batchSize,

server.js

@@ -123,11 +123,7 @@ app.post(
   twilio.webhook({ validate: process.env.NODE_ENV === "PRODUCTION" }),
   smsStatus.status
 );
-app.post(
-  "/sms/markConversationRead",
-  fb.validateFirebaseIdToken,
-  smsStatus.markConversationRead
-);
+app.post("/sms/markConversationRead", smsStatus.markConversationRead);
 
 var job = require("./server/job/job");
 app.post("/job/totals", fb.validateFirebaseIdToken, job.totals);
@@ -151,11 +147,11 @@ app.post("/scheduling/job", fb.validateFirebaseIdToken, scheduling.job);
 var inlineCss = require("./server/render/inlinecss");
 app.post("/render/inlinecss", fb.validateFirebaseIdToken, inlineCss.inlinecss);
 
-// app.post(
-//   "/notifications/send",
+app.post(
+  "/notifications/send",
 
-//   fb.sendNotification
-// );
+  fb.sendNotification
+);
 app.post("/notifications/subscribe", fb.validateFirebaseIdToken, fb.subscribe);
 app.post(
   "/notifications/unsubscribe",
@@ -192,13 +188,13 @@ app.post(
 );
 
 //Stripe Processing
-// var stripe = require("./server/stripe/payment");
-// app.post("/stripe/payment", fb.validateFirebaseIdToken, stripe.payment);
-// app.post(
-//   "/stripe/mobilepayment",
-//   fb.validateFirebaseIdToken,
-//   stripe.mobile_payment
-// );
+var stripe = require("./server/stripe/payment");
+app.post("/stripe/payment", fb.validateFirebaseIdToken, stripe.payment);
+app.post(
+  "/stripe/mobilepayment",
+  fb.validateFirebaseIdToken,
+  stripe.mobile_payment
+);
 
 //Tech Console
 var tech = require("./server/tech/tech");
@@ -206,7 +202,7 @@ app.post("/tech/login", fb.validateFirebaseIdToken, tech.techLogin);
 
 var utils = require("./server/utils/utils");
 app.post("/utils/time", utils.servertime);
-app.post("/utils/jsr", fb.validateFirebaseIdToken, utils.jsrAuth);
+
 var qbo = require("./server/accounting/qbo/qbo");
 app.post("/qbo/authorize", fb.validateFirebaseIdToken, qbo.authorize);
 app.get("/qbo/callback", qbo.callback);
@@ -219,7 +215,7 @@ app.post("/data/ah", data.autohouse);
 app.post("/record-handler/arms", data.arms);
 
 var taskHandler = require("./server/tasks/tasks");
-app.post("/taskHandler", fb.validateFirebaseIdToken, taskHandler.taskHandler);
+app.post("/taskHandler", taskHandler.taskHandler);
 
 var mixdataUpload = require("./server/mixdata/mixdata");
 
@@ -232,10 +228,10 @@ app.post(
 
 var ioevent = require("./server/ioevent/ioevent");
 app.post("/ioevent", ioevent.default);
-// app.post("/newlog", (req, res) => {
-//   const { message, type, user, record, object } = req.body;
-//   logger.log(message, type, user, record, object);
-// });
+app.post("/newlog", (req, res) => {
+  const { message, type, user, record, object } = req.body;
+  logger.log(message, type, user, record, object);
+});
 
 var os = require("./server/opensearch/os-handler");
 app.post(

server/accounting/pbs/pbs-ap-allocations.js

@@ -164,7 +164,7 @@ async function PbsCalculateAllocationsAp(socket, billids) {
 
       let APAmount = Dinero();
       Object.keys(billHash).map((key) => {
-        if (billHash[key].Amount.getAmount() > 0 || billHash[key].Amount.getAmount() < 0) {
+        if (billHash[key].Amount.getAmount() > 0) {
           transactionObject.Posting.Lines.push({
             ...billHash[key],
             Amount: billHash[key].Amount.toFormat("0.00"),

server/data/arms.js

@@ -50,7 +50,7 @@ async function getEntegralShopData() {
 }
 
 exports.default = async (req, res) => {
-  res.sendStatus(401);
+  res.sendStatus(200);
   return;
   //Query for the List of Bodyshop Clients.
   const job = req.body.event.data.new;

server/data/autohouse.js

@@ -40,14 +40,6 @@ exports.default = async (req, res) => {
 
   const specificShopIds = req.body.bodyshopIds; // ['uuid]
   const { start, end, skipUpload } = req.body; //YYYY-MM-DD
-  if (
-    !start ||
-    !moment(start).isValid ||
-    req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN
-  ) {
-    res.sendStatus(401);
-    return;
-  }
   const allxmlsToUpload = [];
   const allErrors = [];
   try {
@@ -780,9 +772,7 @@ const CreateCosts = (job) => {
         billTotalsByCostCenters[
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ] = Dinero({
-          amount: Math.round(
-            ((job.mixdata[0] && job.mixdata[0].totalliquidcost) || 0) * 100
-          ),
+          amount: (job.mixdata[0] && job.mixdata[0].totalliquidcost * 100) || 0,
         });
       } else {
         billTotalsByCostCenters[
@@ -809,7 +799,7 @@ const CreateCosts = (job) => {
             (job.bodyshop.jc_hourly_rates &&
               job.bodyshop.jc_hourly_rates.mapa * 100) ||
             0,
-        }).multiply(job.job_totals.rates.mapa.hours)
+        }).multiply(materialsHours.mapaHrs)
       );
     }
   }

server/email/sendemail.js

@@ -28,7 +28,7 @@ exports.sendServerEmail = async function ({ subject, text }) {
     transporter.sendMail(
       {
         from: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
-        to: ["patrick@imexsystems.ca", "support@thinkimex.com"],
+        to: ["patrick@imexsystems.ca"],
         subject: subject,
         text: text,
         ses: {

server/job/job-costing.js

@@ -626,7 +626,7 @@ function GenerateCostingData(job) {
         billTotalsByCostCenters.additionalCosts[
           job.bodyshop.md_responsibility_centers.defaults.costs.MAPA
         ] = Dinero({
-          amount: Math.round((job.mixdata[0] && job.mixdata[0].totalliquidcost || 0) * 100)
+          amount: (job.mixdata[0] && job.mixdata[0].totalliquidcost * 100) || 0,
         });
       } else {
         billTotalsByCostCenters.additionalCosts[

server/job/job-status-transition.js

@@ -17,7 +17,7 @@ require("dotenv").config({
 });
 async function StatusTransition(req, res) {
   if (req.headers["event-secret"] !== process.env.EVENT_SECRET) {
-    res.status(401).send("Unauthorized");
+    res.status(403).send("Unauthorized");
     return;
   }
   res.sendStatus(200);

server/opensearch/os-handler.js

@@ -45,10 +45,6 @@ const getClient = async () => {
 };
 
 async function OpenSearchUpdateHandler(req, res) {
-  if (req.headers["event-secret"] !== process.env.EVENT_SECRET) {
-    res.status(401).send("Unauthorized");
-    return;
-  }
   try {
     var osClient = await getClient();
     // const osClient = new Client({
@@ -70,12 +66,19 @@ async function OpenSearchUpdateHandler(req, res) {
           document = _.pick(req.body.event.data.new, [
             "id",
             "bodyshopid",
-            "ro_number",
             "clm_no",
+            "clm_total",
+            "comment",
+            "ins_co_nm",
+            "owner_owing",
+            "ownr_co_nm",
             "ownr_fn",
             "ownr_ln",
+            "ownr_ph1",
+            "ownr_ph2",
+            "plate_no",
+            "ro_number",
             "status",
-            "ownr_co_nm",
             "v_model_yr",
             "v_make_desc",
             "v_model_desc",
@@ -124,17 +127,19 @@ async function OpenSearchUpdateHandler(req, res) {
           `,
             { billId: req.body.event.data.new.id }
           );
-
           document = {
             ..._.pick(req.body.event.data.new, [
               "id",
-              "invoice_number",
               "date",
+              "exported",
+              "exported_at",
+              "invoice_number",
+              "is_credit_memo",
+              "total"
             ]),
             ...bill.bills_by_pk,
             bodyshopid: bill.bills_by_pk.job.shopid,
           };
-
           break;
         case "payments":
           //Query to get the job and RO number
@@ -146,21 +151,40 @@ async function OpenSearchUpdateHandler(req, res) {
                     id
                     ro_number
                     shopid
+                    ownerid
+                    ownr_co_nm
+                    ownr_fn
+                    ownr_ln
+                    owner {
+                      id
+                      ownr_co_nm
+                      ownr_fn
+                      ownr_ln
+                    }
                   }
                 }
-              }
-              
-          `,
+              }              
+            `,
             { paymentId: req.body.event.data.new.id }
           );
           document = {
-            ..._.pick(req.body.event.data.new, ["id", "invoice_number"]),
+            ..._.pick(req.body.event.data.new, [
+              "id",
+              "amount",
+              "created_at",
+              "date",
+              "exportedat",
+              "memo",
+              "payer",
+              "paymentnum",
+              "transactionid",
+              "type",
+            ]),
             ...payment.payments_by_pk,
-            bodyshopid: bill.payments_by_pk.job.shopid,
+            bodyshopid: payment.payments_by_pk.job.shopid,
           };
           break;
       }
-
       const payload = {
         id: req.body.event.data.new.id,
         index: req.body.table.name,
@@ -180,7 +204,7 @@ async function OpenSearchUpdateHandler(req, res) {
 
 async function OpensearchSearchHandler(req, res) {
   try {
-    const { search, bodyshopid } = req.body;
+    const { search, bodyshopid, index } = req.body;
     if (!req.user) {
       res.sendStatus(401);
       return;
@@ -209,6 +233,7 @@ async function OpensearchSearchHandler(req, res) {
     var osClient = await getClient();
 
     const { body } = await osClient.search({
+      ...(index ? { index } : {}),
       body: {
         size: 100,
         query: {

server/utils/utils.js

@@ -1,12 +1,3 @@
 exports.servertime = (req, res) => {
   res.status(200).send(new Date());
 };
-
-exports.jsrAuth = async (req, res) => {
-  res.send(
-    "Basic " +
-      Buffer.from(
-        `${process.env.JSR_USER}:${process.env.JSR_PASSWORD}`
-      ).toString("base64")
-  );
-};