@pisell/private-materials 6.5.31 → 6.5.32

package/es/pro/pisellPaymentList/example.d.ts

@@ -4,6 +4,7 @@
  * 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
  * 包括如何通过 Context 访问父组件配置
  */
+/// <reference types="react" />
 export declare const BasicExample: () => JSX.Element;
 export declare const ChildrenExample: () => JSX.Element;
 export declare const CustomItemExample: () => JSX.Element;

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

@@ -22,7 +22,6 @@ 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";
@@ -30,6 +29,7 @@ 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,
@@ -251,47 +251,52 @@ 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: '6px 16px',
+      padding: '0px 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)',
       overflow: 'hidden',
       maxWidth: 188,
       cursor: 'pointer',
-      border: '1px solid #7f56da'
+      border: '1px solid #7f56da',
+      borderBottom: '1px solid #7f56da'
     }),
     onClick: function onClick() {
       setIsShowModal(true);
     }
-  }, /*#__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,
+  }, /*#__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",
     style: {
-      fontSize: '24px',
-      fontWeight: 'bold',
-      border: 'none',
-      background: 'transparent',
-      width: '100%'
+      color: '#7f56da',
+      fontSize: '18px',
+      marginLeft: '4px',
+      marginTop: '4px'
     }
-  })), ((_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'

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

@@ -96,7 +96,7 @@ var VoucherCard = (props) => {
       return {
         _id: item._id,
         quantity: item.num,
-        bundle: item._bundleOrigin,
+        bundle: item.bundle,
         options: item._optionsOrigin,
         product: {
           ...item._productOrigin
@@ -122,6 +122,7 @@ 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,23 +51,31 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    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);
     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: (item == null ? void 0 : item.discount_list) || [],
+      discount_list: discount_list || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
       note: "",
       discountway: "num",
       discount_type: "discount",
-      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
+      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
     };
   });
   return arr;
@@ -241,12 +249,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/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/lib/components/booking/components/TabProduct/productItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

package/lib/components/booking/components/collapsibleList/utils.d.ts

@@ -1 +1,2 @@
+/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/lib/components/booking/components/emptyBooking/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

package/lib/components/booking/components/footer/FooterMenus/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

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