@pisell/private-materials 3.0.186 → 3.0.188

package/lib/components/eftposPay/locales.js

@@ -61,6 +61,7 @@ var locales_default = {
     "page.eftpos-pay.text.manual.diff": "If it doesn't match, please enter the actual transaction amount in the input box below.",
     "page.eftpos-pay.text.manual.tip": "Amount tendered (incl. surcharge)",
     "page.eftpos-pay.text.manual.cancel": "Cancel current transaction",
+    "page.eftpos-pay.text.manual.print_receipt": "Print Receipt",
     "page.eftpos-pay.text.modify.payment.info": (mode) => mode === "pay" || mode === "fullPay" ? "Modify payment info" : "Modify refund information",
     "page.eftpos-pay.text.successful": (mode) => `${mode === "pay" || mode === "fullPay" ? "Payment" : "Refund"} successful`,
     "page.eftpos-pay.text.failed": (mode) => `${mode === "pay" || mode === "fullPay" ? "Payment" : "Refund"} failed`,
@@ -110,6 +111,7 @@ var locales_default = {
     "page.eftpos-pay.text.transaction.eftpos.fail.device": "2. Check if the device is turned on.",
     "page.eftpos-pay.text.transaction.eftpos.fail.network": "3. Check the device network.",
     "page.eftpos-pay.text.transaction.eftpos.fail.if": (mode) => mode === "pay" || mode === "fullPay" ? "If you have confirmed the payment status of this order, please click on Manual marking." : "If you have confirmed the refund status of this order, please click on Manual Marking.",
+    "page.eftpos-pay.text.transaction.eftpos.fail.other": "Payment issue detected. Please print the receipt and contact staff for assistance.",
     "page.eftpos-pay.text.application": "Waiting for customer to select application",
     "page.eftpos-pay.text.approved": "Approved",
     "page.eftpos-pay.text.device.no.title": "No devices added yet. Please add devices to proceed.",
@@ -168,6 +170,7 @@ var locales_default = {
     "page.eftpos-pay.text.manual.diff": "如不一致请在下方输入框内输入真实的交易金额。",
     "page.eftpos-pay.text.manual.tip": "实付金额（含附加费）",
     "page.eftpos-pay.text.manual.cancel": "取消当前交易",
+    "page.eftpos-pay.text.manual.print_receipt": "打印收据",
     "page.eftpos-pay.text.modify.payment.info": (mode) => mode === "pay" || mode === "fullPay" ? "修改支付信息" : "修改退款信息",
     "page.eftpos-pay.text.successful": (mode) => `${mode === "pay" || mode === "fullPay" ? "支付" : "退款"}成功`,
     "page.eftpos-pay.text.failed": (mode) => `${mode === "pay" || mode === "fullPay" ? "支付" : "退款"}失败`,
@@ -224,6 +227,7 @@ var locales_default = {
     "page.eftpos-pay.text.transaction.eftpos.fail.device": "2. 检查设备是否开机",
     "page.eftpos-pay.text.transaction.eftpos.fail.network": "3. 检查设备网络",
     "page.eftpos-pay.text.transaction.eftpos.fail.if": (mode) => mode === "pay" || mode === "fullPay" ? "如果您已确认此交易的付款状态，请点击手动标记" : "如果您已确认此订单的退款状态，请点击手动标记。",
+    "page.eftpos-pay.text.transaction.eftpos.fail.other": "刷卡机支付出现问题，请打印收据后联系店员处理。",
     "page.eftpos-pay.text.application": "等待客户选择应用",
     "page.eftpos-pay.text.approved": "已接受",
     "page.eftpos-pay.text.device.no.title": "您还没有添加任何设备。请添加设备后使用",
@@ -428,6 +432,7 @@ var locales_default = {
     "page.eftpos-pay.text.manual.diff": "如不一致請在下方輸入框內輸入真實的交易金額。",
     "page.eftpos-pay.text.manual.tip": "實付金額（含附加費）",
     "page.eftpos-pay.text.manual.cancel": "取消當前交易",
+    "page.eftpos-pay.text.manual.print_receipt": "打印收據",
     "page.eftpos-pay.text.modify.payment.info": (mode) => mode === "pay" || mode === "fullPay" ? "修改支付信息" : "修改退款信息",
     "page.eftpos-pay.text.successful": (mode) => `${mode === "pay" || mode === "fullPay" ? "支付" : "退款"}成功`,
     "page.eftpos-pay.text.failed": (mode) => `${mode === "pay" || mode === "fullPay" ? "支付" : "退款"}失敗`,
@@ -484,6 +489,7 @@ var locales_default = {
     "page.eftpos-pay.text.transaction.eftpos.fail.device": "2. 檢查設備是否開機",
     "page.eftpos-pay.text.transaction.eftpos.fail.network": "3. 檢查設備網絡",
     "page.eftpos-pay.text.transaction.eftpos.fail.if": (mode) => mode === "pay" || mode === "fullPay" ? "如果您已確認此交易的付款狀態，請點擊手動標記" : "如果您已確認此訂單的退款狀態，請點擊手動標記。",
+    "page.eftpos-pay.text.transaction.eftpos.fail.other": "刷卡機支付出現問題，請打印收據後聯繫店員處理。",
     "page.eftpos-pay.text.application": "等待客户選擇應用",
     "page.eftpos-pay.text.approved": "已接受",
     "page.eftpos-pay.text.device.no.title": "您還沒有添加任何設備。請添加設備後使用",

package/lib/components/eftposPay/pay.d.ts

@@ -7,14 +7,15 @@ import './index.less';
  * @Author: hongbing.wang
  * @Date: 2024-08-20 14:59
  */
-declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isIpad, tyroUrl, tyroVersion, formatAmount, }: PayProps & {
+declare const Pay: ({ api, onChange: onChangeStatus, className, terminal, net, isMobile, tyroUrl, tyroVersion, formatAmount, client }: PayProps & {
     terminal: {
         network: boolean;
     };
     net: boolean;
-    isIpad: boolean;
+    isMobile: boolean;
     tyroUrl?: string | undefined;
     tyroVersion?: string | undefined;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
+    client: string;
 }) => React.JSX.Element;
 export default Pay;

package/lib/components/eftposPay/pay.js

@@ -60,10 +60,11 @@ var Pay = ({
   className,
   terminal,
   net,
-  isIpad,
+  isMobile,
   tyroUrl,
   tyroVersion,
-  formatAmount = (number, precision, symbol) => `${symbol}${number}`
+  formatAmount = (number, precision, symbol) => `${symbol}${number}`,
+  client
 }) => {
   const data = (0, import_store.useContextData)();
   const dataRef = (0, import_react.useRef)(data);
@@ -84,11 +85,11 @@ var Pay = ({
   }, [data]);
   const Comm = Mapping[data.component];
   const onChange = (0, import_react.useCallback)(
-    (status, params) => {
+    (status, params, other) => {
       if (status === import_const.StatusEnum.Success || status === import_const.StatusEnum.Fail) {
         dispatch((0, import_store.updateStatus)(status));
       }
-      onChangeStatus(status, params);
+      onChangeStatus(status, params, other);
     },
     [dispatch, onChangeStatus]
   );
@@ -158,7 +159,7 @@ var Pay = ({
         subTitle: data.subTitle
       }
     ),
-    data.eftpos === "payo" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Payo, { api, onChange }, data.warn && data.status !== import_const.StatusEnum.Success ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-warn" }, data.warn) : null, data.status === import_const.StatusEnum.Success ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip" }, import_utils.locales.getText("page.eftpos-pay.text.transaction.end")) : null) : null,
+    data.eftpos === "payo" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Payo, { api, onChange }, data.warn && data.status !== import_const.StatusEnum.Success && client === import_const.ClientEnum.Merchant ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-warn" }, data.warn) : null, data.status === import_const.StatusEnum.Success ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item pisell-lowcode__eft-pay-step-item-tip" }, import_utils.locales.getText("page.eftpos-pay.text.transaction.end")) : null) : null,
     data.eftpos === "tyro" ? /* @__PURE__ */ import_react.default.createElement(import_manufacturer.Tyro, { api, onChange, key: data.key, url: tyroUrl, version: tyroVersion }) : null,
     data.eftpos === "windcave" ? /* @__PURE__ */ import_react.default.createElement(
       import_manufacturer.Windcave,
@@ -175,7 +176,7 @@ var Pay = ({
       onChange,
       api,
       className,
-      isIpad,
+      isMobile,
       formatAmount
     }
   ) : null);

package/lib/components/eftposPay/payo/config.d.ts

@@ -8,4 +8,6 @@ export declare const POS: ({ api, onChange, }: {
         [keys: string]: unknown;
     } | undefined) => void;
 }) => React.JSX.Element;
