@pisell/private-materials 6.4.71 → 6.4.73

package/lib/components/authentication/admin/index.d.ts

@@ -0,0 +1,26 @@
+export type { AuthMethodsProps, AuthMethod } from './AuthMethods';
+export { AuthMethodType, AuthMethodCategory } from './AuthMethods';
+export { default as ChannelAuthSetting } from './ChannelAuthSetting';
+export type { ChannelAuthSettingProps, ChannelAuthSettingValue, TabKey } from './ChannelAuthSetting';
+export { default as PageSetting } from './ChannelAuthSetting/PageSetting';
+export { default as PageSettingItem } from './ChannelAuthSetting/PageSettingItem';
+export { default as AuthenticationMethods } from './ChannelAuthSetting/AuthenticationMethods';
+export { default as CollectInfo } from './ChannelAuthSetting/CollectInfo';
+export type { PageSettingProps, PageSettingValue, } from './ChannelAuthSetting/PageSetting/types';
+export type { PageSettingItemProps, PageSettingItemValue, TermsCondition, TranslationValue as PageTranslationValue, } from './ChannelAuthSetting/PageSettingItem/types';
+export type { AuthenticationMethodsProps, AuthenticationMethodsValue, GlobalAuthMethod, AuthenticationMethod, AuthenticationSettingsMode, } from './ChannelAuthSetting/AuthenticationMethods/types';
+export type { CollectInfoProps, CollectInfoValue, AccountField, CustomerFormItem, TranslationValue as CollectInfoTranslationValue, } from './ChannelAuthSetting/CollectInfo/types';
+export type { SaaSAdminAuthProps } from './SaaSAdminAuth';
+export type { OrgAdminAuthProps } from './OrgAdminAuth';
+export type { DeviceAuthProps } from './DeviceAuth';
+export type { POSOperatorAuthProps } from './POSOperatorAuth';
+export type { CustomerOAuthConfigProps } from './CustomerOAuthConfig';
+export { default as SaaSAdminAuth } from './SaaSAdminAuth';
+export { default as OrgAdminAuth } from './OrgAdminAuth';
+export { default as OAuthConfig } from './OAuthConfig';
+export { default as CustomerAuth } from './CustomerAuth';
+export { default as CustomerOAuthConfig } from './CustomerOAuthConfig';
+export { default as DeviceAuth } from './DeviceAuth';
+export { default as POSOperatorAuth } from './POSOperatorAuth';
+export { default as OnlineShopAuth } from './ChannelAuthSetting/OnlineShopAuth';
+export { default as SaaSManagermentAuth } from './ChannelAuthSetting/SaaSManagermentAuth';

package/lib/components/authentication/admin/index.js

