Merged in feature/IO-3355-Job-Cash-Discounting (pull request #2537)

Feature/IO-3355 Job Cash Discounting

Approved-by: Dave Richer

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

@@ -20,35 +20,27 @@ export function JobTotalsCashDiscount({ bodyshop, amountDinero }) {
   const notification = useNotification();
 
   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 (!amountDinero || !bodyshop) return;
 
-        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);
+    setLoading(true);
+    const errorMessage = "Error encountered when contacting IntelliPay service to determine cash discounted price.";
+
+    try {
+      const { id, imexshopid, state } = bodyshop;
+      const { data } = await axios.post("/intellipay/checkfee", {
+        bodyshop: { id, imexshopid, state },
+        amount: Dinero(amountDinero).toUnit()
+      });
+
+      if (data?.error) {
+        notification.open({ type: "error", message: data.error || errorMessage });
+      } else {
+        setFee(data?.fee ?? 0);
       }
+    } catch (error) {
+      notification.open({ type: "error", message: error.response?.data?.error || errorMessage });
+    } finally {
+      setLoading(false);
     }
   }, [amountDinero, bodyshop, notification]);
 

client/src/components/vendors-form/vendors-form.component.jsx

@@ -173,7 +173,7 @@ export function VendorsFormComponent({ bodyshop, form, formLoading, handleDelete
 
       <Form.Item
         name="tags"
-        label={t("vendor.fields.tags")}
+        label={t("vendors.fields.tags")}
         rules={[
           {
             //message: t("general.validation.required"),