@pisell/private-materials 6.3.14 → 6.4.1

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -38,6 +38,8 @@ var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_useContext = require("../../hooks/useContext");
 var import_useAddService = __toESM(require("../../hooks/useAddService"));
 var import_ahooks = require("ahooks");
+var import_utils = require("../../../booking/info/service2/utils");
+var import_pisellNumberSelector = __toESM(require("../../../../pro/pisellNumberSelector"));
 var Product = (props) => {
   const { id, lists, isAdd = true } = props;
   const { state, onAction, onChange } = (0, import_useContext.useContext)();
@@ -52,13 +54,16 @@ var Product = (props) => {
     isShowChangeHolder,
     isShowHolder,
     isShowAddHolderButton,
-    isShowEditProduct
+    isShowEditProduct,
+    productCardStyleConfig = {}
   } = state;
   const clearCart = (0, import_useClearCart.default)(id);
-  const handleChange = (0, import_ahooks.useMemoizedFn)((item, type, other) => {
-    if (disabledEdit && !(other == null ? void 0 : other.disabled)) return;
-    onChange(item, type, other);
-  });
+  const handleChange = (0, import_ahooks.useMemoizedFn)(
+    (item, type, other) => {
+      if (disabledEdit && !(other == null ? void 0 : other.disabled)) return;
+      onChange(item, type, other);
+    }
+  );
   const productParams = (0, import_react.useMemo)(() => {
     return {
       isShowNote,
@@ -82,18 +87,53 @@ var Product = (props) => {
     isShowChangeHolder,
     isShowEditProduct
   ]);
-  (0, import_ahooks.useTrackedEffect)(
-    (changes) => {
-      console.log("Index of changed dependencies: ", changes);
-    },
-    [clearCart, lists, productParams, hideAddBtn, isAdd, platform]
+  const getProductCardStyleProps = (0, import_ahooks.useMemoizedFn)(
+    (type) => {
+      const conf = productCardStyleConfig[`${type}_product_card_style`];
+      if (state.scenario !== "booking2") return {};
+      return {
+        isShowImage: conf == null ? void 0 : conf.show_product_image,
+        isShowDelete: conf == null ? void 0 : conf.show_remove_button,
+        disabledEdit: true
+      };
+    }
   );
   return (0, import_react.useMemo)(() => {
     console.log("render cart");
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, lists == null ? void 0 : lists.map((item) => {
+      let Comp = import_materials.ProductCard;
+      let isRetail;
+      if (state.scenario === "booking2") {
+        isRetail = (0, import_utils.isNormalProductByDurationSchedule)(item == null ? void 0 : item._origin);
+        Comp = import_materials.ProductCard.V2;
+      }
       return /* @__PURE__ */ import_react.default.createElement(
-        import_materials.ProductCard,
+        Comp,
         {
+          type: isRetail ? "a2" : "a5",
+          rightActions: [
+            {
+              key: "update_number",
+              text: /* @__PURE__ */ import_react.default.createElement(
+                import_pisellNumberSelector.default,
+                {
+                  enablePriceAdjust: true,
+                  min: 1,
+                  className: "pisell-sku-card__pisell-number-setter",
+                  value: item == null ? void 0 : item.num,
+                  onChange: (value) => {
+                    if (value < 1) {
+                      handleChange(item, "num", { num: 1 });
+                    } else {
+                      handleChange(item, "num", { num: value });
+                    }
+                  }
+                }
+              ),
+              color: "#667085"
+            }
+          ],
+          escapeDom: ".pisell-number-selector-popover",
           key: item._id,
           dataSource: item,
           onAction: (e) => onAction == null ? void 0 : onAction(e),
@@ -105,7 +145,9 @@ var Product = (props) => {
           onChangeResource: (e) => handleChange(item, "change_resource", e),
           onChangeHolder: (e) => handleChange(item, "change_holder", e),
           onAddHolder: (e) => handleChange(item, "add_holder", e),
-          ...productParams
+          ...productParams,
+          ...getProductCardStyleProps(isRetail ? "retail" : "appointment"),
+          scenario: state.scenario
         }
       );
     }), !hideAddBtn && platform !== "h5" && isAdd ? (0, import_useAddService.default)(id, "more") : null);

package/lib/components/shoppingCart/components/Cart/index.less

@@ -18,7 +18,7 @@
   .pisell-lowcode__shopping-cart-content {
     display: flex;
     flex-direction: column;
-    gap: 16px;
+    gap: 8px;
 
     .pisell-lowcode-product-card {
       margin-bottom: 0;
@@ -66,3 +66,17 @@
   //  align-items: start;
   //}
 }
+
+.pisell-sku-card__pisell-number-setter {
+  width: 110px;
+
+  .pisell-number-selector-btn {
+    flex-shrink: 0;
+  }
+
+  .pisell-number-selector-number {
+    min-width: unset !important;
+    padding: 0 !important;
+    flex: 1;
+  }
+}

package/lib/components/shoppingCart/type.d.ts

@@ -33,6 +33,7 @@ export interface shoppingCartProps {
     productParams?: productProps;
     isHideClearCart?: boolean;
     isParallelResource?: boolean;
+    scenario?: 'booking2';
 }
 /**
  * @title: 商品卡片

package/lib/components/subTotal/index.less

@@ -14,7 +14,7 @@
 
   .pisell-lowcode__subtotal-item-label {
     color: var(--Base-Black, #000);
-    font-size: 16px;
+    font-size: 14px;
     font-style: normal;
     font-weight: 500;
     line-height: 24px;

package/lib/components/subTotal/locales.js

@@ -38,7 +38,7 @@ var locales_default = {
   },
   "zh-CN": {
     "pisell2.subtotal.deposit": "定金",
-    "pisell2.subtotal.total": "总价",
+    "pisell2.subtotal.total": "总计",
     "pisell2.subtotal.subtotal": "小计",
     "pisell2.subtotal.tax": "税",
     "pisell2.subtotal.delivery-fee": "配送费",
@@ -51,7 +51,7 @@ var locales_default = {
   },
   "zh-HK": {
     "pisell2.subtotal.deposit": "定金",
-    "pisell2.subtotal.total": "總價",
+    "pisell2.subtotal.total": "總計",
     "pisell2.subtotal.subtotal": "小計",
     "pisell2.subtotal.tax": "稅",
     "pisell2.subtotal.delivery-fee": "配送費",

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -40,17 +40,29 @@ var import_utils2 = require("../../../booking/utils");
 var import_utils3 = require("../../../booking/info2/service/addService/utils");
 var import_utils4 = require("../../../booking/info/service2/utils");
 var import_utils5 = require("../../../booking/info/utils");
-var import_serve = require("../../../booking/info/service/serve");
 var import_serviceManager = require("../../../booking/info/service/serviceManager");
 var import_productSelect = __toESM(require("../../../../plus/productSelect"));
 var import_index = require("./index.less");
 var import_utils6 = require("../../utils");
 var import_notAvailable = __toESM(require("../notAvailable"));
 var import_dayjs = __toESM(require("dayjs"));
+var import_pisellos = require("../../hooks/pisellos");
+var import_utils7 = require("./utils");
+var productListLayout = {
+  grid: true,
+  config: "12:12"
+};
+var productListSetting = {
+  isProductCover: 1,
+  isTitle: 1,
+  isSubtitle: 1,
+  isPrice: 1,
+  isOriginPrice: 0,
+  isStock: 0
+};
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const { onEdit, state, dispatch, renderMode = "current" } = props;
-  const [loading, setLoading] = (0, import_react.useState)(true);
   const context = (0, import_useEngineContext.default)();
   const notAvailableRef = (0, import_react.useRef)(null);
   const isLoadedServiceRef = (0, import_react.useRef)(false);
@@ -63,13 +75,14 @@ var AddSerivce = (props) => {
     dispatch
   });
   const isBooking4 = (0, import_utils5.isBooking4Shop)(
-    (_g = (_f = (_e = (_d = (_c = context.appHelper.utils.store) == null ? void 0 : _c.getState) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.global) == null ? void 0 : _f.globalConfig) == null ? void 0 : _g.id,
+    ((_e = (_d = (_c = context.appHelper) == null ? void 0 : _c.utils) == null ? void 0 : _d.getData) == null ? void 0 : _e.call(_d, "shop_id")) || ((_j = (_i = (_h = (_g = (_f = context.appHelper.utils.store) == null ? void 0 : _f.getState) == null ? void 0 : _g.call(_f)) == null ? void 0 : _h.global) == null ? void 0 : _i.globalConfig) == null ? void 0 : _j.id),
     state == null ? void 0 : state.renderType,
-    (_h = context.appHelper.utils) == null ? void 0 : _h.businessUtils
+    (_k = context.appHelper.utils) == null ? void 0 : _k.businessUtils
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
   const stateRef = (0, import_react.useRef)(state);
   stateRef.current = state;
+  const { getProducts, products, loading } = (0, import_pisellos.useProducts)();
   (0, import_react.useEffect)(() => {
     return () => {
       Object.values(debounceTimersRef.current).forEach((timer) => {
@@ -78,163 +91,94 @@ var AddSerivce = (props) => {
       debounceTimersRef.current = {};
     };
   }, []);
+  (0, import_react.useEffect)(() => {
+    const handler = (event) => {
+      var _a2;
+      const cacheItem = (_a2 = event == null ? void 0 : event.detail) == null ? void 0 : _a2.cacheItem;
+      console.log("Modal closed with result:", event.detail.cacheItem);
+      if (!(cacheItem == null ? void 0 : cacheItem.id)) return;
+      (0, import_utils6.addServiceScroll)(String(cacheItem.id), cacheItem);
+    };
+    window.addEventListener("onAddNewService", handler);
+    return () => {
+      window.removeEventListener("onAddNewService", handler);
+    };
+  }, []);
   const pendingCacheValuesRef = (0, import_react.useRef)({});
   const clickCountRef = (0, import_react.useRef)({});
   const debounceTimersRef = (0, import_react.useRef)({});
   const menuList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.menu_list_tab) == null ? void 0 : _c2.menu_list) || [];
-  }, [(_i = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _i.config]);
+  }, [(_l = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _l.config]);
   const customerId = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
-  }, [(_k = (_j = state.client) == null ? void 0 : _j.value) == null ? void 0 : _k.id]);
-  const setDefaultService = async (list) => {
-    if (state.renderType !== "eventBooking") {
-      return;
-    }
-    if (state.bookingId) {
-      return;
-    }
-    if (list.length !== 1) {
-      return;
-    }
-    let _list = [...state.service.value];
-    if (_list.length !== 0) {
-      return;
-    }
-    setLoading(true);
-    let product = list[0];
-    const detail = await (0, import_serve.getProductDetail)(product.id, {
-      schedule_date: state.date.value.format("YYYY-MM-DD")
-    });
-    const isBundleOrCombination = (0, import_utils5.getIsBundleOrCombination)(detail.data);
-    setLoading(false);
-    if (isBundleOrCombination) return;
-    let _item = {
-      ...product,
-      product_id: product.id,
-      _id: (0, import_utils.getUniqueId)(),
-      _extend: {
-        start_date: state.date.value,
-        startDate: state.date.value,
-        endDate: state.date.value,
-        start_time: "00:00:00",
-        duration: 10,
-        quantity: 1,
-        price: product.price,
-        total: product.price,
-        origin_total: product.price,
-        product_name: product.title
-      }
-    };
-    _list.push(_item);
-    dispatch({
-      type: "setService",
-      payload: {
-        value: _list,
-        edit: true
+  }, [(_n = (_m = state.client) == null ? void 0 : _m.value) == null ? void 0 : _n.id]);
+  const scanAddService = (0, import_ahooks.useMemoizedFn)((list, code) => {
+    let newService = [...state.service.value];
+    list.forEach((item) => {
+      if ((0, import_utils7.isBundle)(item) || (0, import_utils7.isOption)(item)) {
+        handleSelectProduct(item);
+        return;
       }
+      const values = (0, import_utils7.genValues)(item, code);
+      let cacheItem = (0, import_utils7.createCacheItem)(item, values, state);
+      cacheItem._serviceKey = (0, import_utils6.genServiceKey)(cacheItem);
+      cacheItem.autoClose = false;
+      let { list: _list, quantity } = (0, import_utils6.addService)(
+        [...newService],
+        cacheItem,
+        state
+      );
+      handleAddToast(cacheItem.title, quantity);
+      newService = _list;
     });
-  };
-  const removeNotAvailableService = (list) => {
-    var _a2, _b2, _c2, _d2, _e2;
-    if (!((_c2 = (_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.service) == null ? void 0 : _b2.value) == null ? void 0 : _c2.length)) return;
-    const listMap = list.reduce((acc, cur) => {
-      acc[cur.id] = cur;
-      return acc;
-    }, {});
-    const newValue = (((_e2 = (_d2 = stateRef.current) == null ? void 0 : _d2.service) == null ? void 0 : _e2.value) || []).filter(
-      (item) => listMap[item.product_id]
-    );
     dispatch({
       type: "setService",
       payload: {
-        value: newValue,
+        value: newService,
         edit: true
       }
     });
+  });
+  (0, import_react.useMemo)(() => {
+    (0, import_utils7.setHandleSetService)(scanAddService);
+  }, []);
+  const handleAddToast = (title, quantity) => {
+    var _a2;
+    (_a2 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _a2.call(
+      Toast,
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-title" }, title), /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-quantity" }, import_utils.locales.getText("pisell2.ticket-booking.in-cart")(quantity || 1)))
+    );
   };
-  const getServices = async (params) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
-    setLoading(true);
-    if (state.renderType === "eventBooking" && !((_b2 = (_a2 = state.eventOtherParams) == null ? void 0 : _a2.productIds) == null ? void 0 : _b2.length)) {
-      dispatch({
-        type: "setService",
-        payload: {
-          services: []
-        }
-      });
-      setLoading(false);
-      return;
-    }
-    let data = await state.apis.getServices({
-      skip: 1,
-      num: 500,
-      // extension_type: state.productExtensionType,
-      exclude_extension_type: [
-        "product_party",
-        "product_event",
-        "product_series_event",
-        "product_package_ticket",
-        "ticket",
-        "event_item"
-      ],
-      with: ["category"],
-      open_quotation: 1,
-      with_schedule: 1,
-      with_count: ["bundleGroup", "optionGroup"],
-      order_by_string: "sort:desc",
-      status: "published",
-      schedule_date: params == null ? void 0 : params.schedule_date,
-      schedule_datetime: params == null ? void 0 : params.schedule_datetime,
-      customer_id: params == null ? void 0 : params.customer_id,
-      menu_list_ids: params == null ? void 0 : params.menu_list_ids,
-      _config: {
-        fullResult: true,
-        customResponse: true
-      }
-    });
-    setLoading(false);
-    if ((data == null ? void 0 : data.code) === 607100) {
-      if (!isLoadedServiceRef.current || ((_d2 = (_c2 = state.service) == null ? void 0 : _c2.services) == null ? void 0 : _d2.length)) {
-        (_e2 = notAvailableRef.current) == null ? void 0 : _e2.open();
-      }
-    }
-    if (!state.service.addModal) {
-      setDefaultService((_f2 = data == null ? void 0 : data.data) == null ? void 0 : _f2.list);
+  const executeCacheValues = (0, import_ahooks.useMemoizedFn)(
+    (productId, originalCacheValues, item, originalCallback) => {
+      const clickCount = clickCountRef.current[productId] || 1;
+      const finalCacheValues = {
+        ...originalCacheValues,
+        quantity: clickCount
+      };
+      delete pendingCacheValuesRef.current[productId];
+      delete clickCountRef.current[productId];
+      delete debounceTimersRef.current[productId];
+      originalCallback(finalCacheValues, "", item, true);
     }
-    removeNotAvailableService((_g2 = data == null ? void 0 : data.data) == null ? void 0 : _g2.list);
-    isLoadedServiceRef.current = true;
-    dispatch({
-      type: "setService",
-      payload: {
-        services: ((_h2 = data == null ? void 0 : data.data) == null ? void 0 : _h2.list) || []
+  );
+  const debouncedExecuteCacheValues = (0, import_ahooks.useMemoizedFn)(
+    (productId, cacheValues, item, callback) => {
+      if (debounceTimersRef.current[productId]) {
+        clearTimeout(debounceTimersRef.current[productId]);
       }
-    });
-  };
-  const executeCacheValues = (0, import_ahooks.useMemoizedFn)((productId, originalCacheValues, item, originalCallback) => {
-    const clickCount = clickCountRef.current[productId] || 1;
-    const finalCacheValues = {
-      ...originalCacheValues,
-      quantity: clickCount
-    };
-    delete pendingCacheValuesRef.current[productId];
-    delete clickCountRef.current[productId];
-    delete debounceTimersRef.current[productId];
-    originalCallback(finalCacheValues, "", item, true);
-  });
-  const debouncedExecuteCacheValues = (0, import_ahooks.useMemoizedFn)((productId, cacheValues, item, callback) => {
-    if (debounceTimersRef.current[productId]) {
-      clearTimeout(debounceTimersRef.current[productId]);
+      debounceTimersRef.current[productId] = setTimeout(() => {
+        executeCacheValues(productId, cacheValues, item, callback);
+      }, 0);
     }
-    debounceTimersRef.current[productId] = setTimeout(() => {
-      executeCacheValues(productId, cacheValues, item, callback);
-    }, 0);
-  });
+  );
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type = "select") => {
       var _a2, _b2, _c2, _d2;
+      console.log("handleSelectProduct");
       if (!(0, import_utils4.isNormalProductByDurationSchedule)(item)) {
         if (!Array.isArray((_a2 = state.service) == null ? void 0 : _a2.resourcesOrigin) || !state.service.resourcesOrigin.length) {
           dispatch({
@@ -334,16 +278,17 @@ var AddSerivce = (props) => {
             state
           );
           if (!notShowToast) {
-            (_b3 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _b3.call(
-              Toast,
-              /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-title" }, cacheItem.title), /* @__PURE__ */ import_react.default.createElement("div", { className: "add-toast-quantity" }, import_utils.locales.getText("pisell2.ticket-booking.in-cart")(
-                quantity || 1
-              )))
-            );
+            handleAddToast(cacheItem.title, quantity || 1);
           }
-          (0, import_utils6.addServiceScroll)(e.rowKey, cacheItem);
+          window.dispatchEvent(
+            new CustomEvent("onAddNewService", {
+              detail: {
+                cacheItem
+              }
+            })
+          );
           try {
-            if (((_g2 = (_f2 = (_e2 = (_d3 = (_c3 = context.appHelper.utils.store) == null ? void 0 : _c3.getState) == null ? void 0 : _d3.call(_c3)) == null ? void 0 : _e2.global) == null ? void 0 : _f2.globalConfig) == null ? void 0 : _g2.id) === 2155) {
+            if (((_f2 = (_e2 = (_d3 = (_c3 = (_b3 = context.appHelper.utils.store) == null ? void 0 : _b3.getState) == null ? void 0 : _c3.call(_b3)) == null ? void 0 : _d3.global) == null ? void 0 : _e2.globalConfig) == null ? void 0 : _f2.id) === 2155) {
               const val = _list == null ? void 0 : _list.map((s) => {
                 return {
                   product_id: s == null ? void 0 : s.product_id,
@@ -387,6 +332,7 @@ var AddSerivce = (props) => {
             }
           });
         } else {
+          (_g2 = window.openBookingEditModal) == null ? void 0 : _g2.call(window);
           dispatch({
             type: "setService",
             payload: {
@@ -408,7 +354,9 @@ var AddSerivce = (props) => {
           clickCountRef.current[productId] = 1;
         }
         const cacheItem = (0, import_utils6.createSimpleCacheItem)(item, cacheValues, state);
-        const detail = (_b2 = state.service.value) == null ? void 0 : _b2.find((val) => (0, import_utils6.isSameProduct)(val, cacheItem));
+        const detail = (_b2 = state.service.value) == null ? void 0 : _b2.find(
+          (val) => (0, import_utils6.isSameProduct)(val, cacheItem)
+        );
         const originalQuantity = ((_c2 = detail == null ? void 0 : detail._extend) == null ? void 0 : _c2.quantity) || 0;
         (_d2 = Toast == null ? void 0 : Toast.success) == null ? void 0 : _d2.call(
           Toast,
@@ -444,8 +392,7 @@ var AddSerivce = (props) => {
     }
   );
   const renderList = (0, import_react.useMemo)(() => {
-    var _a2;
-    let _list = ((_a2 = state.service) == null ? void 0 : _a2.services) || [];
+    let _list = products || [];
     if ((0, import_utils4.isDaysBooking)(state)) {
       if (!(0, import_utils4.holderId)(state)) {
         _list = _list.filter(
@@ -454,7 +401,7 @@ var AddSerivce = (props) => {
       }
     }
     return _list;
-  }, [(_l = state.service) == null ? void 0 : _l.services, state == null ? void 0 : state.activeCartId]);
+  }, [products, state == null ? void 0 : state.activeCartId]);
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
@@ -463,7 +410,7 @@ var AddSerivce = (props) => {
   }, [state.date.value]);
   (0, import_react.useEffect)(() => {
     if (renderMode === "current" && state.bookingConfig) {
-      getServices({
+      getProducts({
         schedule_date: currentDate,
         customer_id: customerId,
         menu_list_ids: menuList,
@@ -477,21 +424,11 @@ var AddSerivce = (props) => {
         import_productSelect.default,
         {
           dataSource: renderList,
-          layout: {
-            grid: true,
-            config: "12:12"
-          },
+          layout: productListLayout,
           onChange: handleSelectProduct,
           value: currentProduct == null ? void 0 : currentProduct.id,
           loading: !renderList.length && loading,
-          productListSetting: {
-            isProductCover: 1,
-            isTitle: 1,
-            isSubtitle: 1,
-            isPrice: 1,
-            isOriginPrice: 0,
-            isStock: 0
-          }
+          productListSetting
         }
       ), /* @__PURE__ */ import_react.default.createElement(import_notAvailable.default, { ref: notAvailableRef }));
     }

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

@@ -0,0 +1,8 @@
+export declare const formatVariantGroupTitle: (title: any, variant_group?: never[]) => string | undefined;
+export declare const createCacheItem: (detail: any, values: any, state: any) => any;
+export declare const isVariant: (item: any) => boolean;
+export declare const isOption: (item: any) => boolean;
+export declare const isBundle: (item: any) => boolean;
+export declare const genValues: (item: any, code: string) => any;
+export declare const setHandleSetService: (fn: ((list: any[], code: string) => void) | null) => void;
+export declare const getHandleSetService: () => ((list: any[], code: string) => void) | null;