@pisell/private-materials 6.4.73 → 6.4.74

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, containerStyle, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

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

package/es/components/ticketBooking/components/timeBar/index.js

@@ -4,7 +4,7 @@ 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, { useMemo } from 'react';
+import React, { useMemo, useState, useEffect } from 'react';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import { DatePicker, SelectTime } from '@pisell/materials';
 import { useMemoizedFn } from 'ahooks';
@@ -13,12 +13,65 @@ import dayjs from 'dayjs';
 import classNames from 'classnames';
 import { locales } from '@pisell/utils';
 import "./index.less";
+import { Iconfont } from '@pisell/materials';
 var TimeBar = function TimeBar(props) {
-  var _state$modalState6;
+  var _state$modalState7;
   var state = props.globalState,
     setGlobalState = props.setGlobalState,
     locale = props.locale,
     onCreateClick = props.onCreateClick;
+  var _useState = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    collapsed = _useState2[0],
+    setCollapsed = _useState2[1];
+  var _useState3 = useState(1),
+    _useState4 = _slicedToArray(_useState3, 2),
+    scaleCompensation = _useState4[0],
+    setScaleCompensation = _useState4[1];
+
+  // 获取 body 的 scale 值并计算补偿
+  useEffect(function () {
+    var getBodyScale = function getBodyScale() {
+      var body = document.body;
+      var computedStyle = window.getComputedStyle(body);
+      var transform = computedStyle.transform;
+      if (transform && transform !== 'none') {
+        // 解析 transform matrix 获取 scale 值
+        // matrix(scaleX, skewY, skewX, scaleY, translateX, translateY)
+        var matrix = transform.match(/matrix\(([^)]+)\)/);
+        if (matrix) {
+          var values = matrix[1].split(',').map(function (v) {
+            return parseFloat(v.trim());
+          });
+          // scaleX 通常是 matrix 的第一个值
+          var scale = values[0] || 1;
+          return scale;
+        }
+      }
+      return 1;
+    };
+    var updateScale = function updateScale() {
+      var scale = getBodyScale();
+      // 目标高度是 40px，需要补偿 scale 的影响
+      // 实际设置高度 = 目标高度 / scale
+      setScaleCompensation(scale);
+    };
+    updateScale();
+
+    // 监听 body 的 transform 变化（使用 MutationObserver）
+    var observer = new MutationObserver(updateScale);
+    observer.observe(document.body, {
+      attributes: true,
+      attributeFilter: ['style', 'class']
+    });
+
+    // 也监听窗口大小变化（某些情况下 scale 可能随窗口变化）
+    window.addEventListener('resize', updateScale);
+    return function () {
+      observer.disconnect();
+      window.removeEventListener('resize', updateScale);
+    };
+  }, []);
   var _onClickNext = useMemoizedFn(function () {
     var _state$modalState, _props$onDateChange, _props$setIntervalTim;
     var currentTime = (_state$modalState = state.modalState) === null || _state$modalState === void 0 || (_state$modalState = _state$modalState.date) === null || _state$modalState === void 0 ? void 0 : _state$modalState.value;
@@ -57,8 +110,52 @@ var TimeBar = function TimeBar(props) {
     });
     (_props$setIntervalTim5 = props.setIntervalTime) === null || _props$setIntervalTim5 === void 0 || _props$setIntervalTim5.call(props, timeString === dayjs().format('HH:mm'));
   });
