@pisell/private-materials 6.4.62 → 6.4.63

package/es/components/appointmentBooking/hooks.js

@@ -14,7 +14,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { useState, useEffect, useMemo } from 'react';
-import { locales } from "@pisell/utils";
+import { locales } from '@pisell/utils';
 import { usePisellOS } from "../../hooks/useEngineContext";
 import useEngineContext from "../../hooks/useEngineContext";
 import { sortResources, getCustomer, currentAppointmentBoard, currentRenderLists, getFormInsertBeforeKey, checkAndGoNext, checkAndMarkCartRenderError, formatHolder, Toast } from "./utils";
@@ -37,7 +37,7 @@ export var contextUtils = function contextUtils() {
 
 /**
  * @title: 监听步骤发生变化
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:11
@@ -143,56 +143,56 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
     var currentSelectedResources = appointmentBooking.getOtherData('current_selected_resources');
 
     // 先确定点击时的步骤，如果当前步骤是选择服务
-    if (!isRetailTemplate && currentKey === "select-service") {
+    if (!isRetailTemplate && currentKey === 'select-service') {
       var _appointmentBooking$o, _stepList, _stepList2;
       var _ref3 = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.productModuleParams) || {},
         bookingProcess = _ref3.bookingProcess;
-      var isDateSelectedFirst = bookingProcess === "date_first";
+      var isDateSelectedFirst = bookingProcess === 'date_first';
       var hasResourceStep = (_stepList = stepList) === null || _stepList === void 0 ? void 0 : _stepList.find(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.key) === "select-resource";
+        return (item === null || item === void 0 ? void 0 : item.key) === 'select-resource';
       });
       var hasSelectGuestStep = (_stepList2 = stepList) === null || _stepList2 === void 0 || (_stepList2 = _stepList2.find(function (item) {
-        return (item === null || item === void 0 ? void 0 : item.key) === "select-guest";
+        return (item === null || item === void 0 ? void 0 : item.key) === 'select-guest';
       })) === null || _stepList2 === void 0 ? void 0 : _stepList2.key;
       // 判断购物车里是否全是是普通商品
       var isAllNormalProduct = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartAllNormalProducts();
       if (isAllNormalProduct) {
-        removeStep("select-resource");
-        removeStep("select-time");
+        removeStep('select-resource');
+        removeStep('select-time');
         removeStep('fill-form');
         if (!isDateSelectedFirst) {
-          removeStep("select-date");
+          removeStep('select-date');
         }
       } else if (!hasResourceStep) {
         // 如果不全是普通商品，并且还没有选择资源步骤，证明之前被删除过，要给她加回来
         // 判断当前步骤里有没有添加预约人，如果有的话则应该是在添加预约人之后添加步骤
-        var targetKey = hasSelectGuestStep ? hasSelectGuestStep : "select-service";
+        var targetKey = hasSelectGuestStep ? hasSelectGuestStep : 'select-service';
         var isHasDurationProduct = appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.isCartHasDurationProduct();
         // 如果购物车里有 duration 商品（目前来说，只能是纯 duration 商品）
         if (isHasDurationProduct) {
           // 如果是先选商品，则添加日期、资源、时间步骤
           if (!isDateSelectedFirst) {
             appointmentBooking.addStep({
-              key: "select-date",
-              description: locales.getText("pisell2.appointment.select.date")
+              key: 'select-date',
+              description: locales.getText('pisell2.appointment.select.date')
             }, targetKey);
-            targetKey = "select-date";
+            targetKey = 'select-date';
           }
           // 如果是先选日期，则添加资源、时间
           appointmentBooking.addStep({
-            key: "select-resource",
-            description: locales.getText("pisell2.appointment.select.resource")
+            key: 'select-resource',
+            description: locales.getText('pisell2.appointment.select.resource')
           }, targetKey);
-          targetKey = "select-resource";
+          targetKey = 'select-resource';
           appointmentBooking.addStep({
-            key: "select-time",
-            description: locales.getText("pisell2.appointment.select.time")
+            key: 'select-time',
+            description: locales.getText('pisell2.appointment.select.time')
           }, targetKey);
         } else {
           // 如果购物车里是session 商品，则只添加选择资源步骤
           appointmentBooking.addStep({
-            key: "select-resource",
-            description: locales.getText("pisell2.appointment.select.resource")
+            key: 'select-resource',
+            description: locales.getText('pisell2.appointment.select.resource')
           }, targetKey);
         }
       }
@@ -381,7 +381,6 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
                     //   //     getHolders();
                     //   //   }
                     //   // }
-
                     //   // 继续后续流程
                     //   checkHolder()
                     // }
@@ -434,7 +433,7 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
 
 /**
  * @title: 获取商品数据
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:12
@@ -525,7 +524,7 @@ export var useAppointmentBookingProduct = function useAppointmentBookingProduct(
 
 /**
  * @title: 更新购物车数据
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:12
@@ -612,7 +611,7 @@ export var useAppointmentBookingCart = function useAppointmentBookingCart() {
 
 /**
  * @title: 获取登录状态
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:14
@@ -640,7 +639,7 @@ export var useAppointmentBookingLogin = function useAppointmentBookingLogin() {
 
 /**
  * @title: 获取账户
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:15
@@ -790,7 +789,7 @@ export var useAppointmentBookingAccount = function useAppointmentBookingAccount(
 
 /**
  * @title: 获取资源数据
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-15 11:29
@@ -855,7 +854,7 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
 
 /**
  * @title: 是否跳过资源选择步骤
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-21 11:47
@@ -937,13 +936,13 @@ export var useIsSkipResourceStep = function useIsSkipResourceStep() {
 
 /**
  * @title: 获取预约配置
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-04-24 18:15
  */
 export var useAppointmentBookingSetting = function useAppointmentBookingSetting() {
-  var _appointmentBooking$o4, _appointmentBooking$o5;
+  var _appointmentBooking$o4, _appointmentBooking$o5, _appointmentBooking$o6;
   var utils = contextUtils();
   var _ref28 = useAppointmentBookingContext(),
     appointmentBooking = _ref28.appointmentBooking;
@@ -977,6 +976,7 @@ export var useAppointmentBookingSetting = function useAppointmentBookingSetting(
     bookingSubject: bookingSubject,
     setOtherData: setOtherData,
     getOtherData: getOtherData,
-    formName: formName
+    formName: formName,
+    bookingSetting: (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o6 = appointmentBooking.otherParams) === null || _appointmentBooking$o6 === void 0 ? void 0 : _appointmentBooking$o6.bookingSetting) || {}
   };
 };

