@pisell/private-materials 6.8.12 → 6.8.14

package/es/components/booking/info2/service/editNormalService/index.js

@@ -100,11 +100,12 @@ var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
     }
     var newProducts = (_ref3 = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (item) {
       if (item._id == data._id) {
-        var _data$_extend, _data$_extend2;
+        var _data$_extend, _data$_extend2, _data$_extend3;
         data = setProductPrice(data, {
           newTotal: (_data$_extend = data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.total,
           origin_total: (_data$_extend2 = data._extend) === null || _data$_extend2 === void 0 ? void 0 : _data$_extend2.origin_total
         });
+        data.note = (_data$_extend3 = data._extend) === null || _data$_extend3 === void 0 ? void 0 : _data$_extend3.note;
         return data;
       }
       return item;

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -36,6 +36,7 @@ import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } f
 import { useToast } from '@pisell/materials';
 import { useIsActive } from "../../context/IsActiveContext";
 import { SelectHolderModal } from "../../../booking/utils/selectHolderModal";
+import { getOpenNormalServiceHandler } from "../../../booking/info2/service/openNormalService";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -624,29 +625,45 @@ var AddSerivce = function AddSerivce(props) {
     var isSession = isSessionProduct(item);
     var isOnlySession = getIsOnlySession(item);
     var isEject = getIsEject(item, type);
-    state.action({
-      type: 'pisell1.handleOpenProductModal',
-      data: {
-        id: item.id,
-        date: state.date.value.format('YYYY-MM-DD'),
-        productDetail: item,
-        showConfig: {
-          option: true,
-          session: isSession,
-          variant: true,
-          package: true,
-          number: getIsShowNumber(item, state)
+    if (isNormalProductByDurationSchedule(item) || !isSession && isEject) {
+      var openNormalService = getOpenNormalServiceHandler();
+      if (openNormalService) {
+        openNormalService({
+          mode: 'create',
+          productId: item.id,
+          date: state.date.value.format('YYYY-MM-DD'),
+          isEject: isEject ? 1 : 0,
+          onClose: function onClose() {
+            setCurrentProduct(null);
+          },
+          callback: createProductModalCallback(item)
+        });
+      }
+    } else {
+      state.action({
+        type: 'pisell1.handleOpenProductModal',
+        data: {
+          id: item.id,
+          date: state.date.value.format('YYYY-MM-DD'),
+          productDetail: item,
+          showConfig: {
+            option: true,
+            session: isSession,
+            variant: true,
+            package: true,
+            number: getIsShowNumber(item, state)
+          },
+          isOnlySession: isOnlySession,
+          is_eject: isEject ? 1 : 0,
+          customer_id: customerId,
+          isOS: isSession
         },
-        isOnlySession: isOnlySession,
-        is_eject: isEject ? 1 : 0,
-        customer_id: customerId,
-        isOS: isSession
-      },
-      onCancel: function onCancel() {
-        setCurrentProduct(null);
-      },
-      callback: createProductModalCallback(item)
-    });
+        onCancel: function onCancel() {
+          setCurrentProduct(null);
+        },
+        callback: createProductModalCallback(item)
+      });
+    }
   });
 
   // 处理产品选择

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

@@ -114,12 +114,13 @@ var EditNormalService = (0, import_react.forwardRef)((props, ref) => {
       return;
     }
     const newProducts = (_e = ((_d = state == null ? void 0 : state.service) == null ? void 0 : _d.value) || []) == null ? void 0 : _e.map((item) => {
-      var _a2, _b2;
+      var _a2, _b2, _c2;
       if (item._id == data._id) {
         data = (0, import_utils.setProductPrice)(data, {
           newTotal: (_a2 = data._extend) == null ? void 0 : _a2.total,
           origin_total: (_b2 = data._extend) == null ? void 0 : _b2.origin_total
         });
+        data.note = (_c2 = data._extend) == null ? void 0 : _c2.note;
         return data;
       }
       return item;

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -51,6 +51,7 @@ var import_utils7 = require("./utils");
 var import_materials = require("@pisell/materials");
 var import_IsActiveContext = require("../../context/IsActiveContext");
 var import_selectHolderModal = require("../../../booking/utils/selectHolderModal");
+var import_openNormalService = require("../../../booking/info2/service/openNormalService");
 var productListLayout = {
   grid: true,
   config: "12:12"
@@ -488,29 +489,45 @@ var AddSerivce = (props) => {
     const isSession = (0, import_utils2.isSessionProduct)(item);
     const isOnlySession = (0, import_utils2.getIsOnlySession)(item);
     const isEject = (0, import_utils2.getIsEject)(item, type);
-    state.action({
-      type: "pisell1.handleOpenProductModal",
-      data: {
-        id: item.id,
-        date: state.date.value.format("YYYY-MM-DD"),
-        productDetail: item,
-        showConfig: {
-          option: true,
-          session: isSession,
-          variant: true,
-          package: true,
-          number: (0, import_utils6.getIsShowNumber)(item, state)
+    if ((0, import_utils4.isNormalProductByDurationSchedule)(item) || !isSession && isEject) {
+      const openNormalService = (0, import_openNormalService.getOpenNormalServiceHandler)();
+      if (openNormalService) {
+        openNormalService({
+          mode: "create",
+          productId: item.id,
+          date: state.date.value.format("YYYY-MM-DD"),
+          isEject: isEject ? 1 : 0,
+          onClose: () => {
+            setCurrentProduct(null);
+          },
+          callback: createProductModalCallback(item)
+        });
+      }
+    } else {
+      state.action({
+        type: "pisell1.handleOpenProductModal",
+        data: {
+          id: item.id,
+          date: state.date.value.format("YYYY-MM-DD"),
+          productDetail: item,
+          showConfig: {
+            option: true,
+            session: isSession,
+            variant: true,
+            package: true,
+            number: (0, import_utils6.getIsShowNumber)(item, state)
+          },
+          isOnlySession,
+          is_eject: isEject ? 1 : 0,
+          customer_id: customerId,
+          isOS: isSession
         },
-        isOnlySession,
-        is_eject: isEject ? 1 : 0,
-        customer_id: customerId,
-        isOS: isSession
-      },
-      onCancel: () => {
-        setCurrentProduct(null);
-      },
-      callback: createProductModalCallback(item)
-    });
+        onCancel: () => {
+          setCurrentProduct(null);
+        },
+        callback: createProductModalCallback(item)
+      });
+    }
   });
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     async (item, type = "select") => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.8.12",
+  "version": "6.8.14",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,10 +76,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.8.4",
     "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/materials": "6.8.4",
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/appointmentBooking/components/Services/index.d.ts

@@ -1,4 +0,0 @@
-import React from 'react';
-import './index.less';
-declare const Services: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
-export default Services;

package/es/components/appointmentBooking/components/Voucher/index.d.ts

@@ -1,4 +0,0 @@
-import '../../../booking/components/voucher/index.less';
-import './index.less';
-declare const VoucherCard: (props: any) => JSX.Element;
-export default VoucherCard;

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

@@ -1,31 +0,0 @@
-import React from 'react';
-import './index.less';
-interface ActionButtonsProps {
-    /** booking 状态对象，包含 service、addons 等数据 */
-    state: {
-        service?: {
-            value?: any[];
-        };
-        addons?: {
-            value?: any[];
-        };
-        disabledEdit?: boolean;
-        channelDisabledEdit?: boolean;
-        shop_discount?: string;
-        bookingDetail?: {
-            [key: string]: any;
-        };
-        [key: string]: any;
-    };
-    /** dispatch 函数，用于触发状态更新 */
-    dispatch: (action: {
-        type: string;
-        payload?: any;
-    }) => void;
-    /** 是否禁用所有按钮 */
-    disabled?: boolean;
-    /** 数据源，传递给 VoucherCard */
-    source?: any;
-}
-declare const ActionButtons: React.FC<ActionButtonsProps>;
-export default ActionButtons;

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

@@ -1,11 +0,0 @@
-import './index.less';
-/**
- * @title: 底部
- * @description:
- * @param {any} props
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-01-30 16:51
- */
-declare const Footer: (props: any) => JSX.Element;
-export default Footer;

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

@@ -1,67 +0,0 @@
-/**
- * @title: 套餐单规格信息
- * @description:
- * @param {any} option
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-19 09:26
- */
-export declare const formatProductOption: (option: any) => any;
-/**
- * @title: 套餐信息
- * @description:
- * @param {any} bundle
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-19 09:26
- */
-export declare const formatProductBundle: (bundle: any) => any;
-/**
- * 获取子商品折扣信息
- * @param item
- */
-export declare const getBundleDiscountList: (bundle: any[]) => any[];
-export interface ResourceItem {
-    [key: string]: any;
-}
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
-export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
-/**
- * @title: 格式化商品单价
- * @description:
- * @param {any} item
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-23 12:05
- */
-export declare const formatProductPrice: (item: any) => number;
-/**
- * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
- * @param item
- * @returns
- */
-export declare const formatOriginalPrice: (item: any) => number;
-/**
- * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
- * @param item
- * @returns
- */
-export declare const formatSellingPrice: (item: any) => number;
-export declare const getSourceProductPrice: (item: any) => number;
-export declare const getMainProductSellingPrice: (item: any) => number | undefined;
-/**
- * @title: 是否包含跨日预约商品
- * @description:
- * @param {any} data
- * @return {*}
- */
-export declare const getHasMultiDayProduct: (data: any) => any;
-export declare const formatValues: (state: any) => any;
-export declare const checkHolderIsError: (state: any) => any;

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

@@ -1,3 +0,0 @@
-import './index.less';
-declare const VoucherCard: (props: any) => JSX.Element | null;
-export default VoucherCard;

package/es/components/booking/dashboard/serve.d.ts

@@ -1 +0,0 @@
-export declare const getBookingList: (params: any) => Promise<any>;

package/es/components/booking/forms/serve.d.ts

@@ -1,18 +0,0 @@
-/**
- * 获取表单数据
- */
-export declare const getFormData: (params: {
-    form_id: number;
-    form_record_ids: number[];
-    num: number;
-    skip: number;
-}) => Promise<any>;
-/**
- * 发送表单填写提醒
- */
-export declare const sendFormReminder: (params: {
-    email?: string;
-    phone?: string;
-    order_id: number;
-    country_calling_code?: string;
-}) => Promise<any>;

package/es/components/booking/info/client/serve.d.ts

@@ -1,2 +0,0 @@
-export declare const getFranchiseeCustomerInfo: (params: any) => Promise<any>;
-export declare const getFranchiseeCustomerList: (params: any) => Promise<any>;

package/es/components/booking/info/pet/serve.d.ts

@@ -1 +0,0 @@
-export declare const getFormDetail: (id: number) => Promise<any>;

package/es/components/booking/info/service/Lists.d.ts

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

package/es/components/booking/info/service/addTimeModal/serve.d.ts

@@ -1,5 +0,0 @@
-export declare const getAddTimeProducts: (params: any, config: any) => Promise<any>;
-export declare const saveAddTimeProduct: ({ orderId, params }: {
-    orderId: number | string;
-    params: any;
-}) => Promise<any>;

package/es/components/booking/info/service/serve.d.ts

@@ -1,34 +0,0 @@
-export declare const getProductDetail: (id: string, params: any) => Promise<any>;
-/**
- * @title: 跨日预约获取预约商品报价单
- * @description:
- * @param {string} id
- * @param {any} params
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-23 17:06
- */
-export declare const postMultiDay: (id: string, params: any) => Promise<any>;
-/**
- * 批量查询指定商品的最新价格
- * @param params
- */
-export declare const getProductPrice: (params: {
-    ids: number[];
-    customer_id: number;
-    schedule_date: string;
-}) => Promise<any>;
-declare type MultiDayProductPriceParams = {
-    customer_id: number;
-    data: {
-        product_id: number;
-        schedule_date: string;
-    }[];
-};
-/**
- * 获取普通商品和跨日预约的价格
- * @param params
- * @returns
- */
-export declare const getNormalAndMultiDayProductPrice: (params: MultiDayProductPriceParams) => Promise<any>;
-export {};

package/es/components/booking/info/service2/utils.d.ts

@@ -1,219 +0,0 @@
-import dayjs from 'dayjs';
-export declare const formatActiveKey: (lists: any[], platform: string, isEdit: boolean) => any[];
-/**
- * @title: 获取资源名称
- * @description:
- * @param {any} id
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-11-29 18:02
- */
-export declare const getResourceItem: (id: any, state: any) => any;
-/**
- * @title: 错误提示
- * @description:
- * @param {any} service
- * @param {any} resourceItem
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-11-29 18:41
- */
-export declare const getErrorMessage: (service: any, resourceItem: any, isDay?: boolean) => any;
-/**
- * @title: 格式化主体列表
- * @description:
- * @param {any} lists
- * @param {boolean} isOpenGroup
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-04 11:27
- */
-export declare const formatHolderLists: (lists: any) => any;
-export declare const isBookingProduct: (extension_type: any, bol?: boolean) => boolean | undefined;
-/**
- * @title: 是否是预约商品
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-06 11:24
- */
-export declare const isDayBookingProduct: (item: any, state: any) => boolean | undefined;
-export declare const handleChangeHolder: (products: any[], currentItem: any, other: any) => any[];
-/**
- * @title: 更新商品数据
- * @description:
- * @param {any} state
- * @param currentItem
- * @param {string} type
- * @param {any} other
- * @param actions
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-01-03 15:00
- */
-export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any, actions?: any) => any;
-export declare const formItems: (items: any[]) => any[];
-export declare const getIsSubjectRequire: (state: any) => boolean;
-export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
-export declare const isAllNormalProduct: (items: any[]) => boolean;
-export declare const isAllNormalProductByState: (state: any) => boolean;
-export declare const genRowKey: (key: string) => string;
-/**
- * @title: 格式化商品数据
- * @description:
- * @param {any} lists
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-11-29 17:36
- */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
-/**
- * @title: 禁用日期
- * @description:
- * @param {any} current
- * @param {string} position
- * @param {any} startDate
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-03 17:51
- */
-export declare const disabledDate: (current: any, position: string, currentDate: any) => any;
-/**
- * @title: 是否是跨日预约
- * @description:
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-04 09:49
- */
-export declare const isDayBooking: (state: any) => boolean;
-export declare const isDaysBooking: (state: any) => boolean;
-export declare const isEventBooking: (state: any) => boolean;
-export declare const isAppointmentProduct: (item: any) => boolean;
-/**
- * @title: 是否是terminal上的跨日预约
- * @description:
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-04 15:31
- */
-export declare const isTerminalDayBooking: (state: any) => any;
-export declare const formatDayDate: (_extend: any) => any;
-/**
- * @title: 根据营业日时间格式化时间
- * @description:
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-04 12:07
- */
-export declare const formatDayTime: ({ startDate, endDate }: any) => {
-    startDateTime: dayjs.Dayjs;
-    endDateTime: dayjs.Dayjs;
-};
-export declare const formatDateTime: (start_date: any, end_date: any) => {
-    value: dayjs.Dayjs;
-    end_date: dayjs.Dayjs;
-};
-/**
- * @title: 初始化日期
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-06 17:24
- */
-export declare const initDate: () => {
-    value: dayjs.Dayjs;
-    end_date: dayjs.Dayjs;
-};
-/**
- * @title: 是否有预约商品
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-12 15:47
- */
-export declare const isHasDayAppointmentProduct: (state: any) => boolean;
-/**
- * @title: 过滤出如果是预约商品，则只获取跨日的预约商品
- * @description:
- * @param {any} lists
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-13 16:44
- */
-export declare const getDayProducts: (holderId: number, lists: any, isTerminal?: boolean) => any;
-/**
- * @title: 格式化表单数据
- * @description:
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-30 22:19
- */
-export declare const getPets: (state: any) => any;
-/**
- * @title: 得出预约商品
- * @description:
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-30 22:26
- */
-export declare const getAppointmentService: (state: any) => any;
-/**
- * @title: 判断是否打开删除宠物弹窗
- * @description:
- * @param {any} state
- * @param {any} newVal
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-16 16:12
- */
-export declare const isOpenDeletePet: (state: any, newVal: any) => {
-    ids: any;
-    lists: any;
-};
-/**
- * @title: 当前选中的表单id
- * @description:
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-17 14:40
- */
-export declare const holderId: (state: any) => number;
-/**
- * @title: 更新套餐的价格
- * @description:
- * @param {any} currentValue
- * @param {any} newBundleData
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-31 15:16
- */
-export declare function updateNormalBundlePrice(currentValue: any, newBundleData: any): any[];
-/**
- * @title: 更新预约商品报价单
- * @description:
- * @param {any} state
- * @param {any} cacheItem
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-25 16:41
- */
-export declare const updateAppointmentServicePrice: (state: any, { start_date, end_date, product_id }: any) => Promise<{
-    multiDayPrices: any;
-    price: number;
-}>;
-/**
- * @title: 更新普通商品报价单价格
- * @description:
- * @param {any} state
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-24 11:32
- */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/es/components/booking/info2/serve.d.ts

@@ -1,6 +0,0 @@
-export declare const getResourceList: (params: any, bookingId?: number[]) => Promise<{
-    list: any[];
-    listMap: any;
-}>;
-export declare const createBookings: (params: any) => Promise<any>;
-export declare const editBookings: (params: any, id?: number) => Promise<any>;