@pisell/private-materials 6.5.27 → 6.7.1

package/lib/components/booking/info/main.js

@@ -54,6 +54,7 @@ var import_index = require("./index.less");
 var import_notes = __toESM(require("./notes"));
 var import_service2 = require("./service2");
 var import_utils3 = require("./service2/utils");
+var import_contactInfoMode = __toESM(require("../info2/service/contactInfoMode"));
 var defaultModules = {
   client: 1,
   date: 1,
@@ -64,7 +65,7 @@ var defaultModules = {
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var Info = (0, import_model.Provider)((props) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
@@ -90,7 +91,7 @@ var Info = (0, import_model.Provider)((props) => {
     }
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h, _i, _j, _k, _l, _m;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -99,7 +100,7 @@ var Info = (0, import_model.Provider)((props) => {
         ...globalState,
         isTerminal: (_g2 = (_f2 = (_e2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.isTerminal) == null ? void 0 : _g2.call(_f2),
         isFranchisee,
-        timezone: (_m = (_l = (_k = (_j = (_i = (_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) == null ? void 0 : _i.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone,
+        timezone: (_m = (_l2 = (_k2 = (_j2 = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j2.getState()) == null ? void 0 : _k2.global) == null ? void 0 : _l2.globalConfig) == null ? void 0 : _m.timezone,
         isDayBooking: (globalState == null ? void 0 : globalState.renderType) === "dayBooking"
       }
     });
@@ -171,7 +172,7 @@ var Info = (0, import_model.Provider)((props) => {
       dispatch: modal.dispatch,
       source: "info"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_g = modal.state) == null ? void 0 : _g.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, ((_k = (_j = (_i = (_h = (_g = modal == null ? void 0 : modal.state) == null ? void 0 : _g.bookingConfig) == null ? void 0 : _h.config) == null ? void 0 : _i.cart_settings_tab) == null ? void 0 : _j.display_contact_info) == null ? void 0 : _k.show_contact_info) === true ? /* @__PURE__ */ import_react.default.createElement(import_contactInfoMode.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,
       {
         loading: globalState.loading,

package/lib/components/booking/info/model.js

@@ -38,6 +38,11 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
     setClient(state, payload) {
       state.setGlobalState({ client: { ...state.client, ...payload } });
     },
+    setContactsInfo(state, payload) {
+      state.setGlobalState({
+        contacts_info: { ...state.contacts_info, ...payload }
+      });
+    },
     setService(state, payload) {
       let obj = {};
       if (payload.value) {

package/lib/components/booking/info/service/Lists.js

@@ -60,7 +60,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
       if (type === "view" || type === "edit_product") {
         let product = currentItem._origin;
         let cacheItem = { ...product, new: 0 };
-        if (isParallelResource && !(0, import_utils.isNormalProductByDurationSchedule)(products2)) {
+        if (isParallelResource && !(0, import_utils.isNormalProductByDurationSchedule)(product)) {
           cacheItem = (0, import_utils2.getProductExtend)({
             cacheItem,
             state

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

@@ -58,6 +58,7 @@ var import_classnames = __toESM(require("classnames"));
 var import_useCreateBookingPageHeader = __toESM(require("../hooks/useCreateBookingPageHeader"));
 var import_locales2 = require("../../../utils/locales");
 var import_ahooks = require("ahooks");
+var import_contactInfoMode = __toESM(require("./service/contactInfoMode"));
 var import_cartClientCard = __toESM(require("./cartClientCard"));
 var import_materials = require("@pisell/materials");
 var defaultModules = {
@@ -69,7 +70,7 @@ var defaultModules = {
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var Info = (0, import_model.Provider)((props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
@@ -98,7 +99,7 @@ var Info = (0, import_model.Provider)((props) => {
   }, []);
   const Toast = (0, import_materials.useToast)();
   (0, import_react.useMemo)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k, _l, _m;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -107,7 +108,7 @@ var Info = (0, import_model.Provider)((props) => {
         ...globalState,
         isTerminal: (_g2 = (_f2 = (_e2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.isTerminal) == null ? void 0 : _g2.call(_f2),
         isFranchisee,
-        timezone: (_m = (_l = (_k = (_j2 = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j2.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone
+        timezone: (_m2 = (_l2 = (_k2 = (_j2 = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j2.getState()) == null ? void 0 : _k2.global) == null ? void 0 : _l2.globalConfig) == null ? void 0 : _m2.timezone
       }
     });
   }, [globalState]);
@@ -314,7 +315,7 @@ var Info = (0, import_model.Provider)((props) => {
           style: { color: "#fff", fontSize: 42 }
         }
       )
-    ) : null), modules.holder && !((_j = modal.state) == null ? void 0 : _j.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+    ) : null), ((_n = (_m = (_l = (_k = (_j = modal == null ? void 0 : modal.state) == null ? void 0 : _j.bookingConfig) == null ? void 0 : _k.config) == null ? void 0 : _l.cart_settings_tab) == null ? void 0 : _m.display_contact_info) == null ? void 0 : _n.show_contact_info) === true ? /* @__PURE__ */ import_react.default.createElement(import_contactInfoMode.default, null) : null, modules.holder && !((_o = modal.state) == null ? void 0 : _o.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,
       {
         loading: globalState.loading,

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/info2/service/contactInfoMode/index.d.ts

@@ -0,0 +1,2 @@
+declare const ContactInfoMode: () => JSX.Element;
+export default ContactInfoMode;

package/lib/components/booking/info2/service/contactInfoMode/index.js

@@ -0,0 +1,111 @@
+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/booking/info2/service/contactInfoMode/index.tsx
+var contactInfoMode_exports = {};
+__export(contactInfoMode_exports, {
+  default: () => contactInfoMode_default
+});
+module.exports = __toCommonJS(contactInfoMode_exports);
+var import_react = __toESM(require("react"));
+var import_utils = require("@pisell/utils");
+var import_contactInfo = __toESM(require("../../../../../plus/contactInfo"));
+var import_model = require("../../../info/model");
+var ContactInfoMode = () => {
+  var _a, _b, _c;
+  const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  console.log("state>>>>>>>>>", state);
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i;
+    console.log("state>>>>>>>>>111", (_a2 = state == null ? void 0 : state.contacts_info) == null ? void 0 : _a2.client_id);
+    console.log("state>>>>>>>>>222", (_b2 = state.client.value) == null ? void 0 : _b2.id);
+    if (((_c2 = state.client.value) == null ? void 0 : _c2.id) != ((_d = state == null ? void 0 : state.contacts_info) == null ? void 0 : _d.client_id)) {
+      const contactInfo = (_f = (_e = state.client.value) == null ? void 0 : _e.contacts_info) == null ? void 0 : _f.value;
+      if (!contactInfo) {
+        const {
+          first_name,
+          last_name,
+          phone,
+          country_calling_code,
+          country_code,
+          email
+        } = ((_g = state.client) == null ? void 0 : _g.value) || {};
+        dispatch({
+          type: "setContactsInfo",
+          payload: {
+            value: {
+              first_name: first_name || "",
+              last_name: last_name || "",
+              phone: {
+                phone: phone || "",
+                country_calling_code: country_calling_code || "",
+                country_code: country_code || ""
+              },
+              email: email || ""
+            },
+            client_id: (_h = state.client.value) == null ? void 0 : _h.id
+          }
+        });
+      } else {
+        dispatch({
+          type: "setContactsInfo",
+          payload: {
+            value: { ...contactInfo || {} },
+            client_id: (_i = state.client.value) == null ? void 0 : _i.id
+          }
+        });
+      }
+    }
+  }, [(_a = state.client.value) == null ? void 0 : _a.id, (_b = state == null ? void 0 : state.contacts_info) == null ? void 0 : _b.client_id]);
+  const handleSave = (value) => {
+    dispatch({
+      type: "setContactsInfo",
+      payload: { value, edit: true }
+    });
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { style: { marginTop: "24px" } }, /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: "pisell-lowcode__booking-contact-info-title",
+      style: { fontSize: "16px", fontWeight: 500, marginBottom: "8px" }
+    },
+    import_utils.locales.getText("pisell2.booking.text.contact-info.title")
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_contactInfo.default,
+    {
+      dataSource: ((_c = state.contacts_info) == null ? void 0 : _c.value) || null,
+      isShowDelete: false,
+      isShowAvatar: false,
+      isShowPhone: true,
+      isShowEmail: true,
+      style: { padding: "14px 0 14px 14px" },
+      onSave: handleSave
+    }
+  ));
+};
+var contactInfoMode_default = ContactInfoMode;

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

@@ -302,6 +302,8 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
+        'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -606,6 +608,8 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
+        'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -910,6 +914,8 @@ declare const _default: {
         'pisell2.text.quotation.product.change.describe': string;
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
+        'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -369,7 +369,10 @@ var locales_default = {
     "pisell2.text.quotation.product.change.describe": "Product updates available: Please refresh the following items to load the latest data.",
     // Notes
     "pisell2.booking.notes.placeholder": "Enter a note...",
-    "pisell2.text.form.link.to.another.record.more": "View More"
+    "pisell2.text.form.link.to.another.record.more": "View More",
+    // 联系信息
+    "pisell2.booking.text.contact-info.title": "Contact info",
+    "pisell2.booking.text.search-placeholder": "Search Customers / Contacts"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -711,7 +714,10 @@ var locales_default = {
     "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
     // Notes
     "pisell2.booking.notes.placeholder": "输入备注...",
-    "pisell2.text.form.link.to.another.record.more": "查看更多"
+    "pisell2.text.form.link.to.another.record.more": "查看更多",
+    // 联系信息
+    "pisell2.booking.text.contact-info.title": "联系信息",
+    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -1053,6 +1059,9 @@ var locales_default = {
     "pisell2.text.quotation.product.change.describe": "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
     // Notes
     "pisell2.booking.notes.placeholder": "輸入備註...",
-    "pisell2.text.form.link.to.another.record.more": "查看更多"
+    "pisell2.text.form.link.to.another.record.more": "查看更多",
+    // 联系信息
+    "pisell2.booking.text.contact-info.title": "聯繫信息",
+    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息"
   }
 };

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

@@ -27,6 +27,10 @@ export interface FormState {
         };
         edit: boolean;
     };
+    contacts_info: {
+        edit: boolean;
+        value: any;
+    };
     date: {
         value: any;
         end_date: any;

package/lib/components/booking/model.js

@@ -57,6 +57,9 @@ var apis = {
   },
   getFormData: () => {
     return [];
+  },
+  getContactsInfo: () => {
+    return null;
   }
 };
 var walkInData = {

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" | "print" | "fail" | "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" | "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<"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<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -125,6 +125,7 @@ var Linkly = ({ api, onChange }) => {
     failRef.current = fail;
   }, [fail]);
   (0, import_react.useEffect)(() => {
+    var _a, _b, _c;
     if (statusRef.current === import_const.StatusEnum.Success || statusRef.current === import_const.StatusEnum.Fail) {
       return;
     }
@@ -136,7 +137,36 @@ var Linkly = ({ api, onChange }) => {
       resultQuery();
       return;
     }
-    payOrRefund(resultQuery, handleLinklySuccess);
+    if (((_a = utils == null ? void 0 : utils.isTerminal) == null ? void 0 : _a.call(utils)) && ((_c = (_b = utils == null ? void 0 : utils.interaction) == null ? void 0 : _b.utils) == null ? void 0 : _c.asyncDataManager)) {
+      const _payOrRefund = async () => {
+        var _a2, _b2, _c2;
+        try {
+          const activeStatus = await ((_c2 = (_b2 = (_a2 = utils == null ? void 0 : utils.interaction) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.asyncDataManager) == null ? void 0 : _c2.call(_b2, {
+            module: "get",
+            key: "pay_webview_active"
+          }));
+          if (activeStatus !== "unActive") {
+            payOrRefund(resultQuery, handleLinklySuccess);
+          } else {
+            (0, import_utils.sendWarningLog)({
+              title: "Linkly-支付-当前页面非活跃状态，无法进行支付",
+              content: [
+                { key: "response", value: JSON.stringify({ activeStatus }) }
+              ]
+            });
+          }
+        } catch (error) {
+          (0, import_utils.sendWarningLog)({
+            title: "Linkly-支付-获取当前页面活跃状态失败",
+            content: [{ key: "error", value: JSON.stringify(error) }]
+          });
+          payOrRefund(resultQuery, handleLinklySuccess);
+        }
+      };
+      _payOrRefund();
+    } else {
+      payOrRefund(resultQuery, handleLinklySuccess);
+    }
   }, []);
   (0, import_react.useEffect)(() => {
     return () => {

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