@pisell/private-materials 6.4.46 → 6.4.47

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

@@ -29,6 +29,11 @@ import { setKeyboardTheme } from "../../utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import localeTexts from "./locales";
 import "./index.less";
+var TIP_COLORS = {
+  positive: '#CA8504',
+  negative: '#1570EF',
+  overflow: '#D92D20'
+};
 
 /**
  * originalValue: 当前订单原始值
@@ -120,10 +125,16 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
     }
     return discountAmount.toNumber();
   }, [updateMode, discountMode, internalValue, discountValue, originalValue]);
-  var isDiscountError = useMemo(function () {
-    var _discountAmount = new Decimal(discountAmount || 0);
-    return _discountAmount.lessThan(0) || _discountAmount.greaterThan(new Decimal(originalValue || 0));
-  }, [discountAmount, originalValue]);
+  var isDiscountOverflow = useMemo(function () {
+    var _original = new Decimal(originalValue || 0);
+    if (updateMode === 'priceOverride') {
+      return new Decimal(internalValue || 0).greaterThan(_original);
+    }
+    if (discountMode === 'amount') {
+      return new Decimal(discountValue || 0).greaterThan(_original);
+    }
+    return false;
+  }, [updateMode, discountMode, internalValue, discountValue, originalValue]);
   var payableAmount = useMemo(function () {
     return new Decimal(originalValue || 0).minus(discountAmount).toNumber();
   }, [originalValue, discountAmount]);
@@ -134,7 +145,7 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
       return;
     }
     // 折扣模式、或一口价有限额，则进行折扣值的校验
-    if (isDiscountError) {
+    if (isDiscountOverflow) {
       return;
     }
     onEnter === null || onEnter === void 0 || onEnter(String(discountAmount));
@@ -155,7 +166,9 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
   var rightItems = useRightItems({
     rightItemsStyle: {
       doneButtonStyle: {
-        boxShadow: '0px 0px 1px #898A8D'
+        boxShadow: '0px 0px 1px #898A8D',
+        cursor: updateMode !== 'priceOverride' && isDiscountOverflow ? 'not-allowed' : undefined,
+        backgroundColor: updateMode !== 'priceOverride' && isDiscountOverflow ? '#D0D5DD' : undefined
       }
     },
     doneText: doneText || locales.getText('discount-keyboard-done'),
@@ -182,39 +195,46 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
     }
   }, [amountSymbol, updateMode, discountMode]);
   var renderBottomContent = function renderBottomContent() {
-    var style = {
-      color: isDiscountError ? '#D92D20' : '#079455'
-    };
-    var sign = new Decimal(discountAmount).greaterThan(0) ? '+' : new Decimal(discountAmount).lessThan(0) ? '-' : '';
-    var _maxDiscount = /*#__PURE__*/React.createElement("div", {
-      style: isDiscountError && !isFirstInput ? style : {},
+    // 没改价，则为空
+    if (new Decimal(discountAmount).equals(0)) {
+      return /*#__PURE__*/React.createElement("div", null, "\xA0");
+    }
+    if (updateMode === 'priceOverride' || discountMode === 'percentage') {
+      var color;
+      var sign = '';
+      // 折扣为正值, 展示为负
+      if (new Decimal(discountAmount).greaterThan(0)) {
+        color = TIP_COLORS.negative;
+        sign = '-';
+      } else {
+        sign = '+';
+        color = TIP_COLORS.positive;
+      }
+      var style = {
+        color: color
+      };
+      return /*#__PURE__*/React.createElement("div", {
+        style: style,
+        className: "ellipsis"
+      }, /*#__PURE__*/React.createElement("span", null, sign, /*#__PURE__*/React.createElement(PisellText.Amount, {
+        hideDecimalForWholeNumbers: false,
+        precision: 2,
+        value: Math.abs(discountAmount)
+      })));
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        color: isDiscountOverflow ? TIP_COLORS.overflow : ''
+      },
       className: "ellipsis"
     }, locales.getText('discount-keyboard-max-discount'), ":", ' ', /*#__PURE__*/React.createElement(PisellText.Amount, {
       hideDecimalForWholeNumbers: false,
       precision: 2,
       value: originalValue
     }));
-    var _discountText = /*#__PURE__*/React.createElement("div", {
-      style: style,
-      className: "ellipsis"
-    }, locales.getText('discount-keyboard-discount-amount'), ":", ' ', /*#__PURE__*/React.createElement("span", null, sign, /*#__PURE__*/React.createElement(PisellText.Amount, {
-      hideDecimalForWholeNumbers: false,
-      precision: 2,
-      value: Math.abs(discountAmount)
-    })));
-    if (updateMode === 'priceOverride') {
-      if (isFirstInput) {
-        return _maxDiscount;
-      } else {
-        return _discountText;
-      }
-    }
-    if (updateMode === 'discount' && discountMode === 'amount') {
-      return _maxDiscount;
-    }
-    return _discountText;
   };
   var customDisplay = function customDisplay() {
+    var _color = updateMode === 'discount' && discountMode === 'amount' && isDiscountOverflow ? TIP_COLORS.overflow : undefined;
     return /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'flex',
@@ -231,6 +251,9 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
         flex: '2',
         overflow: 'hidden'
       },
