@pisell/private-materials 3.3.45 → 3.3.47

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

@@ -46,11 +46,15 @@ var import_serve = require("../../../booking/info/service/serve");
 var import_serviceManager = require("../../../booking/info/service/serviceManager");
 var import_productSelect = __toESM(require("../../../productSelect"));
 var import_index = require("./index.less");
+var import_utils6 = require("../../utils");
+var import_notAvailable = __toESM(require("../notAvailable"));
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { onEdit, state, dispatch, renderMode = "current" } = props;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
+  const notAvailableRef = (0, import_react.useRef)(null);
+  const isLoadedServiceRef = (0, import_react.useRef)(false);
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const { createBookingData, createBooking } = (0, import_serviceManager.useService)({
     renderMode,
@@ -63,10 +67,14 @@ var AddSerivce = (props) => {
     state == null ? void 0 : state.renderType
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
+  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) || [];
+  }, [(_f = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _f.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;
-  }, [(_g = (_f = state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id]);
+  }, [(_h = (_g = state.client) == null ? void 0 : _g.value) == null ? void 0 : _h.id]);
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
       return;
@@ -115,8 +123,24 @@ var AddSerivce = (props) => {
       }
     });
   };
+  const removeNotAvailableService = (list) => {
+    var _a2, _b2, _c2;
+    if (!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length)) return;
+    const listMap = list.reduce((acc, cur) => {
+      acc[cur.id] = cur;
+      return acc;
+    }, {});
+    const newValue = (((_c2 = state.service) == null ? void 0 : _c2.value) || []).filter((item) => listMap[item.product_id]);
+    dispatch({
+      type: "setService",
+      payload: {
+        value: newValue,
+        edit: true
+      }
+    });
+  };
   const getServices = async (params) => {
-    var _a2, _b2;
+    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({
@@ -131,7 +155,15 @@ var AddSerivce = (props) => {
     let data = await state.apis.getServices({
       skip: 1,
       num: 500,
-      extension_type: state.productExtensionType,
+      // 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,
@@ -139,23 +171,36 @@ var AddSerivce = (props) => {
       order_by_string: "sort:desc",
       status: "published",
       schedule_date: params == null ? void 0 : params.schedule_date,
-      customer_id: params == null ? void 0 : params.customer_id
+      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(data == null ? void 0 : data.list);
+      setDefaultService((_f2 = data == null ? void 0 : data.data) == null ? void 0 : _f2.list);
     }
+    removeNotAvailableService((_g2 = data == null ? void 0 : data.data) == null ? void 0 : _g2.list);
+    isLoadedServiceRef.current = true;
     dispatch({
       type: "setService",
       payload: {
-        services: (data == null ? void 0 : data.list) || []
+        services: ((_h2 = data == null ? void 0 : data.data) == null ? void 0 : _h2.list) || []
       }
     });
   };
   const handleSelectProduct = (0, import_ahooks.useMemoizedFn)(
     (item, type = "select") => {
       const isSession = (0, import_utils2.isSessionProduct)(item);
-      const isEject = type === "detail" || item.bundle_group_count > 0 || isSession;
+      const isEject = (0, import_utils2.getIsEject)(item, type);
       let lock = false;
       if (isEject) {
         setCurrentProduct(item);
@@ -168,10 +213,11 @@ var AddSerivce = (props) => {
           id: item.id,
           date: state.date.value.format("YYYY-MM-DD"),
           showConfig: {
-            option: false,
+            option: true,
             session: isSession,
-            variant: false,
-            package: true
+            variant: true,
+            package: true,
+            number: (0, import_utils4.isNormalProductByDurationSchedule)(item)
           },
           is_eject: isEject ? 1 : 0,
           customer_id: customerId,
@@ -207,7 +253,7 @@ var AddSerivce = (props) => {
             _key: e.key,
             _extend: {
               start_date: state.date.value,
-              quantity: 1,
+              quantity: (e == null ? void 0 : e.quantity) || 1,
               price: _detail.price,
               product_name: item.title,
               other
@@ -231,7 +277,7 @@ var AddSerivce = (props) => {
           }
           if (cacheItem.autoClose) {
             cacheItem.autoClose = false;
-            let _list = [...state.service.value, cacheItem];
+            let _list = (0, import_utils6.addService)(state.service.value, cacheItem);
             (0, import_materials.PisellToast)({
               content: import_utils.locales.getText("pisell2.ticket-booking.add-to-cart")
             });
@@ -271,18 +317,26 @@ var AddSerivce = (props) => {
       }
     }
     return _list;
-  }, [(_h = state.service) == null ? void 0 : _h.services, state == null ? void 0 : state.activeCartId]);
+  }, [(_i = state.service) == null ? void 0 : _i.services, state == null ? void 0 : state.activeCartId]);
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
+  const currentDatetime = (0, import_react.useMemo)(() => {
+    return state.date.value.format("YYYY-MM-DD HH:mm:ss");
+  }, [state.date.value]);
   (0, import_react.useEffect)(() => {
-    if (renderMode === "current") {
-      getServices({ schedule_date: currentDate, customer_id: customerId });
+    if (renderMode === "current" && state.bookingConfig) {
+      getServices({
+        schedule_date: currentDate,
+        customer_id: customerId,
+        menu_list_ids: menuList,
+        schedule_datetime: currentDatetime
+      });
     }
-  }, [renderMode, currentDate, customerId]);
+  }, [renderMode, currentDate, customerId, menuList, currentDatetime]);
   return (0, import_react.useMemo)(() => {
     if (renderMode === "current") {
-      return /* @__PURE__ */ import_react.default.createElement(
+      return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
         import_productSelect.default,
         {
           dataSource: renderList,
@@ -302,11 +356,11 @@ var AddSerivce = (props) => {
             isStock: 1
           }
         }
-      );
+      ), /* @__PURE__ */ import_react.default.createElement(import_notAvailable.default, { ref: notAvailableRef }));
     }
     return null;
   }, [
-    (_j = (_i = state.service) == null ? void 0 : _i.cacheItem) == null ? void 0 : _j.autoClose,
+    (_k = (_j = state.service) == null ? void 0 : _j.cacheItem) == null ? void 0 : _k.autoClose,
     state.service.addModal,
     import_utils.locales,
     renderList,

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default _default;

package/lib/components/ticketBooking/components/notAvailable/index.js

@@ -0,0 +1,61 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/ticketBooking/components/notAvailable/index.tsx
+var notAvailable_exports = {};
+__export(notAvailable_exports, {
+  default: () => notAvailable_default
+});
+module.exports = __toCommonJS(notAvailable_exports);
+var import_react = __toESM(require("react"));
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var NotAvailable = (props, ref) => {
+  const [open, setOpen] = (0, import_react.useState)(false);
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    open: () => {
+      setOpen(true);
+    }
+  }));
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellModal.Information,
+    {
+      open,
+      platform: "pc",
+      title: import_utils.locales.getText("pisell2.ticket-booking.not-available-title"),
+      describe: "",
+      cancelText: import_utils.locales.getText("pisell2.text.cancel"),
+      okText: import_utils.locales.getText("pisell2.ticket-booking.not-available-ok"),
+      cancelVisible: false,
+      closable: true,
+      onOk: () => setOpen(false),
+      onCancel: () => setOpen(false)
+    }
+  );
+};
+var notAvailable_default = (0, import_react.forwardRef)(NotAvailable);

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];

package/lib/components/ticketBooking/index.js

@@ -171,7 +171,7 @@ var initialState = {
   bookingConfigParams: {
     item_type: "appointment_booking"
   },
-  productExtensionType: ["appointment_ticket", "session_ticket"]
+  productExtensionType: ["appointment_ticket", "session_ticket", "product_appointment", "service_product", "session_product", "normal", "product_appointment"]
 };
 var ticketBooking_default = (props) => {
   var _a, _b;

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

@@ -45,6 +45,8 @@ declare const _default: {
         "pisell2.ticket-booking.scan": string;
         "pisell2.ticket-booking.create-new": string;
         "pisell2.ticket-booking.add-to-cart": string;
+        "pisell2.ticket-booking.not-available-title": string;
+        "pisell2.ticket-booking.not-available-ok": string;
     };
     "zh-CN": {
         "pisell2.ticket-booking.info": string;
@@ -92,6 +94,8 @@ declare const _default: {
         "pisell2.ticket-booking.scan": string;
         "pisell2.ticket-booking.create-new": string;
         "pisell2.ticket-booking.add-to-cart": string;
+        "pisell2.ticket-booking.not-available-title": string;
+        "pisell2.ticket-booking.not-available-ok": string;
     };
     "zh-HK": {
         "pisell2.ticket-booking.info": string;
@@ -139,6 +143,8 @@ declare const _default: {
         "pisell2.ticket-booking.scan": string;
         "pisell2.ticket-booking.create-new": string;
         "pisell2.ticket-booking.add-to-cart": string;
+        "pisell2.ticket-booking.not-available-title": string;
+        "pisell2.ticket-booking.not-available-ok": string;
     };
 };
 export default _default;

package/lib/components/ticketBooking/locales.js

@@ -68,7 +68,9 @@ var locales_default = {
     "pisell2.ticket-booking.appointment-not-found": "Appointment not found",
     "pisell2.ticket-booking.scan": "Scan",
     "pisell2.ticket-booking.create-new": "Create new",
-    "pisell2.ticket-booking.add-to-cart": "Added to Cart"
+    "pisell2.ticket-booking.add-to-cart": "Added to Cart",
+    "pisell2.ticket-booking.not-available-title": "Sorry, Not available at current time.",
+    "pisell2.ticket-booking.not-available-ok": "OK"
   },
   "zh-CN": {
     "pisell2.ticket-booking.info": "信息",
@@ -115,7 +117,9 @@ var locales_default = {
     "pisell2.ticket-booking.appointment-not-found": "没有发现此预约",
     "pisell2.ticket-booking.scan": "",
     "pisell2.ticket-booking.create-new": "新建",
-    "pisell2.ticket-booking.add-to-cart": "已加入购物车"
+    "pisell2.ticket-booking.add-to-cart": "已加入购物车",
+    "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售时间。",
+    "pisell2.ticket-booking.not-available-ok": "好的"
   },
   "zh-HK": {
     "pisell2.ticket-booking.info": "資訊",
@@ -162,6 +166,8 @@ var locales_default = {
     "pisell2.ticket-booking.appointment-not-found": "没有發現此預約",
     "pisell2.ticket-booking.scan": "扫码",
     "pisell2.ticket-booking.create-new": "新建",
-    "pisell2.ticket-booking.add-to-cart": "已加入购物车"
+    "pisell2.ticket-booking.add-to-cart": "已加入购物车",
+    "pisell2.ticket-booking.not-available-title": "抱歉，目前不在可售時間。",
+    "pisell2.ticket-booking.not-available-ok": "好的"
   }
 };

package/lib/components/ticketBooking/serve.js

@@ -58,8 +58,12 @@ var getClients = async (params) => {
   return data;
 };
 var getServices = async (params) => {
-  let { data } = await import_utils.request.getRequest().post(prefix + "/product/query", params);
-  return data;
+  const { _config } = params;
+  let res = await import_utils.request.getRequest().post(prefix + "/product/query", params, _config);
+  if (_config == null ? void 0 : _config.fullResult) {
+    return res;
+  }
+  return res.data;
 };
 var getResources = async (params) => {
   let { data } = await import_utils.request.getRequest().get(prefix + "/form/schedule", params);

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

@@ -12,3 +12,4 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
+export declare const addService: (list: any[], addItem: any) => any[];

package/lib/components/ticketBooking/utils/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/ticketBooking/utils/index.ts
 var utils_exports = {};
 __export(utils_exports, {
+  addService: () => addService,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
   getDefaultStartParam: () => getDefaultStartParam,
@@ -38,6 +39,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
+var import_utils = require("../../booking/info/service2/utils");
 var formatDateToStr = (date) => {
   const format = (val) => {
     return (0, import_dayjs.default)(val).format("YYYY-MM-DD HH:mm:ss");
@@ -120,8 +122,39 @@ var restoreProductOtherData = (data) => {
     quantity: Number(detail.product_quantity)
   };
 };
+var isSameProduct = (a, b) => {
+  var _a, _b, _c, _d;
+  return ((_b = (_a = a._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.rowKey) === ((_d = (_c = b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.rowKey);
+};
+var addService = (list, addItem) => {
+  let value = list;
+  if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem)) {
+    value.push(addItem);
+  } else {
+    let isNotSame = true;
+    value = list.map((item) => {
+      var _a, _b;
+      if (isSameProduct(item, addItem)) {
+        isNotSame = false;
+        return {
+          ...item,
+          _extend: {
+            ...item._extend,
+            quantity: (((_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1)
+          }
+        };
+      }
+      return item;
+    });
+    if (isNotSame) {
+      value.push(addItem);
+    }
+  }
+  return value;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  addService,
   formatBookingList,
   formatDateToStr,
   getDefaultStartParam,

package/lib/components/wallet/hooks/useWalletCard.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.45",
+  "version": "3.3.47",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,9 +60,9 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.3.15",
-    "@pisell/date-picker": "3.0.2",
-    "@pisell/icon": "0.0.11"
+    "@pisell/materials": "3.3.16",
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",