@pisell/private-materials 3.3.81 → 3.3.83

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

@@ -22,22 +22,14 @@ import { getErrorList } from "../../../utilsByBooking";
 import { isArray } from 'lodash';
 import { getAutoAllocationStorage, setAutoAllocationStorage } from "../utils";
 import { useUpdate } from 'ahooks';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined } from "@ant-design/icons";
 var Resources = function Resources(_ref, ref) {
   var _cacheItem$_data2, _cacheItem$_data4;
   var state = _ref.state,
     cacheItem = _ref.cacheItem,
     getCurrentCacheItem = _ref.getCurrentCacheItem,
     onChange = _ref.onChange,
-    value = _ref.value,
-    _ref$config = _ref.config,
-    config = _ref$config === void 0 ? {
-      // 是否显示自动分配
-      autoAllocation: true,
-      // 是否显示资源错误图标
-      resourceErrorIcon: true,
-      disabled: false
-    } : _ref$config;
+    value = _ref.value;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showError = _useState2[0],
@@ -152,7 +144,7 @@ var Resources = function Resources(_ref, ref) {
         relation_type: d.relation_type
       }), d[label]);
     });
-  }, [config === null || config === void 0 ? void 0 : config.resourceErrorIcon]);
+  }, []);
 
   /**
    * @title: 检查当前资源最小选择数量
@@ -201,7 +193,6 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: item.title,
       required: true,
-      labelCol: config === null || config === void 0 ? void 0 : config.labelCol,
       extra: showError && item.select_type.min > (cur === null || cur === void 0 ? void 0 : cur.length) ? /*#__PURE__*/React.createElement("span", {
         style: {
           color: '#ff4d4f'
@@ -210,17 +201,13 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement("div", {
       className: "resource-col"
     }, item.select_type.type === 'multiple' ? null : /*#__PURE__*/React.createElement(Button, {
-      className: "resource-col-like-wrap ".concat(config !== null && config !== void 0 && config.disabled ? 'resource-col-like-wrap-disabled' : ''),
+      className: "resource-col-like-wrap",
       onClick: function onClick() {
         var _cur$;
-        if (config !== null && config !== void 0 && config.disabled) {
-          return;
-        }
         setLikeStatus((cur === null || cur === void 0 || (_cur$ = cur[0]) === null || _cur$ === void 0 ? void 0 : _cur$.like_status) === 'like' ? 'common' : 'like', item.form_id, 'like_status');
       }
     }, /*#__PURE__*/React.createElement(Like, {
-      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status,
-      className: "".concat(config !== null && config !== void 0 && config.disabled ? 'like-icon-disabled' : '')
+      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status
     })), /*#__PURE__*/React.createElement(MaxLengthSelect, {
       className: "resource-col-select",
       size: "large",
@@ -241,16 +228,15 @@ var Resources = function Resources(_ref, ref) {
       showSearch: true,
       filterOption: function filterOption(str, option) {
         return ((option === null || option === void 0 ? void 0 : option.labelText) || '').toLowerCase().includes((str || '').toLowerCase());
-      },
-      disabled: config === null || config === void 0 ? void 0 : config.disabled
-    }, renderOptions(item.renderList, 'id', config !== null && config !== void 0 && config.resourceErrorIcon ? 'label' : 'labelText', 'resource')), config !== null && config !== void 0 && config.autoAllocation ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
+      }
+    }, renderOptions(item.renderList, 'id', 'label', 'resource')), /*#__PURE__*/React.createElement(Checkbox, {
       checked: getIsAutoAllocation(item.form_id),
       onChange: function onChange(e) {
         handleCheckAutoAllocation(item.form_id, e.target.checked);
       }
     }), /*#__PURE__*/React.createElement(Tooltip, {
       title: locales.getText('page.booking.text.resource.check-auto-allocation-tip')
-    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null))) : null)), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
+    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null)))), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
       return /*#__PURE__*/React.createElement(Alert, {
         key: d.type,
         message: d.label,

package/es/components/booking/info2/service/editService/Resources/index.less

@@ -15,12 +15,6 @@
     .like-resource {}
   }
 
-  .resource-col-like-wrap-disabled,
-  .like-icon-disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
-
   .resource-col-select {
     flex: 1;
   }

package/es/components/booking/info2/utilsByBooking.js

@@ -260,15 +260,6 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
       }
     }
   }
-
-  // 平行资源日历拖动优化需求
-  // 拖入到未绑定的资源中
-  if (resource.unbound) {
-    list.push({
-      label: locales.getText('pisell1.text.resource-error-message-unbound'),
-      type: "time"
-    });
-  }
   return list;
 };
 

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