package/es/components/appointmentBooking/locales.d.ts

@@ -117,6 +117,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -236,6 +237,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -355,6 +357,7 @@ declare const _default: {
         'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
+        'pisell2.text.contact-info.title': string;
     };
 };
 export default _default;

package/es/components/appointmentBooking/locales.js

@@ -132,9 +132,10 @@ export default {
     'pisell2.text.goodpass.code': 'Code',
     'pisell2.text.goodpass.enter-code': 'Enter Code',
     'pisell2.text.goodpass.code-invalid': 'Current code is invalid',
-    'pisell2.text.goodpass.code-invalid-cart': "No eligible items in the cart",
+    'pisell2.text.goodpass.code-invalid-cart': 'No eligible items in the cart',
     'pisell2.text.goodpass.login': 'Login',
-    'pisell2.text.goodpass.login-tip': ' for member benefit Or use account credit'
+    'pisell2.text.goodpass.login-tip': ' for member benefit Or use account credit',
+    'pisell2.text.contact-info.title': 'Contact info'
   },
   'zh-CN': {
     'pisell2.event.calendar.limit.unavailable': '不可预约',
@@ -269,9 +270,10 @@ export default {
     'pisell2.text.goodpass.code': '券码',
     'pisell2.text.goodpass.enter-code': '请输入券码',
     'pisell2.text.goodpass.code-invalid': '当前券码不可用',
-    'pisell2.text.goodpass.code-invalid-cart': "当前购物车中无可用商品",
+    'pisell2.text.goodpass.code-invalid-cart': '当前购物车中无可用商品',
     'pisell2.text.goodpass.login': '登录',
-    'pisell2.text.goodpass.login-tip': '以获取会员福利或使用账户积分'
+    'pisell2.text.goodpass.login-tip': '以获取会员福利或使用账户积分',
+    'pisell2.text.contact-info.title': '联系信息'
   },
   'zh-HK': {
     'pisell2.event.calendar.limit.unavailable': '不可預約',
@@ -406,8 +408,9 @@ export default {
     'pisell2.text.goodpass.code': '券碼',
     'pisell2.text.goodpass.enter-code': '請輸入券碼',
     'pisell2.text.goodpass.code-invalid': '當前券碼不可用',
-    'pisell2.text.goodpass.code-invalid-cart': "當前購物車中無可用商品",
+    'pisell2.text.goodpass.code-invalid-cart': '當前購物車中無可用商品',
     'pisell2.text.goodpass.login': '登錄',
-    'pisell2.text.goodpass.login-tip': '以獲取會員福利或使用賬戶積分'
+    'pisell2.text.goodpass.login-tip': '以獲取會員福利或使用賬戶積分',
+    'pisell2.text.contact-info.title': '聯繫信息'
   }
 };

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <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;
+}>;

package/es/components/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/es/components/booking/components/actionButtons/index.js

@@ -32,8 +32,6 @@ import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePisellOS } from "../../../../hooks/useEngineContext";
 import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
 import { DiscountKeyboard } from "../../../../pro/priceKeyboard";
