Merge branch 'feature/IO-3000-messaging-sockets-migrationv2' of bitbucket.org:snaptsoft/bodyshop into feature/IO-3000-messaging-sockets-migrationv2

client/src/components/job-totals-table/job-totals.table.totals.component.jsx

@@ -7,6 +7,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import JobTotalsCashDiscount from "./jobs-totals.cash-discount-display.component";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -149,11 +150,27 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
             ]
       }),
 
-      {
-        key: t("jobs.labels.total_repairs"),
-        total: job.job_totals.totals.total_repairs,
-        bold: true
-      },
+      ...(bodyshop.intellipay_config?.enable_cash_discount
+        ? [
+            {
+              key: t("jobs.labels.total_repairs_cash_discount"),
+              total: job.job_totals.totals.total_repairs,
+              bold: true
+            },
+            {
+              key: t("jobs.labels.total_repairs"),
+              render: <JobTotalsCashDiscount amountDinero={job.job_totals.totals.total_repairs} />,
+              bold: true
+            }
+          ]
+        : [
+            {
+              key: t("jobs.labels.total_repairs"),
+              total: job.job_totals.totals.total_repairs,
+              bold: true
+            }
+          ]),
+
       {
         key: t("jobs.fields.ded_amt"),
         total: job.job_totals.totals.custPayable.deductible
@@ -186,13 +203,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
             },
             {
               key: t("jobs.labels.total_cust_payable"),
-              total: Dinero(job.job_totals.totals.custPayable.total)
-                .add(
-                  Dinero(job.job_totals.totals.custPayable.total).percentage(
-                    bodyshop.intellipay_config?.cash_discount_percentage || 0
-                  )
-                )
-                .toJSON(),
+              render: <JobTotalsCashDiscount amountDinero={job.job_totals.totals.custPayable.total} />,
               bold: true
             }
           ]
@@ -228,7 +239,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
       dataIndex: "total",
       key: "total",
       align: "right",
-      render: (text, record) => Dinero(record.total).toFormat(),
+      render: (text, record) => (record.render ? record.render : Dinero(record.total).toFormat()),
       width: "20%",
       onCell: (record, rowIndex) => {
         return { style: { fontWeight: record.bold && "bold" } };

client/src/components/job-totals-table/jobs-totals.cash-discount-display.component.jsx

@@ -0,0 +1,60 @@
+import { notification, Spin } from "antd";
+import axios from "axios";
+import Dinero from "dinero.js";
+import React, { useCallback, useEffect, useState } from "react";
+
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = (dispatch) => ({});
+export default connect(mapStateToProps, mapDispatchToProps)(JobTotalsCashDiscount);
+
+export function JobTotalsCashDiscount({ bodyshop, amountDinero }) {
+  const [loading, setLoading] = useState(true);
+  const [fee, setFee] = useState(0);
+
+  const fetchData = useCallback(async () => {
+    if (amountDinero && bodyshop) {
+      setLoading(true);
+      let response;
+      try {
+        response = await axios.post("/intellipay/checkfee", {
+          bodyshop: { id: bodyshop.id, imexshopid: bodyshop.imexshopid, state: bodyshop.state },
+          amount: Dinero(amountDinero).toFormat("0.00")
+        });
+
+        if (response?.data?.error) {
+          notification.open({
+            type: "error",
+            message:
+              response.data?.error ||
+              "Error encountered when contacting IntelliPay service to determine cash discounted price."
+          });
+        } else {
+          setFee(response.data?.fee || 0);
+        }
+      } catch (error) {
+        notification.open({
+          type: "error",
+          message:
+            error.response?.data?.error ||
+            "Error encountered when contacting IntelliPay service to determine cash discounted price."
+        });
+      } finally {
+        setLoading(false);
+      }
+    }
+  }, [amountDinero, bodyshop]);
+
+  useEffect(() => {
+    fetchData();
+  }, [fetchData, bodyshop, amountDinero]);
+
+  if (loading) return <Spin size="small" />;
+  return Dinero(amountDinero)
+    .add(Dinero({ amount: Math.round(fee * 100) }))
+    .toFormat();
+}

client/src/components/shop-info/shop-intellipay-config.component.jsx

@@ -37,16 +37,6 @@ export function ShopInfoIntellipay({ bodyshop, form }) {
         >
           <Switch />
         </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.cash_discount_percentage")}
-          dependencies={[["intellipay_config", "enable_cash_discount"]]}
-          name={["intellipay_config", "cash_discount_percentage"]}
-          rules={[
-            ({ getFieldsValue }) => ({ required: form.getFieldValue(["intellipay_config", "enable_cash_discount"]) })
-          ]}
-        >
-          <InputNumber min={0} max={100} precision={1} suffix="%" />
-        </Form.Item>
       </LayoutFormRow>
     </>
   );