@pisell/private-materials 3.0.150-gray → 3.0.150

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

@@ -1,12 +1,6 @@
 import React from 'react';
-import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
-interface AddServiceProps {
+declare const Info: ({ onEdit }: {
     onEdit: any;
-    dispatch?: any;
-    state?: any;
-    drawerProps?: PisellDrawerProps;
-    renderMode?: 'current' | 'drawer';
-}
-declare const Info: (props: AddServiceProps) => React.JSX.Element;
+}) => React.JSX.Element;
 export default Info;

package/lib/components/booking/info/service/addService/index.js

@@ -63,16 +63,13 @@ var shopList = [
   6848,
   6305
 ];
-var Info = (props) => {
+var Info = ({ onEdit }) => {
   var _a, _b, _c, _d;
-  const { onEdit, drawerProps, renderMode } = props;
   const [search, setSearch] = (0, import_react.useState)("");
-  let { state, dispatch } = (0, import_react.useContext)(import_model.Context);
+  const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const searchRef = (0, import_react.useRef)();
   const context = (0, import_useEngineContext.default)();
-  state = state || (props == null ? void 0 : props.state);
-  dispatch = dispatch || (props == null ? void 0 : props.dispatch);
   import_utils3.request.setRequest(context.appHelper.utils.request);
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
@@ -123,7 +120,7 @@ var Info = (props) => {
       }
     });
   };
-  const getServices = async (params) => {
+  const getServices = async () => {
     var _a2;
     setLoading(true);
     let data = await state.apis.getServices({
@@ -137,10 +134,8 @@ var Info = (props) => {
       with_count: ["bundleGroup", "optionGroup"],
       order_by_string: "sort:desc",
       status: "published",
-      ...state.isBookingCreatePage ? { schedule_date: params == null ? void 0 : params.schedule_date } : {
-        _config: {
-          useCache: true
-        }
+      _config: {
+        useCache: true
       }
     });
     setLoading(false);
@@ -216,10 +211,6 @@ var Info = (props) => {
             cacheItem._id = (_a2 = state.service.cacheItem) == null ? void 0 : _a2._id;
             cacheItem.new = 0;
           }
-          if (renderMode === "current") {
-            cacheItem._extend.resource = 0;
-            cacheItem.currentDefaultTime = state.date.value.format("HH:mm");
-          }
           cacheItem._extend = (0, import_utils2.getProductExtend)({ cacheItem, state });
           if (state.renderType === "eventBooking") {
             cacheItem.autoClose = false;
@@ -277,24 +268,12 @@ var Info = (props) => {
       setSearch("");
     }
   }, [state.service.addModal]);
-  const currentDate = (0, import_react.useMemo)(() => {
-    return state.date.value.format("YYYY-MM-DD");
-  }, [state.date.value]);
-  console.log(currentDate, "currentDate");
-  (0, import_react.useEffect)(() => {
-    if (renderMode === "current") {
-      getServices({ schedule_date: currentDate });
-    }
-  }, [renderMode, currentDate]);
   (0, import_react.useEffect)(() => {
     if (state.renderType === "eventBooking" && state.modalOpen) {
       getServices();
     }
   }, [state.renderType, state.modalOpen]);
   const addButton = (0, import_react.useMemo)(() => {
-    if (state.isBookingCreatePage) {
-      return /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } });
-    }
     if (state.renderType === "eventBooking") {
       return isService ? /* @__PURE__ */ import_react.default.createElement("div", { style: { height: 20 } }) : /* @__PURE__ */ import_react.default.createElement(
         import_addButton.default,
@@ -323,49 +302,12 @@ var Info = (props) => {
     state.service.value,
     loading
   ]);
-  const isRenderCurrent = (0, import_react.useMemo)(() => {
-    return renderMode === "current";
-  }, [renderMode]);
   return (0, import_react.useMemo)(() => {
     var _a2, _b2;
-    const header = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Input,
-      {
-        ref: searchRef,
-        prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
-        style: { marginTop: 16, height: 44 },
-        placeholder: import_utils4.locales.getText("pisell2.text.search"),
-        allowClear: true,
-        value: search,
-        onChange: (e) => {
-          setSearch(e.target.value);
-        }
-      }
-    ));
-    const content = /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body" }, /* @__PURE__ */ import_react.default.createElement(
-      import_TabProduct.default,
-      {
-        list: renderList,
-        amountSymbol: state.amountSymbol,
-        onChange: handleSelectProduct,
-        scrollDom: isRenderCurrent ? ".pisell-lowcode__booking-vertical-add-service-wrap" : ".booking-server-wrap .pisell-lowcode-drawer-body "
-      }
-    ));
-    if (renderMode === "current") {
-      return /* @__PURE__ */ import_react.default.createElement(
-        "div",
-        {
-          className: "pisell-lowcode__booking-vertical-add-service-wrap",
-          style: { width: "100%", height: "100%", overflow: "auto" }
-        },
-        header,
-        content
-      );
-    }
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2.autoClose) && /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { loading: true, active: true, round: true }), addButton, /* @__PURE__ */ import_react.default.createElement(
       import_drawer.default,
       {
-        open: state.service.addModal && !state.isBookingCreatePage,
+        open: state.service.addModal,
         title: import_utils4.locales.getText("pisell2.text.select-service"),
         rootClassName: "booking-server-wrap",
         onClose: () => {
@@ -377,10 +319,30 @@ var Info = (props) => {
             }
           });
         },
