@pisell/private-materials 3.3.89 → 3.3.91

package/lib/components/appointmentBooking/components/Services/index.js

@@ -74,7 +74,9 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     let type = "";
     if (!isRetailTemplate) {
       type = await checkProductType(item == null ? void 0 : item.id);
-      appointmentBooking.openProductDetail(item.id);
+      if (type === "session") {
+        appointmentBooking.openProductDetail(item.id);
+      }
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
@@ -84,10 +86,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       },
       callback: async (data) => {
         var _a, _b;
-        if (data.isCancel) {
-          appointmentBooking.closeProductDetail();
-          return;
-        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -98,6 +96,13 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
           appointmentBooking.storeProduct(product);
           return;
         }
+        if (data == null ? void 0 : data.isCancel) {
+          if (type === "session") {
+            appointmentBooking.closeProductDetail();
+            appointmentBooking.getAvailableDate();
+          }
+          return;
+        }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
@@ -109,6 +114,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
+          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -126,7 +132,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             await appointmentBooking.getAvailableDate();
           }
         }
-        appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
           if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -36,6 +36,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
+var import_context = require("../../../context");
 var import_index = require("./index.less");
 var DepositModal = (props) => {
   const {
@@ -44,10 +45,9 @@ var DepositModal = (props) => {
     item,
     onChange,
     onConfirm,
-    isHideCheckout = true,
-    depositProtocolRequest
-    // 定金协议请求
+    isHideCheckout = true
   } = props;
+  const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const [policy, setPolicy] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [disabled, setDisabled] = (0, import_react.useState)(false);
@@ -55,13 +55,9 @@ var DepositModal = (props) => {
     setDisabled(!isHideCheckout);
   }, [isHideCheckout]);
   const getPolicy = async (id) => {
-    if (!depositProtocolRequest) {
-      console.error("depositProtocolRequest is not defined");
-      return;
-    }
     setLoading(true);
     try {
-      const { data } = await (depositProtocolRequest == null ? void 0 : depositProtocolRequest(id));
+      const { data } = await appointmentBooking.getProtocol(id);
       setPolicy(data);
       onChange && onChange(data);
     } catch (error) {

package/lib/components/appointmentBooking/deposit/index.js

@@ -48,8 +48,7 @@ var Deposit = (props) => {
     title,
     isAgreePolicy = true,
     isShowTitle = true,
-    onChange,
-    depositProtocolRequest
+    onChange
   } = props;
   const context = (0, import_useEngineContext.default)();
   const [visible, setVisible] = (0, import_react.useState)(false);
@@ -103,8 +102,7 @@ var Deposit = (props) => {
     {
       open: visible,
       onCancel: () => setVisible(false),
-      item: policyItem,
-      depositProtocolRequest
+      item: policyItem
     }
   ));
 };

package/lib/components/appointmentBooking/index.js

@@ -58,17 +58,6 @@ var AppointmentBooking = () => {
       }
     });
   }, []);