+      style: {
+        color: _color
+      },
       placeholder: placeholder,
       bottomContent: renderBottomContent()
     }), /*#__PURE__*/React.createElement("div", {
@@ -277,7 +300,7 @@ var DiscountKeyboardBase = function DiscountKeyboardBase(props) {
       }
     }, locales.getText('discount-keyboard-payable')), /*#__PURE__*/React.createElement("div", {
       style: {
-        color: isDiscountError ? '#f56565' : '#475467',
+        color: '#475467',
         fontSize: 14,
         fontWeight: 700,
         wordWrap: 'break-word'

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

@@ -5,7 +5,7 @@ export default {
     'discount-keyboard-discount': 'Discount',
     'discount-keyboard-amount': 'Amount',
     'discount-keyboard-percentage': 'Percentage',
-    'discount-keyboard-max-discount': 'Max Discount',
+    'discount-keyboard-max-discount': 'Max',
     'discount-keyboard-discount-amount': 'Discount Amount',
     'discount-keyboard-total': 'Total',
     'discount-keyboard-payable': 'Payable',
@@ -19,7 +19,7 @@ export default {
     'discount-keyboard-discount': '折扣',
     'discount-keyboard-amount': '金额',
     'discount-keyboard-percentage': '百分比',
-    'discount-keyboard-max-discount': '最高折扣',
+    'discount-keyboard-max-discount': '最高',
     'discount-keyboard-discount-amount': '折扣金额',
     'discount-keyboard-total': '待支付金额',
     'discount-keyboard-payable': '需支付金额',
@@ -33,7 +33,7 @@ export default {
     'discount-keyboard-discount': '折扣',
     'discount-keyboard-amount': '金額',
     'discount-keyboard-percentage': '百分比',
-    'discount-keyboard-max-discount': '最高折扣',
+    'discount-keyboard-max-discount': '最高',
     'discount-keyboard-discount-amount': '折扣金額',
     'discount-keyboard-total': '待支付金額',
     'discount-keyboard-payable': '需支付金額',

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PaymentKeyboardBaseProps } from './types';
 import './index.less';
 interface PaymentKeyboardProps extends PaymentKeyboardBaseProps {

package/es/pro/priceKeyboard/hooks/rightItems.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const useRightItems: (props: {
     rightItemsStyle?: any;
     doneText?: string;

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts

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

package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/lib/components/appointmentBooking/components/Cart/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Cart: ({ open, onCancel, onNext }: any) => JSX.Element;
 export default Cart;

package/lib/components/appointmentBooking/components/Content/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

package/lib/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/lib/components/appointmentBooking/components/Footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Footer: ({ onNext, isOpen }: any) => JSX.Element;
 export default Footer;

package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const GuestOptionsModal: (props: any) => JSX.Element;
 export default GuestOptionsModal;

package/lib/components/appointmentBooking/components/Voucher/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../booking/components/voucher/index.less';
 import './index.less';
 declare const VoucherCard: (props: any) => JSX.Element;

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

package/lib/components/appointmentBooking/deposit/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/lib/components/appointmentBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AppointmentBooking: () => JSX.Element;
 export default AppointmentBooking;

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/footer/amount.js

@@ -484,7 +484,6 @@ var getSumTotal = (state, options) => {
     state,
     options.isEdit
   );
-  debugger;
   const shopDiscount = getShopDiscount(state);
   const roundingAmount = getRoundingAmount(state);
   const paySurchargeFee = getPaySurchargeFee(state);

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

@@ -613,8 +613,8 @@ var Footer = (props) => {
       if (noSubmit) {
         return values;
       }
+      const checkout = pisellos.getModule("checkout");
       if (editOrderId) {
-        const checkout = pisellos.getModule("checkout");
         const subtotal_info = {
           subTotalList: (0, import_lodash.cloneDeep)(subTotalList),
           orderTotalList: (0, import_lodash.cloneDeep)(orderTotalList),
@@ -635,6 +635,13 @@ var Footer = (props) => {
         }
         return;
       }
+      if (type === "save") {
+        const isNeedDeposit = checkout.checkIsNeedDepositAsync(values.bookings, values.relation_products);
+        if (isNeedDeposit == null ? void 0 : isNeedDeposit.hasDeposit) {
+          values.is_deposit = 1;
+          values.deposit_amount = isNeedDeposit == null ? void 0 : isNeedDeposit.total;
+        }
+      }
       let api = state.bookingId ? editApi : createApi;
       (0, import_utils4.sendWarningLog)({
         title: "saveBooking",

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Deposit: (props: any) => JSX.Element;
 export default Deposit;

package/lib/components/booking/forms/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/forms/single/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

package/lib/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

package/lib/components/booking/info/addServiceVariant/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { FormState } from '../../../model';
 interface useClientFnParams {
     state: any;

package/lib/components/booking/info/date/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/info/notes/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Notes: () => JSX.Element | null;
 export default Notes;

package/lib/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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/info2/service/actions/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

package/lib/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/service/serviceList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface DurationProps extends SelectProps {
     locale?: string;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 interface StartTimeProps extends SelectProps {
     locale?: string;

package/lib/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -106,11 +105,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-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/notes/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/payments/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;