-        header,
-        ...drawerProps || {}
+        header: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-header" }, /* @__PURE__ */ import_react.default.createElement(
+          import_antd.Input,
+          {
+            ref: searchRef,
+            prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
+            style: { marginTop: 16, height: 44 },
+            placeholder: import_utils4.locales.getText("pisell2.text.search"),
+            allowClear: true,
+            value: search,
+            onChange: (e) => {
+              setSearch(e.target.value);
+            }
+          }
+        ))
       },
-      content
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body" }, /* @__PURE__ */ import_react.default.createElement(
+        import_TabProduct.default,
+        {
+          list: renderList,
+          amountSymbol: state.amountSymbol,
+          onChange: handleSelectProduct,
+          scrollDom: ".booking-server-wrap .pisell-lowcode-drawer-body"
+        }
+      ))
     ));
   }, [
     (_d = (_c = state.service) == null ? void 0 : _c.cacheItem) == null ? void 0 : _d.autoClose,

package/lib/components/booking/info/service/addService/index.less

@@ -3,33 +3,7 @@
   // border-bottom: 1px solid var(--gray-300, #D0D5DD);
 }
 
+
 .pisell-lowcode__booking-service-body {
   background: var(--gray-50, #F9FAFB);
-}
-
-.pisell-lowcode__booking-vertical-add-service-wrap {
-  &::-webkit-scrollbar {
-    display: none !important;
-  }
-  .pisell-lowcode__booking-service-header {
-    background-color: #fff;
-    top: 0;
-    position: sticky;
-    z-index: 2;
-    padding: 16px !important;
-    margin: 0;
-    .pisell-lowcode-input-affix-wrapper {
-      margin: 0 !important;
-    }
-  }
-  .booking-category-list {
-    padding: 0 16px !important;
-  }
-  .pisell-lowcode__booking-service-body {
-    .booking-tab-product {
-      .booking-tabs-wrap {
-        top: 76px !important;
-      }
-    }
-  }
 }

package/lib/components/booking/info/service/editService/index.js

@@ -270,7 +270,7 @@ var Info = (_, ref) => {
     let values = cacheItem._extend;
     form.setFieldsValue(values);
     if (state.renderType !== "eventBooking") {
-      getResources(cacheItem);
+      getResources(_cacheItem);
     }
   });
   const isReason = (0, import_react.useMemo)(() => {
@@ -297,10 +297,7 @@ var Info = (_, ref) => {
     (_f = state.service.cacheItem) == null ? void 0 : _f.autoClose
   ]);
   (0, import_react.useEffect)(() => {
-    if (state.isBookingCreatePage && state.service.editModal) {
-      setEditData();
-    }
-  }, [state.service.editModal, state.isBookingCreatePage]);
+  }, [state.service.editModal]);
   (0, import_react.useEffect)(() => {
     getErrorMsg();
   }, [useResource, useStartTime, useDuration]);
