@pisell/private-materials 6.9.2 → 6.9.3

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

@@ -18,6 +18,7 @@ import { useBookingTicket } from "./bookingTicket";
 import { useState, useEffect, useRef } from 'react';
 import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
 import dayjs from 'dayjs';
+import useLogger from "../../../../hooks/useLogger";
 // 等待函数
 var sleep = function sleep(ms) {
   return new Promise(function (resolve) {
@@ -41,6 +42,7 @@ export var useProducts = function useProducts(notAvailableRef) {
   var isFirstLoadDataRef = useRef(true);
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
     getApp = _ref.getApp;
+  var logger = useLogger();
   var app = getApp();
 
   // 日程时间段列表 HH:mm格式
@@ -59,29 +61,47 @@ export var useProducts = function useProducts(notAvailableRef) {
             setLoading(true);
             _context.prev = 1;
             paramsRef.current = params;
-            _context.next = 5;
+            logger.addLog({
+              title: 'useProducts: getProducts 调用',
+              metadata: {
+                params: params
+              }
+            });
+            _context.next = 6;
             return bookingTicket.loadProducts(params);
-          case 5:
+          case 6:
             _products = _context.sent;
+            logger.addLog({
+              title: 'useProducts: getProducts 返回',
+              metadata: {
+                products: (_products === null || _products === void 0 ? void 0 : _products.length) || 0
+              }
+            });
             setProducts(_products);
             setLoading(false);
             isFirstLoadRef.current = false;
-            _context.next = 16;
+            _context.next = 19;
             break;
-          case 11:
-            _context.prev = 11;
+          case 13:
+            _context.prev = 13;
             _context.t0 = _context["catch"](1);
+            logger.addLog({
+              title: 'useProducts: getProducts 错误',
+              metadata: {
+                error: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message
+              }
+            });
             // 只有在第一次加载或之前有数据时才显示 notAvailable
             if ((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) === 607100 && (isFirstLoadRef.current || products.length > 0)) {
               (_notAvailableRef$curr = notAvailableRef.current) === null || _notAvailableRef$curr === void 0 || _notAvailableRef$curr.open();
             }
             setLoading(false);
             isFirstLoadRef.current = false;
-          case 16:
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 11]]);
+      }, _callee, null, [[1, 13]]);
     }));
     return function (_x) {
       return _ref2.apply(this, arguments);
@@ -110,13 +130,27 @@ export var useProducts = function useProducts(notAvailableRef) {
               case 0:
                 task = _ref3.task;
                 console.log('定时执行 getProducts，参数：', task.payload);
-                _context2.next = 4;
+                logger.addLog({
+                  title: 'useProducts: 定时执行 getProducts',
+                  metadata: {
+                    payload: task.payload,
+                    task: task
+                  }
+                });
+                _context2.next = 5;
                 return getProducts(task.payload);
-              case 4:
+              case 5:
+                logger.addLog({
+                  title: 'useProducts: 定时执行 getProducts 完成',
+                  metadata: {
+                    payload: task.payload,
+                    task: task
+                  }
+                });
                 return _context2.abrupt("return", {
                   status: 'success'
                 });
-              case 5:
+              case 7:
               case "end":
                 return _context2.stop();
             }
@@ -169,10 +203,23 @@ export var useProducts = function useProducts(notAvailableRef) {
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current
         });
+        logger.addLog({
+          title: 'useProducts: 创建定时任务',
+          metadata: {
+            tasks: tasks.length,
+            log: "\u5DF2\u4E3A ".concat(tasks.length, " \u4E2A\u65F6\u95F4\u70B9\u521B\u5EFA\u5B9A\u65F6\u4EFB\u52A1")
+          }
+        });
         console.log("\u5DF2\u4E3A ".concat(tasks.length, " \u4E2A\u65F6\u95F4\u70B9\u521B\u5EFA\u5B9A\u65F6\u4EFB\u52A1"));
       }
     } catch (error) {
       console.error('创建定时任务失败：', error);
+      logger.addLog({
+        title: 'useProducts: 创建定时任务失败',
+        metadata: {
+          error: error === null || error === void 0 ? void 0 : error.message
+        }
+      });
     }
 
     // 清理函数：组件卸载时清除定时任务
@@ -181,12 +228,24 @@ export var useProducts = function useProducts(notAvailableRef) {
         var _context$appHelper3, _context$appHelper3$g;
         var _app2 = context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.utils) === null || _context$appHelper3 === void 0 || (_context$appHelper3$g = _context$appHelper3.getApp) === null || _context$appHelper3$g === void 0 ? void 0 : _context$appHelper3$g.call(_context$appHelper3);
         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 || error === void 0 ? void 0 : error.message