@@ -110,7 +110,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell1.text.no-addons': string;
         'pisell1.text.no-resource': string;
         'pisell1.text.no-payments': string;
@@ -390,7 +389,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;
@@ -662,7 +660,6 @@ declare const _default: {
         'pisell1.text.resource-error-message-1': (x: string, y: string) => string;
         'pisell1.text.resource-error-message-2': (x: string, y: string, z: string) => string;
         'pisell1.text.resource-error-message-3': (x: string, y: string, z: string) => string;
-        'pisell1.text.resource-error-message-unbound': string;
         'pisell2.text.flexible': string;
         'pisell2.text.order-discount': string;
         'pisell2.text.no-product-added': string;

package/es/components/booking/locales.js

@@ -128,7 +128,6 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, " is fully booked between ").concat(y, " and ").concat(z, ", but your team member can still book appointments.");
     },
-    'pisell1.text.resource-error-message-unbound': 'This booking product is not associated with the target resource.',
     'pisell1.text.no-addons': 'No addons',
     'pisell1.text.no-resource': 'No resource',
     'pisell1.text.no-payments': 'No payments',
@@ -455,7 +454,6 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, "\u5728").concat(y, "\u5230").concat(z, "\u4E4B\u95F4\u5DF2\u7EA6\u6EE1\uFF0C\u4F46\u60A8\u7684\u56E2\u961F\u6210\u5458\u4ECD\u7136\u53EF\u4EE5\u9884\u7EA6\u3002");
     },
-    'pisell1.text.resource-error-message-unbound': '该预约商品未关联目标资源。',
     'pisell2.text.flexible': "灵活",
     'pisell2.text.order-discount': "折扣",
     'pisell2.text.no-product-added': '未添加商品',
