@pisell/private-materials 6.11.41 → 6.11.42

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

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

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

@@ -69,7 +69,7 @@ import Decimal from 'decimal.js';
  * @Date: 2024-01-30 16:51
  */
 var Footer = function Footer(props) {
-  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$addons4, _state$notes4, _state$bookingConfig7, _state$client5;
+  var _context$appHelper, _state$paymentPaid2, _state$bookingConfig2, _state$bookingConfig4, _state$addons2, _state$bookingDetail, _state$bookingDetail2, _state$client2, _state$notes3, _state$bookingDetail13, _state$bookingDetail16, _state$addons4, _state$notes4, _state$bookingConfig7, _state$client5;
   var state = props.state,
     buttons = props.buttons,
     dispatch = props.dispatch,
@@ -2122,6 +2122,7 @@ var Footer = function Footer(props) {
    * @Date: 2024-01-30 17:00
    */
   var totalText = useMemo(function () {
+    var _state$bookingDetail15;
     var str = '';
 
     // 有退款金额时, 直接展示 退款:$8.00
@@ -2134,7 +2135,7 @@ var Footer = function Footer(props) {
       return "".concat(locales.getText('pisell2.text.deposit-paid'), " ").concat(formatAmount(state === null || state === void 0 || (_state$bookingDetail14 = state.bookingDetail) === null || _state$bookingDetail14 === void 0 ? void 0 : _state$bookingDetail14.deposit_paid_amount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'), " ").concat(total.duration ? "(".concat(total.duration, ")") : '');
     }
     // 如果待支付金额小于0 则展示全额支付
-    if (total.notPaidAmount <= 0 && state.bookingId) {
+    if (total.notPaidAmount <= 0 && (state.bookingId || (_state$bookingDetail15 = state.bookingDetail) !== null && _state$bookingDetail15 !== void 0 && _state$bookingDetail15.id)) {
       str = "".concat(locales.getText('pisell1.text.fully-paid'), ": ").concat(formatAmount(total.sumTotalAmount, 2, (state === null || state === void 0 ? void 0 : state.amountSymbol) || '$'));
     }
 
@@ -2146,7 +2147,7 @@ var Footer = function Footer(props) {
       str = str + " (".concat(total.duration, ")");
     }
     return str;
-  }, [state, total, state.bookingId, isOnlyDeposit]);
+  }, [state, total, state.bookingId, isOnlyDeposit, (_state$bookingDetail16 = state.bookingDetail) === null || _state$bookingDetail16 === void 0 ? void 0 : _state$bookingDetail16.id]);
 
   /**
    * @title: 是否显示footer loading

package/es/components/booking/components/voucher/index.d.ts

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

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

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

package/es/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/es/components/checkout/components/SearchAndClientModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface IScanResult {
     status: 'success' | 'failed';

package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts

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

package/es/components/pay/toB/components/Cache/index.d.ts

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

package/es/components/ticketBooking/components/addServiceVariant/addService.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter';
 import './index.less';
 interface AddServiceProps {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;

package/es/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -18,11 +18,13 @@ import { useBookingTicket } from "./bookingTicket";
 import { usePisellOS } from "../../../../hooks/useEngineContext";
 import { useMemoizedFn } from 'ahooks';
 import { useActiveExecute } from "./useActiveExecute";
+import { useIsActive } from "../../context/IsActiveContext";
 export var useCustomer = function useCustomer(props) {
   var bookingTicket = useBookingTicket();
   var pisellos = usePisellOS();
   var _useActiveExecute = useActiveExecute(),
     executeIfActive = _useActiveExecute.executeIfActive;
+  var isActive = useIsActive();
 
   // 客户列表
   var _useState = useState([]),
@@ -60,6 +62,16 @@ export var useCustomer = function useCustomer(props) {
     loadingMore = _useState14[0],
     setLoadingMore = _useState14[1];
 
+  // 针对于有预加载的页面，如果预加载的页面不是刷新后的第一个路由页面，会导致下面依靠 effects:onCustomerListUpdate 的回调不触发
+  // 所以当页面 active 以后，做一个检测，如果没有客户，则从 OS 里捞出来
+  useEffect(function () {
+    if (isActive && bookingTicket) {
+      if ((selectedCustomer === null || selectedCustomer === void 0 ? void 0 : selectedCustomer.length) > 0) return;
+      var _customers = bookingTicket.getCustomers();
+      setCustomers(_customers);
+    }
+  }, [isActive, bookingTicket]);
+
   // 监听事件
   useEffect(function () {
     var _bookingTicket$store;

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

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

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

@@ -74,7 +74,7 @@ var import_serve3 = require("../../editBookingModal/serve");
 var import_ticketBooking = require("../../../ticketBooking/components/ticketBooking");
 var import_decimal = __toESM(require("decimal.js"));
 var Footer = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -1483,7 +1483,7 @@ var Footer = (props) => {
     (_n = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _n.payment_status
   ]);
   const totalText = (0, import_react.useMemo)(() => {
-    var _a2;
+    var _a2, _b2;
     let str = "";
     if (total.totalRefundAmount > 0) {
       return `${import_utils.locales.getText(
@@ -1501,7 +1501,7 @@ var Footer = (props) => {
         (state == null ? void 0 : state.amountSymbol) || "$"
       )} ${total.duration ? `(${total.duration})` : ""}`;
     }
-    if (total.notPaidAmount <= 0 && state.bookingId) {
+    if (total.notPaidAmount <= 0 && (state.bookingId || ((_b2 = state.bookingDetail) == null ? void 0 : _b2.id))) {
       str = `${import_utils.locales.getText("pisell1.text.fully-paid")}: ${(0, import_utils.formatAmount)(
         total.sumTotalAmount,
         2,
@@ -1519,7 +1519,7 @@ var Footer = (props) => {
       str = str + ` (${total.duration})`;
     }
     return str;
-  }, [state, total, state.bookingId, isOnlyDeposit]);
+  }, [state, total, state.bookingId, isOnlyDeposit, (_o = state.bookingDetail) == null ? void 0 : _o.id]);
   const showFooter = (0, import_react.useMemo)(() => {
     var _a2;
     if (state.bookingId) {
@@ -1534,7 +1534,7 @@ var Footer = (props) => {
   }, [
     state.bookingId,
     state.bookingDetail,
-    (_o = state.addons) == null ? void 0 : _o.load,
+    (_p = state.addons) == null ? void 0 : _p.load,
     state.renderType
   ]);
   const menuChange = (e) => {
@@ -1751,7 +1751,7 @@ var Footer = (props) => {
     {
       open: noteModalOpen,
       title: import_utils.locales.getText("pisell2.text.add-order-notes"),
-      value: ((_p = state.notes) == null ? void 0 : _p.orderNote) || "",
+      value: ((_q = state.notes) == null ? void 0 : _q.orderNote) || "",
       onConfirm: handleNoteConfirm,
       onDelete: handleNoteDelete,
       onCancel: handleNoteCancel
@@ -1768,9 +1768,9 @@ var Footer = (props) => {
       },
       callback: paymentCallback || void 0,
       setEditCartMode,
-      paymentResultDisplayMode: (_s = (_r = (_q = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _q.config) == null ? void 0 : _r.payment_setting) == null ? void 0 : _s.payment_result_display_mode,
+      paymentResultDisplayMode: (_t = (_s = (_r = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _r.config) == null ? void 0 : _s.payment_setting) == null ? void 0 : _t.payment_result_display_mode,
       shopDiscount: state.shop_discount,
-      client: (_t = state.client) == null ? void 0 : _t.value,
+      client: (_u = state.client) == null ? void 0 : _u.value,
       currentTotalPrice: total.productAmount,
       onChangeShopDiscount: (discount) => {
         const normalizedDiscountAmount = new import_decimal.default(discount || 0).toDecimalPlaces(2, import_decimal.default.ROUND_DOWN).toString();

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

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

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/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/checkout/components/SearchAndClientModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface IScanResult {
     status: 'success' | 'failed';

package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts

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

package/lib/components/pay/toB/components/Cache/index.d.ts

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

package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter';
 import './index.less';
 interface AddServiceProps {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;

package/lib/components/ticketBooking/hooks/pisellos/useCustomer.js

@@ -27,10 +27,12 @@ var import_bookingTicket = require("./bookingTicket");
 var import_useEngineContext = require("../../../../hooks/useEngineContext");
 var import_ahooks = require("ahooks");
 var import_useActiveExecute = require("./useActiveExecute");
+var import_IsActiveContext = require("../../context/IsActiveContext");
 var useCustomer = (props) => {
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
   const pisellos = (0, import_useEngineContext.usePisellOS)();
   const { executeIfActive } = (0, import_useActiveExecute.useActiveExecute)();
+  const isActive = (0, import_IsActiveContext.useIsActive)();
   const [customers, setCustomers] = (0, import_react.useState)([]);
   const [selectedCustomer, setSelectedCustomer] = (0, import_react.useState)(
     null
@@ -44,6 +46,13 @@ var useCustomer = (props) => {
   });
   const [hasMore, setHasMore] = (0, import_react.useState)(false);
   const [loadingMore, setLoadingMore] = (0, import_react.useState)(false);
+  (0, import_react.useEffect)(() => {
+    if (isActive && bookingTicket) {
+      if ((selectedCustomer == null ? void 0 : selectedCustomer.length) > 0) return;
+      const customers2 = bookingTicket.getCustomers();
+      setCustomers(customers2);
+    }
+  }, [isActive, bookingTicket]);
   (0, import_react.useEffect)(() => {
     var _a;
     if (!bookingTicket) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.11.41",
+  "version": "6.11.42",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -67,10 +67,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
+    "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.11.16",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.8",
-    "@pisell/utils": "3.0.2"
+    "@pisell/date-picker": "3.0.8"
   },
   "peerDependencies": {
     "react": "^18.0.0",

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

@@ -1,38 +0,0 @@
-export declare const getRelationDetailsTotal: (relation_details: any) => number;
-export declare const getProductDiscountProductDiscountDifference: (product: any) => any;
-export declare const getIsPriceIncludeTax: (state: any) => any;
-/**
- * 总金额
- * @param state
- * @param options isEdit: 预约信息是否发生变动
- * @returns
- */
-export declare const getSumTotal: (state: any, options: {
-    [key: string]: any;
-    isEdit: boolean;
-    ScheduleModule: any;
-}) => {
-    productAmount: number;
-    duration: string;
-    tax: number;
-    taxInfo: {
-        title: any;
-        rate: any;
-        is_price_include_tax: any;
-    };
-    shopDiscount: number;
-    surcharge: any;
-    otherAmount: any;
-    sumTotalAmount: number;
-    paidAmount: any;
-    notPaidAmount: number;
-    paySurchargeFee: number;
-    expectAmount: number;
-    actualPaidAmount: any;
-    orderPaidAmount: any;
-    totalRefundAmount: number;
-    dueAmount: number;
-    roundingAmount: number;
-    originExpectAmount: number;
-    originExpectAmountWithoutDiscount: number;
-};

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

@@ -1,67 +0,0 @@
-/**
- * @title: 套餐单规格信息
- * @description:
- * @param {any} option
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-19 09:26
- */
-export declare const formatProductOption: (option: any) => any;
-/**
- * @title: 套餐信息
- * @description:
- * @param {any} bundle
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-02-19 09:26
- */
-export declare const formatProductBundle: (bundle: any, is_price_include_tax: number) => any;
-/**
- * 获取子商品折扣信息
- * @param item
- */
-export declare const getBundleDiscountList: (bundle: any[]) => any[];
-export interface ResourceItem {
-    [key: string]: any;
-}
-/**
- * @title: 传入资源，如果有子资源，会根据组合资源的 capacity 计算修改子资源的 capacity
- * @description:
- * @param {object} resource
- * @return {*}
- * @Author: jinglin.tan
- */
-export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
-export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
-/**
- * @title: 格式化商品单价
- * @description:
- * @param {any} item
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-23 12:05
- */
-export declare const formatProductPrice: (item: any) => number;
-/**
- * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
- * @param item
- * @returns
- */
-export declare const formatOriginalPrice: (item: any) => number;
-/**
- * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
- * @param item
- * @returns
- */
-export declare const formatSellingPrice: (item: any) => number;
-export declare const getSourceProductPrice: (item: any) => number;
-export declare const getMainProductSellingPrice: (item: any) => number | undefined;
-/**
- * @title: 是否包含跨日预约商品
- * @description:
- * @param {any} data
- * @return {*}
- */
-export declare const getHasMultiDayProduct: (data: any) => any;
-export declare const formatValues: (state: any) => any;
-export declare const checkHolderIsError: (state: any) => any;