+          }
+        });
         console.error('清理定时任务失败：', error);
       }
     };

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductDisplayConfig, ProductDisplayPresetKey } from './components/ProductDisplayAdapter/types';
 import './index.less';
 interface TicketBookingProps {
@@ -10,6 +11,7 @@ interface TicketBookingProps {
     productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
     isActive?: boolean;
     rulesHooks?: any;
+    businessCode?: string;
 }
 declare const _default: (props: TicketBookingProps) => JSX.Element;
 export default _default;

package/es/components/ticketBooking/index.js

@@ -241,7 +241,8 @@ export default (function (props) {
   }), /*#__PURE__*/React.createElement(IsActiveProvider, {
     isActive: isActive
   }, /*#__PURE__*/React.createElement(OsKeyProvider, {
-    osKey: osKey
+    osKey: osKey,
+    businessCode: props === null || props === void 0 ? void 0 : props.businessCode
   }, /*#__PURE__*/React.createElement(Provider, {
     store: storeRef.current,
     key: activeNavKey

package/es/components/walletList/index.js

@@ -172,7 +172,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 = Provider(function (props) {
   var _utils$getStore, _context$engine, _store$getState;
@@ -776,7 +777,7 @@ var WalletList = Provider(function (props) {
       return bi.wallet_id == item.wallet_id;
     }) || DEFAULT_BALANCE;
 
-    // 字段映射关系
+    // 字段映射关系 voucher 需要额外处理 good_pass_count(@date: 251229)
     var _balanceKeyMap = {
       rechargeable: 'gift_card_balance',
       point: 'point_card_balance',
@@ -786,6 +787,10 @@ var WalletList = Provider(function (props) {
     var cardItems = showcaseWalletPassNew.map(function (showCaseItem) {
       var balanceKey = _balanceKeyMap[showCaseItem.type];
       var value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      // voucher 类型需要额外处理 good_pass_count
+      if (showCaseItem.type === 'voucher') {
+        value += balanceItem.good_pass_count || 0;
+      }
       return _objectSpread(_objectSpread({}, showCaseItem), {}, {
         value: value
       });

package/es/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/es/index.js

@@ -72,13 +72,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/es/plus/clinetSearch/Add/PhoneField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/es/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/es/plus/clinetSearch/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["onRowClick", "resultProps", "onAddClient", "hasMore", "onLoadMore"];
+var _excluded = ["onRowClick", "resultProps", "onAddClient", "hasMore", "onLoadMore", "state"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -22,12 +22,13 @@ import useEngineContext from "../../hooks/useEngineContext";
 import useTranslationOriginal from "../../hooks/useTranslationOriginal";
 import "./index.less";
 var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
-  var _context$appHelper;
+  var _context$appHelper, _state$bookingConfig, _context$appHelper2;
   var onRowClick = _ref.onRowClick,
     resultProps = _ref.resultProps,
     onAddClient = _ref.onAddClient,
     hasMore = _ref.hasMore,
     onLoadMore = _ref.onLoadMore,
+    state = _ref.state,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -39,6 +40,8 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var translationOriginal = useTranslationOriginal();
   var context = useEngineContext();
   locales.init(localeTexts, ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.storage) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.get('umi_locale')) || 'en');
+  var appointmentSubject = (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_subject) || {};
+  var translation = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.translationShop;
   var handleAdd = function handleAdd() {
     setModalVisible(true);
   };
@@ -72,7 +75,12 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
       style: {
         width: 180
       }
-    }, locales.getText('pisell2.text.client-search.contact-info')));
+    }, locales.getText('pisell2.text.client-search.contact-info')), /*#__PURE__*/React.createElement("div", {
+      className: "header-item",
+      style: {
+        width: 200
+      }
+    }, translation(appointmentSubject === null || appointmentSubject === void 0 ? void 0 : appointmentSubject.form_name) || locales.getText('pisell2.text.client-search.holder')));
   };
 
   // 自定义结果展示组件
@@ -114,7 +122,7 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, /*#__PURE__*/React.createElement(List, {
       dataSource: searchResults,
       renderItem: function renderItem(item, index) {
-        var _latest_wallet_detail, _item$contacts_info, _item$contacts_info2, _item$contacts_info3;
+        var _latest_wallet_detail, _item$contacts_info, _item$contacts_info2, _item$contacts_info3, _item$form_record, _item$form_record2;
         var membershipText = (_latest_wallet_detail = item.latest_wallet_detail) === null || _latest_wallet_detail === void 0 || (_latest_wallet_detail = _latest_wallet_detail.wallet) === null || _latest_wallet_detail === void 0 ? void 0 : _latest_wallet_detail.name;
         return /*#__PURE__*/React.createElement(List.Item, {
           key: item.id,
@@ -175,7 +183,21 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
             textOverflow: 'ellipsis',
             whiteSpace: 'nowrap'
           }
-        }, (item === null || item === void 0 || (_item$contacts_info3 = item.contacts_info) === null || _item$contacts_info3 === void 0 || (_item$contacts_info3 = _item$contacts_info3.value) === null || _item$contacts_info3 === void 0 ? void 0 : _item$contacts_info3.email) || '-'))));
+        }, (item === null || item === void 0 || (_item$contacts_info3 = item.contacts_info) === null || _item$contacts_info3 === void 0 || (_item$contacts_info3 = _item$contacts_info3.value) === null || _item$contacts_info3 === void 0 ? void 0 : _item$contacts_info3.email) || '-')), /*#__PURE__*/React.createElement("div", {
+          className: "item-cell",
+          style: {
+            width: 200
+          }
+        }, (item === null || item === void 0 || (_item$form_record = item.form_record) === null || _item$form_record === void 0 ? void 0 : _item$form_record.length) > 0 ? item === null || item === void 0 || (_item$form_record2 = item.form_record) === null || _item$form_record2 === void 0 ? void 0 : _item$form_record2.map(function (itemForm) {
+          return /*#__PURE__*/React.createElement("div", {
+            key: itemForm === null || itemForm === void 0 ? void 0 : itemForm.id,
+            style: {
+              overflow: 'hidden',
+              textOverflow: 'ellipsis',
+              whiteSpace: 'nowrap'
+            }
+          }, (itemForm === null || itemForm === void 0 ? void 0 : itemForm.main_field) || '-');
+        }) : '-')));
       }
     }))));
   };

package/es/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/es/plus/clinetSearch/locales.js

@@ -31,7 +31,8 @@ export 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': '如未注册游客则留空',
@@ -65,7 +66,8 @@ export 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': '如未註冊遊客則留空',
@@ -99,6 +101,7 @@ export 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/es/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/es/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;