-import { useActiveExecute, useBookingTicket } from "../../../ticketBooking/hooks/pisellos";
-import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 // Toast 内容包装器，统一设置行高
 var createToastContent = function createToastContent(text) {
   return /*#__PURE__*/React.createElement("div", {
@@ -63,17 +61,13 @@ var ActionButtons = function ActionButtons(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     showVoucherModal = _useState8[0],
     setShowVoucherModal = _useState8[1];
-  var _useActiveExecute = useActiveExecute(),
-    executeIfActive = _useActiveExecute.executeIfActive;
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     getData = _context$appHelper$ut.getData,
     pisellosAllModule = _context$appHelper$ut.pisellosAllModule;
   var Toast = useToast();
   var pisellOS = usePisellOS();
-  var bookingTicket = useBookingTicket();
   var ScheduleModule = pisellosAllModule.ScheduleModule;
-  var shopDiscount = useShopDiscountModule();
 
   // 将选中的客户数据传递给状态管理
   var changeCustomerToGlobalState = useMemoizedFn(function (value) {
@@ -94,7 +88,7 @@ var ActionButtons = function ActionButtons(_ref) {
 
   // 监听客户选择变化，清空手动折扣
   useEffect(function () {
-    if (!bookingTicket) return;
+    if (!pisellOS) return;
     var handleCustomerSelected = function handleCustomerSelected() {
       // 当客户选择改变时，清空 shop_discount
       dispatch({
@@ -104,16 +98,15 @@ var ActionButtons = function ActionButtons(_ref) {
         }
       });
     };
-    var wrappedHandleCustomerSelected = executeIfActive(handleCustomerSelected);
 
     // 监听客户选择事件
-    bookingTicket.effectsOn('onCustomerSelected', wrappedHandleCustomerSelected);
+    pisellOS.effects.on('bookingTicket:onCustomerSelected', handleCustomerSelected);
 
     // 清理函数
     return function () {
-      bookingTicket.effectsOff('onCustomerSelected', wrappedHandleCustomerSelected);
+      pisellOS.effects.off('bookingTicket:onCustomerSelected', handleCustomerSelected);
     };
-  }, [dispatch, bookingTicket]);
+  }, [dispatch, pisellOS]);
 
   // 同步获取金额计算所需配置
   var getDataFromHost = function getDataFromHost() {
@@ -229,14 +222,13 @@ var ActionButtons = function ActionButtons(_ref) {
     var _context$appHelper2;
     var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {},
       pisellos = _ref2.pisellos;
-    if (!pisellos || !shopDiscount) return;
+    if (!pisellos) return;
     var onDiscountListChange = function onDiscountListChange(discount) {
       setDiscountList(discount);
     };
-    var wrappedHandler = executeIfActive(onDiscountListChange);
-    shopDiscount.effectsOn('onDiscountListChange', wrappedHandler);
+    pisellos.effects.on('shopDiscount:onDiscountListChange', onDiscountListChange);
     return function () {
-      shopDiscount.effectsOff('onDiscountListChange', wrappedHandler);
+      pisellos.effects.off('shopDiscount:onDiscountListChange', onDiscountListChange);
     };
   }, [(_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.utils]);
 

package/es/components/booking/components/collapsibleList/utils.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/es/components/booking/components/emptyBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/es/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

package/es/components/booking/components/footer/index.js

@@ -46,7 +46,7 @@ import { Iconfont } from '@pisell/materials';
 import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
 import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
 import { cloneDeep } from 'lodash';
-import { useShopDiscountModule } from "../../../ticketBooking/hooks/pisellos/useShopDiscountModule";
+import { useShopDiscount } from "../../../appointmentBooking/hooks";
 
 /**
  * @title: 底部
@@ -261,7 +261,7 @@ var Footer = function Footer(props) {
 
   // info 是否有编辑
   var infoEdit = useMemo(function () {
-    var _state$client, _state$date, _state$pet, _state$service3, _state$notes, _state$contacts;
+    var _state$client, _state$date, _state$pet, _state$service3, _state$notes, _state$contacts, _state$contacts_info;
     if (!state.bookingId) {
       return true;
     }
@@ -283,6 +283,9 @@ var Footer = function Footer(props) {
     if ((_state$contacts = state.contacts) !== null && _state$contacts !== void 0 && _state$contacts.edit) {
       return true;
     }
+    if ((_state$contacts_info = state.contacts_info) !== null && _state$contacts_info !== void 0 && _state$contacts_info.edit) {
+      return true;
+    }
     return false;
   }, [state]);
 
@@ -1734,7 +1737,7 @@ var Footer = function Footer(props) {
       changeCustomerToGlobalState: changeCustomerToGlobalState
     }),
     selectCustomer = _useCustomer.selectCustomer;
-  var shopDiscount = useShopDiscountModule();
+  var shopDiscount = useShopDiscount();
   var _useScanManager2 = useScanManager(),
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车