@@ -0,0 +1,83 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/authentication/admin/index.ts
+var admin_exports = {};
+__export(admin_exports, {
+  AuthMethodCategory: () => import_AuthMethods.AuthMethodCategory,
+  AuthMethodType: () => import_AuthMethods.AuthMethodType,
+  AuthenticationMethods: () => import_AuthenticationMethods.default,
+  ChannelAuthSetting: () => import_ChannelAuthSetting.default,
+  CollectInfo: () => import_CollectInfo.default,
+  CustomerAuth: () => import_CustomerAuth.default,
+  CustomerOAuthConfig: () => import_CustomerOAuthConfig.default,
+  DeviceAuth: () => import_DeviceAuth.default,
+  OAuthConfig: () => import_OAuthConfig.default,
+  OnlineShopAuth: () => import_OnlineShopAuth.default,
+  OrgAdminAuth: () => import_OrgAdminAuth.default,
+  POSOperatorAuth: () => import_POSOperatorAuth.default,
+  PageSetting: () => import_PageSetting.default,
+  PageSettingItem: () => import_PageSettingItem.default,
+  SaaSAdminAuth: () => import_SaaSAdminAuth.default,
+  SaaSManagermentAuth: () => import_SaaSManagermentAuth.default
+});
+module.exports = __toCommonJS(admin_exports);
+var import_AuthMethods = require("./AuthMethods");
+var import_ChannelAuthSetting = __toESM(require("./ChannelAuthSetting"));
+var import_PageSetting = __toESM(require("./ChannelAuthSetting/PageSetting"));
+var import_PageSettingItem = __toESM(require("./ChannelAuthSetting/PageSettingItem"));
+var import_AuthenticationMethods = __toESM(require("./ChannelAuthSetting/AuthenticationMethods"));
+var import_CollectInfo = __toESM(require("./ChannelAuthSetting/CollectInfo"));
+var import_SaaSAdminAuth = __toESM(require("./SaaSAdminAuth"));
+var import_OrgAdminAuth = __toESM(require("./OrgAdminAuth"));
+var import_OAuthConfig = __toESM(require("./OAuthConfig"));
+var import_CustomerAuth = __toESM(require("./CustomerAuth"));
+var import_CustomerOAuthConfig = __toESM(require("./CustomerOAuthConfig"));
+var import_DeviceAuth = __toESM(require("./DeviceAuth"));
+var import_POSOperatorAuth = __toESM(require("./POSOperatorAuth"));
+var import_OnlineShopAuth = __toESM(require("./ChannelAuthSetting/OnlineShopAuth"));
+var import_SaaSManagermentAuth = __toESM(require("./ChannelAuthSetting/SaaSManagermentAuth"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  AuthMethodCategory,
+  AuthMethodType,
+  AuthenticationMethods,
+  ChannelAuthSetting,
+  CollectInfo,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
+  PageSetting,
+  PageSettingItem,
+  SaaSAdminAuth,
+  SaaSManagermentAuth
+});

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/customSelect/index.js

