@pisell/private-materials 6.3.14 → 6.4.1

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

@@ -27,6 +27,7 @@ var ServiceList = function ServiceList(_ref) {
   //   maxLimit: locales.getText('pisell2.text.status.service-error-3'),
   // };
   var handleEditService = function handleEditService(item) {
+    var _window$openBookingEd, _window;
     if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
@@ -36,6 +37,7 @@ var ServiceList = function ServiceList(_ref) {
       }),
       state: state
     });
+    (_window$openBookingEd = (_window = window).openBookingEditModal) === null || _window$openBookingEd === void 0 || _window$openBookingEd.call(_window);
     dispatch({
       type: 'setService',
       payload: {
@@ -46,6 +48,7 @@ var ServiceList = function ServiceList(_ref) {
     onEdit === null || onEdit === void 0 || onEdit(cacheItem);
   };
   var handleDeleteService = function handleDeleteService(item) {
+    var _window$closeBookingE, _window2;
     if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
       return;
     }
@@ -53,6 +56,7 @@ var ServiceList = function ServiceList(_ref) {
     _list = _list.filter(function (d) {
       return d._id !== item._id;
     });
+    (_window$closeBookingE = (_window2 = window).closeBookingEditModal) === null || _window$closeBookingE === void 0 || _window$closeBookingE.call(_window2);
     dispatch({
       type: 'setService',
       payload: {

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

@@ -33,3 +33,4 @@ export declare const getAppointmentTimingPreference: (state: any) => any;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServiceStartTimeAndEndTime: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getIsNoSpecAndPackage: (product: any) => boolean;

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

@@ -10,6 +10,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
 import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
+import { isOption } from "../../ticketBooking/components/addServiceVariant/utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -319,11 +320,19 @@ export var getAppointmentTimingPreference = function getAppointmentTimingPrefere
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _cacheItem$duration, _cacheItem$_extend2;
+  var _state$service$value, _cacheItem$duration, _cacheItem$_extend2;
+  // 自定义商品不需要时间相关处理，直接返回基础扩展参数
+  if (cacheItem !== null && cacheItem !== void 0 && cacheItem.isCustomItem) {
+    return {
+      duration: null // 自定义商品没有时长概念
+    };
+  }
   var appointmentTimingPreference = getAppointmentTimingPreference(state);
 
-  // 获取上一个服务商品
-  var lastServer = getLastServer(state.service.value);
+  // 获取上一个服务商品（过滤掉自定义商品）
+  var lastServer = getLastServer((_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.filter(function (item) {
+    return !item.isCustomItem;
+  }));
 
   // 下一个商品的扩展参数
   var _extend = {
@@ -400,4 +409,18 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     }, 'minutes');
   }
   return _extend;
+};
+
+// 是否是无规格无套餐商品的非预约商品
+export var getIsNoSpecAndPackage = function getIsNoSpecAndPackage(product) {
+  var _product$variant;
+  if ((product === null || product === void 0 ? void 0 : product.extension_type) !== 'normal') {
+    return false;
+  }
+  // 编辑状态参数判断
+  if (product !== null && product !== void 0 && product.isEditBooking) {
+    var _product$product_bund, _product$product_sku;
+    return (product === null || product === void 0 || (_product$product_bund = product.product_bundle) === null || _product$product_bund === void 0 ? void 0 : _product$product_bund.length) === 0 && (product === null || product === void 0 ? void 0 : product.product_variant_id) === 0 && ((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 || (_product$product_sku = _product$product_sku.option) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.length) || 0) === 0;
+  }
+  return (product === null || product === void 0 ? void 0 : product.is_bundle) === 0 && ((product === null || product === void 0 || (_product$variant = product.variant) === null || _product$variant === void 0 ? void 0 : _product$variant.length) || 0) === 0 && !isOption(product);
 };

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

@@ -223,6 +223,7 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
@@ -240,6 +241,30 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.action-buttons.clear': string;
+        'pisell2.action-buttons.manuel-order': string;
+        'pisell2.action-buttons.customise-item': string;
+        'pisell2.action-buttons.no-items-to-adjust': string;
+        'pisell2.action-buttons.adjust-order-price': string;
+        'pisell2.action-buttons.price-adjusted-success': string;
+        'pisell2.action-buttons.clear-success': string;
+        'pisell2.text.manual-price-adjustment': string;
+        'pisell2.customise-item.modal-title': string;
+        'pisell2.customise-item.product-name': string;
+        'pisell2.customise-item.default-product-name': string;
+        'pisell2.customise-item.vouchers-applicable': string;
+        'pisell2.customise-item.sell-price': string;
+        'pisell2.customise-item.manual-deduction-price': string;
+        'pisell2.customise-item.amount-placeholder': string;
+        'pisell2.customise-item.save': string;
+        'pisell2.customise-item.save-success': string;
+        'pisell2.customise-item.price-required-error': (priceType: string) => string;
+        'pisell2.subtotal.total': string;
+        'pisell2.clear-cart-modal.title': string;
+        'pisell2.clear-cart-modal.clear-items-only': string;
+        'pisell2.clear-cart-modal.clear-all-reset': string;
+        'pisell2.clear-cart-modal.empty-cart-tip': string;
+        'pisell2.voucher-modal.title': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -273,6 +298,7 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
+        'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
     };
     'zh-CN': {
@@ -499,6 +525,7 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
@@ -516,6 +543,30 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.action-buttons.clear': string;
+        'pisell2.action-buttons.manuel-order': string;
+        'pisell2.action-buttons.customise-item': string;
+        'pisell2.action-buttons.no-items-to-adjust': string;
+        'pisell2.action-buttons.adjust-order-price': string;
+        'pisell2.action-buttons.price-adjusted-success': string;
+        'pisell2.action-buttons.clear-success': string;
+        'pisell2.text.manual-price-adjustment': string;
+        'pisell2.customise-item.modal-title': string;
+        'pisell2.customise-item.product-name': string;
+        'pisell2.customise-item.default-product-name': string;
+        'pisell2.customise-item.vouchers-applicable': string;
+        'pisell2.customise-item.sell-price': string;
+        'pisell2.customise-item.manual-deduction-price': string;
+        'pisell2.customise-item.amount-placeholder': string;
+        'pisell2.customise-item.save': string;
+        'pisell2.customise-item.save-success': string;
+        'pisell2.customise-item.price-required-error': (priceType: string) => string;
+        'pisell2.subtotal.total': string;
+        'pisell2.clear-cart-modal.title': string;
+        'pisell2.clear-cart-modal.clear-items-only': string;
+        'pisell2.clear-cart-modal.clear-all-reset': string;
+        'pisell2.clear-cart-modal.empty-cart-tip': string;
+        'pisell2.voucher-modal.title': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -549,6 +600,7 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
+        'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
     };
     'zh-HK': {
@@ -775,6 +827,7 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
+        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
@@ -792,6 +845,30 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
+        'pisell2.action-buttons.clear': string;
+        'pisell2.action-buttons.manuel-order': string;
+        'pisell2.action-buttons.customise-item': string;
+        'pisell2.action-buttons.no-items-to-adjust': string;
+        'pisell2.action-buttons.adjust-order-price': string;
+        'pisell2.action-buttons.price-adjusted-success': string;
+        'pisell2.action-buttons.clear-success': string;
+        'pisell2.text.manual-price-adjustment': string;
+        'pisell2.customise-item.modal-title': string;
+        'pisell2.customise-item.product-name': string;
+        'pisell2.customise-item.default-product-name': string;
+        'pisell2.customise-item.vouchers-applicable': string;
+        'pisell2.customise-item.sell-price': string;
+        'pisell2.customise-item.manual-deduction-price': string;
+        'pisell2.customise-item.amount-placeholder': string;
+        'pisell2.customise-item.save': string;
+        'pisell2.customise-item.save-success': string;
+        'pisell2.customise-item.price-required-error': (priceType: string) => string;
+        'pisell2.subtotal.total': string;
+        'pisell2.clear-cart-modal.title': string;
+        'pisell2.clear-cart-modal.clear-items-only': string;
+        'pisell2.clear-cart-modal.clear-all-reset': string;
+        'pisell2.clear-cart-modal.empty-cart-tip': string;
+        'pisell2.voucher-modal.title': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -825,6 +902,7 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
+        'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
     };
 };

package/es/components/booking/locales.js

@@ -43,7 +43,7 @@ export default {
     'pisell2.text.holder': 'Holder',
     'pisell2.text.warnings': 'Warnings',
     'pisell2.text.order-notes': 'Order notes',
-    'pisell2.text.add-order-notes': 'Add Order note',
+    'pisell2.text.add-order-notes': 'Add Order Note',
     'pisell2.text.add-internal-notes': 'Add Internal note',
     'pisell2.text.add-notes': 'Add Notes',
     'pisell2.text.notes': 'Notes',
@@ -51,7 +51,7 @@ export default {
     'pisell2.text.enroll.detail': 'Details',
     'pisell2.text.add-products-successfully': 'Add products successfully',
     'pisell2.text.add': 'Add',
-    'pisell2.text.created-successfully': 'Appointment created',
+    'pisell2.text.created-successfully': 'Order saved. You can find it in Order List.',
     'pisell2.text.edit-successfully': 'Edited successfully',
     'pisell2.text.updated': ' updated',
     'pisell2.text.appointment-updated': 'Appointment updated',
@@ -258,6 +258,7 @@ export default {
     'pisell2.booking.dashboard.departed-visitors': "Departed visitors",
     'pisell2.booking.dashboard.departed-visitors-tip': "Tip: Total number of visitors who checked in and have left the venue today",
     'pisell2.booking.dashboard.default': "Default",
+    'pisell2.booking.info.text.clear': "Clear",
     'pisell2.booking.info.text.clear-cart': "Clear cart",
     'pisell2.booking.info.text.clear-all': "Clear all",
     'pisell2.booking.info.text.create-new': "Create new",
@@ -277,6 +278,37 @@ export default {
     'pisell2.text.missing.reservation.content': 'You have not selected a reservation type, Please select one before proceeding.',
     'pisell2.text.confirm': 'Confirm',
     'pisell2.text.cancel': 'Cancel',
+    // Action Buttons
+    'pisell2.action-buttons.clear': 'Clear',
+    'pisell2.action-buttons.manuel-order': "Manual\nOrder\xA0$",
+    'pisell2.action-buttons.customise-item': 'Cust.\nItem',
+    'pisell2.action-buttons.no-items-to-adjust': 'No items in cart to adjust price.',
+    'pisell2.action-buttons.adjust-order-price': 'Adjust Order Price',
+    'pisell2.action-buttons.price-adjusted-success': 'Order price adjusted successfully.',
+    'pisell2.action-buttons.clear-success': 'Cart Cleared',
+    'pisell2.text.manual-price-adjustment': 'Discount',
+    // Customise Item Modal
+    'pisell2.customise-item.modal-title': 'Create and Add Customise (Once-off) Item',
+    'pisell2.customise-item.product-name': 'Product Name',
+    'pisell2.customise-item.default-product-name': 'One-Off Item',
+    'pisell2.customise-item.vouchers-applicable': 'Vouchers/Discounts Applicable',
+    'pisell2.customise-item.sell-price': 'Sell Price',
+    'pisell2.customise-item.manual-deduction-price': 'Manual Deduction Price',
+    'pisell2.customise-item.amount-placeholder': 'Amount',
+    'pisell2.customise-item.save': 'Save',
+    'pisell2.customise-item.save-success': 'Custom item added successfully.',
+    'pisell2.customise-item.price-required-error': function pisell2CustomiseItemPriceRequiredError(priceType) {
+      return "Please complete the input for ".concat(priceType, ".");
+    },
+    // SubTotal
+    'pisell2.subtotal.total': 'Total',
+    // Clear Cart Modal
+    'pisell2.clear-cart-modal.title': 'Are you sure to clear cart?',
+    'pisell2.clear-cart-modal.clear-items-only': 'Clear Items Only',
+    'pisell2.clear-cart-modal.clear-all-reset': 'Clear All &\nReset Cart',
+    'pisell2.clear-cart-modal.empty-cart-tip': 'Cart is empty',
+    // Voucher Modal
+    'pisell2.voucher-modal.title': 'Vouchers & Discounts',
     'pisell2.text.change.pet.title': 'You have changed the holder information. Do you want to keep the items under their name?',
     'pisell2.text.change.pet.content': 'Selecting “Keep” will move the items to Open Items. Selecting “Discard” will clear all items under the holder’s name.',
     'pisell2.text.change.pet.content1': 'Reservation-type items cannot be added to the Open Items cart and will be removed.',
@@ -316,6 +348,8 @@ export default {
     },
     '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.",
+    // Notes
+    'pisell2.booking.notes.placeholder': 'Enter a note...',
     'pisell2.text.form.link.to.another.record.more': 'View More'
   },
   'zh-CN': {
@@ -377,7 +411,7 @@ export default {
     'pisell2.text.refund-amount': '退款金额',
     //
     'pisell2.text.add': '添加',
-    'pisell2.text.created-successfully': '预约已创建',
+    'pisell2.text.created-successfully': '订单已保存。您可以在订单列表中找到它。',
     'pisell2.text.edit-successfully': '编辑成功',
     'pisell2.text.appointment-updated': '预约已更新',
     'pisell2.text.updated': '已更新',
@@ -581,6 +615,7 @@ export default {
     'pisell2.booking.dashboard.departed-visitors': "已离场的游客",
     'pisell2.booking.dashboard.departed-visitors-tip': "提示：今日已检票并离场的游客总人数",
     'pisell2.booking.dashboard.default': "默认",
+    'pisell2.booking.info.text.clear': "清空",
     'pisell2.booking.info.text.clear-cart': "清空购物车",
     'pisell2.booking.info.text.clear-all': "清空",
     'pisell2.booking.info.text.create-new': "新建",
@@ -600,6 +635,37 @@ export default {
     'pisell2.text.missing.reservation.content': '您尚未选择预约类型，请在继续操作前选择。',
     'pisell2.text.confirm': '确定',
     'pisell2.text.cancel': '取消',
+    // Action Buttons
+    'pisell2.action-buttons.clear': '清空',
+    'pisell2.action-buttons.manuel-order': "\u624B\u52A8\n\u8BA2\u5355\xA0$",
+    'pisell2.action-buttons.customise-item': '自定义\n商品',
+    'pisell2.action-buttons.no-items-to-adjust': '购物车中没有商品可调整价格。',
+    'pisell2.action-buttons.adjust-order-price': '调整订单价格',
+    'pisell2.action-buttons.price-adjusted-success': '订单价格调整成功。',
+    'pisell2.action-buttons.clear-success': '清空成功',
+    'pisell2.text.manual-price-adjustment': '折扣',
+    // Customise Item Modal
+    'pisell2.customise-item.modal-title': '创建并添加一次性商品',
+    'pisell2.customise-item.product-name': '商品名称',
+    'pisell2.customise-item.default-product-name': '一次性商品',
+    'pisell2.customise-item.vouchers-applicable': '应用所有优惠 / 折扣',
+    'pisell2.customise-item.sell-price': '售价',
+    'pisell2.customise-item.manual-deduction-price': '手动减价金额',
+    'pisell2.customise-item.amount-placeholder': '金额',
+    'pisell2.customise-item.save': '保存',
+    'pisell2.customise-item.save-success': '自定义商品添加成功。',
+    'pisell2.customise-item.price-required-error': function pisell2CustomiseItemPriceRequiredError(priceType) {
+      return "\u8BF7\u5B8C\u6210".concat(priceType, "\u7684\u8F93\u5165\u3002");
+    },
+    // SubTotal
+    'pisell2.subtotal.total': '总计',
+    // Clear Cart Modal
+    'pisell2.clear-cart-modal.title': '确定要清空购物车吗？',
+    'pisell2.clear-cart-modal.clear-items-only': '仅清空商品',
+    'pisell2.clear-cart-modal.clear-all-reset': '清空所有内容\n并重置购物车',
+    'pisell2.clear-cart-modal.empty-cart-tip': '当前购物车为空',
+    // Voucher Modal
+    'pisell2.voucher-modal.title': '券码管理',
     'pisell2.text.change.pet.title': '您已变更持有人信息，是否保留该持有人名下的商品？',
     'pisell2.text.change.pet.content': '选择“保留”将商品添加到未分配商品（公共购物车）中；选择“不保留”将清空该持有人名下的所有商品。',
     'pisell2.text.change.pet.content1': '预约类商品无法添加到公共购物车，将会被删除。',
@@ -639,6 +705,8 @@ export default {
     },
     'pisell2.text.quotation.product.change.title': "提示",
     'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
+    // Notes
+    'pisell2.booking.notes.placeholder': '输入备注...',
     'pisell2.text.form.link.to.another.record.more': '查看更多'
   },
   'zh-HK': {
@@ -698,7 +766,7 @@ export default {
     'pisell2.text.add-products-successfully': '添加商品成功',
     //
     'pisell2.text.add': '添加',
-    'pisell2.text.created-successfully': '預約已創建',
+    'pisell2.text.created-successfully': '訂單已保存。 您可以在訂單清單中找到它。',
     'pisell2.text.edit-successfully': '編輯成功',
     'pisell2.text.appointment-updated': '預約已更新',
     'pisell2.text.updated': '已更新',
@@ -904,6 +972,7 @@ export default {
     'pisell2.booking.dashboard.departed-visitors': "已離場的遊客",
     'pisell2.booking.dashboard.departed-visitors-tip': "提示：今日已檢票並離場的遊客總人數",
     'pisell2.booking.dashboard.default': "默认",
+    'pisell2.booking.info.text.clear': "清空",
     'pisell2.booking.info.text.clear-cart': "清空購物車",
     'pisell2.booking.info.text.clear-all': "清空",
     'pisell2.booking.info.text.create-new': "新建",
@@ -923,6 +992,37 @@ export default {
     'pisell2.text.missing.reservation.content': '您尚未選擇預約類型，請在繼續操作前選擇。',
     'pisell2.text.confirm': '確定',
     'pisell2.text.cancel': '取消',
+    // Action Buttons
+    'pisell2.action-buttons.clear': '清空',
+    'pisell2.action-buttons.manuel-order': "\u624B\u52D5\n\u8A02\u55AE\xA0$",
+    'pisell2.action-buttons.customise-item': '自定義\n商品',
+    'pisell2.action-buttons.no-items-to-adjust': '購物車中沒有商品可調整價格。',
+    'pisell2.action-buttons.adjust-order-price': '調整訂單價格',
+    'pisell2.action-buttons.price-adjusted-success': '訂單價格調整成功。',
+    'pisell2.action-buttons.clear-success': '清空成功',
+    'pisell2.text.manual-price-adjustment': '折扣',
+    // Customise Item Modal
+    'pisell2.customise-item.modal-title': '創建並添加一次性商品',
+    'pisell2.customise-item.product-name': '商品名稱',
+    'pisell2.customise-item.default-product-name': '一次性商品',
+    'pisell2.customise-item.vouchers-applicable': '應用所有優惠 / 折扣',
+    'pisell2.customise-item.sell-price': '售價',
+    'pisell2.customise-item.manual-deduction-price': '手動減價金額',
+    'pisell2.customise-item.amount-placeholder': '金額',
+    'pisell2.customise-item.save': '保存',
+    'pisell2.customise-item.save-success': '自定義商品添加成功。',
+    'pisell2.customise-item.price-required-error': function pisell2CustomiseItemPriceRequiredError(priceType) {
+      return "\u8ACB\u5B8C\u6210".concat(priceType, "\u7684\u8F38\u5165\u3002");
+    },
+    // SubTotal
+    'pisell2.subtotal.total': '總計',
+    // Clear Cart Modal
+    'pisell2.clear-cart-modal.title': '確定要清空購物車嗎？',
+    'pisell2.clear-cart-modal.clear-items-only': '僅清空商品',
+    'pisell2.clear-cart-modal.clear-all-reset': '清空所有內容\n並重置購物車',
+    'pisell2.clear-cart-modal.empty-cart-tip': '當前購物車為空',
+    // Voucher Modal
+    'pisell2.voucher-modal.title': '券碼管理',
     'pisell2.text.change.pet.title': '您已變更持有人信息，是否保留該持有人名下的商品？',
     'pisell2.text.change.pet.content': '選擇“保留”將商品添加到未分配商品（公共購物車）中；選擇“不保留”將清空該持有人名下的所有商品。',
     'pisell2.text.change.pet.content1': '預約類商品無法添加到公共購物車，將會被刪除。',
@@ -962,6 +1062,8 @@ export default {
     },
     'pisell2.text.quotation.product.change.title': "提示",
     'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
+    // Notes
+    'pisell2.booking.notes.placeholder': '輸入備註...',
     'pisell2.text.form.link.to.another.record.more': '查看更多'
   }
 };

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => JSX.Element;
+declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/es/components/booking/notes/addNote/index.js

@@ -4,53 +4,73 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useEffect, useState } from "react";
-import { Input } from "antd";
-import { useDebounce, useUpdateEffect } from "ahooks";
+import React, { useState } from "react";
+import { Button } from "antd";
+import Edit05 from "@pisell/icon/es/Edit05";
 import "./index.less";
 import { locales } from "@pisell/utils";
+import NoteModal from "../../../../plus/noteModal";
 var AddNote = function AddNote(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
-    _ref$wait = _ref.wait,
-    wait = _ref$wait === void 0 ? 200 : _ref$wait,
     title = _ref.title,
     placeholder = _ref.placeholder;
-  var _useState = useState(),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    _value = _useState2[0],
-    _setValue = _useState2[1];
-  var debouncedValue = useDebounce(_value, {
-    wait: wait
-  });
-  useEffect(function () {
-    _setValue(value);
-  }, [value]);
-  var _onChange = function _onChange(e) {
-    _setValue(e.target.value);
+    modalOpen = _useState2[0],
+    setModalOpen = _useState2[1];
+
+  // 打开弹窗
+  var handleOpenModal = function handleOpenModal() {
+    setModalOpen(true);
   };
-  useUpdateEffect(function () {
-    if (value !== debouncedValue) {
-      onChange(debouncedValue);
-    }
-  }, [debouncedValue]);
-  return /*#__PURE__*/React.createElement("div", {
+
+  // 确认回调
+  var handleConfirm = function handleConfirm(newValue) {
+    onChange === null || onChange === void 0 || onChange(newValue);
+    setModalOpen(false);
+  };
+
+  // 删除回调
+  var handleDelete = function handleDelete() {
+    onChange === null || onChange === void 0 || onChange("");
+    setModalOpen(false);
+  };
+
+  // 取消回调
+  var handleCancel = function handleCancel() {
+    setModalOpen(false);
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-notes"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-notes-label"
   }, title), /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__booking-notes-input",
+    className: "pisell-lowcode__booking-notes-input-area",
     style: {
       marginTop: title ? 8 : 0
-    }
-  }, /*#__PURE__*/React.createElement(Input.TextArea, {
-    placeholder: placeholder || locales.getText("pisell2.text.add-order-notes"),
-    autoSize: {
-      minRows: 4
     },
-    allowClear: true,
-    value: _value,
-    onChange: _onChange
-  })));
+    onClick: handleOpenModal
+  }, value ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-notes-content"
+  }, value) : /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-notes-placeholder"
+  }, placeholder || locales.getText("pisell2.text.add-order-notes")), /*#__PURE__*/React.createElement(Button, {
+    type: "text",
+    icon: /*#__PURE__*/React.createElement(Edit05, null),
+    size: "small",
+    className: "pisell-lowcode__booking-notes-edit-btn",
+    onClick: function onClick(e) {
+      e.stopPropagation();
+      handleOpenModal();
+    }
+  }))), /*#__PURE__*/React.createElement(NoteModal, {
+    open: modalOpen,
+    title: title || locales.getText("pisell2.text.add-order-notes"),
+    value: value,
+    onConfirm: handleConfirm,
+    onDelete: handleDelete,
+    onCancel: handleCancel
+  }));
 };
 export default AddNote;

package/es/components/booking/notes/addNote/index.less

@@ -1,6 +1,7 @@
 .pisell-lowcode__booking-notes {
   padding: 20px 0;
 }
+
 .pisell-lowcode__booking-notes-label {
   font-size: 16px;
   font-weight: 500;
@@ -10,6 +11,58 @@
   margin-top: 8px;
 }
 
+.pisell-lowcode__booking-notes-input-area {
+  position: relative;
+  min-height: 80px;
+  padding: 12px;
+  border: 1px solid #d9d9d9;
+  border-radius: 6px;
+  background-color: #ffffff;
+  cursor: pointer;
+  transition: all 0.2s;
+  
+  &:hover {
+    border-color: #4096ff;
+  }
+  
+  &:focus-within {
+    border-color: #4096ff;
+    box-shadow: 0 0 0 2px rgba(5, 145, 255, 0.1);
+  }
+}
+
+.pisell-lowcode__booking-notes-content {
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.88);
+  line-height: 1.5714285714285714;
+  white-space: pre-wrap;
+  word-break: break-word;
+  padding-right: 32px;
+}
+
+.pisell-lowcode__booking-notes-placeholder {
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.25);
+  line-height: 1.5714285714285714;
+  padding-right: 32px;
+}
+
+.pisell-lowcode__booking-notes-edit-btn {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+  height: 24px;
+  color: rgba(0, 0, 0, 0.45);
+  
+  &:hover {
+    color: #4096ff;
+  }
+}
+
 .pisell-lowcode__booking-notes-desc {
   margin-top: 8px;
 }

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

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/checkout/PaymentModal.d.ts

@@ -0,0 +1,28 @@
+import React from 'react';
+import './index.less';
+interface PaymentModalData {
+    order_info: any;
+    subtotal_info: {
+        subTotalList: any[];
+        orderTotalList: any[];
+        total: number;
+        showDetail: boolean;
+    };
+    total: any;
+}
+interface PaymentModalProps {
+    data?: PaymentModalData;
+    callback?: (result: any) => void;
+    onClose?: (reset?: boolean) => void;
+    dispatch?: (action: {
+        type: string;
+        payload?: any;
+    }) => void;
+    state?: any;
+}
+interface PaymentModalMainProps extends PaymentModalProps {
+    onClose?: (reset?: boolean) => void;
+}
+declare const PaymentModal: React.FC<PaymentModalMainProps>;
+export type { PaymentModalData, PaymentModalProps };
+export default PaymentModal;