@pisell/private-materials 6.2.49 → 6.2.50

package/es/components/walletList/index.js

@@ -30,6 +30,7 @@ import "./index.less";
 import classNames from 'classnames';
 // 导入所有类型
 import { WalletCardItem, DEFAULT_CARD_CONFIG } from "./types";
+import PinModal from "../pinModal";
 
 // 添加 localStorage 相关的操作函数
 var STORAGE_KEY = 'pisell_wallet_list_data';
@@ -176,6 +177,9 @@ var WalletList = Provider(function (props) {
   var requestIdRef = useRef('');
   var pubsub = utils === null || utils === void 0 ? void 0 : utils.pubsub;
 
+  // pinModal的ref
+  var pinModalRef = useRef(null);
+
   //获取登录状态
   var isUserLoggedIn = useMemo(function () {
     var _utils$token, _utils$token$get;
@@ -586,6 +590,14 @@ var WalletList = Provider(function (props) {
       return _ref3.apply(this, arguments);
     };
   }();
+  var _onViewPinClick = function onViewPinClick(card) {
+    if (card !== null && card !== void 0 && card.id) {
+      var _pinModalRef$current;
+      (_pinModalRef$current = pinModalRef.current) === null || _pinModalRef$current === void 0 || _pinModalRef$current.open(card === null || card === void 0 ? void 0 : card.id);
+    } else {
+      console.error('onViewPinClick方法需要传入wallet_detail_id');
+    }
+  };
   var renderWalletCard = function renderWalletCard(item) {
     var _dvaStore$core;
     var code = item.code,
@@ -652,7 +664,11 @@ var WalletList = Provider(function (props) {
     });
     return /*#__PURE__*/React.createElement(WalletCard, _extends({
       key: id
-    }, cardProps));
+    }, cardProps, {
+      onViewPinClick: function onViewPinClick() {
+        return _onViewPinClick(item);
+      }
+    }));
   };
   var carouselProps = {
     className: classNames('pisell-lowcode__walletList'),
@@ -811,7 +827,9 @@ var WalletList = Provider(function (props) {
         fontSize: '24px',
         color: currentIndex === list.length - 1 ? '#D0D5DD' : '#101828'
       }
-    }))));
+    }))), /*#__PURE__*/React.createElement(PinModal, {
+      ref: pinModalRef
+    }));
   };
 
   // 最终返回组件内容

package/es/index.d.ts

@@ -52,3 +52,5 @@ export { default as NoteModal } from './plus/noteModal';
 export { default as SaasLogin } from './plus/saasLogin';
 export { default as SaasRegister } from './plus/saasRegister';
 export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
+export { default as PinModal } from './components/pinModal';
+export { default as PinVerifyModal } from './components/pinVerifyModal';

package/es/index.js

@@ -55,4 +55,6 @@ export { default as ComprehensiveSearch } from "./pro/comprehensiveSearch";
 export { default as NoteModal } from "./plus/noteModal";
 export { default as SaasLogin } from "./plus/saasLogin";
 export { default as SaasRegister } from "./plus/saasRegister";
-export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
+export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
+export { default as PinModal } from "./components/pinModal";
+export { default as PinVerifyModal } from "./components/pinVerifyModal";

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

@@ -43,9 +43,11 @@ var import_utils3 = require("./utils");
 var import_index = require("./index.less");
 var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   var _a, _b;
+  const hasSubscribedRef = (0, import_react.useRef)(false);
   const context = (0, import_useEngineContext.default)();
   const config = ((_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.constants) == null ? void 0 : _b.config) || {};
   const utils = (0, import_hooks.contextUtils)();
+  const { pubsub } = context.appHelper.utils;
   const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading } = (0, import_context.useAppointmentBookingContext)();
   const { isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const goPaymentFinish = (order_id, amount) => {
@@ -141,10 +143,28 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
       }, 50);
     }
   };
