@pisell/private-materials 3.3.26 → 3.3.28

package/es/businessModel/SalesModel/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/Sales/Customer/index.js

@@ -21,7 +21,9 @@ export var CustomerProvider = function CustomerProvider(_ref) {
       callback = _ref2.callback;
     utils.action({
       type: 'pisell1.login',
-      data: {},
+      data: {
+        type: 'plugin'
+      },
       callback: callback
     });
   };

package/es/components/Sales/Event/Detail.js

@@ -19,6 +19,7 @@ import { getEventDetailBookingOptionsApi, getEventDetailIntroductionApi, getEven
 import { useRequest } from 'ahooks';
 import { useEvent } from "./index";
 import { getIamgeFromMedia } from "../utils";
+import useLoginUser from "../../../hooks/useLoginUser";
 
 // 定义步骤数据接口
 
@@ -44,6 +45,7 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     setCurrentBookingOption = _useState6[1];
   var _useEvent = useEvent(),
     selectEvent = _useEvent.selectEvent;
+  var customer = useLoginUser();
   var _setDetail = function _setDetail(detailData) {
     detailRef.current = _objectSpread(_objectSpread({}, detailRef.current || {}), detailData || {});
     console.log(detailRef.current, '55555555');
@@ -70,7 +72,9 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     getEventDetailBookingOptions.run({
       ids: ((_eventItem$_originDat = eventItem._originData) === null || _eventItem$_originDat === void 0 ? void 0 : _eventItem$_originDat.relation_product_ids) || [],
       num: 100,
-      skip: 1
+      skip: 1,
+      customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+      open_quotation: 1
     });
     getEventDetailSelectDate.run(eventItem.id, {
       days: 366

package/es/components/Sales/Event/serve.d.ts

@@ -10,6 +10,7 @@ export declare const getEventListApi: (params: {
     title?: string;
     skip?: number;
     num?: number;
+    open_quotation: number;
 }) => Promise<any>;
 export declare const getEventDetailIntroductionApi: (eventItemId: number | string) => Promise<any>;
 export declare const getEventDetailTeacherApi: (params: {
@@ -19,6 +20,8 @@ export declare const getEventDetailBookingOptionsApi: (params: {
     ids: number | string;
     num: number;
     skip: number;
+    customer_id?: number;
+    open_quotation?: number;
 }) => Promise<any>;
 export declare const getEventDetailSelectDateApi: (id: number | string, params: {
     days: number;

package/es/components/Sales/Init/index.d.ts

@@ -4,6 +4,7 @@ interface InitData {
     form_id?: number;
     shop_id?: number;
     shop?: any;
+    scheduleDisplayType?: 'calendarView' | 'textList';
 }
 interface InitContextType {
     getBoardSetting: any;

package/es/components/Sales/Init/index.js

@@ -84,12 +84,13 @@ export var InitProvider = function InitProvider(_ref) {
   var getBoardSetting = useRequest(getBoardSettingApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
-      var _res$data, _res$data2, _appUtils$getStore;
+      var _res$data, _res$data2, _appUtils$getStore, _res$data3;
       setInitData({
         boardSetting: res === null || res === void 0 ? void 0 : res.data,
         form_id: res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.config) === null || _res$data === void 0 || (_res$data = _res$data.resource) === null || _res$data === void 0 || (_res$data = _res$data.booking_event_v2_resource) === null || _res$data === void 0 ? void 0 : _res$data.form_id,
         shop_id: res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shop_id,
-        shop: (_appUtils$getStore = appUtils.getStore()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.getState()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 ? void 0 : _appUtils$getStore.shop
+        shop: (_appUtils$getStore = appUtils.getStore()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.getState()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 ? void 0 : _appUtils$getStore.shop,
+        scheduleDisplayType: res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 || (_res$data3 = _res$data3.config) === null || _res$data3 === void 0 || (_res$data3 = _res$data3.product_display_setting) === null || _res$data3 === void 0 || (_res$data3 = _res$data3.booking_event_v2_schedule_display_format) === null || _res$data3 === void 0 ? void 0 : _res$data3.value
       });
     }
   });

package/es/components/Sales/Step/index.d.ts

@@ -7,6 +7,7 @@ interface Step {
 declare type StepKey = 'select-category' | 'select-event' | 'confirm-information';
 interface StepData {
     currentStep: StepKey;
+    isAutoOperate?: boolean;
 }
 interface StepContextType {
     setStepData: (data: Partial<StepData>) => void;
@@ -18,6 +19,7 @@ interface StepContextType {
     isLastStep: boolean;
     isFirstStep: boolean;
     isTwoStep: boolean;
+    changeAutoOperate: (newAutoOperate: boolean) => void;
 }
 interface StepProviderProps {
     children: React.ReactNode;

package/es/components/Sales/Step/index.js

@@ -40,7 +40,8 @@ var stepMaps = steps.reduce(function (acc, step) {
 
 // 默认步骤状态
 var defaultState = {
-  currentStep: steps[0].key
+  currentStep: steps[0].key,
+  isAutoOperate: true
 };
 
 // 创建步骤上下文
@@ -97,7 +98,8 @@ export var StepProvider = function StepProvider(_ref) {
     var nextStep = getNextStep();
     if (nextStep) {
       setStepData({
-        currentStep: nextStep
+        currentStep: nextStep,
+        isAutoOperate: true
       });
     }
   };
@@ -107,7 +109,8 @@ export var StepProvider = function StepProvider(_ref) {
     var prevStep = getPrevStep();
     if (prevStep) {
       setStepData({
-        currentStep: prevStep
+        currentStep: prevStep,
+        isAutoOperate: false
       });
     } else {
       closePage();
@@ -162,6 +165,11 @@ export var StepProvider = function StepProvider(_ref) {
   var isTwoStep = useMemo(function () {
     return (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) === steps[1].key;
   }, [currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key]);
+  var changeAutoOperate = function changeAutoOperate(newAutoOperate) {
+    setStepData({
+      isAutoOperate: newAutoOperate
+    });
+  };
   var contextValue = {
     setStepData: setStepData,
     currentStepData: currentStepData,
@@ -171,7 +179,8 @@ export var StepProvider = function StepProvider(_ref) {
     toFirstStep: toFirstStep,
     isFirstStep: isFirstStep,
     isLastStep: isLastStep,
-    isTwoStep: isTwoStep
+    isTwoStep: isTwoStep,
+    changeAutoOperate: changeAutoOperate
   };
   return /*#__PURE__*/React.createElement(StepContext.Provider, {
     value: contextValue

package/es/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -65,18 +65,18 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
    */
   var handleNext = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _summary$deposit;
+      var _deposit$protocols;
       var deposit, _yield$appointmentBoo, data, _ref2, is_deposit, deposit_amount, total_amount, order_id, _total, freeResult;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(summary !== null && summary !== void 0 && (_summary$deposit = summary.deposit) !== null && _summary$deposit !== void 0 && _summary$deposit.hasDeposit && !isAgreeDepositPolicy)) {
-              _context.next = 2;
+            deposit = summary.deposit; // 如果未同意定金政策，则提示
+            if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit && (deposit === null || deposit === void 0 || (_deposit$protocols = deposit.protocols) === null || _deposit$protocols === void 0 ? void 0 : _deposit$protocols.length) > 0 && !isAgreeDepositPolicy)) {
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.deposit.agree.policy')));
-          case 2:
-            deposit = summary.deposit;
+          case 3:
             setLoading(true);
             _context.prev = 4;
             _context.next = 7;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

package/es/components/appointmentBooking/components/Services/index.js

@@ -153,6 +153,8 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                               key: 'select-time',
                               description: description
                             }, 'select-resource');
+                          } else {
+                            removeStep('select-time');
                           }
                         } else {
                           // 先选择商品，如果商品是session类型，则不需要选择日期和时间步骤

package/es/components/appointmentBooking/deposit/index.js

@@ -67,7 +67,7 @@ var Deposit = function Deposit(props) {
     value: total,
     showCurrencySymbol: true,
     className: "amount"
-  }), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.appointment.deposit.amount.tip2')))), /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.appointment.deposit.amount.tip2')))), (protocols === null || protocols === void 0 ? void 0 : protocols.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     className: "checkbox-wrap",
     onClick: function onClick() {
       return handleAgreed();
@@ -90,7 +90,7 @@ var Deposit = function Deposit(props) {
     }, item === null || item === void 0 ? void 0 : item.title, /*#__PURE__*/React.createElement("span", {
       className: "symbol"
     }, _policyText(item, index)));
-  }))))), /*#__PURE__*/React.createElement(PolicyModal, {
+  })))) : null), /*#__PURE__*/React.createElement(PolicyModal, {
     open: visible,
     onCancel: function onCancel() {
       return setVisible(false);

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -277,7 +277,7 @@ var formatMetaData = function formatMetaData(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item) {
-  var _item$_extend10, _item$_extend11, _item$_extend12;
+  var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend13;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -293,6 +293,7 @@ var formatProducts = function formatProducts(item) {
   return {
     "num": item._extend.quantity,
     "price": formatProductPrice(item),
+    "source_product_price": (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.price,
     "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
@@ -302,10 +303,10 @@ var formatProducts = function formatProducts(item) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 || (_item$_extend10 = _item$_extend10.other) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.bundle),
+    "product_bundle": formatProductBundle((_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option),
-    "product_variant_id": ((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.option),
+    "product_variant_id": ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 || (_item$_extend13 = _item$_extend13.other) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -325,8 +326,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend13;
-    var holderId = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.holder_id;
+    var _item$_extend14;
+    var holderId = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -352,15 +353,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend14;
-      return ((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id) && appointmentTypes.includes(item.extension_type);
+      var _item$_extend15;
+      return ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id) && appointmentTypes.includes(item.extension_type);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend15;
-      var key = (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id; // 分组键
+      var _item$_extend16;
+      var key = (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -422,9 +423,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19;
-      var startDate = ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.startDate) || ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.start_date);
-      var endDate = ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.endDate) || ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.end_date);
+      var _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20;
+      var startDate = ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.startDate) || ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.start_date);
+      var endDate = ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.endDate) || ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -485,8 +486,8 @@ var formatRelationProducts = function formatRelationProducts(data) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend20;
-    return !((_item$_extend20 = item._extend) !== null && _item$_extend20 !== void 0 && _item$_extend20.holder_id);
+    var _item$_extend21;
+    return !((_item$_extend21 = item._extend) !== null && _item$_extend21 !== void 0 && _item$_extend21.holder_id);
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

package/es/components/booking/forms/single/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/es/components/booking/forms/table/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/es/components/booking/hooks/useQuotation.d.ts

@@ -0,0 +1,4 @@
+declare const useQuotation: (state: any, dispatch: any) => {
+    dom: JSX.Element;
+};
+export default useQuotation;