@pisell/private-materials 3.3.26 → 3.3.27

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

@@ -39,7 +39,7 @@ import { getNoResource } from "../../../mock";
 import { getDays, getErrorList, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { createBookingItemsByGroup, filterItemByGroupId, getGroupTotalPrice, isGroupBooking } from "../../service2/Group/utils";
 import useSelectPet from "../../service2/hooks/useSelectPet";
-import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isEventBooking } from "../../service2/utils";
+import { disabledDate as _disabledDate, formatDayTime, isDayBooking, isDayBookingProduct, isDaysBooking, isEventBooking } from "../../service2/utils";
 import { formatResources, getDurationProps, getFlexibleOption, getMultiDay, getTimeObj } from "../addService/utils";
 import Like from "../like";
 import { editSessionProduct, getMultiDayPrices } from "../../utils";
@@ -86,6 +86,9 @@ var Info = function Info(_, ref) {
   var isDayBookingMode = useMemo(function () {
     return isDayBooking(state);
   }, [state === null || state === void 0 ? void 0 : state.renderType]);
+  var isDaysBookingMode = useMemo(function () {
+    return isDaysBooking(state);
+  }, [state === null || state === void 0 ? void 0 : state.renderType]);
   var isEventBookingMode = useMemo(function () {
     return isEventBooking(state);
   }, [state === null || state === void 0 ? void 0 : state.renderType]);
@@ -692,7 +695,7 @@ var Info = function Info(_, ref) {
         },
         value: _objectSpread(_objectSpread(_objectSpread({}, ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other) || {}), dayValue), sessionValue),
         isOS: isSession,
-        customer_id: isDayBookingMode ? ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 1 : undefined
+        customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id
       },
       callback: function () {
         var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e, extension_type, detail) {
@@ -733,7 +736,7 @@ var Info = function Info(_, ref) {
                     cacheItem: cacheItem
                   }
                 });
-                if (isDayBookingMode) {
+                if (isDaysBookingMode) {
                   setTimeout(function () {
                     updateMultiDay({
                       start_date: values.start_date,

package/es/components/booking/info/service/index.js

@@ -6,6 +6,7 @@ import "./index.less";
 import ServiceList from "./serviceList";
 import AddTimeModal from "./addTimeModal";
 import useClearCart from "../../hooks/useClearCart";
+import useQuotation from "../../hooks/useQuotation";
 var Service = function Service() {
   var _state$bookingConfig2;
   var _useContext = useContext(Context),
@@ -45,6 +46,8 @@ var Service = function Service() {
     }, 100);
   };
   var clearCart = useClearCart(state, dispatch);
+  var _useQuotation = useQuotation(state, dispatch),
+    dom = _useQuotation.dom;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
   }, clearCart, /*#__PURE__*/React.createElement(ServiceList, {
@@ -53,6 +56,6 @@ var Service = function Service() {
     onEdit: handleEdit
   }) : null), /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
-  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
+  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
 };
 export default /*#__PURE__*/React.memo(Service);

package/es/components/booking/info/service2/Group/utils.js

@@ -85,7 +85,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     var startDate = _extend.start_date.add(i, 'day');
     var endDate = _extend.start_date.add(i + 1, 'day');
     // 商品原始价格  
-    var price = ((_extend$multiDayPrice = _extend.multiDayPrices[startDate.format('YYYY-MM-DD')]) === null || _extend$multiDayPrice === void 0 ? void 0 : _extend$multiDayPrice.total) || item._extend.price;
+    var price = ((_extend$multiDayPrice = _extend.multiDayPrices) === null || _extend$multiDayPrice === void 0 || (_extend$multiDayPrice = _extend$multiDayPrice[startDate.format('YYYY-MM-DD')]) === null || _extend$multiDayPrice === void 0 ? void 0 : _extend$multiDayPrice.total) || item._extend.price;
     var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
       // 编辑时组商品需要清空booking_id  否则会重复
       booking_id: isBatchEdit ? 0 : item.booking_id,

package/es/components/booking/info/service2/hooks/useSelectPet.js

@@ -1,9 +1,9 @@
 import { useMemo } from 'react';
-import { formatHolderLists, isDaysBooking } from "../utils";
+import { formatHolderLists, isDayBooking } from "../utils";
 var useSelectPet = function useSelectPet(state) {
   var _state$pet2, _state$pet4;
   var isDaysBookingBol = useMemo(function () {
-    return isDaysBooking(state);
+    return isDayBooking(state);
   }, [state === null || state === void 0 ? void 0 : state.renderType]);
 
   /**
@@ -30,9 +30,11 @@ var useSelectPet = function useSelectPet(state) {
    */
   var holderLists = useMemo(function () {
     var _state$pet3;
+    var _lists = formatHolderLists(petLists);
+    return _lists;
     if (isDaysBookingBol) {
-      var _lists = formatHolderLists(petLists);
-      return _lists;
+      var _lists2 = formatHolderLists(petLists);
+      return _lists2;
     }
     return (state === null || state === void 0 || (_state$pet3 = state.pet) === null || _state$pet3 === void 0 ? void 0 : _state$pet3.holders) || [];
   }, [petLists, isDaysBookingBol, state === null || state === void 0 || (_state$pet4 = state.pet) === null || _state$pet4 === void 0 ? void 0 : _state$pet4.holders]);

package/es/components/booking/info/service2/index.js

@@ -9,6 +9,7 @@ import AddService from "../service/addService";
 import EditService from "../service/editService";
 import { Context } from "../model";
 import Lists from "./Lists";
+import useQuotation from "../../hooks/useQuotation";
 export var Service2Context = /*#__PURE__*/createContext({});
 export var Service2Cart = function Service2Cart(_ref) {
   var hideAdd = _ref.hideAdd,
@@ -42,6 +43,8 @@ export var Service2Cart = function Service2Cart(_ref) {
       (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem);
     }, 100);
   };
+  var _useQuotation = useQuotation(state, dispatch),
+    dom = _useQuotation.dom;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
   }, /*#__PURE__*/React.createElement(Lists, {
@@ -53,5 +56,5 @@ export var Service2Cart = function Service2Cart(_ref) {
     onEdit: handleEdit
   })), !hideEdit && /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
-  }));
+  }), dom);
 };

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

