@pisell/private-materials 6.6.45 → 6.6.46

package/lib/components/booking/components/voucher/index.less

@@ -1,5 +1,8 @@
 .pisell-lowcode__booking-footer-voucher-container {
   margin-bottom: 8px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
   .voucher-title {
     display: flex;
     align-items: center;
@@ -47,9 +50,9 @@
     width: 100%;
     transition: 0.2s;
     max-height: 0;
-    overflow: hidden;
     display: flex;
     flex-direction: column;
+    overflow: auto;
 
     &.show {
       max-height: unset;

package/lib/components/booking/components/voucherModal/index.less

@@ -6,6 +6,7 @@
   .pisell-voucher-modal-content {
     max-height: 70vh;
     overflow-y: auto;
+    display: flex;
   }
 
   // 隐藏状态下的样式优化

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/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/editService/index.js

@@ -61,12 +61,13 @@ var import_EditTabs = __toESM(require("../../../info/service/editService/EditTab
 var import_BookingList = __toESM(require("../../../info/service/editService/BookingList"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils9 = require("../../../info/service2/Group/utils");
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 var import_decimal = __toESM(require("decimal.js"));
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -85,6 +86,10 @@ var Info = (_, ref) => {
   const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
+  const context = (0, import_useEngineContext.default)();
+  const {
+    getData
+  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const valuesRef = (0, import_react.useRef)({});
   const noInOriginalDiscountIdsRef = (0, import_react.useRef)([]);
   const isEditedRef = (0, import_react.useRef)(false);
@@ -102,7 +107,7 @@ var Info = (_, ref) => {
       return true;
     }
     return ((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem) && (0, import_utils4.isNormalProductByDurationSchedule)((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.cacheItem);
-  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.cacheItem]);
+  }, [(_b = state == null ? void 0 : state.service) == null ? void 0 : _b.cacheItem]);
   const getCurrentCacheItem = (0, import_ahooks.useMemoizedFn)((_cacheItem) => {
     let values = form.getFieldsValue();
     let _item = _cacheItem || state.service.cacheItem;
@@ -132,7 +137,7 @@ var Info = (_, ref) => {
     state.service.cacheItem,
     useStartTime,
     useResource,
-    (_d = (_c = (_b = state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.service_time
+    (_e = (_d = (_c = state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.basic) == null ? void 0 : _e.service_time
   ]);
   const flexibleOption = (0, import_react.useMemo)(() => {
     const op = (0, import_utils7.getFlexibleOption)({
@@ -154,7 +159,7 @@ var Info = (_, ref) => {
     durationProps,
     useStartTime,
     currentResource,
-    (_g = (_f = (_e = state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.service_time,
+    (_h = (_g = (_f = state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.basic) == null ? void 0 : _h.service_time,
     useDuration
   ]);
   (0, import_react.useEffect)(() => {
@@ -251,6 +256,7 @@ var Info = (_, ref) => {
     }, 1500);
     let _list = [...state.service.value];
     let _item = {
+      is_price_include_tax: getData("is_price_include_tax"),
       ...cacheItem ?? state.service.cacheItem,
       autoClose: false
     };
@@ -430,7 +436,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
+  }, [useTotal, (_j = (_i = state.service.cacheItem) == null ? void 0 : _i._extend) == null ? void 0 : _j.origin_total]);
   const getResources = () => {
     var _a2, _b2;
     let res = (0, import_utils7.formatResources)({
@@ -494,11 +500,11 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_k = (_j = state.service.cacheItem) == null ? void 0 : _j._extend) == null ? void 0 : _k.origin_total]);
+  }, [useTotal, (_l = (_k = state.service.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
+  }, [(_p = (_o = (_n = (_m = state.service) == null ? void 0 : _m.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.other) == null ? void 0 : _p.bundle]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
     var _a2, _b2, _c2, _d2, _e2;
     const item = state.service.cacheItem;
@@ -528,7 +534,6 @@ var Info = (_, ref) => {
         customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
         value: {
           ...item._extend.other,
-          bundle: (0, import_utils8.mergeBundles)(item._extend.other),
           ...sessionValue,
           quantity: values.quantity || item._extend.quantity
         }
@@ -630,7 +635,7 @@ var Info = (_, ref) => {
     }
     return false;
   }, [state.renderType, isNormalProduct]);
-  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
+  const SelectTime = (_q = window.BaseMaterials) == null ? void 0 : _q.SelectTime;
   const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
   const items = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -667,7 +672,7 @@ var Info = (_, ref) => {
       }
     ))));
   }, [
-    (_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.product_name,
+    (_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name,
     bundles,
     state.amountSymbol,
     state.isBookingCreatePage
@@ -712,7 +717,7 @@ var Info = (_, ref) => {
     ));
   }, [
     useTotal,
-    (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
+    (_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total,
     state.amountSymbol,
     state.channelDisabledEdit
   ]);
@@ -760,7 +765,7 @@ var Info = (_, ref) => {
         }
       ) : null
     ));
-  }, [SelectTime, (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value, isEditGroup]);
+  }, [SelectTime, (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value, isEditGroup]);
   const endTime = (0, import_react.useMemo)(() => {
     if (!isEditGroup) {
       return null;
@@ -799,8 +804,8 @@ var Info = (_, ref) => {
     ));
   }, [
     state.renderType,
-    (_A = (_z = state.service.cacheItem) == null ? void 0 : _z._data) == null ? void 0 : _A.resources,
-    (_C = (_B = state.service.cacheItem) == null ? void 0 : _B._data) == null ? void 0 : _C.resourceMaps
+    (_B = (_A = state.service.cacheItem) == null ? void 0 : _A._data) == null ? void 0 : _B.resources,
+    (_D = (_C = state.service.cacheItem) == null ? void 0 : _C._data) == null ? void 0 : _D.resourceMaps
   ]);
   const holder = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
@@ -838,7 +843,7 @@ var Info = (_, ref) => {
   }, [
     state.locale,
     state.isTerminal,
-    (_F = (_E = (_D = state.service) == null ? void 0 : _D.cacheItem) == null ? void 0 : _E._data) == null ? void 0 : _F.capacitys
+    (_G = (_F = (_E = state.service) == null ? void 0 : _E.cacheItem) == null ? void 0 : _F._data) == null ? void 0 : _G.capacitys
   ]);
   const hiddenQuantity = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null));
@@ -918,10 +923,10 @@ var Info = (_, ref) => {
         import_utils.locales.getText("pisell2.text.apply")
       )
     );
-  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
+  }, [(_H = state.service.resourcesOrigin) == null ? void 0 : _H.length, isNormalProduct]);
   console.log("render edit");
   console.log(
-    state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
+    state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
     performance.now() - window.pp1,
     "打开商品1"
   );
@@ -1024,8 +1029,6 @@ var Info = (_, ref) => {
     var _a2, _b2, _c2;
     delete cacheItem.discount_list;
     (_c2 = (_b2 = (_a2 = cacheItem._extend.other) == null ? void 0 : _a2.bundle) == null ? void 0 : _b2.forEach) == null ? void 0 : _c2.call(_b2, (bundle) => {
-      var _a3;
-      (_a3 = bundle == null ? void 0 : bundle.metadata) == null ? true : delete _a3.custom_product_bundle_map_id;
       bundle == null ? true : delete bundle.discount_list;
       bundle == null ? true : delete bundle.booking_id;
       bundle == null ? true : delete bundle.bundle_selling_price;
@@ -1058,7 +1061,7 @@ var Info = (_, ref) => {
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
       mask: state.drawerMask,
-      open: !isNoSpecAndPackage && state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
+      open: !isNoSpecAndPackage && state.service.editModal && !((_J = state.service.cacheItem) == null ? void 0 : _J.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         var _a2;
@@ -1084,7 +1087,7 @@ var Info = (_, ref) => {
           display: currentTab === "batch_edit" ? "block" : "none"
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_K = (_J = state.client) == null ? void 0 : _J.value) == null ? void 0 : _K.id) && holder),
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_L = (_K = state.client) == null ? void 0 : _K.value) == null ? void 0 : _L.id) && holder),
       /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "note" }, noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
         import_noteModal.default,
         {

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

@@ -32,7 +32,6 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
-export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

package/lib/components/booking/info2/service/editService/utils.js

@@ -32,7 +32,6 @@ __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
-  mergeBundles: () => mergeBundles,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
   setProductPrice: () => setProductPrice
 });
@@ -97,20 +96,6 @@ var getProductAllDiscountList = (cacheItem) => {
   discountList.push(...bundleDiscountList);
   return discountList;
 };
-var mergeBundles = (other) => {
-  const bundle = (other == null ? void 0 : other.bundle) || [];
-  const newBundle = [];
-  bundle.forEach((item) => {
-    const newItem = newBundle.find((newItem2) => newItem2.id === item.id);
-    if (newItem) {
-      newItem.num += item.num || 1;
-      newItem.quantity += item.quantity || 1;
-    } else {
-      newBundle.push({ ...item });
-    }
-  });
-  return newBundle;
-};
 var mergeBundleWithOriginalPrice = (other, originalOther) => {
   var _a, _b;
   if (!((_a = other == null ? void 0 : other.bundle) == null ? void 0 : _a.length) || !((_b = originalOther == null ? void 0 : originalOther.bundle) == null ? void 0 : _b.length)) return other;
@@ -130,7 +115,6 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
   getAutoAllocationStorage,
   getProductAllDiscountList,
   mergeBundleWithOriginalPrice,
-  mergeBundles,
   setAutoAllocationStorage,
   setProductPrice
 });

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

@@ -134,7 +134,7 @@ var Payments = (0, import_model.Provider)((props) => {
           item.service_fee,
           2,
           (state == null ? void 0 : state.amountSymbol) || "$"
-        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time || item.created_at).format(
+        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time).format(
           "HH:mm YYYY/MM/DD"
         ), /* @__PURE__ */ import_react.default.createElement("span", { className: "payment-list-item-platform-type" }, item.platform && import_utils.locales.getText("pisell2.text.platform.type")(
           item.platform

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

@@ -175,10 +175,10 @@ export declare const getProductOriginTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/components/WalletPassModule/index.js

@@ -68,6 +68,7 @@ var WalletPassModule = (0, import_react.forwardRef)(
     } = (0, import_useWalletPass.useWalletPass)({
       onSelectChange,
       customAmount,
+      totalAmount: Number(orderInfo == null ? void 0 : orderInfo.totalAmount) || 0,
       clientId
     });
     const [expiredModalVisible, setExpiredModalVisible] = (0, import_react.useState)(false);

package/lib/components/checkout/components/WalletPassModule/utils.d.ts

@@ -1,6 +1,7 @@
 declare type WalletPassDataType = Record<string, any>;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => any;
 export declare const voucherTime: (data: WalletPassDataType, key?: string) => any;
+export declare const getVoucherAvailableStatus: (item: any) => boolean;
 export declare const formatMachineCodeServer2CardList: (data: WalletPassDataType[], selectId?: number[], otherProps?: Record<string, any>) => any;
 export declare const formatDiscountWalletData: (data: any, selectId?: number[]) => any;
 export interface WalletPassUsageUnit {

package/lib/components/checkout/components/WalletPassModule/utils.js

@@ -33,6 +33,7 @@ __export(utils_exports, {
   formatMachineCodeServer2CardList: () => formatMachineCodeServer2CardList,
   getAvailableMaxAmount: () => getAvailableMaxAmount,
   getPointCardAmount: () => getPointCardAmount,
+  getVoucherAvailableStatus: () => getVoucherAvailableStatus,
   isSameContent: () => isSameContent,
   voucherTime: () => voucherTime
 });
@@ -43,6 +44,9 @@ var import_materials = require("@pisell/materials");
 var import_decimal = __toESM(require("decimal.js"));
 var Amount = import_materials.PisellText.Amount;
 var getAvailableMaxAmount = (data) => {
+  if ((0, import_utils.isNumber)(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
 };
 var voucherTime = (data, key = "expire_date") => {
@@ -55,9 +59,20 @@ var voucherTime = (data, key = "expire_date") => {
   }
   return import_utils.locales.getText("pisell2.text.walletPassPermanent");
 };
+var getVoucherAvailableStatus = (item) => {
+  return item.unified_available_status === 1 && ((0, import_utils.isNumber)(item._unified_available_status) ? !!item._unified_available_status : true);
+};
 var formatMachineCodeServer2CardList = (data, selectId = [], otherProps = {}) => {
   return (data || []).map((item) => {
     var _a, _b;
+    let disabled = false;
+    if (item.unified_available_status === 0) {
+      disabled = true;
+    } else {
+      if ((0, import_utils.isNumber)(item._unified_available_status)) {
+        disabled = !item._unified_available_status;
+      }
+    }
     return {
       id: item.id,
       name: item.product_name,
@@ -74,8 +89,8 @@ var formatMachineCodeServer2CardList = (data, selectId = [], otherProps = {}) =>
       showQrCode: false,
       showStatus: true,
       code: item.code,
-      disabled: !item.unified_available_status,
-      disabledReason: (_a = item.unified_messages) == null ? void 0 : _a.title,
+      disabled,
+      disabledReason: (0, import_utils.isNumber)(item._unified_available_status) && item._unified_available_status !== 1 ? item.reason : (_a = item.unified_messages) == null ? void 0 : _a.title,
       cover: (_b = item.product) == null ? void 0 : _b.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
@@ -153,6 +168,7 @@ var isSameContent = (arr1, arr2) => {
   formatMachineCodeServer2CardList,
   getAvailableMaxAmount,
   getPointCardAmount,
+  getVoucherAvailableStatus,
   isSameContent,
   voucherTime
 });

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -9,6 +9,7 @@ export declare const useWalletPass: (props: {
     }[]) => void) | undefined;
     customAmount?: string | undefined;
     clientId?: number | undefined;
+    totalAmount?: number | undefined;
 }) => {
     walletRecommendList: any[];
     userIdentificationCodes: any[];
@@ -29,7 +30,6 @@ export declare const useWalletPass: (props: {
     selectedDiscountList: any;
     handleSelectDiscount: (this: unknown, value: number[], option: any) => void;
     customerName: any;
-    fetchWalletRecommendList: (this: unknown, params: any) => Promise<any>;
     fetchUserIdentificationCodes: (this: unknown, params: any) => Promise<any>;
     getCachedWalletRecommendList: (this: unknown) => any;
     getCachedUserIdentificationCodes: (this: unknown) => any;