@pisell/private-materials 3.3.95 → 3.3.97

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

@@ -190,6 +190,10 @@ var Layout = () => {
     if (isDateSelectedFirst && key === "select-date") return false;
     return key !== "confirm-information";
   }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
+  const depositProtocolRequest = (id) => {
+    var _a2;
+    return (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a2.call(appointmentBooking, id);
+  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !isRetailTemplate ? /* @__PURE__ */ import_react.default.createElement(import_Header.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -214,7 +218,8 @@ var Layout = () => {
       onConfirm: () => closePolicy(true),
       item: policyParams == null ? void 0 : policyParams.content,
       onChange: () => setLoading(false),
-      isHideCheckout: false
+      isHideCheckout: false,
+      depositProtocolRequest
     }
   ) : null);
 };

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

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(100vh - 16px) !important;
+      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
     }
   }
 }

package/lib/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,3 +1,9 @@
 import './index.less';
+export declare const DepositContent: (props: {
+    isAgreeDepositPolicy: boolean;
+    setIsAgreeDepositPolicy: (value: boolean) => void;
+    deposit: any;
+    depositProtocolRequest?: any;
+}) => JSX.Element;
 declare const Deposit: () => JSX.Element;
 export default Deposit;

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

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/appointmentBooking/components/Deposit/index.tsx
 var Deposit_exports = {};
 __export(Deposit_exports, {
+  DepositContent: () => DepositContent,
   default: () => Deposit_default
 });
 module.exports = __toCommonJS(Deposit_exports);
@@ -38,9 +39,13 @@ var import_deposit = __toESM(require("../../deposit"));
 var import_context = require("../../context");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
-var Deposit = () => {
-  const { setIsAgreeDepositPolicy, isAgreeDepositPolicy, summary } = (0, import_context.useAppointmentBookingContext)();
-  const { deposit } = summary;
+var DepositContent = (props) => {
+  const {
+    isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy,
+    deposit,
+    depositProtocolRequest
+  } = props;
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-top" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.appointment.deposit")), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellText.Amount,
     {
@@ -54,8 +59,35 @@ var Deposit = () => {
       total: deposit == null ? void 0 : deposit.total,
       protocols: deposit == null ? void 0 : deposit.protocols,
       isAgreePolicy: isAgreeDepositPolicy,
-      onChange: (value) => setIsAgreeDepositPolicy(value)
+      onChange: (value) => setIsAgreeDepositPolicy(value),
+      depositProtocolRequest
     }
   ));
 };
+var Deposit = () => {
+  const {
+    setIsAgreeDepositPolicy,
+    isAgreeDepositPolicy,
+    summary,
+    appointmentBooking
+  } = (0, import_context.useAppointmentBookingContext)();
+  const { deposit } = summary;
+  const depositProtocolRequest = (id) => {
+    var _a;
+    return (_a = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a.call(appointmentBooking, id);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    DepositContent,
+    {
+      isAgreeDepositPolicy: !!isAgreeDepositPolicy,
+      setIsAgreeDepositPolicy,
+      deposit,
+      depositProtocolRequest
+    }
+  );
+};
 var Deposit_default = Deposit;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DepositContent
+});

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

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/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/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

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/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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/materiels/holder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

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

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps, RouteType } from './const';
 declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

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/device.d.ts

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

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"success" | "loading" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
+    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/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"
+}