@@ -35,7 +35,7 @@ import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
-  var _state$service2, _state$service4, _state$service5;
+  var _state$client2, _state$service2, _state$service4, _state$service5;
   var onEdit = props.onEdit,
     drawerProps = props.drawerProps,
     renderMode = props.renderMode;
@@ -56,6 +56,20 @@ var Info = function Info(props) {
   dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
   request.setRequest(context.appHelper.utils.request);
 
+  /**
+   * @title: 客户id
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2024-12-24 10:33
+   */
+  var customerId = useMemo(function () {
+    var _state$client;
+    return ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || undefined;
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
+  console.log(customerId, 'customerIdcustomerId');
+
   /**
    * @title: 如果商品只有一个, 则自动设置默认商品
    * @description:
@@ -182,7 +196,8 @@ var Info = function Info(props) {
               with_count: ['bundleGroup', 'optionGroup'],
               order_by_string: 'sort:desc',
               status: 'published',
-              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
+              customer_id: params === null || params === void 0 ? void 0 : params.customer_id
             });
           case 7:
             data = _context2.sent;
@@ -223,6 +238,7 @@ var Info = function Info(props) {
     }
   };
   var handleSelectProduct = function handleSelectProduct(item, type) {
+    var _state$client3;
     var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
     var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
@@ -239,7 +255,8 @@ var Info = function Info(props) {
           package: true
         },
         is_eject: isEject ? 1 : 0,
-        isOS: isSession
+        isOS: isSession,
+        customer_id: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id
       },
       callback: function callback(e, extension_type, detail) {
         // 防止选择商品弹窗多次触发callback
@@ -369,25 +386,28 @@ var Info = function Info(props) {
   useUpdateEffect(function () {
     if (state.service.addModal) {
       getServices({
-        schedule_date: currentDate
+        schedule_date: currentDate,
+        customer_id: customerId
       });
       setSearch('');
     }
-  }, [state.service.addModal, currentDate]);
+  }, [state.service.addModal, currentDate, customerId]);
   useEffect(function () {
     if (renderMode === 'current') {
       getServices({
-        schedule_date: currentDate
+        schedule_date: currentDate,
+        customer_id: customerId
       });
     }
-  }, [renderMode, currentDate]);
+  }, [renderMode, currentDate, customerId]);
   useEffect(function () {
     if (state.renderType === 'eventBooking' && state.modalOpen) {
       getServices({
-        schedule_date: currentDate
+        schedule_date: currentDate,
+        customer_id: customerId
       });
     }
-  }, [state.renderType, state.modalOpen, currentDate]);
+  }, [state.renderType, state.modalOpen, currentDate, customerId]);
   var addButton = useMemo(function () {
     if (state.isBookingCreatePage) {
       return /*#__PURE__*/React.createElement("div", {

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

@@ -386,6 +386,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-08-28 17:08
    */
   var handleEdit = function handleEdit(e) {
+    var _state$client;
     // 当前商品
     var item = state.service.cacheItem;
 
@@ -415,6 +416,7 @@ var Info = function Info(_, ref) {
           package: true
         },
         isOS: isSession,
+        customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
         value: _objectSpread(_objectSpread({}, item._extend.other), sessionValue)
       },
       callback: function callback(e, extension_type, detail) {

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

@@ -7,6 +7,7 @@ import AddTimeModal from "./addTimeModal";
 import useInfoHolder from "../../info/hooks/useInfoHolder";
 import Lists from "../../info/service/Lists";
 import useClearCart from "../../hooks/useClearCart";
+import useQuotation from "../../hooks/useQuotation";
 var Service = function Service() {
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -21,6 +22,8 @@ var Service = function Service() {
     document.body.id = 'body';
   }, []);
   var clearCart = useClearCart(state, dispatch);
+  var _useQuotation = useQuotation(state, dispatch),
+    dom = _useQuotation.dom;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
   }, clearCart, /*#__PURE__*/React.createElement(Lists, {
@@ -34,6 +37,6 @@ var Service = function Service() {
     onEdit: handleEdit
   }) : null), /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
-  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
+  }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
 };
 export default /*#__PURE__*/React.memo(Service);

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

@@ -266,6 +266,8 @@ declare const _default: {
         'pisell2.text.validity.expired': (str: string) => string;
         'pisell2.text.validity.expiring_soon': (str: string) => string;
         'pisell2.text.validity.valid_through': (str: string) => string;
+        'pisell2.text.quotation.product.change.title': string;
+        'pisell2.text.quotation.product.change.describe': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -534,6 +536,8 @@ declare const _default: {
         'pisell2.text.validity.expired': (str: string) => string;
         'pisell2.text.validity.expiring_soon': (str: string) => string;
         'pisell2.text.validity.valid_through': (str: string) => string;
+        'pisell2.text.quotation.product.change.title': string;
+        'pisell2.text.quotation.product.change.describe': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -802,6 +806,8 @@ declare const _default: {
         'pisell2.text.validity.expired': (str: string) => string;
         'pisell2.text.validity.expiring_soon': (str: string) => string;
         'pisell2.text.validity.valid_through': (str: string) => string;
+        'pisell2.text.quotation.product.change.title': string;
+        'pisell2.text.quotation.product.change.describe': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -308,7 +308,9 @@ export default {
     },
     'pisell2.text.validity.valid_through': function pisell2TextValidityValid_through(str) {
       return "Valid through ".concat(str);
-    }
+    },
+    'pisell2.text.quotation.product.change.title': "Notification",
+    'pisell2.text.quotation.product.change.describe': "Product updates available: Please refresh the following items to load the latest data."
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -623,7 +625,9 @@ export default {
     },
     'pisell2.text.validity.valid_through': function pisell2TextValidityValid_through(str) {
       return "\u6709\u6548\u671F\u81F3 ".concat(str, " \uFF08\u542B\u5F53\u65E5\uFF09");
-    }
+    },
+    'pisell2.text.quotation.product.change.title': "提示",
+    'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。"
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -938,6 +942,8 @@ export default {
     },
     'pisell2.text.validity.valid_through': function pisell2TextValidityValid_through(str) {
       return "\u6709\u6548\u671F\u81F3 ".concat(str, " \uFF08\u542B\u7576\u65E5\uFF09");
-    }
+    },
+    'pisell2.text.quotation.product.change.title': "提示",
+    'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。"
   }
 };

package/es/components/eftposPay/component/fail/failCustom.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/unknow.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PosProps } from './const';
 import './index.less';
 declare const _default: (props: PosProps) => JSX.Element | null;

package/es/components/eftposPay/pay.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/es/components/eftposPay/store/index.d.ts

@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;