IO-2561 Return Items Modal

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -1,17 +1,16 @@
 import { DeleteFilled, DownOutlined, WarningFilled } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Checkbox, Divider, Dropdown, Form, Input, InputNumber, Radio, Select, Space, Tag } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import PartsOrderModalPriceChange from "./parts-order-modal-price-change.component";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -33,7 +32,7 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
   });
 
   const { t } = useTranslation();
-  const handleClick = ({ item, key, keyPath }) => {
+  const handleClick = ({ item }) => {
     form.setFieldsValue({ comments: item.props.value });
   };
 
@@ -98,17 +97,18 @@ export function PartsOrderModalComponent({ bodyshop, vendorList, sendTypeState,
             <Checkbox />
           </Form.Item>
         )}
-
-        <Form.Item name="order_type" initialValue="parts_order" label={t("parts_orders.labels.order_type")}>
-          <Radio.Group disabled={sendType === "oec"}>
-            <Radio value={"parts_order"}>{t("parts_orders.labels.parts_order")}</Radio>
-            <Radio value={"sublet"}>{t("parts_orders.labels.sublet_order")}</Radio>
-          </Radio.Group>
-        </Form.Item>
+        {!isReturn && (
+          <Form.Item name="order_type" initialValue="parts_order" label={t("parts_orders.labels.order_type")}>
+            <Radio.Group disabled={sendType === "oec"}>
+              <Radio value={"parts_order"}>{t("parts_orders.labels.parts_order")}</Radio>
+              <Radio value={"sublet"}>{t("parts_orders.labels.sublet_order")}</Radio>
+            </Radio.Group>
+          </Form.Item>
+        )}
       </LayoutFormRow>
       <Divider orientation="left">{t("parts_orders.labels.inthisorder")}</Divider>
       <Form.List name={["parts_order_lines", "data"]}>
-        {(fields, { add, remove, move }) => {
+        {(fields, { remove, move }) => {
           return (
             <div>
               {fields.map((field, index) => (

server/email/sendemail.js

@@ -92,7 +92,7 @@ const sendTaskEmail = async ({ to, subject, type = "text", html, text, attachmen
       },
       (err, info) => {
         // (message, type, user, record, meta
-        logger.log("server-email", err ? "error" : "debug", null, null, { message: err || info });
+        logger.log("server-email", err ? "error" : "debug", null, null, { message: err ? err?.message : info });
       }
     );
   } catch (error) {
@@ -239,24 +239,24 @@ const emailBounce = async (req, res) => {
         return;
       }
       //If it's bounced, log it as bounced in audit log. Send an email to the user.
-      const result = await client.request(queries.UPDATE_EMAIL_AUDIT, {
+      await client.request(queries.UPDATE_EMAIL_AUDIT, {
         sesid: messageId,
         status: "Bounced",
         context: message.bounce?.bouncedRecipients
       });
       mailer.sendMail(
         {
-          from: InstanceMgr({
+          from: InstanceManager({
             imex: `ImEX Online <noreply@imex.online>`,
             rome: `Rome Online <noreply@romeonline.io>`
           }),
           to: replyTo,
           //bcc: "patrick@snapt.ca",
-          subject: `${InstanceMgr({
+          subject: `${InstanceManager({
             imex: "ImEX Online",
             rome: "Rome Online"
           })} Bounced Email - RE: ${subject}`,
-          text: `${InstanceMgr({
+          text: `${InstanceManager({
             imex: "ImEX Online",
             rome: "Rome Online"
           })} has tried to deliver an email with the subject: ${subject} to the intended recipients but encountered an error.
@@ -270,7 +270,7 @@ ${body.bounce?.bouncedRecipients.map(
         },
         (err, info) => {
           logger.log("sns-error", err ? "error" : "debug", "api", null, {
-            message: err ? JSON.stringify(error) : info
+            message: err ? err?.message : info
           });
         }
       );

server/opensearch/os-handler.js

@@ -99,6 +99,7 @@ async function OpenSearchUpdateHandler(req, res) {
           break;
         case "payments":
           //Query to get the job and RO number
+
           const payment = await client.request(
             `query ADMIN_GET_PAYMENT_BY_ID($paymentId: uuid!) {
                 payments_by_pk(id: $paymentId) {
@@ -147,11 +148,25 @@ async function OpenSearchUpdateHandler(req, res) {
         body: document
       };
 
+      logger.log("os-handler", "DEBUG", null, null, {
+        id: req.body.event.data.new.id,
+        index: req.body.table.name,
+        bodyshopid: payload.body.bodyshopid
+        // body: document
+      });
+
       const response = await osClient.index(payload);
       //console.log(response.body);
       res.status(200).json(response.body);
     }
   } catch (error) {
+    logger.log("os-handler-error", "ERROR", null, null, {
+      id: req.body.event.data.new.id,
+      index: req.body.table.name,
+      message: error.message,
+      stack: error.stack
+      // body: document
+    });
     res.status(400).json(JSON.stringify(error));
   }
 }
@@ -166,7 +181,9 @@ async function OpenSearchSearchHandler(req, res) {
     }
 
     logger.log("os-search", "DEBUG", req.user.email, null, {
-      search
+      search,
+      index,
+      bodyshopid
     });
 
     const BearerToken = req.BearerToken;
@@ -187,7 +204,7 @@ async function OpenSearchSearchHandler(req, res) {
       : process.env.BODY_SHOP_ID_MATCH_OVERRIDE;
 
     const { body } = await osClient.search({
-      ...(index ? { index } : {}),
+      ...(index ? { index } : { index: ["jobs", "vehicles", "owners", "bills", "payments"] }),
       body: {
         size: 100,
         query: {
@@ -231,8 +248,8 @@ async function OpenSearchSearchHandler(req, res) {
                           "*ownr_fn^8",
                           "*ownr_co_nm^8",
                           "*ownr_ph1^8",
-                          "*ownr_ph2^8",
-                          "*"
+                          "*ownr_ph2^8"
+                          //  "*"
                         ]
                       }
                     }