Merged in feature/IO-3176-IntelliPay-Payment-Mapping (pull request #2217)

IO-3176 IntelliPay Payment Method Mapping

Approved-by: Dave Richer
Approved-by: Patrick Fic

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

@@ -1,11 +1,10 @@
-import { Alert, Form, Switch } from "antd";
-import React from "react";
+import { Alert, Form, Select, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
-import {connect} from "react-redux";
-import {createStructuredSelector} from "reselect";
-import {selectBodyshop} from "../../redux/user/user.selectors";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -16,17 +15,17 @@ const mapDispatchToProps = () => ({
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoIntellipay);
 
 // noinspection JSUnusedLocalSymbols
-export function ShopInfoIntellipay({bodyshop, form}) {
-  const {t} = useTranslation();
+export function ShopInfoIntellipay({ bodyshop, form }) {
+  const { t } = useTranslation();
 
   return (
     <>
       <Form.Item dependencies={[["intellipay_config", "enable_cash_discount"]]}>
         {() => {
-          const {intellipay_config} = form.getFieldsValue();
+          const { intellipay_config } = form.getFieldsValue();
 
           if (intellipay_config?.enable_cash_discount)
-            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")}/>;
+            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")} />;
         }}
       </Form.Item>
 
@@ -36,7 +35,93 @@ export function ShopInfoIntellipay({bodyshop, form}) {
           valuePropName="checked"
           name={["intellipay_config", "enable_cash_discount"]}
         >
-          <Switch/>
+          <Switch />
+        </Form.Item>
+      </LayoutFormRow>
+      <LayoutFormRow header={t("bodyshop.fields.intellipay_config.payment_type")}>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.visa")}
+          name={["intellipay_config", "payment_map", "visa"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.mast")}
+          name={["intellipay_config", "payment_map", "mast"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.amex")}
+          name={["intellipay_config", "payment_map", "amex"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.disc")}
+          name={["intellipay_config", "payment_map", "disc"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.dnrs")}
+          name={["intellipay_config", "payment_map", "dnrs"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.jcb")}
+          name={["intellipay_config", "payment_map", "jcb"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.intellipay_config.payment_map.intr")}
+          name={["intellipay_config", "payment_map", "intr"]}
+        >
+          <Select showSearch>
+            {bodyshop.md_payment_types.map((item, idx) => (
+              <Select.Option key={idx} value={item}>
+                {item}
+              </Select.Option>
+            ))}
+          </Select>
         </Form.Item>
       </LayoutFormRow>
     </>

server/intellipay/intellipay.js

@@ -371,6 +371,7 @@ exports.postback = async (req, res) => {
     iprequest: values,
     decodedComment
   };
+  const ipMapping = req.body?.bodyshop?.intellipay_config?.payment_map;
 
   logger.log("intellipay-postback-received", "DEBUG", req.user?.email, null, logResponseMeta);
 
@@ -417,7 +418,7 @@ exports.postback = async (req, res) => {
           amount: p.amount,
           transactionid: values.authcode,
           payer: "Customer",
-          type: values.cardtype,
+          type: ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype,
           jobid: p.jobid,
           date: moment(Date.now()),
           payment_responses: {
@@ -481,7 +482,7 @@ exports.postback = async (req, res) => {
           amount: values.total,
           transactionid: values.authcode,
           payer: "Customer",
-          type: values.cardtype,
+          type: ipMapping[(values.cardtype || "").toLowerCase()] || values.cardtype,
           jobid: values.invoice,
           date: moment(Date.now())
         }