@@ -436,7 +433,7 @@ var Info = (_, ref) => {
           });
         }
       },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_d2 = (_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend) == null ? void 0 : _d2.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), !state.isBookingCreatePage && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-body-edit" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form, { layout: "vertical", form, onFinish }, /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { name: "product_name" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "current-service-info-name" }, ((_d2 = (_c2 = (_b2 = state.service) == null ? void 0 : _b2.cacheItem) == null ? void 0 : _c2._extend) == null ? void 0 : _d2.product_name) || "-"), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleEdit }, import_utils.locales.getText("pisell2.text.edit")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: handleChange }, import_utils.locales.getText("pisell2.text.change"))), /* @__PURE__ */ import_react.default.createElement(
         import_collapsibleList.default,
         {
           style: { marginTop: bundles.length ? "8px" : 0 },

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

@@ -194,22 +194,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option': string;
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
-        'pisell2.booking.dashboard.groups-on-site-now': string;
-        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
-        'pisell2.booking.dashboard.people-on-site-now': string;
-        'pisell2.booking.dashboard.people-on-site-now-tip': string;
-        'pisell2.booking.dashboard.total-visitors-today': string;
-        'pisell2.booking.dashboard.total-visitors-today-tip': string;
-        'pisell2.booking.dashboard.ongoing-visitors': string;
-        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
-        'pisell2.booking.dashboard.upcoming-visitors': string;
-        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
-        'pisell2.booking.dashboard.overdue-visitors': string;
-        'pisell2.booking.dashboard.overdue-visitors-tip': string;
-        'pisell2.booking.dashboard.completed-visitors': string;
-        'pisell2.booking.dashboard.completed-visitors-tip': string;
-        'pisell2.booking.dashboard.departed-visitors': string;
-        'pisell2.booking.dashboard.departed-visitors-tip': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -406,22 +390,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option': string;
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
-        'pisell2.booking.dashboard.groups-on-site-now': string;
-        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
-        'pisell2.booking.dashboard.people-on-site-now': string;
-        'pisell2.booking.dashboard.people-on-site-now-tip': string;
-        'pisell2.booking.dashboard.total-visitors-today': string;
-        'pisell2.booking.dashboard.total-visitors-today-tip': string;
-        'pisell2.booking.dashboard.ongoing-visitors': string;
-        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
-        'pisell2.booking.dashboard.upcoming-visitors': string;
-        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
-        'pisell2.booking.dashboard.overdue-visitors': string;
-        'pisell2.booking.dashboard.overdue-visitors-tip': string;
-        'pisell2.booking.dashboard.completed-visitors': string;
-        'pisell2.booking.dashboard.completed-visitors-tip': string;
-        'pisell2.booking.dashboard.departed-visitors': string;
-        'pisell2.booking.dashboard.departed-visitors-tip': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -618,22 +586,6 @@ declare const _default: {
         'page.booking.text.please-choose-an-option': string;
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
-        'pisell2.booking.dashboard.groups-on-site-now': string;
-        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
-        'pisell2.booking.dashboard.people-on-site-now': string;
-        'pisell2.booking.dashboard.people-on-site-now-tip': string;
-        'pisell2.booking.dashboard.total-visitors-today': string;
-        'pisell2.booking.dashboard.total-visitors-today-tip': string;
-        'pisell2.booking.dashboard.ongoing-visitors': string;
-        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
-        'pisell2.booking.dashboard.upcoming-visitors': string;
-        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
-        'pisell2.booking.dashboard.overdue-visitors': string;
-        'pisell2.booking.dashboard.overdue-visitors-tip': string;
-        'pisell2.booking.dashboard.completed-visitors': string;
-        'pisell2.booking.dashboard.completed-visitors-tip': string;
-        'pisell2.booking.dashboard.departed-visitors': string;
-        'pisell2.booking.dashboard.departed-visitors-tip': string;
     };
 };
 export default _default;

package/lib/components/booking/locales.js

