From a3557bbc86a78d08516f6d3d5bda463beb1896e6 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan.carr@thinkimex.com>
Date: Fri, 5 May 2023 13:10:07 -0700
Subject: [PATCH] IO-2261 Add Delete function, Correct Payment edit, add Totals
 to Bills handler

---
 .../bill-delete-button.component.jsx          |  4 ++-
 .../payment-list-paginated.component.jsx      | 17 ++++++++--
 client/src/graphql/payments.queries.js        | 34 +++++++++++++++++++
 .../src/pages/bills/bills.page.component.jsx  | 10 +++++-
 os-loader.js                                  |  1 +
 server/opensearch/os-handler.js               |  2 ++
 6 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/client/src/components/bill-delete-button/bill-delete-button.component.jsx b/client/src/components/bill-delete-button/bill-delete-button.component.jsx
index b6cb19992..5d2d154f6 100644
--- a/client/src/components/bill-delete-button/bill-delete-button.component.jsx
+++ b/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);
diff --git a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
index 718d056e8..d1d806b29 100644
--- a/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
+++ b/client/src/components/payments-list-paginated/payment-list-paginated.component.jsx
@@ -1,4 +1,5 @@
 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";
@@ -7,6 +8,7 @@ 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";
@@ -43,6 +45,7 @@ export function PaymentsListPaginated({
   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: {},
@@ -154,10 +157,20 @@ 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,
+                context: apolloResults ? record : apolloResults,
               });
             }}
           >
diff --git a/client/src/graphql/payments.queries.js b/client/src/graphql/payments.queries.js
index 5141e9acf..9d56dad7d 100644
--- a/client/src/graphql/payments.queries.js
+++ b/client/src/graphql/payments.queries.js
@@ -114,3 +114,37 @@ 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
+    created_at
+    jobid
+    paymentnum
+    date
+    job {
+      id
+      ro_number
+      ownerid
+      ownr_co_nm
+      ownr_fn
+      ownr_ln
+      owner {
+        id
+        ownr_co_nm
+        ownr_fn
+        ownr_ln
+      }
+    }
+    transactionid
+    memo
+    type
+    amount
+    stripeid
+    exportedat
+    stripeid
+    payer
+  }
+}
+`
\ No newline at end of file
diff --git a/client/src/pages/bills/bills.page.component.jsx b/client/src/pages/bills/bills.page.component.jsx
index d52a69c9e..f2273e805 100644
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -177,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={{
diff --git a/os-loader.js b/os-loader.js
index c076a4bbb..c09f1a98a 100644
--- a/os-loader.js
+++ b/os-loader.js
@@ -210,6 +210,7 @@ async function OpenSearchUpdateHandler(req, res) {
         id
         date
         exported
+        exported_at
         invoice_number
         is_credit_memo
         total
diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js
index 9c9240898..072ece57d 100644
--- a/server/opensearch/os-handler.js
+++ b/server/opensearch/os-handler.js
@@ -131,8 +131,10 @@ async function OpenSearchUpdateHandler(req, res) {
               "id",
               "date",
               "exported",
+              "exported_at",
               "invoice_number",
               "is_credit_memo",
+              "total"
             ]),
             ...bill.bills_by_pk,
             bodyshopid: bill.bills_by_pk.job.shopid,