@pisell/private-materials 6.4.59 → 6.4.60

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

@@ -27,15 +27,13 @@ var import_utils = require("@pisell/utils");
 var import_bookingTicket = require("./bookingTicket");
 var import_utils2 = require("../../utils");
 var import_materials = require("@pisell/materials");
-var import_useActiveExecute = require("./useActiveExecute");
 var useScanCustomer = () => {
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
   const scanRef = (0, import_react.useRef)(null);
   const Toast = (0, import_materials.useToast)();
-  const { executeIfActive } = (0, import_useActiveExecute.useActiveExecute)();
   const handleScanCustomer = (callback) => {
     console.log("handleScanCustomer>>>>>>>", callback);
-    scanRef.current = bookingTicket == null ? void 0 : bookingTicket.scanCustomerListener(executeIfActive((data) => {
+    scanRef.current = bookingTicket == null ? void 0 : bookingTicket.scanCustomerListener((data) => {
       console.log("scanCustomerListener>>>>>>>", data);
       if (data.status === "failed") {
         Toast.fail(import_utils.locales.getText("pisell2.text.scan-global-failed"));
@@ -43,7 +41,7 @@ var useScanCustomer = () => {
       }
       const customer = (0, import_utils2.formatScanCustomer)(data);
       callback(customer);
-    }));
+    });
   };
   return {
     openScan: handleScanCustomer,

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

@@ -27,17 +27,13 @@ var import_bookingTicket = require("./bookingTicket");
 var import_utils = require("../../utils");
 var import_materials = require("@pisell/materials");
 var import_utils2 = require("@pisell/utils");
-var import_useActiveExecute = require("./useActiveExecute");
 var useScanGlobal = () => {
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
   const scanRef = (0, import_react.useRef)(null);
   const Toast = (0, import_materials.useToast)();
-  const { executeIfActive } = (0, import_useActiveExecute.useActiveExecute)();
   const handleScanGlobal = (callback) => {
-    var _a;
-    (_a = bookingTicket == null ? void 0 : bookingTicket.initPeripheralsListener) == null ? void 0 : _a.call(bookingTicket);
     scanRef.current = bookingTicket == null ? void 0 : bookingTicket.scanGlobalListener(
-      executeIfActive((data) => {
+      (data) => {
         console.log("scanGlobalListener>>>>>>>", data);
         if (data.status === "failed") {
           Toast.fail(import_utils2.locales.getText("pisell2.text.scan-global-failed"));
@@ -45,7 +41,7 @@ var useScanGlobal = () => {
         }
         const result = (0, import_utils.formatScanGlobal)(data);
         callback(result);
-      })
+      }
     );
   };
   return {

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

@@ -1,14 +1,8 @@
-import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {
     productExtensionType: string[];
     bookingConfigParams: Record<string, any>;
     isShowMenuBar?: boolean;
-    isShowTimeBar?: boolean;
-    isShowFloatButtons?: boolean;
-    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
-    isActive?: boolean;
-    rulesHooks?: any;
 }
 declare const _default: (props: TicketBookingProps) => JSX.Element;
 export default _default;

package/lib/components/ticketBooking/index.js

@@ -43,9 +43,6 @@ var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_utils3 = require("./utils");
 var import_locales = __toESM(require("./locales"));
 var import_menuBar = __toESM(require("./components/menuBar"));
-var import_ahooks = require("ahooks");
-var import_OsKeyContext = require("./context/OsKeyContext");
-var import_IsActiveContext = require("./context/IsActiveContext");
 var import_index = require("./index.less");
 var initialState = {
   amountSymbol: "$",
@@ -192,49 +189,13 @@ var ticketBooking_default = (props) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const {
     productExtensionType,
-    bookingConfigParams: propsBookingConfigParams,
-    isShowMenuBar = true,
-    isShowTimeBar: propsIsShowTimeBar = true,
-    isShowFloatButtons: propsIsShowFloatButtons = true,
-    productDisplayConfig: propsProductDisplayConfig,
-    isActive = true,
-    rulesHooks: propsRulesHooks
+    bookingConfigParams,
+    isShowMenuBar = true
   } = props;
-  const [activeNavKey, setActiveNavKey] = (0, import_ahooks.useLocalStorageState)(
-    "pisell-ticket-booking-nav-key",
-    {
-      defaultValue: "ticket"
-    }
-  );
-  const bookingConfigParams = (0, import_react.useMemo)(() => {
-    if (isShowMenuBar && activeNavKey === "food") {
-      return {
-        ...propsBookingConfigParams,
-        sub_type: "food",
-        source_type: "pos"
-      };
-    }
-    return propsBookingConfigParams;
-  }, [isShowMenuBar, activeNavKey, propsBookingConfigParams]);
-  const isShowTimeBar = (0, import_react.useMemo)(() => {
-    return isShowMenuBar && activeNavKey === "food" ? false : propsIsShowTimeBar;
-  }, [isShowMenuBar, activeNavKey, propsIsShowTimeBar]);
-  const isShowFloatButtons = (0, import_react.useMemo)(() => {
-    return isShowMenuBar && activeNavKey === "food" ? false : propsIsShowFloatButtons;
-  }, [isShowMenuBar, activeNavKey, propsIsShowFloatButtons]);
-  const osKey = (0, import_react.useMemo)(() => {
-    return bookingConfigParams == null ? void 0 : bookingConfigParams.sub_type;
-  }, [bookingConfigParams]);
-  const productDisplayConfig = (0, import_react.useMemo)(() => {
-    if (isShowMenuBar && activeNavKey === "food") {
-      return "sku-list-a5";
-    }
-    return propsProductDisplayConfig;
-  }, [isShowMenuBar, activeNavKey, propsProductDisplayConfig]);
   const storeRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
   const { pisellos, pisellosAllModule } = (_a = context.appHelper) == null ? void 0 : _a.utils;
-  const { BookingTicket, ShopDiscountImpl } = pisellosAllModule || {};
+  const { BookingTicket } = pisellosAllModule || {};
   import_utils.locales.init(
     import_locales.default,
     ((_f = (_e = (_d = (_c = (_b = context.appHelper.utils) == null ? void 0 : _b.getApp) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.locales) == null ? void 0 : _e.getLocale) == null ? void 0 : _f.call(_e)) || ((_h = (_g = context.appHelper.utils) == null ? void 0 : _g.storage) == null ? void 0 : _h.get("umi_locale")) || "en"
@@ -249,34 +210,17 @@ var ticketBooking_default = (props) => {
       productExtensionType
     });
     storeRef.current = store;
-  }, [bookingConfigParams, productExtensionType]);
+  }, []);
   (0, import_react.useMemo)(() => {
     if (BookingTicket) {
-      pisellos == null ? void 0 : pisellos.registerModule(new BookingTicket((0, import_utils3.getBookingTicketKey)(osKey)), {
+      pisellos == null ? void 0 : pisellos.registerModule(new BookingTicket("bookingTicket"), {
         initialState: {},
         otherParams: {
-          cacheId: (0, import_utils3.getBookingTicketKey)(osKey),
+          cacheId: "test-cache",
           platform: "shop"
         }
       });
     }
-    if (ShopDiscountImpl) {
-      pisellos == null ? void 0 : pisellos.registerModule(new ShopDiscountImpl((0, import_utils3.getShopDiscountKey)(osKey)), {
-        otherParams: {
-          platform: "shop",
-          rules: {
-            hooks: propsRulesHooks || import_utils3.rulesHooks
-          }
-        }
-      });
-    }
-  }, [osKey]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-ticket-booking-wrapper" }, isShowMenuBar && /* @__PURE__ */ import_react.default.createElement(import_menuBar.default, { activeNavKey, onNavChange: setActiveNavKey }), /* @__PURE__ */ import_react.default.createElement(import_IsActiveContext.IsActiveProvider, { isActive }, /* @__PURE__ */ import_react.default.createElement(import_OsKeyContext.OsKeyProvider, { osKey }, /* @__PURE__ */ import_react.default.createElement(import_miniRedux.Provider, { store: storeRef.current, key: activeNavKey }, /* @__PURE__ */ import_react.default.createElement(
-    import_ticketBooking.default,
-    {
-      productDisplayConfig,
-      isShowTimeBar,
-      isShowFloatButtons
-    }
-  )))));
+  }, []);
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-ticket-booking-wrapper" }, isShowMenuBar && /* @__PURE__ */ import_react.default.createElement(import_menuBar.default, null), /* @__PURE__ */ import_react.default.createElement(import_miniRedux.Provider, { store: storeRef.current }, /* @__PURE__ */ import_react.default.createElement(import_ticketBooking.default, null)));
 };

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

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;
@@ -59,32 +59,4 @@ export declare const formatScanGlobal: (data: ScanData) => {
     scanCode: string;
 } | null | undefined;
 export declare const createSimpleCacheItem: (item: any, e: any, state: any) => any;