@@ -774,7 +772,6 @@ export default {
     'pisell1.text.resource-error-message-3': function pisell1TextResourceErrorMessage3(x, y, z) {
       return "".concat(x, "\u5728").concat(y, "\u5230").concat(z, "\u4E4B\u9593\u5DF2\u7D04\u6EFF\uFF0C\u4F46\u60A8\u7684\u5718\u968A\u6210\u54E1\u4ECD\u7136\u53EF\u4EE5\u9810\u7D04\u3002");
     },
-    'pisell1.text.resource-error-message-unbound': '該預約商品未關聯目標資源。',
     'pisell2.text.flexible': "靈活",
     'pisell2.text.order-discount': "折扣",
     'pisell2.text.no-product-added': '未添加商品',

package/es/components/eventBooking/components/Provider/Event/index.js

@@ -7,7 +7,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import { Skeleton } from 'antd';
-import { useEvent, useSales, useEventDetail, useStep, useCustomer } from "../../../../Sales";
+import { useEvent, useSales, useEventDetail, useStep } from "../../../../Sales";
 import BookingServiceList from "../../bookingServiceList";
 import BookingDetailModal from "../../bookingDetailModal";
 import "./index.less";
@@ -31,8 +31,6 @@ var Event = function Event() {
     lists = _useState2[0],
     setLists = _useState2[1];
   var customer = useLoginUser();
-  var _useCustomer = useCustomer(),
-    appUtils = _useCustomer.appUtils;
   useEffect(function () {
     var _data$stepData;
     var eventList = (eventData === null || eventData === void 0 ? void 0 : eventData.eventList) || [];
@@ -47,23 +45,16 @@ var Event = function Event() {
     }
   }, [eventData === null || eventData === void 0 ? void 0 : eventData.eventList]);
   useEffect(function () {
-    var _data$resourceData, _appUtils$getHistory, _history$location;
+    var _data$resourceData;
     var id = data === null || data === void 0 || (_data$resourceData = data.resourceData) === null || _data$resourceData === void 0 || (_data$resourceData = _data$resourceData.currentResourceItem) === null || _data$resourceData === void 0 ? void 0 : _data$resourceData.id;
     if (!id) return;
-    var history = (appUtils === null || appUtils === void 0 || (_appUtils$getHistory = appUtils.getHistory) === null || _appUtils$getHistory === void 0 ? void 0 : _appUtils$getHistory.call(appUtils)) || {};
-    var query = history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.query;
-    var params = {
+    getEventList.run({
       event_item_resource_id: id,
       skip: 1,
       num: 100,
       customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
       open_quotation: 1
-    };
-    if (query !== null && query !== void 0 && query.ids) {
-      var _query$ids;
-      params.ids = query === null || query === void 0 || (_query$ids = query.ids) === null || _query$ids === void 0 ? void 0 : _query$ids.split(',');
-    }
-    getEventList.run(params);
+    });
   }, [data === null || data === void 0 || (_data$resourceData2 = data.resourceData) === null || _data$resourceData2 === void 0 || (_data$resourceData2 = _data$resourceData2.currentResourceItem) === null || _data$resourceData2 === void 0 ? void 0 : _data$resourceData2.id, customer === null || customer === void 0 ? void 0 : customer.id]);
 
   /**

package/es/components/eventBooking/components/bookingDetailModal/index.js

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useRef, useState, useEffect } from 'react';
 import { PisellModal, PisellAnchor, PisellImageCarousels } from '@pisell/materials';
 import EventCard from "../eventCard";
-import { useCart, useEventDetail, useInit } from "../../../Sales";
+import { useCart, useEventDetail } from "../../../Sales";
 import { isMobile, locales } from '@pisell/utils';
 import Schedule from "./components/Schedule";
 import Resource from "./components/Resource";
@@ -25,7 +25,7 @@ import OrderProductModal from "../Provider/OrderProductModal/index";
 import "./index.less";
 import useEngineContext from "../../../../hooks/useEngineContext";
 var BookingDetailModal = function BookingDetailModal(props) {
-  var _initData$boardSettin2, _detail$introduction2;
+  var _detail$introduction2;
   var modalContentRef = useRef(null);
   var context = useEngineContext();
   var _ref = context.appHelper || {},
@@ -43,8 +43,6 @@ var BookingDetailModal = function BookingDetailModal(props) {
     addToCart = _useCart.addToCart,
     checkBeforeAddToCart = _useCart.checkBeforeAddToCart,
     checkBeforeAddToCartResquest = _useCart.checkBeforeAddToCartResquest;
-  var _useInit = useInit(),
-    initData = _useInit.initData;
   var _useState = useState('introduction'),
     _useState2 = _slicedToArray(_useState, 2),
     activeTab = _useState2[0],
@@ -61,20 +59,6 @@ var BookingDetailModal = function BookingDetailModal(props) {
   var isUserClickRef = useRef(false); // 添加用户点击标记
   var scrollTimeoutRef = useRef(null);
 
-  /**
-   * @title: 按钮确认文案
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2025-06-26 15:34
-   */
-  var buttonText = useMemo(function () {
-    var _initData$boardSettin, _utils$translation;
-    var config = (initData === null || initData === void 0 || (_initData$boardSettin = initData.boardSetting) === null || _initData$boardSettin === void 0 || (_initData$boardSettin = _initData$boardSettin.config) === null || _initData$boardSettin === void 0 ? void 0 : _initData$boardSettin.product_display_setting) || {};
-    return (utils === null || utils === void 0 || (_utils$translation = utils.translation) === null || _utils$translation === void 0 ? void 0 : _utils$translation.call(utils, config === null || config === void 0 ? void 0 : config.booking_event_v2_product_detail_button)) || locales.getText('pisell2.event.add.to.cart');
-  }, [initData === null || initData === void 0 || (_initData$boardSettin2 = initData.boardSetting) === null || _initData$boardSettin2 === void 0 || (_initData$boardSettin2 = _initData$boardSettin2.config) === null || _initData$boardSettin2 === void 0 ? void 0 : _initData$boardSettin2.product_display_setting]);
-
   /**
    * @title: 详情锚点
    * @description:
@@ -393,7 +377,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     destroyOnClose: true,
     className: "booking-detail-modal",
     onCancel: onCloseEventDetail,
-    okText: buttonText,
+    okText: locales.getText('pisell2.event.add.to.cart'),
     cancelVisible: false,
     onOk: handleOk,
     width: isMobile() ? '100%' : 600,

package/es/components/eventBooking/index.js

@@ -36,28 +36,14 @@ var Content = function Content() {
    * @Author: WangHan
    * @Date: 2025-01-17 14:25
    */
-  // useEffect(() => {
-  //   if (!form_id) return;
-
-  //   getResourceList.run({
-  //     form_id: form_id,
-  //     shop_id: shop_id,
-  //     form_data_status: 'active',
-  //   });
-  // }, [form_id]);
   useEffect(function () {
-    var _utils$getHistory, _history$location;
-    var history = (utils === null || utils === void 0 || (_utils$getHistory = utils.getHistory) === null || _utils$getHistory === void 0 ? void 0 : _utils$getHistory.call(utils)) || {};
-    var query = history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 ? void 0 : _history$location.query;
-    var params = {
-      front_end_cache_id: (query === null || query === void 0 ? void 0 : query.cacheId) || ''
-    };
-    if (query !== null && query !== void 0 && query.ids) {
-      var _query$ids;
-      params.event_item_ids = query === null || query === void 0 || (_query$ids = query.ids) === null || _query$ids === void 0 ? void 0 : _query$ids.split(',');
-    }
-    getResourceList.run(params);
-  }, []);
+    if (!form_id) return;
+    getResourceList.run({
+      form_id: form_id,
+      shop_id: shop_id,
+      form_data_status: 'active'
+    });
+  }, [form_id]);
   return /*#__PURE__*/React.createElement("div", {
     className: "event-booking-wrap ".concat(isMobile() ? 'event-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(Header, null), /*#__PURE__*/React.createElement(EventContent, null), isMobile() && (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) !== 'select-category' ? /*#__PURE__*/React.createElement(Footer, null) : null);

package/es/components/eventBooking/locales.js

@@ -35,7 +35,7 @@ export default {
     'pisell2.event.campus': 'Campus',
     'pisell2.event.resource': 'Location',
     'pisell2.event.booking.options': 'Booking options',
-    'pisell2.event.add.to.cart': 'Add to Cart',
+    'pisell2.event.add.to.cart': 'Add to cart',
     'pisell2.event.description': 'Description',
     'pisell2.event.view.more': 'View more',
     'pisell2.event.view.less': 'View less',
@@ -120,7 +120,7 @@ export default {
     'pisell2.event.campus': '校区',
     'pisell2.event.resource': '资源',
     'pisell2.event.booking.options': '预约选项',
-    'pisell2.event.add.to.cart': '加入购物车',
+    'pisell2.event.add.to.cart': '添加到购物车',
     'pisell2.event.description': '描述',
     'pisell2.event.view.more': '查看更多',
     'pisell2.event.view.less': '收起',
@@ -205,7 +205,7 @@ export default {
     'pisell2.event.campus': '校區',
     'pisell2.event.resource': '資源',
     'pisell2.event.booking.options': '預約選項',
-    'pisell2.event.add.to.cart': '加入購物車',
+    'pisell2.event.add.to.cart': '添加到購物車',
     'pisell2.event.description': '描述',
     'pisell2.event.view.more': '查看更多',
     'pisell2.event.view.less': '收起',

package/es/components/index.d.ts

@@ -15,6 +15,4 @@ import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
 import SubTotal from './subTotal';
-import StepController from './stepController';
-import EditBookingModal from './booking/editBookingModal';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, StepController, EditBookingModal };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, };

package/es/components/index.js

@@ -15,6 +15,4 @@ import WorkspaceListDetail from "./workSpaceListDetail/";
 import WorkspaceList from "./workSpaceList";
 import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
 import SubTotal from "./subTotal";
-import StepController from "./stepController";
-import EditBookingModal from "./booking/editBookingModal";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, StepController, EditBookingModal };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal };

package/es/components/pay/toC/PaymentMethods/index.js

@@ -35,7 +35,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
   return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
 };
 var PaymentMethods = function PaymentMethods(props, ref) {
-  var _context$appHelper, _interaction$utils, _interaction$utils$is;
+  var _context$appHelper;
   var MWCreditCardRef = useRef(null);
   var SuperPayAliPayH5Ref = useRef(null);
   var StripePayRef = useRef(null);
@@ -118,11 +118,10 @@ var PaymentMethods = function PaymentMethods(props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
-  console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils), interaction, context);
   useEffect(function () {
-    var _interaction$utils2, _interaction$utils2$i, _interaction$utils3, _interaction$utils3$i;
-    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAppEnv) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2));
-    if (interaction !== null && interaction !== void 0 && (_interaction$utils3 = interaction.utils) !== null && _interaction$utils3 !== void 0 && (_interaction$utils3$i = _interaction$utils3.isAppEnv) !== null && _interaction$utils3$i !== void 0 && _interaction$utils3$i.call(_interaction$utils3)) {
+    var _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
+    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils));
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils2 = interaction.utils) !== null && _interaction$utils2 !== void 0 && (_interaction$utils2$i = _interaction$utils2.isAppEnv) !== null && _interaction$utils2$i !== void 0 && _interaction$utils2$i.call(_interaction$utils2)) {
       interaction.utils.mountFunction('global', 'paymentResult', function (strResult) {
         console.log('paymentResult', strResult);
         if (!isJson(strResult)) return;

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

@@ -494,7 +494,7 @@ var AddSerivce = function AddSerivce(props) {
           isTitle: 1,
           isSubtitle: 1,
           isPrice: 1,
-          isOriginPrice: 0,
+          isOriginPrice: 1,
           isStock: 1
         }
       }), /*#__PURE__*/React.createElement(NotAvailable, {

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

@@ -1,4 +1,3 @@
 import './index.less';
-export declare const _formatBookingDetail: (data: any, modalState: any) => any;
 declare const TicketBooking: () => JSX.Element;
 export default TicketBooking;