@@ -165,14 +165,37 @@ var CustomSelect = (props, ref) => {
   const renderList = (0, import_react.useMemo)(() => {
     let _list = [...options];
     if (search) {
-      const isIncludes = (str) => {
-        return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
+      const isIncludes = (item) => {
+        try {
+          const q = search.toLowerCase();
+          const numericKeys = Object.keys(item).filter((k) => /^\d+$/.test(k));
+          const customerKeys = [
+            "customer_nickname",
+            "customer_first_name",
+            "customer_last_name",
+            "customer_phone",
+            "customer_email"
+          ];
+          const allKeys = [...numericKeys, ...customerKeys];
+          return allKeys.some((k) => {
+            const val = item[k];
+            if (val === null || val === void 0) return false;
+            try {
+              const str = JSON.stringify(val);
+              return str.includes(q) || str.toLocaleLowerCase().includes(q);
+            } catch (error) {
+              return false;
+            }
+          });
+        } catch (e) {
+          return false;
+        }
       };
       _list = _list.filter((d) => {
         if (filterItem) {
           return filterItem(d, search);
         }
-        return isIncludes(d.main_field || "");
+        return isIncludes(d);
       });
     }
     return _list;

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

@@ -237,7 +237,7 @@ var formatSellingPrice = (item) => {
   var _a;
   return Number((_a = item._extend) == null ? void 0 : _a.total);
 };
-var formatMetaData = (item) => {
+var formatMetaData = (item, isMultiDayPrices) => {
   var _a, _b, _c, _d, _e, _f, _g;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
@@ -249,7 +249,7 @@ var formatMetaData = (item) => {
   if ((_b = item._extend) == null ? void 0 : _b.holder_id) {
     metadata.holder_id = (_c = item._extend) == null ? void 0 : _c.holder_id;
   }
-  if ((_d = item._extend) == null ? void 0 : _d.multiDayPrices) {
+  if (isMultiDayPrices && ((_d = item._extend) == null ? void 0 : _d.multiDayPrices)) {
     metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
   }
   if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
@@ -309,7 +309,7 @@ var formatProducts = (item, quantity) => {
     product_option_item: formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
     product_variant_id: ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0,
     discount_list: notManualDiscount,
-    metadata: formatMetaData(item),
+    metadata: formatMetaData(item, false),
     // checkout 需求新增字段
     calculated_original_price: formatOriginalPrice(item),
     calculated_selling_price: formatSellingPrice(item),
@@ -370,8 +370,9 @@ var formatBookings = (data, values) => {
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;
   let bookings = [];
+  let obj = {};
   list.forEach((item) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (item.isCustomItem) {
       bookings.push({
         ...item._extend,
@@ -406,13 +407,13 @@ var formatBookings = (data, values) => {
         "minutes"
       );
     }
-    if (!((_e = item._extend) == null ? void 0 : _e.unique_identification_number)) {
+    const isSetGroupId = obj[(_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.groupId];
+    if (!((_f = item._extend) == null ? void 0 : _f.unique_identification_number)) {
       const unique_identification_number = (0, import_utils5.getUniqueId)();
       item._extend.unique_identification_number = unique_identification_number;
     }
     const booking = {
       product: formatProducts(item),
-      metadata: formatMetaData(item),
       relation_products: formatRelationDetails(item._extend.relation_details),
       id: item.booking_id || 0,
       relation_id: item._extend.relation_id || 0,
@@ -430,9 +431,13 @@ var formatBookings = (data, values) => {
       number: item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
       resources: formatResource(item),
       note: item._extend.note,
+      "metadata": formatMetaData(item, !isSetGroupId),
       ...eventOtherParams || {},
       ...dayParams
     };
+    if (!isSetGroupId) {
+      obj[item._extend.groupId] = true;
+    }
     if (isDay) {
       bookings.push(booking);
       return;

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: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

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

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: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -110,11 +109,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/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "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<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "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<"stripe" | "payo" | "tyro" | "windcave" | "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/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "success" | "warn" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -295,10 +295,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/index.d.ts

@@ -9,8 +9,8 @@ import ProductExtension from './productExtension';
 import RuleSetting from './ruleSetting';
 import TaxSelect from './taxSelect';
 import ToCPay from './pay/toC';
-import Wallet from './wallet';
 import WalletList from './walletList';
+import Wallet from './wallet';
 import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
@@ -19,4 +19,5 @@ import EditBookingModal from './booking/editBookingModal';
 import StepController from './stepController';
 import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, };
+import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, };

package/lib/components/index.js

@@ -34,13 +34,22 @@ __export(components_exports, {
   BookingForms: () => import_forms.default,
   BookingInfo: () => import_info.default,
   BookingNotes: () => import_notes.default,
+  CustomerAuth: () => import_admin.CustomerAuth,
+  CustomerOAuthConfig: () => import_admin.CustomerOAuthConfig,
+  DeviceAuth: () => import_admin.DeviceAuth,
   EditBookingModal: () => import_editBookingModal.default,
   Login: () => import_login.default,
+  OAuthConfig: () => import_admin.OAuthConfig,
+  OnlineShopAuth: () => import_admin.OnlineShopAuth,
+  OrgAdminAuth: () => import_admin.OrgAdminAuth,
+  POSOperatorAuth: () => import_admin.POSOperatorAuth,
   PinModal: () => import_pinModal.default,
   PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
   ProductExtension: () => import_productExtension.default,
   RuleSetting: () => import_ruleSetting.default,
+  SaaSAdminAuth: () => import_admin.SaaSAdminAuth,
+  SaaSManagermentAuth: () => import_admin.SaaSManagermentAuth,
   Schedules: () => import_schedules.default,
   StepController: () => import_stepController.default,
   SubTotal: () => import_subTotal.default,
@@ -63,8 +72,8 @@ var import_productExtension = __toESM(require("./productExtension"));
 var import_ruleSetting = __toESM(require("./ruleSetting"));
 var import_taxSelect = __toESM(require("./taxSelect"));
 var import_toC = __toESM(require("./pay/toC"));
-var import_wallet = __toESM(require("./wallet"));
 var import_walletList = __toESM(require("./walletList"));
+var import_wallet = __toESM(require("./wallet"));
 var import_workSpaceListDetail = __toESM(require("./workSpaceListDetail/"));
 var import_workSpaceList = __toESM(require("./workSpaceList"));
 var import_pisellSelectCustomerModal = __toESM(require("./pisellSelectCustomerModal"));
@@ -73,6 +82,7 @@ var import_editBookingModal = __toESM(require("./booking/editBookingModal"));
 var import_stepController = __toESM(require("./stepController"));
 var import_pinModal = __toESM(require("./pinModal"));
 var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
+var import_admin = require("./authentication/admin");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Booking,
@@ -80,13 +90,22 @@ var import_pinVerifyModal = __toESM(require("./pinVerifyModal"));
   BookingForms,
   BookingInfo,
   BookingNotes,
+  CustomerAuth,
+  CustomerOAuthConfig,
+  DeviceAuth,
   EditBookingModal,
   Login,
+  OAuthConfig,
+  OnlineShopAuth,
+  OrgAdminAuth,
+  POSOperatorAuth,
   PinModal,
   PinVerifyModal,
   PisellSelectCustomerModal,
   ProductExtension,
   RuleSetting,
+  SaaSAdminAuth,
+  SaaSManagermentAuth,
   Schedules,
   StepController,
   SubTotal,

package/lib/components/pay/toC/PaymentMethods/ApplePay/index.js

@@ -35,15 +35,17 @@ module.exports = __toCommonJS(ApplePay_exports);
 var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
 var import_ThreedsLoading = __toESM(require("../MWCreditCard/TDSPay/ThreedsLoading"));
+var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
 var import_model = require("../../model");
 var import_utils = require("@pisell/utils");
 var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
+var import_hooks = require("../hooks");
 var import_index = require("./index.less");
 var import_utils2 = require("../../utils");
 var ApplePay = (props, ref) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
@@ -52,8 +54,12 @@ var ApplePay = (props, ref) => {
     orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
     step: "2"
   });
+  const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
+    orderId: (_c = state.payGroup) == null ? void 0 : _c.order_id,
+    paymentType: "applePay"
+  });
   const init = async ({ payGroup }) => {
-    var _a2, _b2, _c, _d, _e, _f, _g;
+    var _a2, _b2, _c2, _d2, _e, _f, _g;
     paymentLogger.addLog({
       key: "ApplePay初始化开始",
       value: ""
@@ -81,14 +87,14 @@ var ApplePay = (props, ref) => {
       value: ""
     });
     try {
-      const locale = ((_c = dvaStore.core) == null ? void 0 : _c.translateLocale) || "en";
-      const shopId = (_f = (_e = (_d = dvaStore.core) == null ? void 0 : _d.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
+      const locale = ((_c2 = dvaStore.core) == null ? void 0 : _c2.translateLocale) || "en";
+      const shopId = (_f = (_e = (_d2 = dvaStore.core) == null ? void 0 : _d2.core) == null ? void 0 : _e.shop) == null ? void 0 : _f.id;
       const currentURL = window.location.href;
       const linkElement = document.createElement("a");
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
       const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
-        `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        `/apple-pay?order_id=${(_g = state.payGroup) == null ? void 0 : _g.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}&front_order_uuid=${state.front_order_uuid}&is_replace_router=1`,
         state.history
       )}`;
       paymentLogger.addLog({
@@ -96,7 +102,7 @@ var ApplePay = (props, ref) => {
         value: ""
       });
       paymentLogger.sendLogs("ApplePay跳转成功");
-      window.location.href = _href;
+      await handleRedirect(_href);
     } catch (err) {
       paymentLogger.addLog({
         key: "ApplePay处理错误",
@@ -118,6 +124,10 @@ var ApplePay = (props, ref) => {
       init
     })
   );
+  const handleReturn = () => {
+    setOpen(false);
+    resetState();
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -128,11 +138,21 @@ var ApplePay = (props, ref) => {
       closable: false,
       bodyStyle: { padding: 0 }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && // 跳转前展示 Loading
+    /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
         title: import_utils.locales.getText("tocPay.text.connectingApplePay")
       }
+    ), isReturned && // 跳转后返回时展示新组件内容
+    /* @__PURE__ */ import_react.default.createElement(
+      import_PaymentReturnContent.default,
+      {
+        handleReturn,
+        state,
+        orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
+        unique_payment_number: state == null ? void 0 : state.front_order_uuid
+      }
     ))
   );
 };