@pisell/private-materials 3.3.89 → 3.3.91

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:
@@ -304,9 +288,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     utils === null || utils === void 0 || utils.action({
       type: 'pisell1.productDetail',
       data: {
-        detail: _objectSpread(_objectSpread({}, (bookingOption === null || bookingOption === void 0 ? void 0 : bookingOption._originData) || {}), {}, {
-          open_deposit: 1
-        }),
+        detail: _objectSpread({}, (bookingOption === null || bookingOption === void 0 ? void 0 : bookingOption._originData) || {}),
         isOS: false
       },
       callback: function callback(data) {
@@ -395,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.d.ts

@@ -71,14 +71,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -152,14 +144,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -233,14 +217,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
 };
 export default _default;

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',
@@ -82,15 +82,7 @@ export default {
     'pisell2.event.capacity.limit.reached.title': 'Capacity limit reached',
     'pisell2.event.capacity.limit.reached.tip': 'One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.',
     'pisell2.event.schedule.item.expand': 'See more',
-    'pisell2.event.schedule.item.collapse': 'See less',
-    'pisell2.appointment.deposit': 'Deposit',
-    'pisell2.appointment.deposit.agreed': 'I have read and agree to the ',
-    'pisell2.appointment.deposit.agree.policy': 'You need to agree the policy to proceed',
-    'pisell2.appointment.deposit.and': ' & ',
-    'pisell2.appointment.deposit.amount.tip1': ' needs to be paid as deposit.',
-    'pisell2.appointment.deposit.amount.tip2': ' ',
-    'pisell2.appointment.deposit.close': 'Close',
-    'pisell2.appointment.booking.empty.data': 'No data'
+    'pisell2.event.schedule.item.collapse': 'See less'
   },
   'zh-CN': {
     'pisell2.event.calendar.limit.unavailable': '不可预约',
@@ -128,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': '收起',
@@ -175,15 +167,7 @@ export default {
     'pisell2.event.capacity.limit.reached.title': '活动名额已满',
     'pisell2.event.capacity.limit.reached.tip': '购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。',
     'pisell2.event.schedule.item.expand': '查看更多',
-    'pisell2.event.schedule.item.collapse': '收起',
-    'pisell2.appointment.deposit': '定金',
-    'pisell2.appointment.deposit.agreed': '我已阅读并同意 ',
-    'pisell2.appointment.deposit.agree.policy': '您需要同意协议才能继续',
-    'pisell2.appointment.deposit.and': ' 和 ',
-    'pisell2.appointment.deposit.amount.tip1': '请支付 ',
-    'pisell2.appointment.deposit.amount.tip2': ' 定金。',
-    'pisell2.appointment.deposit.close': '关闭',
-    'pisell2.appointment.booking.empty.data': '暂无数据'
+    'pisell2.event.schedule.item.collapse': '收起'
   },
   'zh-HK': {
     'pisell2.event.calendar.limit.unavailable': '不可預約',
@@ -221,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': '收起',
@@ -268,14 +252,6 @@ export default {
     'pisell2.event.capacity.limit.reached.title': '活動名額已滿',
     'pisell2.event.capacity.limit.reached.tip': '購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。',
     'pisell2.event.schedule.item.expand': '查看更多',
-    'pisell2.event.schedule.item.collapse': '收起',
-    'pisell2.appointment.deposit': '定金',
-    'pisell2.appointment.deposit.agreed': '我已閱讀並同意 ',
-    'pisell2.appointment.deposit.agree.policy': '您需要同意協議才能繼續',
-    'pisell2.appointment.deposit.and': ' 和 ',
-    'pisell2.appointment.deposit.amount.tip1': '請支付 ',
-    'pisell2.appointment.deposit.amount.tip2': ' 定金。',
-    'pisell2.appointment.deposit.close': '关闭',
-    'pisell2.appointment.booking.empty.data': '暫無數據'
+    'pisell2.event.schedule.item.collapse': '收起'
   }
 };

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

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

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

@@ -493,7 +493,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;