@pisell/private-materials 6.7.7 → 6.7.8

package/es/pro/Login2.0/index.less

@@ -15,14 +15,6 @@
   
   /* 默认底部内边距 */
   padding-bottom: 24px;
-
-  // 加载状态优化
-  .pisell-lowcode-btn-loading-icon {
-    .anticon {
-      color: #ffffff !important;
-    }
-  }
-
   
   /* 在弹窗模式下不需要额外的底部内边距，因为使用 sticky 定位 */
   .pisell-lowcode-modal-body & {
@@ -458,13 +450,6 @@
   .login-lm-drawer-popover & {
     padding-bottom: 100px;
   }
-    // 加载状态优化
-  .pisell-lowcode-btn-loading-icon {
-    .anticon {
-      color: #ffffff !important;
-    }
-  }
-
 }
 
 // 错误提示样式优化
@@ -524,6 +509,14 @@
 //     }
 //   }
 // }
+
+// 加载状态优化
+.pisell-lowcode-btn-loading-icon {
+  .anticon {
+    color: #ffffff !important;
+  }
+}
+
 // 切换认证方式按钮
 .login2-switch-button {
   margin-top: 0;

package/es/pro/comprehensiveSearch/components/searchSection/locales.js

@@ -1,14 +1,14 @@
 export default {
   en: {
-    'pisell2.comprehensive-search.placeholder': 'WalletPass Code / Name / Mobile / Email / Contact info',
+    'pisell2.comprehensive-search.placeholder': 'WalletPass Code / Name / Mobile / Email',
     'pisell2.text.search': 'Search'
   },
   'zh-CN': {
-    'pisell2.comprehensive-search.placeholder': '钱包码 / 姓名 / 电话 / 电子邮箱 / 联系信息',
+    'pisell2.comprehensive-search.placeholder': '钱包码 / 姓名 / 电话 / 电子邮箱',
     'pisell2.text.search': '搜索'
   },
   'zh-HK': {
-    'pisell2.comprehensive-search.placeholder': '錢包碼 / 姓名 / 電話 / 電子郵箱 / 聯繫信息',
+    'pisell2.comprehensive-search.placeholder': '錢包碼 / 姓名 / 電話 / 電子郵箱',
     'pisell2.text.search': '搜索'
   }
 };

package/es/pro/comprehensiveSearch/locales.js

@@ -1,6 +1,6 @@
 export default {
   en: {
-    'pisell2.text.new-client': 'New Customer',
+    'pisell2.text.new-client': 'New Client',
     'pisell2.comprehensive-search.empty': 'No Data'
   },
   'zh-CN': {

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

@@ -22,6 +22,7 @@ import { useControllableValue } from 'ahooks';
 import { merge, omit } from 'lodash';
 //@ts-ignore
 import { locales } from '@pisell/utils';
+import { VirtualInput } from '@pisell/materials';
 import Shortcuts from "../shortcuts";
 import CashKeyboardSimple from "./CashKeyboardSimple";
 import { setKeyboardTheme } from "../../utils";
@@ -29,7 +30,6 @@ import "./index.less";
 import Decimal from 'decimal.js';
 import { AutoResizeText } from '@pisell/materials';
 import { formatAmountWithOptions } from '@pisell/utils';
-import { Iconfont } from '@pisell/materials';
 var CashKeyboardIntact = function CashKeyboardIntact(props) {
   var _mergedDisplayField$b, _mergedDisplayField$c, _mergedDisplayField$c2;
   var amountSymbol = props.amountSymbol,
@@ -46,8 +46,7 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     doneText = props.doneText,
     resetText = props.resetText,
     disabled = props.disabled,
-    hiddenChangeDue = props.hiddenChangeDue,
-    shortcutsSize = props.shortcutsSize;
+    hiddenChangeDue = props.hiddenChangeDue;
   var _useControllableValue = useControllableValue(props),
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
     internalValue = _useControllableValue2[0],
@@ -70,7 +69,7 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     setKeyboardTheme(selectType);
   }, [selectType]);
 
-  // 变体2：末尾有三个默认预设项，总数不大于7个(因为支付占了 2)
+  // 变体2：末尾有三个默认预设项，总数不大于8个
   var getDefaultPresets = function getDefaultPresets() {
     var defaultEndPresets = [{
       label: locales.getText('cash-keyboard-other'),
@@ -114,8 +113,7 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
       value: 'pay',
       style: {
         color: 'white',
-        backgroundColor: '#7F56DA',
-        gridColumn: 'span 2'
+        backgroundColor: '#7F56DA'
       },
       onClick: function onClick() {
         var _props$onEnter;
@@ -124,8 +122,8 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     }];
     var userPresets = presets || [];
 
-    // 计算可用的用户预设数量（总数7 - 默认3个 = 4个）
-    var maxUserPresets = 7 - defaultEndPresets.length;
+    // 计算可用的用户预设数量（总数8 - 默认3个 = 5个）
+    var maxUserPresets = 8 - defaultEndPresets.length;
     var limitedUserPresets = userPresets.slice(0, maxUserPresets);
     return [].concat(_toConsumableArray(limitedUserPresets), defaultEndPresets);
   };
@@ -251,52 +249,46 @@ var CashKeyboardIntact = function CashKeyboardIntact(props) {
     showCurrencySymbol: true
   }))))), ((_mergedDisplayField$c = mergedDisplayField.cashReceived) === null || _mergedDisplayField$c === void 0 ? void 0 : _mergedDisplayField$c.visible) && /*#__PURE__*/React.createElement("div", {
     style: _objectSpread(_objectSpread({}, getGridStyle(1)), {}, {
-      padding: '0px 16px',
+      padding: '6px 16px',
       borderRadius: '8px',
       backgroundColor: 'white',
-      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)',
+      boxShadow: '0px 1px 2px rgba(16, 24, 40, 0.06)',
       overflow: 'hidden',
       maxWidth: 188,
-      cursor: 'pointer',
-      border: '1px solid #7f56da',
-      borderBottom: '1px solid #7f56da'
+      cursor: 'pointer'
     }),
     onClick: function onClick() {
       setIsShowModal(true);
     }
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-cash-keyboard-intact-container-top",
-    style: _objectSpread(_objectSpread({}, getGridStyle(0)), {}, {
-      overflow: 'hidden',
-      padding: '5px 0'
-    })
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-cash-keyboard-intact-container-top-label"
-  }, mergedDisplayField.cashReceived.label), /*#__PURE__*/React.createElement("div", {
-    className: "pisell-cash-keyboard-intact-container-top-value"
-  }, /*#__PURE__*/React.createElement(AutoResizeText, {
-    minFontSizePx: 10,
-    maxFontSizePx: 18,
-    fontSizePrecisionPx: 0.5,
-    style: {
-      color: '#7f56da',
-      textDecoration: 'underline',
-      textUnderlineOffset: '3px'
-    }
-  }, internalValue ? formatAmountWithOptions(internalValue || '', amountSymbol, {
-    value: internalValue,
-    hideDecimalForWholeNumbers: false,
-    precision: 2,
-    showCurrencySymbol: true
-  }) : ''), /*#__PURE__*/React.createElement(Iconfont, {
-    type: "pisell2-edit-05",
+  }, /*#__PURE__*/React.createElement(VirtualInput, {
+    showCursor: false,
+    focused: true,
+    wrapperStyle: {
+      width: '100%'
+    },
+    topContent: /*#__PURE__*/React.createElement("div", {
+      style: {
+        fontSize: '14px',
+        color: '#667085'
+      }
+    }, mergedDisplayField.cashReceived.label),
+    value: internalValue ? formatAmountWithOptions(internalValue || '', amountSymbol, {
+      value: internalValue,
+      hideDecimalForWholeNumbers: false,
+      precision: 2,
+      showCurrencySymbol: true
+    }) : '',
+    height: 30,
+    fontSize: 20,
+    placeholder: placeholder,
     style: {
-      color: '#7f56da',
-      fontSize: '18px',
-      marginLeft: '4px',
-      marginTop: '4px'
+      fontSize: '24px',
+      fontWeight: 'bold',
+      border: 'none',
+      background: 'transparent',
+      width: '100%'
     }
-  })))), ((_mergedDisplayField$c2 = mergedDisplayField.changeDue) === null || _mergedDisplayField$c2 === void 0 ? void 0 : _mergedDisplayField$c2.visible) && /*#__PURE__*/React.createElement("div", {
+  })), ((_mergedDisplayField$c2 = mergedDisplayField.changeDue) === null || _mergedDisplayField$c2 === void 0 ? void 0 : _mergedDisplayField$c2.visible) && /*#__PURE__*/React.createElement("div", {
     className: "pisell-cash-keyboard-intact-container-top",
     style: _objectSpread(_objectSpread({}, getGridStyle(2)), {}, {
       overflow: 'hidden'
@@ -322,7 +314,6 @@ 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

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

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

@@ -1,4 +1,4 @@
-var _excluded = ["variant", "value", "onChange", "shortcutsSize"];
+var _excluded = ["variant", "value", "onChange"];
 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,7 +26,6 @@ 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),
@@ -37,8 +36,7 @@ var CashKeyboard = function CashKeyboard(props) {
       amountSymbol: amountSymbol,
       value: internalValue,
       placeholder: "".concat(amountSymbol, "0"),
-      onChange: setInternalValue,
-      shortcutsSize: shortcutsSize
+      onChange: setInternalValue
     }));
   }
   return /*#__PURE__*/React.createElement(CashKeyboardSimple, _extends({}, otherProps, {

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

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

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

@@ -46,7 +46,6 @@ 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,
@@ -310,17 +309,9 @@ 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"
-  }, renderTipsContent(), /*#__PURE__*/React.createElement(Segmented, {
+  }, /*#__PURE__*/React.createElement(Segmented, {
     size: "large",
     style: {
       padding: 6

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

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

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

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

package/es/utils/index.d.ts

@@ -18,6 +18,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/confirm").ConfigUpdate) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -96,7 +96,7 @@ var VoucherCard = (props) => {
       return {
         _id: item._id,
         quantity: item.num,
-        bundle: item.bundle,
+        bundle: item._bundleOrigin,
         options: item._optionsOrigin,
         product: {
           ...item._productOrigin
@@ -122,7 +122,6 @@ var VoucherCard = (props) => {
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
-    pisellos.effects.on("appointmentBooking_cart:onUpdateBookingDate", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(

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

@@ -51,31 +51,23 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-    const bundleDiscountList = (0, import_utils.getBundleDiscountList)(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
-    const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
-    discount_list.push(...bundleDiscountList);
+    var _a, _b, _c, _d, _e, _f, _g;
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
       price: (0, import_utils.formatProductPrice)(item),
       product_id: item.id,
-      discount_list: discount_list || [],
+      discount_list: (item == null ? void 0 : item.discount_list) || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
       note: "",
       discountway: "num",
       discount_type: "discount",
-      bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
-      "product_option_item": (0, import_utils.formatProductOption)((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
-      "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
-      "source_product_price": (0, import_utils.getSourceProductPrice)(item),
-      "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
-      "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
-      "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
-      "tax_fee": item._extend.tax_fee
+      bundle_edit: (_a = item._extend) == null ? void 0 : _a.bundle_edit,
+      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+      "product_option_item": (0, import_utils.formatProductOption)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
+      "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0
     };
   });
   return arr;
@@ -249,12 +241,12 @@ var Addons = (0, import_model.Provider)((props) => {
           isAddons: true,
           _key: e.key,
           _extend: {
+            price: _detail.price,
             other: e,
             quantity: (e == null ? void 0 : e.quantity) || 1
           },
           quantity: (e == null ? void 0 : e.quantity) || 1
         };
-        product._extend.price = (0, import_utils2.getMainPrice)(product, _detail.price);
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
         product._extend.origin_total = _total;

package/lib/components/booking/components/footer/amount.d.ts

@@ -33,5 +33,4 @@ export declare const getSumTotal: (state: any, options: {
     dueAmount: number;
     roundingAmount: number;
     originExpectAmount: number;
-    originExpectAmountWithoutDiscount: number;
 };