@@ -249,23 +249,7 @@ var locales_default = {
     "page.booking.text.paid.msg": (x) => `The related order is ${x === "paid" ? "paid" : "partially paid"}.`,
     "page.booking.text.please-choose-an-option": "Please choose an option:",
     "page.booking.text.please-choose-an-option-1": "Refund: Cancel the appointment and process a refund.",
-    "page.booking.text.please-choose-an-option-2": "Cancel only: Cancel the appointment without processing a refund. (You can still process a refund after cancellation if needed)",
-    "pisell2.booking.dashboard.groups-on-site-now": "Groups on-site now",
-    "pisell2.booking.dashboard.groups-on-site-now-tip": "Tip: Total number of groups who have checked in and are currently on-site",
-    "pisell2.booking.dashboard.people-on-site-now": "People on-site now",
-    "pisell2.booking.dashboard.people-on-site-now-tip": "Tip: Total number of people who have checked in and are currently on-site",
-    "pisell2.booking.dashboard.total-visitors-today": "Total visitors today",
-    "pisell2.booking.dashboard.total-visitors-today-tip": "Tip: Total number of visitors today, regardless of check-in status",
-    "pisell2.booking.dashboard.ongoing-visitors": "Ongoing visitors",
-    "pisell2.booking.dashboard.ongoing-visitors-tip": "Tip: Total number of visitors who have passed the start time, regardless of check-in status",
-    "pisell2.booking.dashboard.upcoming-visitors": "Upcoming visitors",
-    "pisell2.booking.dashboard.upcoming-visitors-tip": "Tip: Total number of visitors expected to arrive in the near future",
-    "pisell2.booking.dashboard.overdue-visitors": "Overdue visitors",
-    "pisell2.booking.dashboard.overdue-visitors-tip": "Tip: Total number of visitors whose playtime has expired but have not yet left the venue",
-    "pisell2.booking.dashboard.completed-visitors": "Completed visitors",
-    "pisell2.booking.dashboard.completed-visitors-tip": "Tip: Total number of visitors whose playtime has ended, regardless of whether they have left the venue",
-    "pisell2.booking.dashboard.departed-visitors": "Departed visitors",
-    "pisell2.booking.dashboard.departed-visitors-tip": "Tip: Total number of visitors who checked in and have left the venue today"
+    "page.booking.text.please-choose-an-option-2": "Cancel only: Cancel the appointment without processing a refund. (You can still process a refund after cancellation if needed)"
   },
   "zh-CN": {
     "pisell2.text.refunded-amount": "已退金额",
@@ -487,23 +471,7 @@ var locales_default = {
     "page.booking.text.paid.msg": (x) => `关联订单${x === "paid" ? "已付款" : "部分付款"}。`,
     "page.booking.text.please-choose-an-option": "请选择：",
     "page.booking.text.please-choose-an-option-1": "退款：取消预约，同时处理退款。",
-    "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）",
-    "pisell2.booking.dashboard.groups-on-site-now": "当前在场团体",
-    "pisell2.booking.dashboard.groups-on-site-now-tip": "提示：已检票并在场内的团体总数",
-    "pisell2.booking.dashboard.people-on-site-now": "当前在场人数",
-    "pisell2.booking.dashboard.people-on-site-now-tip": "提示：已检票并在场内的总人数",
-    "pisell2.booking.dashboard.total-visitors-today": "今日游客总数",
-    "pisell2.booking.dashboard.total-visitors-today-tip": "提示：今日的游客总人数，无论是否检票入场",
-    "pisell2.booking.dashboard.ongoing-visitors": "进行中的游客",
-    "pisell2.booking.dashboard.ongoing-visitors-tip": "提示：已过开始时间的游客总数，无论是否检票",
-    "pisell2.booking.dashboard.upcoming-visitors": "即将到达的游客",
-    "pisell2.booking.dashboard.upcoming-visitors-tip": "提示：预计将在未来到场的游客总人数",
-    "pisell2.booking.dashboard.overdue-visitors": "超时的游客",
-    "pisell2.booking.dashboard.overdue-visitors-tip": "提示：游玩时间已过，但尚未离场的游客总人数",
-    "pisell2.booking.dashboard.completed-visitors": "已完成的游客",
-    "pisell2.booking.dashboard.completed-visitors-tip": "提示：游玩时长已结束的游客总人数，无论是否离场",
-    "pisell2.booking.dashboard.departed-visitors": "已离场的游客",
-    "pisell2.booking.dashboard.departed-visitors-tip": "提示：今日已检票并离场的游客总人数"
+    "page.booking.text.please-choose-an-option-2": "仅取消：仅取消预约，但不进行退款处理。（您仍然可以在取消后再进行退款操作）"
   },
   "zh-HK": {
     "pisell2.text.refunded-amount": "已退金額",
@@ -725,22 +693,6 @@ var locales_default = {
     "page.booking.text.paid.msg": (x) => `關聯訂單${x === "paid" ? "已付款" : "部分付款"}。`,
     "page.booking.text.please-choose-an-option": "請選擇：",
     "page.booking.text.please-choose-an-option-1": "退款：取消預約，同時處理退款。",
-    "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）",
-    "pisell2.booking.dashboard.groups-on-site-now": "當前在場團體",
-    "pisell2.booking.dashboard.groups-on-site-now-tip": "提示：已檢票並在場內的團體總數",
-    "pisell2.booking.dashboard.people-on-site-now": "當前在場人數",
-    "pisell2.booking.dashboard.people-on-site-now-tip": "提示：已檢票並在場內的總人數",
-    "pisell2.booking.dashboard.total-visitors-today": "今日遊客總數",
-    "pisell2.booking.dashboard.total-visitors-today-tip": "提示：今日的遊客總人數，無論是否檢票入場",
-    "pisell2.booking.dashboard.ongoing-visitors": "進行中的遊客",
-    "pisell2.booking.dashboard.ongoing-visitors-tip": "提示：已過開始時間的遊客總數，無論是否檢票",
-    "pisell2.booking.dashboard.upcoming-visitors": "即將到達的遊客",
-    "pisell2.booking.dashboard.upcoming-visitors-tip": "提示：預計將在未來到場的遊客總人數",
-    "pisell2.booking.dashboard.overdue-visitors": "超時的遊客",
-    "pisell2.booking.dashboard.overdue-visitors-tip": "提示：遊玩時間已過，但尚未離場的遊客總人數",
-    "pisell2.booking.dashboard.completed-visitors": "已完成的遊客",
-    "pisell2.booking.dashboard.completed-visitors-tip": "提示：遊玩時長已結束的遊客總人數，無論是否離場",
-    "pisell2.booking.dashboard.departed-visitors": "已離場的遊客",
-    "pisell2.booking.dashboard.departed-visitors-tip": "提示：今日已檢票並離場的遊客總人數"
+    "page.booking.text.please-choose-an-option-2": "僅取消：僅取消預約，但不進行退款處理。（您仍然可以在取消後再進行退款操作）"
   }
 };

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

@@ -92,8 +92,6 @@ export interface FormState {
     disableEventBookingEdit?: boolean;
     /** 关闭自动打开选择服务弹窗 */
     closeAutoOpenService?: boolean;
-    /** 是否terminal创建booking页面 */
-    isBookingCreatePage?: boolean;
 }
 export declare const walkInData: {
     id: number;

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: (props: any) => JSX.Element;
 export default Notes;

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

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

@@ -62,7 +62,7 @@ export declare const getServeStartTime: (start_time: string) => string;
  * @Date: 2024-04-26 14:04
  */
 export declare const getServiceTime: (item: any, currentDate: any) => string;
-export declare const findNextSlice: ({ timeSlices, index, date, }: {
+export declare const findNextSlice: ({ timeSlices, index, date }: {
     timeSlices: any[];
     index?: number | undefined;
     date?: string | undefined;

package/lib/components/booking/utils.js

@@ -112,9 +112,7 @@ var sliceDayIntoFiveMinutes = (config, locale) => {
         value: durationValue
       });
     } else {
-      const durationLabel = `${durationValue} ${import_utils.locales.getText(
-        "pisell2.text.min"
-      )}`;
+      const durationLabel = `${durationValue} ${import_utils.locales.getText("pisell2.text.min")}`;
       durationSlicesBasedOnTime.push({
         label: durationLabel,
         value: durationValue
@@ -137,9 +135,7 @@ var getServeStartTime = (start_time) => {
   return start_time;
 };
 var getServiceTime = (item, currentDate) => {
-  const startDate = (0, import_dayjs.default)(
-    currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time)
-  );
+  const startDate = (0, import_dayjs.default)(currentDate.format("YYYY-MM-DD") + " " + getServeStartTime(item._extend.start_time));
   const startTime = startDate.format("HH:mm");
   const endTime = startDate.add(flexibleObj.getValue(item._extend.duration), "minute").format("HH:mm");
   const duration = getDiscountTime(flexibleObj.getValue(item._extend.duration));
@@ -187,7 +183,10 @@ var formatProductListByCategory = (list, filterItem) => {
         }
         categoryObject[categoryItem.id] = {
           ...categoryItem,
-          products: [...categoryObject[categoryItem.id].products, productItem]
+          products: [
+            ...categoryObject[categoryItem.id].products,
+            productItem
+          ]
         };
       }
     } else {
@@ -209,9 +208,7 @@ var formatProductListByCategory = (list, filterItem) => {
   return Object.values(categoryObject).sort((a, b) => b.sort - a.sort);
 };
 var getResourceTimeIsUsable = (item, cacheItem) => {
-  const startDate = (0, import_dayjs.default)(
-    cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time)
-  );
+  const startDate = (0, import_dayjs.default)(cacheItem._extend.start_date.format("YYYY-MM-DD") + " " + getServeStartTime(cacheItem._extend.start_time));
   const isFlexible = flexibleObj.isFlexible(cacheItem._extend.duration);
   let isMaxLimitRange = false;
   let isDateRange = false;
@@ -221,22 +218,13 @@ var getResourceTimeIsUsable = (item, cacheItem) => {
   } else {
     isMaxLimitRange = "unknown";
   }
-  const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(
-    1,
-    "second"
-  );
-  const timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(
-    1,
-    "second"
-  );
+  const timeStartDate = (0, import_dayjs.default)(time.start_date + " " + time.start_time).subtract(1, "second");
+  const timeEndDate = (0, import_dayjs.default)(time.end_date + " " + time.end_time).add(1, "second");
   let bol;
   if (isFlexible) {
     bol = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
   } else {
-    let endDate = startDate.add(
-      flexibleObj.getValue(cacheItem._extend.duration),
-      "minute"
-    );
+    let endDate = startDate.add(flexibleObj.getValue(cacheItem._extend.duration), "minute");
     bol = startDate.isAfter(timeStartDate) && endDate.isBefore(timeEndDate);
   }
   if (bol) {
@@ -341,9 +329,7 @@ var flexibleObj = {
 };
 var getEndDate = (startDate, duration, endDate) => {
   if (duration === "flexible") {
-    let openingDate = (0, import_dayjs.default)(
-      startDate.format("YYYY-MM-DD") + " " + getShopOpeningHours()
-    );
+    let openingDate = (0, import_dayjs.default)(startDate.format("YYYY-MM-DD") + " " + getShopOpeningHours());
     if ((0, import_dayjs.default)(startDate).isAfter(openingDate)) {
       openingDate = openingDate.add(1, "day");
     }
@@ -358,13 +344,8 @@ var getEndDate = (startDate, duration, endDate) => {
   return startDate.add(duration, "minute");
 };
 var getServiceTimes = (service) => {
-  const startDate = (0, import_dayjs.default)(
-    (0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time)
-  );
-  const endDate = startDate.add(
-    flexibleObj.getValue(service._extend.duration),
-    "minute"
-  );
+  const startDate = (0, import_dayjs.default)((0, import_dayjs.default)(service._extend.start_date).format("YYYY-MM-DD ") + getServeStartTime(service._extend.start_time));
+  const endDate = startDate.add(flexibleObj.getValue(service._extend.duration), "minute");
   return {
     startDate,
     endDate
@@ -373,12 +354,10 @@ var getServiceTimes = (service) => {
 var getErrorList = (resource, cacheItem) => {
   var _a, _b, _c;
   if (!(cacheItem == null ? void 0 : cacheItem.id)) {
-    return [
-      {
-        label: import_utils.locales.getText("pisell2.text.no-product-added"),
-        type: "products"
-      }
-    ];
+    return [{
+      label: import_utils.locales.getText("pisell2.text.no-product-added"),
+      type: "products"
+    }];
   }
   if (!resource || !resource._extend || !cacheItem) {
     return [];
@@ -387,10 +366,7 @@ var getErrorList = (resource, cacheItem) => {
   if (!resource.usable) {
     if (!((_a = resource == null ? void 0 : resource._extend) == null ? void 0 : _a.usableProduct)) {
       list.push({
-        label: import_utils.locales.getText("pisell1.text.resource-error-message-1")(
-          resource.labelText,
-          cacheItem == null ? void 0 : cacheItem.title
-        ),
+        label: import_utils.locales.getText("pisell1.text.resource-error-message-1")(resource.labelText, cacheItem == null ? void 0 : cacheItem.title),
         type: "product"
       });
     }
@@ -402,21 +378,13 @@ var getErrorList = (resource, cacheItem) => {
     }
     if (!((_b = resource._extend) == null ? void 0 : _b.usableTime)) {
       list.push({
-        label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(
-          resource.labelText,
-          startText,
-          endText
-        ),
+        label: import_utils.locales.getText("pisell1.text.resource-error-message-2")(resource.labelText, startText, endText),
         type: "time"
       });
     } else {
       if (!((_c = resource._extend) == null ? void 0 : _c.usableTime._extend.isMaxLimitRange)) {
         list.push({
-          label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(
-            resource.labelText,
-            startText,
-            endText
-          ),
+          label: import_utils.locales.getText("pisell1.text.resource-error-message-3")(resource.labelText, startText, endText),
           type: "limit"
         });
       }
@@ -486,14 +454,11 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
         _extend.resource = resourceId;
       }
     }
+    console.log("_extend", findNextSliceProps);
     if (findNextSliceProps.date && findNextSliceProps.date !== "00:00") {
       _extend.start_time = findNextSlice(findNextSliceProps);
     } else {
-      if (cacheItem.currentDefaultTime) {
-        _extend.start_time = cacheItem.currentDefaultTime;
-      } else {
-        _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
-      }
+      _extend.start_time = (0, import_dayjs.default)().format("HH:mm");
     }
   }
   _extend = {

package/lib/components/eftposPay/index.js

@@ -241,6 +241,8 @@ var eftposPay_default = (props) => {
       onChangeParams: props.onChangeParams,
       action,
       source: props.source,
+      tyroUrl: props.tyroUrl,
+      tyroVersion: props.tyroVersion,
       device_number: (_f = props == null ? void 0 : props.params) == null ? void 0 : _f.device_number
     }
   ));

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

@@ -197,10 +197,8 @@ var tyro_default = ({
   const receiptCallbackImpl = ({ signatureRequired, merchantReceipt }) => {
     console.log("商家小票 客户端是否打印小票 = ", signatureRequired);
     console.log("商家小票 小票内容 = \n", merchantReceipt);
-    if (signatureRequired) {
-      const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
-      onChange("print", receipt);
-    }
+    const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
+    onChange("print", receipt);
     merchantReceiptRef.current = { signatureRequired, merchantReceipt };
   };
   const statusMessageCallbackImpl = (message) => {
@@ -308,7 +306,7 @@ var tyro_default = ({
       card_reader_id: (_a = deviceRef.current) == null ? void 0 : _a.id,
       card_reader_type: eftpos,
       amount: requestParams.current.amount,
-      action: modeRef.current,
+      action: modeRef.current === import_const.ModeEnum.FullPay ? import_const.ModeEnum.Pay : modeRef.current,
       status: response.result === "APPROVED" ? "succeed" : "failed",
       request: requestParams.current,
       response: { ...response, merchantReceipt: merchantReceiptRef.current },
@@ -382,7 +380,8 @@ var tyro_default = ({
         failCustom: {
           isPosNetworkError: false,
           status: "fail",
-          fail: import_utils.locales.getText("page.eftpos-pay.text.transaction.fail"),
+          fail: response.result,
+          //locales.getText('page.eftpos-pay.text.transaction.fail'),
           warn: null,
           title: import_utils.locales.getText("page.eftpos-pay.text.failed")(
             modeRef.current
@@ -398,7 +397,9 @@ var tyro_default = ({
     if (load && TyroRef.current) {
       const IClient = TyroRef.current.IClient;
       if (IClient) {
+        console.log("apiKey = ", apiKey, "posProductData = ", posProductData);
         const iclient = new IClient(apiKey, posProductData);
+        console.log(iclient.posProductData);
         iClientRef.current = iclient;
         if (isCancelRef.current) {
           return;