+  var _onToggleCollapse = useMemoizedFn(function () {
+    setCollapsed(!collapsed);
+  });
   return useMemo(function () {
-    var _state$modalState4, _state$modalState5;
+    var _state$modalState5, _state$modalState6;
+    // 收起状态
+    if (collapsed) {
+      var _state$modalState4;
+      var currentDate = state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value;
+      var isToday = currentDate && currentDate.isSame(dayjs(), 'day');
+      var displayText = isToday ? locales.getText('pisell2.ticket-booking.today') : (currentDate === null || currentDate === void 0 ? void 0 : currentDate.format('YYYY-MM-DD')) || '';
+
+      // 计算补偿后的高度：目标高度 / scale
+      var targetHeight = 40;
+      var compensatedHeight = targetHeight / scaleCompensation;
+      return /*#__PURE__*/React.createElement("div", {
+        className: classNames('pisell-ticket-booking-time-bar', 'collapsed'),
+        style: {
+          height: "".concat(compensatedHeight, "px"),
+          minHeight: "".concat(compensatedHeight, "px"),
+          maxHeight: "".concat(compensatedHeight, "px")
+        }
+      }, /*#__PURE__*/React.createElement("div", {
+        className: "pisell-ticket-booking-time-bar-collapsed-content",
+        style: {
+          height: "".concat(compensatedHeight, "px")
+        }
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "pisell-ticket-booking-time-bar-collapsed-today",
+        style: {
+          lineHeight: "".concat(compensatedHeight, "px")
+        }
+      }, displayText), /*#__PURE__*/React.createElement(Button, {
+        type: "link",
+        size: "small",
+        className: "pisell-ticket-booking-time-bar-collapsed-expand",
+        onClick: _onToggleCollapse,
+        style: {
+          lineHeight: "".concat(compensatedHeight, "px")
+        }
+      }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.ticket-booking.expand')), /*#__PURE__*/React.createElement(Iconfont, {
+        type: "pisell2-chevron-right-double"
+      }))));
+    }
+
+    // 展开状态
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-ticket-booking-time-bar",
       style: {
@@ -85,7 +182,7 @@ var TimeBar = function TimeBar(props) {
       }
     }, /*#__PURE__*/React.createElement(DatePicker, {
       inputReadOnly: true,
-      value: state === null || state === void 0 || (_state$modalState4 = state.modalState) === null || _state$modalState4 === void 0 || (_state$modalState4 = _state$modalState4.date) === null || _state$modalState4 === void 0 ? void 0 : _state$modalState4.value,
+      value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value,
       format: locale === 'en' ? 'dddd, DD MMM YYYY' : 'YYYY年MM月DD日',
       onChange: props === null || props === void 0 ? void 0 : props.onDateChange,
       size: "large",
@@ -101,7 +198,7 @@ var TimeBar = function TimeBar(props) {
         'booking-page-date-picker-select': state.isTimeChange
       })
     }, /*#__PURE__*/React.createElement(SelectTime, {
-      value: state === null || state === void 0 || (_state$modalState5 = state.modalState) === null || _state$modalState5 === void 0 || (_state$modalState5 = _state$modalState5.date) === null || _state$modalState5 === void 0 ? void 0 : _state$modalState5.value.format('HH:mm'),
+      value: state === null || state === void 0 || (_state$modalState6 = state.modalState) === null || _state$modalState6 === void 0 || (_state$modalState6 = _state$modalState6.date) === null || _state$modalState6 === void 0 ? void 0 : _state$modalState6.value.format('HH:mm'),
       onChange: _onDateTimeChange,
       popoverProps: {
         style: {
@@ -124,7 +221,15 @@ var TimeBar = function TimeBar(props) {
       },
       size: "large",
       type: "primary"
-    }, locales.getText('pisell2.ticket-booking.create-new')));
-  }, [(_state$modalState6 = state.modalState) === null || _state$modalState6 === void 0 || (_state$modalState6 = _state$modalState6.date) === null || _state$modalState6 === void 0 ? void 0 : _state$modalState6.value, state.intervalSetTime, state.isTimeChange, state.isDateChange, locale]);
+    }, locales.getText('pisell2.ticket-booking.create-new')), /*#__PURE__*/React.createElement(Button, {
+      type: "link",
+      style: {
+        marginLeft: 'auto'
+      },
+      onClick: _onToggleCollapse
+    }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.ticket-booking.collapse')), /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-chevron-left-double"
+    })));
+  }, [collapsed, (_state$modalState7 = state.modalState) === null || _state$modalState7 === void 0 || (_state$modalState7 = _state$modalState7.date) === null || _state$modalState7 === void 0 ? void 0 : _state$modalState7.value, state.intervalSetTime, state.isTimeChange, state.isDateChange, locale, _onToggleCollapse, scaleCompensation]);
 };
 export default TimeBar;

package/es/components/ticketBooking/components/timeBar/index.less

@@ -20,4 +20,63 @@
       }
     }
   }
