@pisell/private-materials 6.9.2 → 6.9.4

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

@@ -37,6 +37,7 @@ var import_bookingTicket = require("./bookingTicket");
 var import_react = require("react");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_dayjs = __toESM(require("dayjs"));
+var import_useLogger = __toESM(require("../../../../hooks/useLogger"));
 var useProducts = (notAvailableRef) => {
   var _a;
   const bookingTicket = (0, import_bookingTicket.useBookingTicket)();
@@ -47,6 +48,7 @@ var useProducts = (notAvailableRef) => {
   const isFirstLoadRef = (0, import_react.useRef)(true);
   const isFirstLoadDataRef = (0, import_react.useRef)(true);
   const { getApp } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const logger = (0, import_useLogger.default)();
   const app = getApp();
   const [scheduleTimePoints, setScheduleTimePoints] = (0, import_react.useState)([]);
   const scheduledTaskQueueIdRef = (0, import_react.useRef)("booking-schedule-products");
@@ -56,11 +58,29 @@ var useProducts = (notAvailableRef) => {
     setLoading(true);
     try {
       paramsRef.current = params;
+      logger.addLog({
+        title: "useProducts: getProducts 调用",
+        metadata: {
+          params
+        }
+      });
       const products2 = await bookingTicket.loadProducts(params);
+      logger.addLog({
+        title: "useProducts: getProducts 返回",
+        metadata: {
+          products: (products2 == null ? void 0 : products2.length) || 0
+        }
+      });
       setProducts(products2);
       setLoading(false);
       isFirstLoadRef.current = false;
     } catch (error) {
+      logger.addLog({
+        title: "useProducts: getProducts 错误",
+        metadata: {
+          error: error == null ? void 0 : error.message
+        }
+      });
       if ((error == null ? void 0 : error.code) === 607100 && (isFirstLoadRef.current || products.length > 0)) {
         (_a2 = notAvailableRef.current) == null ? void 0 : _a2.open();
       }
@@ -81,7 +101,21 @@ var useProducts = (notAvailableRef) => {
       }
       app2.tasksManager.addTaskFunction("getProducts", async ({ task }) => {
         console.log("定时执行 getProducts，参数：", task.payload);
+        logger.addLog({
+          title: "useProducts: 定时执行 getProducts",
+          metadata: {
+            payload: task.payload,
+            task
+          }
+        });
         await getProducts(task.payload);
+        logger.addLog({
+          title: "useProducts: 定时执行 getProducts 完成",
+          metadata: {
+            payload: task.payload,
+            task
+          }
+        });
         return { status: "success" };
       });
       if (scheduleTimePoints && scheduleTimePoints.length > 0) {
@@ -115,22 +149,47 @@ var useProducts = (notAvailableRef) => {
           module: "scheduledTasks",
           queueId: scheduledTaskQueueIdRef.current
         });
+        logger.addLog({
+          title: "useProducts: 创建定时任务",
+          metadata: {
+            tasks: tasks.length,
+            log: `已为 ${tasks.length} 个时间点创建定时任务`
+          }
+        });
         console.log(`已为 ${tasks.length} 个时间点创建定时任务`);
       }
     } catch (error) {
       console.error("创建定时任务失败：", error);
+      logger.addLog({
+        title: "useProducts: 创建定时任务失败",
+        metadata: {
+          error: error == null ? void 0 : error.message
+        }
+      });
     }
     return () => {
       var _a3, _b2, _c2;
       try {
         const app2 = (_c2 = (_b2 = (_a3 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a3.utils) == null ? void 0 : _b2.getApp) == null ? void 0 : _c2.call(_b2);
         if (app2 && app2.tasksManager) {
+          logger.addLog({
+            title: "useProducts: 清理定时任务",
+            metadata: {
+              queueId: scheduledTaskQueueIdRef.current
+            }
+          });
           app2.tasksManager.clearTasks({
             module: "scheduledTasks",
             queueId: scheduledTaskQueueIdRef.current
           });
         }
       } catch (error) {
+        logger.addLog({
+          title: "useProducts: 清理定时任务失败",
+          metadata: {
+            error: error == null ? void 0 : error.message
+          }
+        });
         console.error("清理定时任务失败：", error);
       }
     };

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

@@ -10,6 +10,7 @@ interface TicketBookingProps {
     productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
     isActive?: boolean;
     rulesHooks?: any;
+    businessCode?: string;
 }
 declare const _default: (props: TicketBookingProps) => JSX.Element;
 export default _default;

package/lib/components/ticketBooking/index.js

@@ -272,7 +272,7 @@ var ticketBooking_default = (props) => {
       });
     }
   }, [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(
+  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, businessCode: props == null ? void 0 : props.businessCode }, /* @__PURE__ */ import_react.default.createElement(import_miniRedux.Provider, { store: storeRef.current, key: activeNavKey }, /* @__PURE__ */ import_react.default.createElement(
     import_ticketBooking.default,
     {
       onPrerenderComplete,

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

@@ -47,7 +47,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;

package/lib/components/walletList/index.js

@@ -156,7 +156,8 @@ var DEFAULT_BALANCE = {
   gift_card_balance: 0,
   point_card_balance: 0,
   voucher_count: 0,
-  discount_card_count: 0
+  discount_card_count: 0,
+  good_pass_count: 0
 };
 var WalletList = (0, import_model.Provider)((props) => {
   var _a, _b, _c, _d, _e, _f, _g;
@@ -523,6 +524,9 @@ var WalletList = (0, import_model.Provider)((props) => {
     const cardItems = showcaseWalletPassNew.map((showCaseItem) => {
       const balanceKey = _balanceKeyMap[showCaseItem.type];
       let value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      if (showCaseItem.type === "voucher") {
+        value += balanceItem.good_pass_count || 0;
+      }
       return {
         ...showCaseItem,
         value

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/lib/index.d.ts

@@ -69,13 +69,16 @@ export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
 export { default as WalletEditor } from './plus/walletEditor';
 export { default as WalletPassGallery } from './plus/walletPassGallery';
-export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
-export { default as SelectHolder } from './plus/selectHolder';
-export { default as HolderList } from './plus/selectHolder/components/HolderList';
 export { default as SettingsRegistry } from './components/systemSettings/registry';
 export { default as Selector } from './pro/Selector';
+export { default as SelectHolder } from './plus/selectHolder';
+export { default as HolderList } from './plus/selectHolder/components/HolderList';
+export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
 export { default as WebPosLogin } from './plus/webPosLogin';
 export { default as PaymentModal } from './components/checkout/plugin';
 export { default as SKUOptionsSelection } from './plus/skuOptionsSelection';
 export { default as KioskSkuDetail } from './components/kioskSkuDetail';
-export { default as MyTeamLogin } from './plus/myTeamLogin';
+export { default as EcoCupProject } from './components/ecocup/cupProject';
+export { default as EcoCupList } from './components/ecocup/cupList';
+export { default as EcoCustomerList } from './components/ecocup/customerList';
+export { default as OrderList } from './plus/orderList';

package/lib/index.js

@@ -52,6 +52,9 @@ __export(src_exports, {
   CustomerAuth: () => import_admin.CustomerAuth,
   CustomerOAuthConfig: () => import_admin.CustomerOAuthConfig,
   DeviceAuth: () => import_admin.DeviceAuth,
+  EcoCupList: () => import_cupList.default,
+  EcoCupProject: () => import_cupProject.default,
+  EcoCustomerList: () => import_customerList.default,
   EditBookingModal: () => import_editBookingModal.default,
   Eftpos: () => import_eftpos.default,
   EftposPay: () => import_eftposPay.default,
@@ -71,10 +74,10 @@ __export(src_exports, {
   KioskSkuDetail: () => import_kioskSkuDetail.default,
   Login: () => import_login.default,
   Login2: () => import_Login2.Login2,
-  MyTeamLogin: () => import_myTeamLogin.default,
   NoteModal: () => import_noteModal.default,
   OAuthConfig: () => import_admin.OAuthConfig,
   OnlineShopAuth: () => import_admin.OnlineShopAuth,
+  OrderList: () => import_orderList.default,
   OrgAdminAuth: () => import_admin.OrgAdminAuth,
   POSOperatorAuth: () => import_admin.POSOperatorAuth,
   PaymentModal: () => import_plugin.default,
@@ -192,16 +195,19 @@ var import_contactInfoModal = __toESM(require("./plus/contactInfoModal"));
 var import_Login2 = require("./pro/Login2.0");
 var import_walletEditor = __toESM(require("./plus/walletEditor"));
 var import_walletPassGallery = __toESM(require("./plus/walletPassGallery"));
-var import_passDetail = __toESM(require("./plus/walletPassGallery/components/passDetail"));
-var import_selectHolder2 = __toESM(require("./plus/selectHolder"));
-var import_HolderList = __toESM(require("./plus/selectHolder/components/HolderList"));
 var import_registry = __toESM(require("./components/systemSettings/registry"));
 var import_Selector = __toESM(require("./pro/Selector"));
+var import_selectHolder2 = __toESM(require("./plus/selectHolder"));
+var import_HolderList = __toESM(require("./plus/selectHolder/components/HolderList"));
+var import_passDetail = __toESM(require("./plus/walletPassGallery/components/passDetail"));
 var import_webPosLogin = __toESM(require("./plus/webPosLogin"));
 var import_plugin = __toESM(require("./components/checkout/plugin"));
 var import_skuOptionsSelection = __toESM(require("./plus/skuOptionsSelection"));
 var import_kioskSkuDetail = __toESM(require("./components/kioskSkuDetail"));
-var import_myTeamLogin = __toESM(require("./plus/myTeamLogin"));
+var import_cupProject = __toESM(require("./components/ecocup/cupProject"));
+var import_cupList = __toESM(require("./components/ecocup/cupList"));
+var import_customerList = __toESM(require("./components/ecocup/customerList"));
+var import_orderList = __toESM(require("./plus/orderList"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -229,6 +235,9 @@ import_dayjs.default.extend(import_localeData.default);
   CustomerAuth,
   CustomerOAuthConfig,
   DeviceAuth,
+  EcoCupList,
+  EcoCupProject,
+  EcoCustomerList,
   EditBookingModal,
   Eftpos,
   EftposPay,
@@ -248,10 +257,10 @@ import_dayjs.default.extend(import_localeData.default);
   KioskSkuDetail,
   Login,
   Login2,
-  MyTeamLogin,
   NoteModal,
   OAuthConfig,
   OnlineShopAuth,
+  OrderList,
   OrgAdminAuth,
   POSOperatorAuth,
   PaymentModal,

package/lib/plus/clinetSearch/Add/BirthdayField/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const DateSectionCom: ({ value, onChange, showTime, className, style, useSpace, format, itemStyle, }: any) => JSX.Element;
 export default DateSectionCom;

package/lib/plus/clinetSearch/Add/GenderField/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const GenderField: (props: any) => JSX.Element;
 export default GenderField;

package/lib/plus/clinetSearch/index.d.ts

@@ -9,6 +9,7 @@ interface ClientSearchProps extends Omit<ComprehensiveSearchProps, 'resultDispla
     resultProps?: TableProps<ClientData>;
     hasMore?: boolean;
     onLoadMore?: () => void;
+    state?: any;
 }
 export declare type ClientSearchRef = {
     resetScrollPosition: () => void;

package/lib/plus/clinetSearch/index.js

@@ -45,8 +45,16 @@ var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_useTranslationOriginal = __toESM(require("../../hooks/useTranslationOriginal"));
 var import_index = require("./index.less");
 var ClientSearch = (0, import_react.forwardRef)(
-  ({ onRowClick, resultProps, onAddClient, hasMore, onLoadMore, ...props }, ref) => {
-    var _a, _b, _c;
+  ({
+    onRowClick,
+    resultProps,
+    onAddClient,
+    hasMore,
+    onLoadMore,
+    state,
+    ...props
+  }, ref) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const [modalVisible, setModalVisible] = (0, import_react.useState)(false);
     const comprehensiveSearchRef = (0, import_react.useRef)(null);
     const addClientRef = (0, import_react.useRef)(null);
@@ -57,6 +65,8 @@ var ClientSearch = (0, import_react.forwardRef)(
       import_locales.default,
       ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.storage) == null ? void 0 : _c.get("umi_locale")) || "en"
     );
+    const appointmentSubject = ((_f = (_e = (_d = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _d.config) == null ? void 0 : _e.basic) == null ? void 0 : _f.appointment_subject) || {};
+    const translation = (_h = (_g = context == null ? void 0 : context.appHelper) == null ? void 0 : _g.utils) == null ? void 0 : _h.translationShop;
     const handleAdd = () => {
       setModalVisible(true);
     };
@@ -66,7 +76,7 @@ var ClientSearch = (0, import_react.forwardRef)(
       (_a2 = addClientRef.current) == null ? void 0 : _a2.reset();
     };
     const renderListHeader = () => {
-      return /* @__PURE__ */ import_react.default.createElement("div", { className: "client-search-list-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 180 } }, import_utils.locales.getText("pisell2.text.client-search.name")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 110 } }, import_utils.locales.getText("pisell2.text.client-search.register-time")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 125 } }, import_utils.locales.getText("pisell2.text.client-search.membership")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 180 } }, import_utils.locales.getText("pisell2.text.client-search.contact-info")));
+      return /* @__PURE__ */ import_react.default.createElement("div", { className: "client-search-list-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 180 } }, import_utils.locales.getText("pisell2.text.client-search.name")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 110 } }, import_utils.locales.getText("pisell2.text.client-search.register-time")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 125 } }, import_utils.locales.getText("pisell2.text.client-search.membership")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 180 } }, import_utils.locales.getText("pisell2.text.client-search.contact-info")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 200 } }, translation(appointmentSubject == null ? void 0 : appointmentSubject.form_name) || import_utils.locales.getText("pisell2.text.client-search.holder")));
     };
     const renderResults = (searchResults) => {
       return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (searchResults == null ? void 0 : searchResults.length) ? renderListHeader() : null, /* @__PURE__ */ import_react.default.createElement(
@@ -111,7 +121,7 @@ var ClientSearch = (0, import_react.forwardRef)(
             {
               dataSource: searchResults,
               renderItem: (item, index) => {
-                var _a2, _b2, _c2, _d, _e, _f, _g, _h;
+                var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i, _j;
                 const membershipText = (_b2 = (_a2 = item.latest_wallet_detail) == null ? void 0 : _a2.wallet) == null ? void 0 : _b2.name;
                 return /* @__PURE__ */ import_react.default.createElement(
                   import_antd.List.Item,
@@ -155,7 +165,7 @@ var ClientSearch = (0, import_react.forwardRef)(
                       },
                       translationOriginal == null ? void 0 : translationOriginal(membershipText)
                     ) : "-"),
-                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 180 } }, /* @__PURE__ */ import_react.default.createElement(import_clientName.default, { dataSource: (_c2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c2.value }), ((_f = (_e = (_d = item == null ? void 0 : item.contacts_info) == null ? void 0 : _d.value) == null ? void 0 : _e.phone) == null ? void 0 : _f.phone) || "-", /* @__PURE__ */ import_react.default.createElement(
+                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 180 } }, /* @__PURE__ */ import_react.default.createElement(import_clientName.default, { dataSource: (_c2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c2.value }), ((_f2 = (_e2 = (_d2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _d2.value) == null ? void 0 : _e2.phone) == null ? void 0 : _f2.phone) || "-", /* @__PURE__ */ import_react.default.createElement(
                       "div",
                       {
                         style: {
@@ -164,8 +174,22 @@ var ClientSearch = (0, import_react.forwardRef)(
                           whiteSpace: "nowrap"
                         }
                       },
-                      ((_h = (_g = item == null ? void 0 : item.contacts_info) == null ? void 0 : _g.value) == null ? void 0 : _h.email) || "-"
-                    ))
+                      ((_h2 = (_g2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _g2.value) == null ? void 0 : _h2.email) || "-"
+                    )),
+                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 200 } }, ((_i = item == null ? void 0 : item.form_record) == null ? void 0 : _i.length) > 0 ? (_j = item == null ? void 0 : item.form_record) == null ? void 0 : _j.map((itemForm) => {
+                      return /* @__PURE__ */ import_react.default.createElement(
+                        "div",
+                        {
+                          key: itemForm == null ? void 0 : itemForm.id,
+                          style: {
+                            overflow: "hidden",
+                            textOverflow: "ellipsis",
+                            whiteSpace: "nowrap"
+                          }
+                        },
+                        (itemForm == null ? void 0 : itemForm.main_field) || "-"
+                      );
+                    }) : "-")
                   )
                 );
               }

package/lib/plus/clinetSearch/locales.d.ts

@@ -32,6 +32,7 @@ declare const _default: {
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
         'pisell2.text.client-search.contact-info': string;
+        'pisell2.text.client-search.holder': string;
     };
     'zh-CN': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -66,6 +67,7 @@ declare const _default: {
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
         'pisell2.text.client-search.contact-info': string;
+        'pisell2.text.client-search.holder': string;
     };
     'zh-HK': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -100,6 +102,7 @@ declare const _default: {
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
         'pisell2.text.client-search.contact-info': string;
+        'pisell2.text.client-search.holder': string;
     };
 };
 export default _default;

package/lib/plus/clinetSearch/locales.js

@@ -55,7 +55,8 @@ var locales_default = {
     "pisell2.text.client-search.phone": "Phone Number",
     "pisell2.text.client-search.email": "Email Address",
     "pisell2.text.client-search.membership": "Membership",
-    "pisell2.text.client-search.contact-info": "Contact info"
+    "pisell2.text.client-search.contact-info": "Contact info",
+    "pisell2.text.client-search.holder": "Holder"
   },
   "zh-CN": {
     "pisell2.text.leave-empty-for-walk-in": "如未注册游客则留空",
@@ -89,7 +90,8 @@ var locales_default = {
     "pisell2.text.client-search.phone": "电话号码",
     "pisell2.text.client-search.email": "邮箱",
     "pisell2.text.client-search.membership": "会员",
-    "pisell2.text.client-search.contact-info": "联系信息"
+    "pisell2.text.client-search.contact-info": "联系信息",
+    "pisell2.text.client-search.holder": "持有人"
   },
   "zh-HK": {
     "pisell2.text.leave-empty-for-walk-in": "如未註冊遊客則留空",
@@ -123,6 +125,7 @@ var locales_default = {
     "pisell2.text.client-search.phone": "電話號碼",
     "pisell2.text.client-search.email": "電郵地址",
     "pisell2.text.client-search.membership": "會員",
-    "pisell2.text.client-search.contact-info": "聯繫信息"
+    "pisell2.text.client-search.contact-info": "聯繫信息",
+    "pisell2.text.client-search.holder": "持有人"
   }
 };

package/lib/plus/clinetSearch/types.d.ts

@@ -1,4 +1,12 @@
 /// <reference types="react" />
+export interface FormRecord {
+    form_id: number;
+    id: number;
+    main_field: string;
+    data?: {
+        [key: string]: any;
+    };
+}
 export interface ClientData {
     id: number;
     display_name: string;
@@ -22,6 +30,7 @@ export interface ClientData {
             email?: string;
         };
     };
+    form_record: FormRecord[];
 }
 export interface ClientSearchProps {
     dataSource?: any;

package/lib/plus/orderList/components/BatchActionBar.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export interface OrderBatchActionBarProps {
+    locales: any;
+    selectedKeys: React.Key[];
+    selectedRows: any[];
+    onClearSelection: () => void;
+}
+declare const OrderBatchActionBar: React.FC<OrderBatchActionBarProps>;
+export default OrderBatchActionBar;