-export declare const getBookingTicketKey: (osKey: string) => string;
-export declare const getShopDiscountKey: (osKey: string) => string;
-export declare const rulesHooks: {
-    getProduct(product: Record<string, any>): {
-        booking_id: any;
-        id: any;
-        _id: any;
-        price: any;
-        total: any;
-        discount_list: any;
-        origin_total: any;
-        num: any;
-        quantity: any;
-        vouchersApplicable: any;
-    };
-    setProduct(product: Record<string, any>, values: {
-        total: number;
-        discount_list: any[];
-        price: number;
-        quantity: number;
-        _id?: string;
-    }): {
-        _id: any;
-        discount_list: any[];
-        _extend: any;
-    };
-};
-export { getCache, setCache, clearCache, clearAllCache, clearAllCacheByOsKey, getProductCache, setProductCache, clearProductCache, clearAllProductCache, getBoardConfigCache, setBoardConfigCache, clearBoardConfigCache, } from './productCache';
-export type { CacheType } from './productCache';
+export {};

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

@@ -31,12 +31,6 @@ var utils_exports = {};
 __export(utils_exports, {
   addService: () => addService,
   addServiceScroll: () => addServiceScroll,
-  clearAllCache: () => import_productCache.clearAllCache,
-  clearAllCacheByOsKey: () => import_productCache.clearAllCacheByOsKey,
-  clearAllProductCache: () => import_productCache.clearAllProductCache,
-  clearBoardConfigCache: () => import_productCache.clearBoardConfigCache,
-  clearCache: () => import_productCache.clearCache,
-  clearProductCache: () => import_productCache.clearProductCache,
   createSimpleCacheItem: () => createSimpleCacheItem,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
@@ -45,9 +39,6 @@ __export(utils_exports, {
   formatScanCustomer: () => formatScanCustomer,
   formatScanGlobal: () => formatScanGlobal,
   genServiceKey: () => genServiceKey,
-  getBoardConfigCache: () => import_productCache.getBoardConfigCache,
-  getBookingTicketKey: () => getBookingTicketKey,
-  getCache: () => import_productCache.getCache,
   getCartProductOverlay: () => getCartProductOverlay,
   getDefaultStartParam: () => getDefaultStartParam,
   getDisabledEdit: () => getDisabledEdit,
@@ -55,20 +46,13 @@ __export(utils_exports, {
   getIsParallelResourcesBooking: () => getIsParallelResourcesBooking,
   getIsShowNumber: () => getIsShowNumber,
   getNextTimeSlice: () => getNextTimeSlice,
-  getProductCache: () => import_productCache.getProductCache,
-  getShopDiscountKey: () => getShopDiscountKey,
   isSameProduct: () => isSameProduct,
-  restoreProductOtherData: () => restoreProductOtherData,
-  rulesHooks: () => rulesHooks,
-  setBoardConfigCache: () => import_productCache.setBoardConfigCache,
-  setCache: () => import_productCache.setCache,
-  setProductCache: () => import_productCache.setProductCache
+  restoreProductOtherData: () => restoreProductOtherData
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("../../booking/info/service2/utils");
 var import_utils2 = require("@pisell/utils");
-var import_productCache = require("./productCache");
 var formatDateToStr = (date) => {
   const format = (val) => {
     return (0, import_dayjs.default)(val).format("YYYY-MM-DD HH:mm:ss");
@@ -315,53 +299,10 @@ var createSimpleCacheItem = (item, e, state) => {
   };
   return cacheItem;
 };
-var getBookingTicketKey = (osKey) => {
-  return `bookingTicket-${osKey}`;
-};
-var getShopDiscountKey = (osKey) => {
-  return `shopDiscount-${osKey}`;
-};
-var rulesHooks = {
-  // 获取商品关键信息
-  getProduct(product) {
-    const detail = {
-      booking_id: product.booking_id,
-      id: product.id,
-      _id: product._id,
-      price: product.price,
-      total: product._extend.total,
-      discount_list: product.discount_list,
-      origin_total: product._extend.origin_total,
-      num: product._extend.quantity,
-      quantity: product._extend.quantity || 1,
-      vouchersApplicable: product.vouchersApplicable
-    };
-    return detail;
-  },
-  setProduct(product, values) {
-    const detail = {
-      ...product,
-      _id: values._id || product._id,
-      discount_list: values.discount_list,
-      _extend: {
-        ...product._extend,
-        ..."total" in values ? { total: values.total } : {},
-        ..."quantity" in values ? { quantity: values.quantity } : {}
-      }
-    };
-    return detail;
-  }
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addService,
   addServiceScroll,
-  clearAllCache,
-  clearAllCacheByOsKey,
-  clearAllProductCache,
-  clearBoardConfigCache,
-  clearCache,
-  clearProductCache,
   createSimpleCacheItem,
   formatBookingList,
   formatDateToStr,
@@ -370,9 +311,6 @@ var rulesHooks = {
   formatScanCustomer,
   formatScanGlobal,
   genServiceKey,
-  getBoardConfigCache,
-  getBookingTicketKey,
-  getCache,
   getCartProductOverlay,
   getDefaultStartParam,
   getDisabledEdit,
@@ -380,12 +318,6 @@ var rulesHooks = {
   getIsParallelResourcesBooking,
   getIsShowNumber,
   getNextTimeSlice,
-  getProductCache,
-  getShopDiscountKey,
   isSameProduct,
-  restoreProductOtherData,
-  rulesHooks,
-  setBoardConfigCache,
-  setCache,
-  setProductCache
+  restoreProductOtherData
 });

package/lib/index.d.ts

@@ -59,7 +59,5 @@ export { default as ProSkuDetailModal } from './pro/skuDetailModal';
 export { default as SaasLogin } from './plus/saasLogin';
 export { default as SaasRegister } from './plus/saasRegister';
 export { default as SaasCreateOrganization } from './plus/saasCreateOrganization';
-export { default as SkuCard } from './plus/productSelect/ProductCard/SkuCard';
 export { default as PinModal } from './components/pinModal';
 export { default as PinVerifyModal } from './components/pinVerifyModal';
-export { ResponsiveList as SkuList } from './components/list';

package/lib/index.js

@@ -79,8 +79,6 @@ __export(src_exports, {
   SaasRegister: () => import_saasRegister.default,
   Schedules: () => import_schedules.default,
   ShoppingCart: () => import_shoppingCart.default,
-  SkuCard: () => import_SkuCard.default,
-  SkuList: () => import_list.ResponsiveList,
   StepController: () => import_stepController.default,
   SubTotal: () => import_subTotal.default,
   TaxSelect: () => import_taxSelect.default,
@@ -158,10 +156,8 @@ var import_skuDetailModal = __toESM(require("./pro/skuDetailModal"));
 var import_saasLogin = __toESM(require("./plus/saasLogin"));
 var import_saasRegister = __toESM(require("./plus/saasRegister"));
 var import_saasCreateOrganization = __toESM(require("./plus/saasCreateOrganization"));
-var import_SkuCard = __toESM(require("./plus/productSelect/ProductCard/SkuCard"));
 var import_pinModal = __toESM(require("./components/pinModal"));
 var import_pinVerifyModal = __toESM(require("./components/pinVerifyModal"));
-var import_list = require("./components/list");
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -216,8 +212,6 @@ import_dayjs.default.extend(import_localeData.default);
   SaasRegister,
   Schedules,
   ShoppingCart,
-  SkuCard,
-  SkuList,
   StepController,
   SubTotal,
   TaxSelect,

package/lib/plus/productSelect/components/pisellPriceText/index.d.ts

@@ -7,8 +7,6 @@ interface IProps {
     style?: React.CSSProperties;
     prefix?: React.ReactElement;
     suffix?: React.ReactElement;
-    customPrefixText?: string;
-    customSuffixText?: string;
 }
 declare const index: (props: IProps) => JSX.Element;
 export default index;

package/lib/plus/productSelect/components/pisellPriceText/index.js

@@ -40,15 +40,14 @@ var import_index = require("./index.less");
 var index = (props) => {
   var _a, _b;
   const context = (0, import_useEngineContext.default)();
-  const { value, customPrefixText, customSuffixText } = props;
+  const { value } = props;
   const locale = ((_b = (_a = context.appHelper.utils) == null ? void 0 : _a.storage) == null ? void 0 : _b.get("umi_locale")) || "en";
   const [_prefix, _suffix] = (0, import_react.useMemo)(() => {
     if (!props.isMini) return ["", ""];
-    if (!locale) return [customPrefixText || "From", ""];
-    if (locale.toLowerCase().includes("zh"))
-      return ["", customSuffixText || "起"];
-    return [customPrefixText || "From", ""];
-  }, [locale, props.isMini, customPrefixText, customSuffixText]);
+    if (!locale) return ["From", ""];
+    if (locale.toLowerCase().includes("zh")) return ["", "起"];
+    return ["From", ""];
+  }, [locale, props.isMini]);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-price-text", props.className) }, props.prefix, _prefix ? /* @__PURE__ */ import_react.default.createElement(
     "span",
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.59",
+  "version": "6.4.60",
   "scripts": {
     "dev": "father dev",
     "build": "father build",

package/es/components/list/List.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import './List.less';
-import { ListProps, BaseListItem } from './types';
-declare const List: <TItem extends BaseListItem = BaseListItem>(props: ListProps<TItem>) => React.ReactElement;
-export default List;