+
+  // 收起状态
+  &.collapsed {
+    position: fixed;
+    bottom: 0;
+    left: 86px;
+    padding: 0;
+    background-color: transparent;
+    display: block;
+    // 高度通过内联样式动态设置以补偿 body 的 scale
+
+    .pisell-ticket-booking-time-bar-collapsed-content {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      width: 100%;
+      // 高度通过内联样式动态设置以补偿 body 的 scale
+      padding: 0 16px;
+      background-color: #fff;
+      border-radius: 0 8px 8px 0;
+      box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
+      box-sizing: border-box;
+      overflow: hidden;
+
+      .pisell-ticket-booking-time-bar-collapsed-today {
+        font-weight: 600;
+        font-size: 18px;
+        color: #000;
+        flex-shrink: 0;
+        margin-right: 16px;
+        // line-height 通过内联样式动态设置
+      }
+
+      .pisell-ticket-booking-time-bar-collapsed-expand {
+        color: #7F56DA;
+        padding: 0;
+        margin: 0;
+        height: auto;
+        font-size: 18px;
+        font-weight: 500;
+        display: inline-flex;
+        align-items: center;
+        flex-shrink: 0;
+        // line-height 通过内联样式动态设置
+
+        &:hover {
+          color: #6941c6;
+        }
+
+        span {
+          margin-right: 2px;
+        }
+        .anticon {
+          margin-left: 0px;
+          margin-right: 0px;
+        }
+      }
+    }
+  }
 }

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

@@ -61,6 +61,8 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
+        'pisell2.ticket-booking.collapse': string;
+        'pisell2.ticket-booking.expand': string;
     };
     'zh-CN': {
         'pisell2.ticket-booking.info': string;
@@ -124,6 +126,8 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
+        'pisell2.ticket-booking.collapse': string;
+        'pisell2.ticket-booking.expand': string;
     };
     'zh-HK': {
         'pisell2.ticket-booking.info': string;
@@ -187,6 +191,8 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
+        'pisell2.ticket-booking.collapse': string;
+        'pisell2.ticket-booking.expand': string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -73,7 +73,9 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal Version Reminder',
     'pisell2.ticket-booking.terminal-upgrade-description': 'Your Terminal version is outdated. Please upgrade Terminal to use all features.',
     'pisell2.ticket-booking.terminal-upgrade-ok': 'I understand',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': 'Cancel'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': 'Cancel',
+    'pisell2.ticket-booking.collapse': 'Collapse',
+    'pisell2.ticket-booking.expand': 'Expand'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -149,7 +151,9 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
     'pisell2.ticket-booking.terminal-upgrade-description': '检测到您的Terminal版本较低，请升级Terminal以使用完整功能',
     'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消',
+    'pisell2.ticket-booking.collapse': '收起',
+    'pisell2.ticket-booking.expand': '展开'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -225,6 +229,8 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
     'pisell2.ticket-booking.terminal-upgrade-description': '檢測到您的Terminal版本較低，請升級Terminal以使用完整功能',
     'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消',
+    'pisell2.ticket-booking.collapse': '收起',
+    'pisell2.ticket-booking.expand': '展開'
   }
 };

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

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.js

@@ -46,7 +46,8 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     doneText = props.doneText,
     resetText = props.resetText,
     disabled = props.disabled,
-    hiddenChangeDue = props.hiddenChangeDue;
+    hiddenChangeDue = props.hiddenChangeDue,
+    shortcutsSize = props.shortcutsSize;
   var _useControllableValue = useControllableValue(props),
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
     internalValue = _useControllableValue2[0],
@@ -69,7 +70,7 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     setKeyboardTheme(selectType);
   }, [selectType]);
 
