@pisell/private-materials 6.6.11 → 6.6.12

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

@@ -135,11 +135,17 @@ var VoucherCard = (props) => {
     }
     onScanCode(e.detail.code);
   });
+  const onOriginExpectAmountWithoutDiscountChange = (0, import_ahooks.useMemoizedFn)((e) => {
+    var _a2;
+    (_a2 = shopDiscount == null ? void 0 : shopDiscount.setOriginTotalAmount) == null ? void 0 : _a2.call(shopDiscount, e.detail.originExpectAmountWithoutDiscount);
+  });
   (0, import_react.useEffect)(() => {
     const wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
     window.addEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
+    window.addEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     return () => {
       window.removeEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
+      window.removeEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     };
   }, []);
   const addonsMemo = (0, import_react.useMemo)(() => {

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

@@ -61,9 +61,11 @@ 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_decimal = __toESM(require("decimal.js"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 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);
@@ -80,6 +82,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;
   (0, import_react.useEffect)(() => {
     window.openBookingEditModal = () => {
       setOpen(true);
@@ -94,7 +100,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;
@@ -124,7 +130,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)({
@@ -146,7 +152,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)(() => {
@@ -199,7 +205,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -213,6 +219,7 @@ var Info = (_, ref) => {
     }, 1500);
     let _list = [...state.service.value];
     let _item = {
+      is_price_include_tax: getData("is_price_include_tax"),
       ...state.service.cacheItem,
       autoClose: false
     };
@@ -233,6 +240,23 @@ var Info = (_, ref) => {
       _extend.startDate = startDate;
       _extend.endDate = endDate;
     }
+    if (isChangeTotal.current) {
+      const discountRatio = new import_decimal.default(values.total).div(_item._extend.origin_total);
+      const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
+      let childProductsTotal = new import_decimal.default(0);
+      if (bundles2.length > 0) {
+        bundles2.forEach((bundle) => {
+          const discountedPrice = new import_decimal.default(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+          childProductsTotal = childProductsTotal.add(
+            discountedPrice.mul(bundle.quantity)
+          );
+        });
+      }
+      const mainProductTotal = new import_decimal.default(values.total).sub(childProductsTotal);
+      const mainProductQuantity = ((_d2 = _extend.other) == null ? void 0 : _d2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
     }
@@ -240,7 +264,7 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils3.genServiceKey)(_item);
     _item._holderKey = (0, import_utils3.genHolderKey)(_item);
-    if (((_d2 = (_c2 = _item._extend) == null ? void 0 : _c2.holder_id) == null ? void 0 : _d2.length) > 1 || ((_e2 = _item._extend) == null ? void 0 : _e2.quantity) > 1 && ((_g2 = (_f2 = _item._extend) == null ? void 0 : _f2.holder_id) == null ? void 0 : _g2.length) >= 1) {
+    if (((_f2 = (_e2 = _item._extend) == null ? void 0 : _e2.holder_id) == null ? void 0 : _f2.length) > 1 || ((_g2 = _item._extend) == null ? void 0 : _g2.quantity) > 1 && ((_i2 = (_h2 = _item._extend) == null ? void 0 : _h2.holder_id) == null ? void 0 : _i2.length) >= 1) {
       let holder_ids = _item._extend.holder_id;
       _item._extend.holder_id = holder_ids[0];
       holder_ids = holder_ids.slice(1);
@@ -259,10 +283,10 @@ var Info = (_, ref) => {
       }
     }
     let _id = _item == null ? void 0 : _item._id;
-    let groupId = (_h2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _h2.groupId;
+    let groupId = (_j2 = _item == null ? void 0 : _item._extend) == null ? void 0 : _j2.groupId;
     _item = (0, import_utils8.setProductPrice)(_item, {
       newTotal: values.total,
-      origin_total: (_i2 = _item._extend) == null ? void 0 : _i2.origin_total
+      origin_total: (_k2 = _item._extend) == null ? void 0 : _k2.origin_total
     });
     if (groupId) {
       _list = _list.filter((d) => {
@@ -284,7 +308,7 @@ var Info = (_, ref) => {
     (0, import_utils6.deleteCacheParams)();
     console.log("_onFinish", _list);
     form.resetFields();
-    if (!!((_j2 = state.service.cacheItem) == null ? void 0 : _j2.new)) {
+    if (!!((_l2 = state.service.cacheItem) == null ? void 0 : _l2.new)) {
       window.dispatchEvent(
         new CustomEvent("onAddNewService", {
           detail: {
@@ -293,7 +317,7 @@ var Info = (_, ref) => {
         })
       );
     }
-    (_k2 = window.closeBookingEditModal) == null ? void 0 : _k2.call(window);
+    (_m2 = window.closeBookingEditModal) == null ? void 0 : _m2.call(window);
     _list.sort((a, b) => {
       var _a3, _b3;
       const aHasHolderId = ((_a3 = a._extend) == null ? void 0 : _a3.holder_id) && (Array.isArray(a._extend.holder_id) ? a._extend.holder_id.length > 0 : true);
@@ -370,7 +394,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)({
@@ -434,11 +458,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;
@@ -557,7 +581,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;
@@ -594,7 +618,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
@@ -639,7 +663,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
   ]);
@@ -687,7 +711,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;
@@ -726,8 +750,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;
@@ -766,7 +790,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));
@@ -846,10 +870,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"
   );
@@ -955,7 +979,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;
@@ -981,7 +1005,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/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.js

@@ -43,6 +43,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") => {
@@ -58,6 +61,14 @@ var voucherTime = (data, key = "expire_date") => {
 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 +85,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),

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;