-export declare const Action: () => React.JSX.Element;
+export declare const Action: ({ onChange }: {
+    onChange: any;
+}) => React.JSX.Element;

package/lib/components/eftposPay/payo/config.js

@@ -60,7 +60,7 @@ var POS = ({
   } = (0, import_hooks.useStoreRef)();
   const dispatch = (0, import_store.useDispatch)();
   const { key, ...props } = steps[0];
-  const fail = (0, import_hooks.useFail)(0, true);
+  const fail = (0, import_hooks.useFail)(0);
   const failRef = (0, import_react.useRef)(fail);
   const controllerRef = (0, import_react.useRef)();
   const clearRef = (0, import_react.useRef)();
@@ -110,13 +110,13 @@ var POS = ({
           success(res);
           return;
         }
-        failRef.current(res);
+        failRef.current(res, true);
       },
       (res) => {
         if (unloadRef.current || !netRef.current) {
           return;
         }
-        failRef.current(res);
+        failRef.current(res, true);
       }
     );
   };
@@ -183,7 +183,7 @@ var POS = ({
         checkApi();
         return;
       }
-      failRef.current(err);
+      failRef.current(err, true);
     });
   }, [api, check, dispatch, onChange]);
   (0, import_react.useEffect)(
@@ -199,9 +199,9 @@ var POS = ({
   );
   return /* @__PURE__ */ import_react.default.createElement(import_step.default, { ...props });
 };
-var Action = () => {
+var Action = ({ onChange }) => {
   const dispatch = (0, import_store.useDispatch)();
-  const { mode } = (0, import_store.useContextData)();
+  const { mode, client } = (0, import_store.useContextData)();
   const onManually = () => {
     dispatch(
       (0, import_store.updateState)({
@@ -213,7 +213,7 @@ var Action = () => {
     );
     dispatch((0, import_store.updateComponent)("Manual", true));
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item-btns" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item-btns" }, client === import_const.ClientEnum.Merchant ? /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
       block: true,
@@ -221,7 +221,7 @@ var Action = () => {
       onClick: onManually
     },
     import_utils.locales.getText("page.eftpos-pay.text.manual.marking")
-  ));
+  ) : null);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/components/eftposPay/payo/const.js

@@ -50,6 +50,7 @@ var const_default = (params) => {
     pay,
     device,
     net,
+    client,
     ...other
   } = params || {
     mode: import_const.ModeEnum.Pay
@@ -70,6 +71,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
+    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

package/lib/components/eftposPay/payo/index.js

@@ -59,5 +59,5 @@ var payo_default = ({
         }
       );
     }
-  }), children), data.status !== import_const.StatusEnum.Success ? /* @__PURE__ */ import_react.default.createElement(import_config.Action, null) : null);
+  }), children), data.status !== import_const.StatusEnum.Success ? /* @__PURE__ */ import_react.default.createElement(import_config.Action, { onChange }) : null);
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { DeviceStatusType, StatusType, ModeType, RouteType } from '../const';
+import { DeviceStatusType, StatusType, ModeType, RouteType, ClientEnum } from '../const';
 import { ThunkDispatch } from './useThunkReducer';
 export declare enum EActionTypes {
     UPDATE_INIT = "UPDATE_INIT",
@@ -16,7 +16,8 @@ export declare enum EActionTypes {
     UPDATE_STEP_CURRENT_ITEM_CUSTOM = "UPDATE_STEP_CURRENT_ITEM_CUSTOM",
     UPDATE_STEP_ITEM = "UPDATE_STEP_ITEM",
     BACKUP_PRODUCTION = "BACKUP_PRODUCTION",
-    BACKUP_FREE = "BACKUP_FREE"
+    BACKUP_FREE = "BACKUP_FREE",
+    UPDATE_CLIENT = "UPDATE_CLIENT"
 }
 export declare type State = {
     /** 支付名称 */
@@ -89,6 +90,7 @@ export declare type State = {
         money?: number;
     };
     backup?: Omit<State, 'backup'>;
+    client: ClientEnum;
 };
 export declare type Action = {
     type: EActionTypes;
@@ -258,6 +260,18 @@ export declare const updateCurrentStemItem: (payload: any) => {
     type: EActionTypes;
     payload: any;
 };
+/**
+ * @title: 更新当前步骤信息
+ * @description: 更新当前步骤信息
+ * @Author: hongbing.wang
+ * @Date: 2024-08-19 10:09
+ */
+export declare const updateClient: (payload: ClientEnum) => {
+    type: EActionTypes;
+    payload: {
+        client: ClientEnum;
+    };
+};
 /**
  * @title: 更新备份信息
  * @description: 更新备份信息
@@ -329,6 +343,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
             money?: number | undefined;
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
+        client?: ClientEnum | undefined;
     };
 };
 export declare function reducers(state: State, action: Action): State;

package/lib/components/eftposPay/store/index.js

@@ -34,6 +34,7 @@ __export(store_exports, {
   backUpFree: () => backUpFree,
   backUpProduction: () => backUpProduction,
   reducers: () => reducers,
+  updateClient: () => updateClient,
   updateComponent: () => updateComponent,
   updateCurrentCustomStemItem: () => updateCurrentCustomStemItem,
   updateCurrentStemItem: () => updateCurrentStemItem,
@@ -69,6 +70,7 @@ var EActionTypes = /* @__PURE__ */ ((EActionTypes2) => {
   EActionTypes2["UPDATE_STEP_ITEM"] = "UPDATE_STEP_ITEM";
   EActionTypes2["BACKUP_PRODUCTION"] = "BACKUP_PRODUCTION";
   EActionTypes2["BACKUP_FREE"] = "BACKUP_FREE";
+  EActionTypes2["UPDATE_CLIENT"] = "UPDATE_CLIENT";
   return EActionTypes2;
 })(EActionTypes || {});
 var updateKey = (key) => ({
@@ -124,6 +126,12 @@ var updateCurrentStemItem = (payload) => ({
   type: "UPDATE_STEP_ITEM" /* UPDATE_STEP_ITEM */,
   payload
 });
+var updateClient = (payload) => ({
+  type: "UPDATE_CLIENT" /* UPDATE_CLIENT */,
+  payload: {
+    client: payload
+  }
+});
 var backUpProduction = (payload) => ({
   type: "BACKUP_PRODUCTION" /* BACKUP_PRODUCTION */,
   payload
@@ -260,6 +268,11 @@ function reducers(state, action) {
         ...s,
         ...action.payload
       };
+    case "UPDATE_CLIENT" /* UPDATE_CLIENT */:
+      return {
+        ...state,
+        client: action.payload["client"]
+      };
     default: {
       throw new Error(`Unhandled action type: ${action.type}`);
     }
@@ -296,6 +309,7 @@ function useDispatch() {
   backUpFree,
   backUpProduction,
   reducers,
+  updateClient,
   updateComponent,
   updateCurrentCustomStemItem,
   updateCurrentStemItem,

package/lib/components/eftposPay/tyro/const.js

@@ -36,6 +36,7 @@ var const_default = (params) => {
     pay,
     device,
     net,
+    client,
     ...other
   } = params || {
     mode: import_const.ModeEnum.Pay
@@ -56,6 +57,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: [],
     render: true,
+    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
     custom: other || {},
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

package/lib/components/eftposPay/tyro/index.js

@@ -50,7 +50,7 @@ var tyro_default = ({
   url,
   version
 }) => {
-  const { eftpos, custom, mode, status: payStatus } = (0, import_store.useContextData)();
+  const { eftpos, custom, mode, status: payStatus, client } = (0, import_store.useContextData)();
   const dispatch = (0, import_store.useDispatch)();
   const [status, setStatus] = (0, import_react.useState)(-1);
   const [isManually, setManually] = (0, import_react.useState)(false);
@@ -61,11 +61,15 @@ var tyro_default = ({
   const requestParams = (0, import_react.useRef)(custom == null ? void 0 : custom.requestParams);
   const listRef = (0, import_react.useRef)((custom == null ? void 0 : custom.list) || []);
   const iClientRef = (0, import_react.useRef)();
+  const requestIdRef = (0, import_react.useRef)((custom == null ? void 0 : custom.requestId) || "");
   const unloadRef = (0, import_react.useRef)(false);
   const clearRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
     listRef.current = (custom == null ? void 0 : custom.list) || [];
   }, [custom == null ? void 0 : custom.list]);
+  (0, import_react.useEffect)(() => {
+    requestIdRef.current = (custom == null ? void 0 : custom.requestId) || "";
+  }, [custom == null ? void 0 : custom.requestId]);
   (0, import_react.useEffect)(() => {
     requestParams.current = custom == null ? void 0 : custom.requestParams;
   }, [custom == null ? void 0 : custom.requestParams]);
@@ -92,7 +96,7 @@ var tyro_default = ({
     );
   };
   const refundOrder = () => {
-    var _a, _b;
+    var _a, _b, _c;
     const iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -124,6 +128,27 @@ var tyro_default = ({
     );
     setStatus(Date.now());
     merchantReceiptRef.current = {};
+    api.addTransaction({
+      order_id: orderIdRef.current,
+      number: numRef.current,
+      card_reader_id: (_c = deviceRef.current) == null ? void 0 : _c.id,
+      card_reader_type: eftpos,
+      amount: requestParams.current.amount,
+      action: modeRef.current === import_const.ModeEnum.FullPay ? import_const.ModeEnum.Pay : modeRef.current,
+      status: "pending",
+      request: requestParams.current,
+      response: {},
+      metadata: {
+        receipt: []
+      }
+    }).then((res) => {
+      requestIdRef.current = res.data.id;
+      dispatch(
+        (0, import_store.updateCustom)({
+          requestId: res.data.id
+        })
+      );
+    });
     iClient.initiateRefund(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -132,7 +157,7 @@ var tyro_default = ({
     });
   };
   const payOrder = () => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const iClient = iClientRef.current;
     if (!iClient) {
       return;
@@ -170,6 +195,27 @@ var tyro_default = ({
     );
     setStatus(Date.now());
     merchantReceiptRef.current = {};
+    api.addTransaction({
+      order_id: orderIdRef.current,
+      number: numRef.current,
+      card_reader_id: (_h = deviceRef.current) == null ? void 0 : _h.id,
+      card_reader_type: eftpos,
+      amount: requestParams.current.amount,
+      action: modeRef.current === import_const.ModeEnum.FullPay ? import_const.ModeEnum.Pay : modeRef.current,
+      status: "pending",
+      request: requestParams.current,
+      response: {},
+      metadata: {
+        receipt: []
+      }
+    }).then((res) => {
+      requestIdRef.current = res.data.id;
+      dispatch(
+        (0, import_store.updateCustom)({
+          requestId: res.data.id
+        })
+      );
+    });
     iClient.initiatePurchase(requestParams.current, {
       receiptCallback: receiptCallbackImpl,
       transactionCompleteCallback: transactionCompleteCallbackImpl,
@@ -302,15 +348,15 @@ var tyro_default = ({
       // merchantReceiptRef.current?.merchantReceipt,
       response == null ? void 0 : response.customerReceipt
     ].filter((item) => typeof item === "string").filter(Boolean);
-    api.addTransaction({
+    api.editTransaction(requestIdRef.current, {
       order_id: orderIdRef.current,
       number: numRef.current,
       card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
       action: modeRef.current === import_const.ModeEnum.FullPay ? import_const.ModeEnum.Pay : modeRef.current,
-      status: response.result === "APPROVED" ? "succeed" : "failed",
       request: requestParams.current,
+      status: response.result === "APPROVED" ? "succeed" : "failed",
       response: { ...response, merchantReceipt: merchantReceiptRef.current },
       metadata: {
         receipt
@@ -418,6 +464,9 @@ var tyro_default = ({
       }
     }
   }, [load]);
+  const onNotin = () => {
+    onChange("print", [], "print_on_timeout");
+  };
   (0, import_react.useEffect)(() => {
     let clear;
     if (status === -1) {
@@ -532,7 +581,7 @@ var tyro_default = ({
       reject: item.reject,
       status: item.status
     }
-  ))), isManually ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item-btns" }, /* @__PURE__ */ import_react.default.createElement(
+  ))), isManually ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-step-item-btns" }, client === import_const.ClientEnum.Merchant ? /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
       block: true,
@@ -540,6 +589,14 @@ var tyro_default = ({
       onClick: onManually
     },
     import_utils.locales.getText("page.eftpos-pay.text.manual.marking")
+  ) : /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Button,
+    {
+      block: true,
+      className: "pisell-lowcode__eft-pay-step-item-btn",
+      onClick: onNotin
+    },
+    import_utils.locales.getText("page.eftpos-pay.text.manual.print_receipt")
   )) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/eftposPay/windcave/const.js

@@ -39,6 +39,7 @@ var const_default = (params) => {
     pay,
     device,
     net,
+    client,
     ...other
   } = params || {
     mode: import_const.ModeEnum.Pay
@@ -59,6 +60,7 @@ var const_default = (params) => {
     status: import_const.StatusEnum.Loading,
     steps: [],
     render: true,
+    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
     custom: other ? { ...other, list: [], step: 1 /* Free */ } : { list: [], step: 1 /* Free */ },
     ...typeof net !== "undefined" ? { net } : {},
     ...typeof number !== "undefined" ? { number } : {},

package/lib/components/eftposPay/windcave/helper.js

@@ -44,7 +44,7 @@ var Max4004 = 1;
 var useFail = () => {
   const dispatch = (0, import_store.useDispatch)();
   const { custom } = (0, import_store.useContextData)();
-  const { modeRef } = (0, import_hooks.useStoreRef)();
+  const { modeRef, clientRef } = (0, import_hooks.useStoreRef)();
   const ref = (0, import_react.useRef)((custom == null ? void 0 : custom.retry) || 0);
   (0, import_react.useEffect)(() => {
     ref.current = (custom == null ? void 0 : custom.retry) || 0;
@@ -135,6 +135,23 @@ var useFail = () => {
       }
       if (code === import_const.PayStatus.Timeout) {
         if (isMark) {
+          if (clientRef.current === import_const.ClientEnum.User) {
+            dispatch(
+              (0, import_store.updateCustom)({
+                failCustom: {
+                  isPosNetworkError: true,
+                  status: "warn",
+                  fail: null,
+                  title: import_utils.locales.getText("page.eftpos-pay.text.timedout.title"),
+                  warn: import_utils.locales.getText(
+                    "page.eftpos-pay.text.transaction.eftpos.fail.other"
+                  )
+                }
+              })
+            );
+            dispatch((0, import_store.updateComponent)("FailCustom"));
+            return;
+          }
           dispatch(
             (0, import_store.updateState)({
               manual: {
@@ -211,7 +228,7 @@ var useFail = () => {
               status: "warn",
               fail: null,
               title: import_utils.locales.getText("page.eftpos-pay.text.interrupted"),
-              warn: `${import_utils.locales.getText(
+              warn: clientRef.current === import_const.ClientEnum.Merchant ? `${import_utils.locales.getText(
                 "page.eftpos-pay.text.transaction.eftpos.fail.title"
               )}
 ${import_utils.locales.getText(
@@ -225,31 +242,9 @@ ${import_utils.locales.getText(
               )}
 ${import_utils.locales.getText(
                 "page.eftpos-pay.text.transaction.eftpos.fail.if"
-              )(modeRef.current)}
-              `
-              // warn: (
-              //   <>
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.title'
-              //     )}
-              //     <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.power'
-              //     )}
-              //     . <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.device'
-              //     )}
-              //     <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.network'
-              //     )}
-              //     <br />
-              //     {locales.getText(
-              //       'page.eftpos-pay.text.transaction.eftpos.fail.if'
-              //     )(modeRef.current)}
-              //   </>
-              // ),
+              )(modeRef.current)}` : import_utils.locales.getText(
+                "page.eftpos-pay.text.transaction.eftpos.fail.other"
+              )
             }
           })
         );
@@ -331,7 +326,7 @@ var useValidate = (check, num, onChange) => {
   const failRef = (0, import_react.useRef)(fail);
   const ref = (0, import_react.useRef)();
   const { custom } = (0, import_store.useContextData)();
-  const { netRef, payRef, numRef, modeRef } = (0, import_hooks.useStoreRef)();
+  const { netRef, payRef, numRef, modeRef, clientRef } = (0, import_hooks.useStoreRef)();
   const stepRef = (0, import_react.useRef)(custom == null ? void 0 : custom.step);
   const listRef = (0, import_react.useRef)(custom == null ? void 0 : custom.list);
   (0, import_react.useEffect)(() => {

package/lib/components/eftposPay/windcave/windcave.js

@@ -59,7 +59,8 @@ var windcave_default = ({
     netRef,
     symbolRef,
     amountRef,
-    eftposRef
+    eftposRef,
+    clientRef
   } = (0, import_hooks.useStoreRef)();
   const dispatch = (0, import_store.useDispatch)();
   const fail = (0, import_helper2.useFail)();

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -134,6 +134,9 @@ var checkEnrollment = async (orderId, cardInfo, callback) => {
       ...cardInfo
     });
     (0, import_payGroup.setPayNumber)(orderId, data == null ? void 0 : data.pay_number);
+    if (!(data == null ? void 0 : data.pay_info)) {
+      return null;
+    }
     return data;
   } catch (err) {
     log({

package/lib/components/pisellSelectCustomerModal/RightPanel/index.js

@@ -87,13 +87,15 @@ var RightPanel = (props) => {
   const header = (0, import_react.useMemo)(() => {
     if (page === "list") {
       return /* @__PURE__ */ import_react.default.createElement("div", { className: "select-customer-right-panel-header" }, /* @__PURE__ */ import_react.default.createElement("span", null, phone ? import_utils2.locales.getText("pisell2.text.result-found") : import_utils2.locales.getText("pisell2.text.personnel-list")), /* @__PURE__ */ import_react.default.createElement(
-        import_PlusCircle.default,
+        "span",
         {
-          className: "select-customer-right-panel-header-icon",
+          className: "select-customer-right-panel-header-create-btn",
           onClick: () => {
             setPage("create");
           }
-        }
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "select-customer-right-panel-header-icon" }),
+        import_utils2.locales.getText("pisell2.text.create")
       ));
     }
     return /* @__PURE__ */ import_react.default.createElement(

package/lib/components/pisellSelectCustomerModal/RightPanel/index.less

@@ -25,6 +25,13 @@
       justify-content: flex-start;
     }
 
+    .select-customer-right-panel-header-create-btn {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+    }
+
     .select-customer-right-panel-header-icon {
       display: flex;
       align-items: center;

package/lib/components/pisellSelectCustomerModal/index.js

@@ -154,6 +154,9 @@ var PisellSelectCustomerModal = (props) => {
     document.body.id = "body";
   }, []);
   const adjustFontSize = (0, import_react.useMemo)(() => {
+    if (!phone) {
+      return 30;
+    }
     const maxFontSize = 60;
     const minFontSize = 10;
     const defaultFontSize = maxFontSize;
@@ -197,10 +200,14 @@ var PisellSelectCustomerModal = (props) => {
             onChange: (e) => {
               setPhone(e.target.value);
             },
+            placeholder: import_utils.locales.getText(
+              "pisell2.text.search-customer-by-phone-number"
+            ),
             style: {
               textAlign: "left",
               fontSize: adjustFontSize
             },
+            className: "pisell-select-customer-modal-input",
             ...virtualKeyInputProps
           },
           rightPanel: /* @__PURE__ */ import_react.default.createElement(import_RightPanel.default, { value: _value, phone, onChange: _onChange }),