-  // 变体2：末尾有三个默认预设项，总数不大于8个
+  // 变体2：末尾有三个默认预设项，总数不大于7个(因为支付占了 2)
   var getDefaultPresets = function getDefaultPresets() {
     var defaultEndPresets = [{
       label: locales.getText('cash-keyboard-other'),
@@ -113,7 +114,8 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
       value: 'pay',
       style: {
         color: 'white',
-        backgroundColor: '#7F56DA'
+        backgroundColor: '#7F56DA',
+        gridColumn: 'span 2'
       },
       onClick: function onClick() {
         var _props$onEnter;
@@ -122,8 +124,8 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     }];
     var userPresets = presets || [];
 
-    // 计算可用的用户预设数量（总数8 - 默认3个 = 5个）
-    var maxUserPresets = 8 - defaultEndPresets.length;
+    // 计算可用的用户预设数量（总数7 - 默认3个 = 4个）
+    var maxUserPresets = 7 - defaultEndPresets.length;
     var limitedUserPresets = userPresets.slice(0, maxUserPresets);
     return [].concat(_toConsumableArray(limitedUserPresets), defaultEndPresets);
   };
@@ -252,10 +254,11 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
       padding: '6px 16px',
       borderRadius: '8px',
       backgroundColor: 'white',
-      boxShadow: '0px 1px 2px rgba(16, 24, 40, 0.06)',
+      boxShadow: 'inset 0 2px 4px rgba(16, 24, 40, 0.08), inset 0 -2px 4px rgba(16, 24, 40, 0.08), inset 2px 0 4px rgba(16, 24, 40, 0.08), inset -2px 0 4px rgba(16, 24, 40, 0.08)',
       overflow: 'hidden',
       maxWidth: 188,
-      cursor: 'pointer'
+      cursor: 'pointer',
+      border: '1px solid #7f56da'
     }),
     onClick: function onClick() {
       setIsShowModal(true);
@@ -314,6 +317,7 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     hideDecimalForWholeNumbers: false,
     precision: 2
   })))))), /*#__PURE__*/React.createElement(Shortcuts, {
+    size: shortcutsSize || 'default',
     presets: getDefaultPresets(),
     onChange: setInternalValue,
     disabled: disabled

package/es/pro/priceKeyboard/components/cashKeyboard/index.d.ts

@@ -6,6 +6,7 @@ export interface CashKeyboardProps extends CashKeyboardBaseProps {
         [key: string]: any;
     };
     variant?: 'intact' | 'simple';
+    shortcutsSize?: 'default' | 'large';
 }
 declare const CashKeyboard: (props: CashKeyboardProps) => JSX.Element;
 export default CashKeyboard;

package/es/pro/priceKeyboard/components/cashKeyboard/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["variant", "value", "onChange"];
+var _excluded = ["variant", "value", "onChange", "shortcutsSize"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -26,6 +26,7 @@ var CashKeyboard = function CashKeyboard(props) {
     variant = _props$variant === void 0 ? 'intact' : _props$variant,
     value = props.value,
     onChange = props.onChange,
+    shortcutsSize = props.shortcutsSize,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useControllableValue = useControllableValue(props),
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
@@ -36,7 +37,8 @@ var CashKeyboard = function CashKeyboard(props) {
       amountSymbol: amountSymbol,
       value: internalValue,
       placeholder: "".concat(amountSymbol, "0"),
-      onChange: setInternalValue
+      onChange: setInternalValue,
+      shortcutsSize: shortcutsSize
     }));
   }
   return /*#__PURE__*/React.createElement(CashKeyboardSimple, _extends({}, otherProps, {

package/es/pro/priceKeyboard/components/cashKeyboard/types.d.ts

@@ -94,4 +94,5 @@ export interface CashKeyboardBaseProps {
     keyboardButtonBackgroundColor?: string;
     keyboardButtonTextColor?: string;
     keyboardButtonHoverColor?: string;
+    shortcutsSize?: 'default' | 'large';
 }

package/es/pro/priceKeyboard/components/discountKeyboard/index.js

@@ -46,6 +46,7 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
     originalValue = props.originalValue,
     _props$selectType = props.selectType,
     selectType = _props$selectType === void 0 ? 'light' : _props$selectType,
+    tips = props.tips,
     resetText = props.resetText,
     doneText = props.doneText,
     onEnter = props.onEnter,
@@ -309,9 +310,17 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
       value: payableAmount
     })))));
   };