+  const handleSubmit = () => {
+    var _a2, _b2, _c, _d;
+    if ((_b2 = (_a2 = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _a2.isGuestUser) == null ? void 0 : _b2.call(_a2)) {
+      if (!hasSubscribedRef.current) {
+        pubsub.subscribe("bind.guest.user", handleNext);
+        hasSubscribedRef.current = true;
+      }
+      (_d = (_c = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _c.openRegisterModal) == null ? void 0 : _d.call(_c, true);
+      return;
+    }
+    handleNext();
+  };
+  (0, import_react.useEffect)(() => {
+    return () => {
+      pubsub.unsubscribe("bind.guest.user", handleNext);
+      hasSubscribedRef.current = false;
+    };
+  }, []);
   (0, import_react.useImperativeHandle)(ref, () => ({
-    next: handleNext
+    next: handleSubmit
   }));
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleNext }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-wrap" }, (0, import_utils.isMobile)() ? /* @__PURE__ */ import_react.default.createElement(import_Item.default, { onNext: handleSubmit }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-confirm-information-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "image" }, /* @__PURE__ */ import_react.default.createElement(
     "img",
     {
       src: `${config == null ? void 0 : config.awsStatic}/checkout_confirm.png`,

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

@@ -84,7 +84,7 @@ var Layout = () => {
   const context = (0, import_useEngineContext.default)();
   const { pubsub } = context.appHelper.utils;
   (0, import_react.useEffect)(() => {
-    const handleLoginSuccess = async () => {
+    const handleLoginSuccess = async (res) => {
       var _a2;
       if (!isFormSubject) {
         const user = JSON.parse(((_a2 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a2.get("customer")) || "{}");
@@ -100,7 +100,7 @@ var Layout = () => {
     };
     pubsub.subscribe("pisell1.login.success", handleLoginSuccess);
     return () => {
-      pubsub.unsubscribe("pisell1.login.success");
+      pubsub.unsubscribe("pisell1.login.success", handleLoginSuccess);
     };
   }, []);
   (0, import_react.useEffect)(() => {

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

@@ -95,20 +95,27 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
         delete product.option;
         if (isRetailTemplate) {
           if (data == null ? void 0 : data.isCancel) return;
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           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");
           const endDate = (0, import_dayjs.default)(session == null ? void 0 : session.end_at).format("YYYY-MM-DD");
-          appointmentBooking.addProductToCart({
+          const res = appointmentBooking.addProductToCart({
             product: { ...product },
             date: {
               startTime: `${startDate} ${session == null ? void 0 : session.start_time}`,
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
+          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -121,7 +128,10 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               import_utils.locales.getText("pisell2.appointment.no.available.service")
             );
           }
-          appointmentBooking.storeProduct(product);
+          const res = appointmentBooking.storeProduct(product);
+          if (!res.success && res.errorCode === "not_enough_stock") {
+            return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.stock"));
+          }
           if (type === "duration") {
             await appointmentBooking.getAvailableDate();
           }

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

@@ -133,7 +133,8 @@ var VoucherCard = (props) => {
     );
   }, []);
   const onScanCode = async () => {
-    const val = await shopDiscount.scanCode(code);
+    const customerId = currentUser.id;
+    const val = await shopDiscount.scanCode(code, customerId);
     if (val == null ? void 0 : val.isAvailable) {
       batchUpdateCart(val.productList);
       setCode("");

package/lib/components/appointmentBooking/hooks.js

@@ -189,6 +189,12 @@ var useAppointmentBookingStep = () => {
       if (!result) {
         return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unuse.date"));
       }
+      const capacityResult = appointmentBooking.checkMaxDurationCapacity();
+      if (!capacityResult.success) {
+        const getMessage = import_utils.locales.getText("pisell2.appointment.unuse.capacity");
+        const message = typeof getMessage === "function" ? getMessage(capacityResult.minAvailableCount) : getMessage;
+        return (0, import_utils2.Toast)(message);
+      }
     }
     if (!isRetailTemplate && (currentKey == null ? void 0 : currentKey.startsWith("select-resource"))) {
       const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)(currentSelectedResources, appointmentBooking, utils);
@@ -266,8 +272,10 @@ var useAppointmentBookingStep = () => {
       const checkLogin = async () => {
         if (!isLogin) {
           const { pubsub } = utils;
-          pubsub.once("pisell1.login.success", () => {
-            checkHolder();
+          pubsub.once("pisell1.login.success", (res) => {
+            if (res === "success") {
+              checkHolder();
+            }
           });
           return openLoginModal({
             callback: (status) => {

package/lib/components/appointmentBooking/index.js

@@ -55,6 +55,12 @@ var AppointmentBooking = () => {
       if (!data.length) {
         const currentUser = (0, import_utils2.formatCurrentUser)(utils);
         appointmentBooking.addAccounts([currentUser]);
+      } else if (data.length >= 1) {
+        const meAccount = data == null ? void 0 : data.find((d) => !(d == null ? void 0 : d.isGuest));
+        const currentUser = (0, import_utils2.formatCurrentUser)(utils);
+        if (currentUser && meAccount.id !== currentUser.id) {
+          appointmentBooking.setLoginAccount(meAccount.id, currentUser);
+        }
       }
     });
   }, []);

package/lib/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -281,7 +281,7 @@ var Footer = (props) => {
     type,
     messageShow = true
   }) => {
-    var _a2;
+    var _a2, _b2, _c2, _d2, _e2;
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
@@ -306,7 +306,20 @@ var Footer = (props) => {
         title: "saveBooking",
         content: [
           { key: "下单前数据", value: JSON.stringify(values) },
-          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
+          { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
+          {
+            key: "店铺id",
+            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+          },
+          {
+            key: "shopApi",
+            value: JSON.stringify(window == null ? void 0 : window.shopApi, (key, value) => {
+              if (typeof value === "function") {
+                return "function";
+              }
+              return value;
+            })
+          }
         ]
       });
       if (addonsEdit) {

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

@@ -69,9 +69,7 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
   services = state.service;
-  const {
-    selectCustomer
-  } = (0, import_pisellos.useCustomer)();
+  const { selectCustomer } = (0, import_pisellos.useCustomer)();
   (0, import_ahooks.useDebounceEffect)(
     () => {
       if (isBooking4Shop) {

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

@@ -113,7 +113,12 @@ var EditBookingModal = (props, ref) => {
               _cloned[_idx] = _targetResource;
             }
           } else {
-            _cloned.push(_targetResource);
+            const _targetIdx = _cloned.findIndex((rs) => {
+              return rs.relation_id == (_targetResource == null ? void 0 : _targetResource.relation_id);
+            });
+            if (_targetIdx === -1) {
+              _cloned.push(_targetResource);
+            }
           }
           _initResourceVal = {
             ..._initResourceVal,

package/lib/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

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

@@ -156,6 +156,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -458,6 +460,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -760,6 +764,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;

package/lib/components/booking/locales.js

@@ -200,6 +200,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "It cannot be restored after deletion. Please confirm the operation.",
     "pisell2.text.deposit-paid": "Deposit paid",
     "pisell2.text.stock": "Stock",
+    "pisell2.appointment.unuse.stock": "Not enough stock",
+    "pisell2.appointment.unuse.capacity": (count) => `Only ${count} spots available. Please reduce quantity.`,
     "pisell2.text.payment-link": "Payment link",
     "pisell2.text.send-mail": "Send email",
     "pisell2.text.copy-to-clipboard": "Copy to clipboard",
@@ -540,6 +542,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "删除后不可恢复，请确认操作",
     "pisell2.text.deposit-paid": "已付定金",
     "pisell2.text.stock": "库存",
+    "pisell2.appointment.unuse.stock": "库存不足",
+    "pisell2.appointment.unuse.capacity": (count) => `仅可预约 ${count} 个，请减少数量`,
     "pisell2.text.payment-link": "付款链接",
     "pisell2.text.send-mail": "发送邮件",
     "pisell2.text.copy-to-clipboard": "复制到剪切板",
@@ -880,6 +884,8 @@ var locales_default = {
     "pisell2.text.deposit-delete-message": "刪除後不可恢復，請確認操作",
     "pisell2.text.deposit-paid": "已付定金",
     "pisell2.text.stock": "庫存",
+    "pisell2.appointment.unuse.stock": "庫存不足",
+    "pisell2.appointment.unuse.capacity": (count) => `僅可預約 ${count} 個，請減少數量`,
     "pisell2.text.payment-link": "付款鏈接",
     "pisell2.text.send-mail": "發送郵件",
     "pisell2.text.copy-to-clipboard": "複製到剪切板",

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -106,11 +105,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/linkly/hooks/normal.js

@@ -63,18 +63,18 @@ var useLinklyPayOrRefund = (handleCheck) => {
       content: [{ key: "response", value: JSON.stringify(res) }]
     });
     const status = (_a = res == null ? void 0 : res.data) == null ? void 0 : _a.status;
-    if (status === 0) {
+    if (status == 0) {
       numRef.current = (_b = res == null ? void 0 : res.data) == null ? void 0 : _b.session_id;
       dispatch((0, import_store.updateState)({ number: numRef.current }));
       dispatch((0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.Cancel }));
       setTimeout(() => {
         var _a2;
         (_a2 = resultQueryRef.current) == null ? void 0 : _a2.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
     dispatch((0, import_store.updateCustom)({ actionStatus: import_const2.LinklyActionStatus.Empty }));
-    if (status === 1) {
+    if (status == 1) {
       (_c = handleLinklySuccessRef.current) == null ? void 0 : _c.call(handleLinklySuccessRef, res);
       return;
     }

package/lib/components/eftposPay/linkly/hooks/useTimeQuery.js

@@ -83,13 +83,17 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       _log("Success" /* Success */, result);
       isQueryFinishedRef.current = true;
       const data = (result == null ? void 0 : result.data) || {};
-      if (data.status === 1) {
+      if (data.status == 1) {
         console.log("交易成功，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易成功`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         handleLinklySuccess(result);
         return;
       }
-      if (data.status !== void 0 && (data == null ? void 0 : data.status) === 0) {
+      if ((data == null ? void 0 : data.status) == 0 && (data == null ? void 0 : data.signature_flag) != 1) {
         console.log("交易状态为0需要继续查询");
         isQueryFinishedRef.current = false;
         _resultQuery();
@@ -97,13 +101,21 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       }
       if (data.status < 0) {
         console.log("交易失败，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易失败`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         result.code = import_const.PayStatus.Unknown;
         (_a2 = failRef.current) == null ? void 0 : _a2.call(failRef, result, false);
         return;
       }
-      if (data.signature_flag === 1) {
+      if (data.signature_flag == 1) {
         console.log("交易需要签名，终止查询");
+        (0, import_utils.sendWarningLog)({
+          title: `Linkly-${isPay ? "Pay" : "Refund"}-交易需要签名`,
+          content: [{ key: "response", value: JSON.stringify(result) }]
+        });
         reset();
         gotoSignature();
         return;
@@ -194,7 +206,7 @@ var useTimeResultQuery = (api, resultCheck, handleLinklySuccess) => {
       content.push({ key: "error", value: JSON.stringify(res) });
     }
     (0, import_utils.sendWarningLog)({
-      title: `Linkly-${isPay ? "Pay" : "Refund"}-结果查询--${type}`,
+      title: `Linkly-${isPay ? "Pay" : "Refund"}-交易结果轮询`,
       content
     });
   };

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

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -45,7 +45,8 @@ var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngine
 var import_index = require("./index.less");
 var import_utils3 = require("../../../../../appointmentBooking/utils");
 var ContinueButton = () => {
-  var _a, _b;
+  var _a, _b, _c, _d, _e;
+  const hasSubscribedRef = (0, import_react.useRef)(false);
   const { data } = (0, import_Sales.useSales)();
   const { onHolderOpen } = (0, import_Sales.useHolder)();
   const { checkHolder, onCloseCart, cartData, getWithoutCartItemsHolderNames } = (0, import_Sales.useCart)();
@@ -64,14 +65,17 @@ var ContinueButton = () => {
   const [openEmptyHolder, setOpenEmptyHolder] = (0, import_react.useState)(false);
   const { setData, removeSessionStorage } = (0, import_Sales.useSales)();
   const context = (0, import_useEngineContext.default)();
-  const { store, action, getStore } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const config = ((_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.constants) == null ? void 0 : _b.config) || {};
+  const utils = ((_c = context == null ? void 0 : context.appHelper) == null ? void 0 : _c.utils) || {};
+  const { pubsub } = context.appHelper.utils;
+  const { store, action, getStore } = ((_d = context.appHelper) == null ? void 0 : _d.utils) || {};
   const handleCheckout = async () => {
     const params = (0, import_utils2.getFormParams)(data);
     action == null ? void 0 : action({
       type: "pisell1.goProductForm",
       data: params,
       callback: async (e) => {
-        var _a2, _b2, _c;
+        var _a2, _b2, _c2;
         if ((e == null ? void 0 : e.type) === "close") {
           return;
         }
@@ -88,7 +92,7 @@ var ContinueButton = () => {
           removeSessionStorage();
         } else {
           (0, import_materials.PisellToast)({
-            content: ((_c = result == null ? void 0 : result.err) == null ? void 0 : _c.message) || ""
+            content: ((_c2 = result == null ? void 0 : result.err) == null ? void 0 : _c2.message) || ""
           });
         }
       }
@@ -234,13 +238,13 @@ var ContinueButton = () => {
     handleNextStep();
   };
   const handleContinue = async () => {
-    var _a2, _b2, _c;
+    var _a2, _b2, _c2;
     if (isLastStep) {
       const value = (0, import_utils2.formatValues)({
         state: data,
         platform: (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.constants) == null ? void 0 : _b2.platform
       });
-      if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_c = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _c.length) > 0 && !isAgreeDepositPolicy) {
+      if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_c2 = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _c2.length) > 0 && !isAgreeDepositPolicy) {
         (0, import_utils3.Toast)(import_utils.locales.getText("pisell2.appointment.deposit.agree.policy"));
         return;
       }
@@ -270,6 +274,24 @@ var ContinueButton = () => {
     }
     handleHolder();
   };
+  const handleSubmit = () => {
+    var _a2, _b2, _c2, _d2;
+    if ((_b2 = (_a2 = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _a2.isGuestUser) == null ? void 0 : _b2.call(_a2)) {
+      if (!hasSubscribedRef.current) {
+        pubsub.subscribe("bind.guest.user", handleContinue);
+        hasSubscribedRef.current = true;
+      }
+      (_d2 = (_c2 = utils == null ? void 0 : utils.businessUtils) == null ? void 0 : _c2.openRegisterModal) == null ? void 0 : _d2.call(_c2, true);
+      return;
+    }
+    handleContinue();
+  };
+  (0, import_react.useEffect)(() => {
+    return () => {
+      pubsub.unsubscribe("bind.guest.user", handleContinue);
+      hasSubscribedRef.current = false;
+    };
+  }, []);
   const continueText = (0, import_react.useMemo)(() => {
     if (isLastStep) {
       return import_utils.locales.getText("pisell2.event.checkout");
@@ -289,10 +311,10 @@ var ContinueButton = () => {
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_materials.Button,
     {
-      disabled: !((_b = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _b.length),
+      disabled: !((_e = cartData == null ? void 0 : cartData.cartItems) == null ? void 0 : _e.length),
       size: "large",
       type: "primary",
-      onClick: () => handleContinue(),
+      onClick: () => isLastStep ? handleSubmit() : handleContinue(),
       loading: confirmLoading
     },
     continueText