-  (0, import_react.useEffect)(() => {
-    const setRealVH = () => {
-      const vh = window.innerHeight * 0.01;
-      document.documentElement.style.setProperty("--vh", `${vh}px`);
-    };
-    setRealVH();
-    window.addEventListener("resize", setRealVH);
-    return () => {
-      window.removeEventListener("resize", setRealVH);
-    };
-  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: calc(var(--vh, 1vh) * 100);
+  height: 100vh;
   overflow-y: auto;
 
   .pisell-section-headers {

package/lib/components/booking/components/footer/utils.d.ts

@@ -27,7 +27,6 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
-export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
 /**
  * @title: 格式化商品单价
  * @description:

package/lib/components/booking/components/footer/utils.js

@@ -30,7 +30,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkHolderIsError: () => checkHolderIsError,
-  checkResourcesFormat: () => checkResourcesFormat,
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
@@ -474,7 +473,6 @@ var checkHolderIsError = (state) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkHolderIsError,
-  checkResourcesFormat,
   checkSubResourcesCapacity,
   formatProductBundle,
   formatProductOption,

package/lib/components/booking/components/voucher/index.js

@@ -41,8 +41,8 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_materials = require("@pisell/materials");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_index = require("./index.less");
-var import_ahooks = require("ahooks");
 var import_utils2 = require("./utils");
+var import_ahooks = require("ahooks");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -274,8 +274,8 @@ var VoucherCard = (props) => {
       import_materials.PisellGoodPassCard,
       {
         style: { width: "100%" },
-        dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         mixedSort,
+        dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         onChange: (val) => {
           const shopDiscount2 = pisellos.getModule("shopDiscount");
           const detail = shopDiscount2.setDiscountSelected({

package/lib/components/booking/info/service2/utils.d.ts

@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/components/booking/info/service2/utils.js

@@ -422,7 +422,7 @@ var getErrorMessageInfo2 = (errorList) => {
 };
 var getAllErrorList = (item) => {
   const { resourceMaps } = item._data || {};
-  const { resource = {} } = item._extend || {};
+  const { resource } = item._extend || {};
   const errorList = [];
   Object.entries(resource).forEach(([key, value]) => {
     value.forEach((val) => {
@@ -437,7 +437,7 @@ var getAllErrorList = (item) => {
 var mapListItems = (items) => items.map((item) => ({
   id: item.id || item.form_record_id,
   label: item.labelText,
-  isError: !item.usable || item.unbound
+  isError: !item.usable
 }));
 var getIsSubjectRequire = (state) => {
   var _a, _b, _c, _d, _e, _f, _g;

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -69,16 +69,6 @@ export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
  * @Date: 2024-09-19 20:26
  */
 export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any;
-/**
- * @title: 将商品内关联的资源id还原成数据
- * @description:
- * @param {any} resourcesOriginMap
- * @param {any} cacheItem
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-09-19 20:23
- */
-export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
 /**
  * @title: 预生成服务的 extend
  * @description:

package/lib/components/booking/info2/service/addService/utils.js

@@ -33,7 +33,6 @@ __export(utils_exports, {
   getDurationProps: () => getDurationProps,
   getFlexibleOption: () => getFlexibleOption,
   getProductExtend: () => getProductExtend,
-  getResourceByIds: () => getResourceByIds,
   getTimeObj: () => getTimeObj,
   getTimeSlices: () => getTimeSlices,
   getUsableTime: () => getUsableTime,
@@ -178,12 +177,8 @@ var formatResources = ({ cacheItem, resourcesOrigin, id }) => {
       let _item = (0, import_lodash.cloneDeep)(item);
       _item.renderList = _item.renderList.map((d) => {
         let res = (0, import_utilsByBooking.formatResource)(d, _cacheItem, (newData) => {
-          let unbound = !item.optional_resource.includes(newData.id) && !item.default_resource.includes(newData.id) && newData.id !== 0;
-          return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "resource-option-label-text" }, newData.labelText), (!newData.usable || unbound) && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
+          return /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-option" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "like-wrap" }), newData.labelText, !newData.usable && /* @__PURE__ */ import_react.default.createElement(import_AlertTriangle.default, { className: "resource-option-alert-icon" }));
         });
-        if (!item.optional_resource.includes(d.id) && !item.default_resource.includes(d.id) && d.id !== 0) {
-          res.unbound = true;
-        }
         renderListMaps[res.id] = res;
         return res;
       }).sort((a, b) => b.usable ? 1 : -1);
@@ -285,17 +280,12 @@ var setDefaultCapacitys = ({ capacitys, cacheItem }) => {
   }
   return [{ id: 0, value: 1, name: "" }];
 };
-var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
+var getResourceByIds = (resourcesOriginMap, cacheItem) => {
   var _a;
   let _resources = [...((_a = cacheItem == null ? void 0 : cacheItem.product_resource) == null ? void 0 : _a.resources) || []];
-  const { extraResources = [] } = extraParams || {};
   _resources = _resources.filter((d) => d.status == 1);
   for (let item of _resources) {
     const form_id = item.id;
-    let extraResourceIds = extraResources.filter((_extraItem) => {
-      return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
-    }).map((_extraItem) => _extraItem.id);
-    extraResourceIds = Array.from(new Set(extraResourceIds));
     item.optional_resource = (item.optional_resource || []).filter(
       (d) => item.default_resource.indexOf(d) == -1
     );
@@ -318,7 +308,7 @@ var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
         }
       };
     };