+  var renderTipsContent = function renderTipsContent() {
+    if (tips) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "pisell-pro-price-keyboard-tips"
+      }, tips);
+    }
+    return null;
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-pro-price-keyboard-discount"
-  }, /*#__PURE__*/React.createElement(Segmented, {
+  }, renderTipsContent(), /*#__PURE__*/React.createElement(Segmented, {
     size: "large",
     style: {
       padding: 6

package/es/pro/priceKeyboard/components/discountKeyboard/index.less

@@ -7,6 +7,20 @@
   gap: 10px;
   background-color: var(--pisell-pro-price-keyboard-bg-color, #ffffff);
 
+  .pisell-pro-price-keyboard-tips {
+    background-color: var(
+      --pisell-pro-price-keyboard-bg-color-gray-200,
+      #eaecf0
+    );
+    color: #ffffff;
+    font-size: 14px;
+    font-weight: 600;
+    height: 36px;
+    line-height: 36px;
+    text-align: center;
+    border-radius: 8px;
+  }
+
   .ellipsis {
     overflow: hidden;
     text-overflow: ellipsis;

package/es/pro/priceKeyboard/components/shortcuts/index.d.ts

@@ -12,6 +12,7 @@ export interface ShortcutsProps {
     presets?: ShortcutsItem[];
     onChange?: (val: string) => void;
     disabled?: boolean;
+    size?: 'default' | 'large';
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ShortcutsProps & React.RefAttributes<HTMLDivElement>>>;
 export default _default;

package/es/pro/priceKeyboard/components/shortcuts/index.js

@@ -4,7 +4,9 @@ import "./index.less";
 var Shortcuts = /*#__PURE__*/forwardRef(function (props, ref) {
   var presets = props.presets,
     onChange = props.onChange,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    _props$size = props.size,
+    size = _props$size === void 0 ? 'default' : _props$size;
   var handleItemClick = function handleItemClick(item) {
     if (disabled || item.disabled) {
       return;
@@ -32,7 +34,8 @@ var Shortcuts = /*#__PURE__*/forwardRef(function (props, ref) {
       var itemProps = {
         key: index,
         className: classNames('pisell-virtual-keyboard-shortcut', {
-          disabled: item.disabled
+          disabled: item.disabled,
+          large: size === 'large'
         }),
         style: item.style,
         onClick: function onClick() {

package/es/pro/priceKeyboard/components/shortcuts/index.less

@@ -28,6 +28,10 @@
     cursor: pointer;
     position: relative;
 
+    &.large {
+      height: 54px;
+    }
+
     &.disabled {
       cursor: not-allowed;
       pointer-events: none;

package/lib/components/booking/components/footer/index.js

@@ -467,7 +467,11 @@ var Footer = (props) => {
     (_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id
   ]);
   const handleCheckoutInternal = async () => {
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     const isNewOrder = !state.bookingId;
     if (isEdit) {
       if ((0, import_utils2.isDayBooking)(state)) {
@@ -494,18 +498,18 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a2, _b2, _c2, _d2;
+          var _a3, _b3, _c3, _d2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success") {
             console.log("Payment completed successfully");
-            (_b2 = (_a2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a2.bookingTicket) == null ? void 0 : _b2.clearAllCart();
+            (_b3 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.bookingTicket) == null ? void 0 : _b3.clearAllCart();
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
             console.log("Payment cancelled");
             if (res == null ? void 0 : res.order_id) {
-              (_d2 = (_c2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c2.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
+              (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
             }
             setPaymentModalData(null);
             setPaymentCallback(null);
@@ -596,8 +600,11 @@ var Footer = (props) => {
     messageShow = true,
     noSubmit = false
   }) => {
-    var _a2, _b2, _c2, _d2, _e2;
-    (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
+    const isToastMode = ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.payment_setting) == null ? void 0 : _c2.payment_result_display_mode) !== "modal";
+    if (isToastMode) {
+      (0, import_PaymentResultToast.closeAllPaymentResultToasts)();
+    }
     if ((0, import_utils2.isDayBooking)(state)) {
       const isHasDayProducts = handleDaySubmit();
       if (isHasDayProducts) return;
@@ -612,7 +619,7 @@ var Footer = (props) => {
     const createApi = state.renderType === "eventBooking" ? import_serve2.createEventBooking : createBooking;
     let saveOtherValue = {};
     if (type === "save") {
-      saveOtherValue = await ((_a2 = state == null ? void 0 : state.onSave) == null ? void 0 : _a2.call(state, state.client)) || {};
+      saveOtherValue = await ((_d2 = state == null ? void 0 : state.onSave) == null ? void 0 : _d2.call(state, state.client)) || {};
     }
     try {
       let callbackData = null;
@@ -658,7 +665,7 @@ var Footer = (props) => {
           { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
           {
             key: "店铺id",
-            value: (_e2 = (_d2 = (_c2 = (_b2 = store == null ? void 0 : store.getState) == null ? void 0 : _b2.call(store)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id
+            value: (_h2 = (_g2 = (_f2 = (_e2 = store == null ? void 0 : store.getState) == null ? void 0 : _e2.call(store)) == null ? void 0 : _f2.global) == null ? void 0 : _g2.globalConfig) == null ? void 0 : _h2.id
           },
           {
             key: "shopApi",

package/lib/components/booking/info/service2/utils.d.ts

@@ -248,4 +248,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/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 | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};