@pisell/private-materials 3.3.95 → 3.3.96

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

@@ -74,9 +74,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     let type = "";
     if (!isRetailTemplate) {
       type = await checkProductType(item == null ? void 0 : item.id);
-      if (type === "session") {
-        appointmentBooking.openProductDetail(item.id);
-      }
+      appointmentBooking.openProductDetail(item.id);
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
@@ -86,6 +84,10 @@ 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) || []
@@ -96,13 +98,6 @@ 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");
@@ -114,7 +109,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
-          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -132,6 +126,7 @@ 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,7 +36,6 @@ 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 {
@@ -45,9 +44,10 @@ var DepositModal = (props) => {
     item,
     onChange,
     onConfirm,
-    isHideCheckout = true
+    isHideCheckout = true,
+    depositProtocolRequest
+    // 定金协议请求
   } = 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,9 +55,13 @@ 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 appointmentBooking.getProtocol(id);
+      const { data } = await (depositProtocolRequest == null ? void 0 : depositProtocolRequest(id));
       setPolicy(data);
       onChange && onChange(data);
     } catch (error) {

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

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

package/lib/components/appointmentBooking/index.js

@@ -58,6 +58,17 @@ 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: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   overflow-y: auto;
 
   .pisell-section-headers {

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_utils2 = require("./utils");
 var import_ahooks = require("ahooks");
+var import_utils2 = require("./utils");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -274,8 +274,8 @@ var VoucherCard = (props) => {
       import_materials.PisellGoodPassCard,
       {
         style: { width: "100%" },
-        mixedSort,
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
+        mixedSort,
         onChange: (val) => {
           const shopDiscount2 = pisellos.getModule("shopDiscount");
           const detail = shopDiscount2.setDiscountSelected({

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

@@ -79,6 +79,9 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
     },
     setActiveCartId(state, payload) {
       state.setGlobalState(payload);
+    },
+    setAddons(state, payload) {
+      state.setGlobalState({ addons: { ...state.addons, ...payload } });
     }
   },
   reducers: {

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

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

package/lib/components/eftposPay/const.js

@@ -35,6 +35,7 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
   EftposEnum2["Tyro"] = "tyro";
   EftposEnum2["Windcave"] = "windcave";
   EftposEnum2["Stripe"] = "stripe";
+  EftposEnum2["Linkly"] = "linkly";
   return EftposEnum2;
 })(EftposEnum || {});
 var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
@@ -88,6 +89,7 @@ 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/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<"tyro" | "windcave" | "stripe" | "payo">;
+    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/hooks.js

@@ -128,6 +128,7 @@ 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
@@ -168,8 +169,12 @@ 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"));
@@ -310,7 +315,9 @@ ${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));
@@ -359,7 +366,7 @@ ${import_utils.locales.getText(
         );
         return;
       }
-      if (code === import_const.PayStatus.UserConfigError) {
+      if (code === import_const.PayStatus.UserConfigError || code === import_const.PayStatus.PairingFailure) {
         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("初始化 ........11221801");
+    console.log("初始化 ........112218017777");
   }, []);
   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/linkly/const.d.ts

@@ -0,0 +1,23 @@
+import { State } from '../store';
+import { ModeEnum } from '../const';
+export declare const getStep: (mode?: ModeEnum) => State['steps'];
+declare const _default: (params: any) => State;
+export default _default;
+export declare enum EVisibleButtonType {
+    /** 取消按钮 */
+    CancelButton = "CancelButton",
+    /** 等待按钮 */
+    WaitButton = "WaitButton"
+}
+export declare enum LinklyActionStatus {
+    /** 空 */
+    Empty = "Empty",
+    /** 取消 */
+    Cancel = "Cancel",
+    /** 取消中 */
+    CancelWaiting = "CancelWaiting",
+    /** 签名 */
+    Signature = "Signature",
+    /** 签名等待中 */
+    SignatureWaiting = "SignatureWaiting"
+}

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

@@ -0,0 +1,102 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eftposPay/linkly/const.ts
+var const_exports = {};
+__export(const_exports, {
+  EVisibleButtonType: () => EVisibleButtonType,
+  LinklyActionStatus: () => LinklyActionStatus,
+  default: () => const_default,
+  getStep: () => getStep
+});
+module.exports = __toCommonJS(const_exports);
+var import_utils = require("@pisell/utils");
+var import_const = require("../const");
+var getStep = (mode = import_const.ModeEnum.Pay) => [
+  {
+    key: Date.now(),
+    title: import_utils.locales.getText("page.eftpos-pay.text.loading")(mode),
+    // 'Payment in  process...',
+    text: import_utils.locales.getText("page.eftpos-pay.text.waiting.processing"),
+    // 'Waiting for the processing...',
+    warn: "",
+    tip: import_utils.locales.getText("page.eftpos-pay.text.processing"),
+    // 'processing...',
+    status: import_const.StatusEnum.Loading
+  }
+];
+var const_default = (params) => {
+  const {
+    order_id,
+    name,
+    symbol,
+    amount,
+    mode,
+    number,
+    pay,
+    device,
+    net,
+    client,
+    ...other
+  } = params || {
+    mode: import_const.ModeEnum.Pay
+  };
+  console.log("params =>>>>>> ", params);
+  return {
+    order_id,
+    name,
+    symbol,
+    amount,
+    mode,
+    eftpos: import_const.EftposEnum.Linkly,
+    key: Date.now(),
+    step: 0,
+    type: import_const.PayRouteEnum.Step,
+    title: import_utils.locales.getText("page.eftpos-pay.text.loading")(mode),
+    component: "",
+    status: import_const.StatusEnum.Loading,
+    steps: getStep(mode),
+    render: true,
+    client: client !== "undefined" ? client : import_const.ClientEnum.Merchant,
+    warn: "",
+    custom: other || {},
+    ...typeof net !== "undefined" ? { net } : {},
+    ...typeof number !== "undefined" ? { number } : {},
+    ...typeof pay !== "undefined" ? { pay } : {},
+    ...typeof device !== "undefined" ? { device } : {}
+  };
+};
+var EVisibleButtonType = /* @__PURE__ */ ((EVisibleButtonType2) => {
+  EVisibleButtonType2["CancelButton"] = "CancelButton";
+  EVisibleButtonType2["WaitButton"] = "WaitButton";
+  return EVisibleButtonType2;
+})(EVisibleButtonType || {});
+var LinklyActionStatus = /* @__PURE__ */ ((LinklyActionStatus2) => {
+  LinklyActionStatus2["Empty"] = "Empty";
+  LinklyActionStatus2["Cancel"] = "Cancel";
+  LinklyActionStatus2["CancelWaiting"] = "CancelWaiting";
+  LinklyActionStatus2["Signature"] = "Signature";
+  LinklyActionStatus2["SignatureWaiting"] = "SignatureWaiting";
+  return LinklyActionStatus2;
+})(LinklyActionStatus || {});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  EVisibleButtonType,
+  LinklyActionStatus,
+  getStep
+});

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

@@ -0,0 +1,2 @@
+export * from './normal';
+export * from './useTimeQuery';

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

@@ -0,0 +1,25 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/eftposPay/linkly/hooks/index.ts
+var hooks_exports = {};
+module.exports = __toCommonJS(hooks_exports);
+__reExport(hooks_exports, require("./normal"), module.exports);
+__reExport(hooks_exports, require("./useTimeQuery"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./normal"),
+  ...require("./useTimeQuery")
+});

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

@@ -0,0 +1,30 @@
+/**
+ * 支付或退款
+ * @param failAction 失败回调
+ */
+export declare const useLinklyPayOrRefund: (handleCheck: () => boolean) => {
+    action: {
+        pay: import("ahooks/lib/useRequest/src/types").Result<any, [data: any]>;
+    };
+    payOrRefund: (resultQuery: any, handleLinklySuccess: any) => void;
+};
+/**
+ * @title: 取消支付或退款
+ * @description: 取消支付或退款调用接口后不管成功还是失败都需要调用支付查询接口
+ */
+export declare const useLinklyCancel: (handleCheck: () => boolean) => {
+    action: {
+        cancel: import("ahooks/lib/useRequest/src/types").Result<any, [param: any]>;
+    };
+    linklyCancel: (resultQuery: any) => void;
+};
+/**
+ * @title: 支付或退款签名
+ * @description: 支付或退款签名调用接口后不管成功还是失败都需要调用支付查询接口
+ */
+export declare const useLinklySignature: (handleCheck: () => boolean) => {
+    action: {
+        signature: import("ahooks/lib/useRequest/src/types").Result<any, [param: any]>;
+    };
+    linklySignature: (status: number, resultQuery: any) => void;
+};