-    let optional_resource = [...item.optional_resource, ...extraResourceIds].map((d) => {
+    let optional_resource = item.optional_resource.map((d) => {
       if (!resourcesOriginMap[d]) {
         return null;
       }
@@ -427,21 +417,9 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
-      const extraResources = [];
-      if (Array.isArray(_cacheItem._extend.event_resources)) {
-        _cacheItem._extend.event_resources.forEach((_item) => {
-          extraResources.push({
-            form_id: _item.form_id,
-            id: _item.relation_id
-          });
-        });
-      }
       _cacheItem._data.resourcesOrigin = getResourceByIds(
         resourcesOriginMap,
-        cacheItem,
-        {
-          extraResources
-        }
+        cacheItem
       );
     }
     if (!_cacheItem._data.resources) {
@@ -480,7 +458,6 @@ var transServiceList = (list) => {
   getDurationProps,
   getFlexibleOption,
   getProductExtend,
-  getResourceByIds,
   getTimeObj,
   getTimeSlices,
   getUsableTime,

package/lib/components/booking/info2/service/editService/Resources/index.js

@@ -43,20 +43,7 @@ var import_lodash = require("lodash");
 var import_utils2 = require("../utils");
 var import_ahooks = require("ahooks");
 var import_icons = require("@ant-design/icons");
-var Resources = ({
-  state,
-  cacheItem,
-  getCurrentCacheItem,
-  onChange,
-  value,
-  config = {
-    // 是否显示自动分配
-    autoAllocation: true,
-    // 是否显示资源错误图标
-    resourceErrorIcon: true,
-    disabled: false
-  }
-}, ref) => {
+var Resources = ({ state, cacheItem, getCurrentCacheItem, onChange, value }, ref) => {
   var _a, _b;
   const [showError, setShowError] = (0, import_react.useState)(false);
   const update = (0, import_ahooks.useUpdate)();
@@ -147,7 +134,7 @@ var Resources = ({
         );
       });
     },
-    [config == null ? void 0 : config.resourceErrorIcon]
+    []
   );
   const check = () => {
     var _a2;
@@ -179,7 +166,6 @@ var Resources = ({
       {
         label: item.title,
         required: true,
-        labelCol: config == null ? void 0 : config.labelCol,
         extra: showError && item.select_type.min > (cur == null ? void 0 : cur.length) ? /* @__PURE__ */ import_react.default.createElement("span", { style: { color: "#ff4d4f" } }, import_utils.locales.getText(
           "page.booking.text.resource.min-length-error"
         )(item.select_type.min, item.title)) : void 0
@@ -187,12 +173,9 @@ var Resources = ({
       /* @__PURE__ */ import_react.default.createElement("div", { className: "resource-col" }, item.select_type.type === "multiple" ? null : /* @__PURE__ */ import_react.default.createElement(
         import_antd.Button,
         {
-          className: `resource-col-like-wrap ${(config == null ? void 0 : config.disabled) ? "resource-col-like-wrap-disabled" : ""}`,
+          className: "resource-col-like-wrap",
           onClick: () => {
             var _a3;
-            if (config == null ? void 0 : config.disabled) {
-              return;
-            }
             setLikeStatus(
               ((_a3 = cur == null ? void 0 : cur[0]) == null ? void 0 : _a3.like_status) === "like" ? "common" : "like",
               item.form_id,
@@ -200,13 +183,7 @@ var Resources = ({
             );
           }
         },
-        /* @__PURE__ */ import_react.default.createElement(
-          import_like.default,
-          {
-            status: (_a2 = cur == null ? void 0 : cur[0]) == null ? void 0 : _a2.like_status,
-            className: `${(config == null ? void 0 : config.disabled) ? "like-icon-disabled" : ""}`
-          }
-        )
+        /* @__PURE__ */ import_react.default.createElement(import_like.default, { status: (_a2 = cur == null ? void 0 : cur[0]) == null ? void 0 : _a2.like_status })
       ), /* @__PURE__ */ import_react.default.createElement(
         import_MaxLengthSelect.default,
         {
@@ -227,35 +204,14 @@ var Resources = ({
           showSearch: true,
           filterOption: (str, option) => {
             return ((option == null ? void 0 : option.labelText) || "").toLowerCase().includes((str || "").toLowerCase());
-          },
-          disabled: config == null ? void 0 : config.disabled
-        },
-        renderOptions(
-          item.renderList,
-          "id",
-          (config == null ? void 0 : config.resourceErrorIcon) ? "label" : "labelText",
-          "resource"
-        )
-      ), (config == null ? void 0 : config.autoAllocation) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Checkbox,
-        {
-          checked: getIsAutoAllocation(item.form_id),
-          onChange: (e) => {
-            handleCheckAutoAllocation(
-              item.form_id,
-              e.target.checked
-            );
           }
-        }
-      ), /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Tooltip,
-        {
-          title: import_utils.locales.getText(
-            "page.booking.text.resource.check-auto-allocation-tip"
-          )
         },
-        /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, null)
-      )) : null)
+        renderOptions(item.renderList, "id", "label", "resource")
+      ), /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { checked: getIsAutoAllocation(item.form_id), onChange: (e) => {
+        handleCheckAutoAllocation(item.form_id, e.target.checked);
+      } }), /* @__PURE__ */ import_react.default.createElement(import_antd.Tooltip, { title: import_utils.locales.getText(
+        "page.booking.text.resource.check-auto-allocation-tip"
+      ) }, /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, null)))
     ), state.renderType !== "eventBooking" && (errors || []).map((d) => {
       return /* @__PURE__ */ import_react.default.createElement(
         import_antd.Alert,

package/lib/components/booking/info2/service/editService/Resources/index.less

@@ -15,12 +15,6 @@
     .like-resource {}
   }
 
-  .resource-col-like-wrap-disabled,
-  .like-icon-disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
-
   .resource-col-select {
     flex: 1;
   }

package/lib/components/booking/info2/utilsByBooking.js

@@ -180,12 +180,6 @@ var getErrorList = (resource, cacheItem) => {
       }
     }
   }
-  if (resource.unbound) {
-    list.push({
-      label: import_utils.locales.getText("pisell1.text.resource-error-message-unbound"),
-      type: "time"
-    });
-  }
   return list;
 };
 var formatResource = (resourceItem, cacheItem, formatLabel) => {

package/lib/components/booking/locales.d.ts

@@ -110,7 +110,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell1.text.no-addons': string;
         'pisell1.text.no-resource': string;
         'pisell1.text.no-payments': string;
@@ -390,7 +389,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -662,7 +660,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;

package/lib/components/booking/locales.js

@@ -154,7 +154,6 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} doesn't provide ${y}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x} isn't available between ${y} and ${z}, but your team member can still book appointments.`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x} is fully booked between ${y} and ${z}, but your team member can still book appointments.`,
-    "pisell1.text.resource-error-message-unbound": "This booking product is not associated with the target resource.",
     "pisell1.text.no-addons": "No addons",
     "pisell1.text.no-resource": "No resource",
     "pisell1.text.no-payments": "No payments",
@@ -466,7 +465,6 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之间不提供服务，但您的团队成员仍然可以预约。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之间已约满，但您的团队成员仍然可以预约。`,
-    "pisell1.text.resource-error-message-unbound": "该预约商品未关联目标资源。",
     "pisell2.text.flexible": "灵活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",
@@ -770,7 +768,6 @@ var locales_default = {
     "pisell1.text.resource-error-message-1": (x, y) => `${x} 不提供 ${y}，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-2": (x, y, z) => `${x}在${y}到${z}之間不提供服務，但您的團隊成員仍然可以預約。`,
     "pisell1.text.resource-error-message-3": (x, y, z) => `${x}在${y}到${z}之間已約滿，但您的團隊成員仍然可以預約。`,
-    "pisell1.text.resource-error-message-unbound": "該預約商品未關聯目標資源。",
     "pisell2.text.flexible": "靈活",
     "pisell2.text.order-discount": "折扣",
     "pisell2.text.no-product-added": "未添加商品",

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

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -5,8 +5,7 @@ export declare enum EftposEnum {
     Tyro = "tyro",
     /** 后端支付 - 支付 + 退款  */
     Windcave = "windcave",
-    Stripe = "stripe",
-    Linkly = "linkly"
+    Stripe = "stripe"
 }
 export declare enum StatusEnum {
     Loading = "loading",
@@ -148,8 +147,6 @@ export declare enum PayStatus {
     'Success' = "200",
     /** 未生成交易记录 */
     'NoPay' = "4004",
-    /** 配对失效 */
-    'PairingFailure' = "606020",
     /** 支付失败 */
     'Unknown' = "701000",
     /** 交易请求超时 */

package/lib/components/eftposPay/const.js

@@ -35,7 +35,6 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
   EftposEnum2["Tyro"] = "tyro";
   EftposEnum2["Windcave"] = "windcave";
   EftposEnum2["Stripe"] = "stripe";
-  EftposEnum2["Linkly"] = "linkly";
   return EftposEnum2;
 })(EftposEnum || {});
 var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
@@ -89,7 +88,6 @@ var PayRouteEnum = /* @__PURE__ */ ((PayRouteEnum2) => {
 var PayStatus = /* @__PURE__ */ ((PayStatus2) => {
   PayStatus2["Success"] = "200";
   PayStatus2["NoPay"] = "4004";
-  PayStatus2["PairingFailure"] = "606020";
   PayStatus2["Unknown"] = "701000";
   PayStatus2["Timeout"] = "701001";
   PayStatus2["PayOtherEftposFailed"] = "701003";

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

@@ -10,7 +10,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/hooks.js

@@ -128,7 +128,6 @@ var useFail = (index) => {
         return;
       }
       const [code] = [`${res.code}`];
-      console.log("code---->>>>>>>", code);
       if (code === import_const.PayStatus.Unknown) {
         steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.failed")(
           modeRef.current
@@ -169,12 +168,8 @@ var useFail = (index) => {
         if (isMark) {
           if (clientRef.current === import_const2.ClientEnum.User) {
             steps[index].status = "fail";
-            steps[index].title = import_utils.locales.getText(
-              "page.eftpos-pay.text.timedout.title"
-            );
-            steps[index].fail = import_utils.locales.getText(
-              "page.eftpos-pay.text.transaction.eftpos.fail.other"
-            );
+            steps[index].title = import_utils.locales.getText("page.eftpos-pay.text.timedout.title");
+            steps[index].fail = import_utils.locales.getText("page.eftpos-pay.text.transaction.eftpos.fail.other");
             steps[index].custom = steps[index].custom ? { ...steps[index].custom, isPosNetworkError: true } : { isPosNetworkError: true };
             dispatch((0, import_store.updateSteps)(steps));
             dispatch((0, import_store.updateComponent)("Fail"));
@@ -315,9 +310,7 @@ ${import_utils.locales.getText(
         )}
 ${import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.eftpos.fail.if"
-        )(modeRef.current)}` : import_utils.locales.getText(
-          "page.eftpos-pay.text.transaction.eftpos.fail.other"
-        );
+        )(modeRef.current)}` : import_utils.locales.getText("page.eftpos-pay.text.transaction.eftpos.fail.other");
         steps[index].status = "warn";
         steps[index].custom = steps[index].custom ? { ...steps[index].custom, isPosNetworkError: true } : { isPosNetworkError: true };
         dispatch((0, import_store.updateSteps)(steps));
@@ -366,7 +359,7 @@ ${import_utils.locales.getText(
         );
         return;
       }
-      if (code === import_const.PayStatus.UserConfigError || code === import_const.PayStatus.PairingFailure) {
+      if (code === import_const.PayStatus.UserConfigError) {
         steps[index].title = import_utils.locales.getText(
           "page.eftpos-pay.text.transaction.user.config.title"
         );

package/lib/components/eftposPay/index.js

@@ -139,7 +139,7 @@ var eftposPay_default = (props) => {
   }, [mode, state]);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
-    console.log("初始化 ........112218017777");
+    console.log("初始化 ........11221801");
   }, []);
   console.log("props?.params?.device_number = ", (_e = props == null ? void 0 : props.params) == null ? void 0 : _e.device_number);
   const api = (0, import_react.useMemo)(() => {

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

@@ -3,5 +3,4 @@ export { getAmonunt } from './helper';
 export { default as Payo } from './payo';
 export { default as Windcave } from './windcave/windcave';
 export { default as Tyro } from './tyro';
-export { default as Linkly } from './linkly';
 export declare const getInitState: (type: string, params?: any) => State;