@pisell/private-materials 6.5.12 → 6.5.14

package/es/components/checkout/hooks/useWalletPass.js

@@ -27,6 +27,8 @@ import { usePisellOS } from "../../../hooks/useEngineContext";
 import { formatDiscountWalletData, formatMachineCodeServer2CardList, isSameContent } from "../components/WalletPassModule/utils";
 import usePaymentLogger from "./usePaymentLogger";
 import { isWalkIn } from "../../booking/utils";
+import { useActiveExecute } from "../../ticketBooking/hooks/pisellos";
+import { useShopDiscountModule } from "../../ticketBooking/hooks/pisellos/useShopDiscountModule";
 
 /**
  * 自定义Hook：使用WalletPass功能
@@ -36,6 +38,8 @@ export var useWalletPass = function useWalletPass(props) {
     customAmount = props.customAmount,
     clientId = props.clientId;
   var logger = usePaymentLogger();
+  var _useActiveExecute = useActiveExecute(),
+    executeIfActive = _useActiveExecute.executeIfActive;
 
   // 钱包推荐列表
   var _useState = useState([]),
@@ -114,7 +118,7 @@ export var useWalletPass = function useWalletPass(props) {
 
   // 获取checkout模块
   var checkoutModule = pisellos.getModule('checkout');
-  var shopDiscount = pisellos.getModule('shopDiscount');
+  var shopDiscount = useShopDiscountModule();
   var paymentModule = checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.payment;
   var setWalletSelect = useMemoizedFn(function (data) {
     setSelectedWallet(data);
@@ -393,7 +397,10 @@ export var useWalletPass = function useWalletPass(props) {
 
     // 更新不可用钱包数据
     setDisabledWalletData(isDisabledData);
-    var newValues = [].concat(_toConsumableArray(selectedWalletRef.current), isAvailableData);
+    var newValues = _toConsumableArray(selectedWalletRef.current);
+    if (isAvailableData.length === 1) {
+      newValues = [].concat(_toConsumableArray(selectedWalletRef.current), isAvailableData);
+    }
     setSearchIdentificationCodeList(cachedSearchResults);
     setWalletSelect(newValues);
     handleFetchUserIdentificationCodes(newValues.map(function (item) {
@@ -512,30 +519,41 @@ export var useWalletPass = function useWalletPass(props) {
     if (!paymentModule) return;
     var core = pisellos; // 获取core实例
 
+    // checkout 单实例，执行时判断是否active
+    var wrappedHandlePaymentStarted = executeIfActive(handlePaymentStarted);
+    var wrappedOnOrderCreated = executeIfActive(onOrderCreated);
+    var wrappedHandleWalletRecommendListUpdated = executeIfActive(handleWalletRecommendListUpdated);
+    var wrappedHandleUserIdentificationCodesUpdated = executeIfActive(handleUserIdentificationCodesUpdated);
+    var wrappedHandleWalletCacheCleared = executeIfActive(handleWalletCacheCleared);
+    var wrappedHandleSearchIdentificationCodeCompleted = executeIfActive(handleSearchIdentificationCodeCompleted);
+    var wrappedHandleWalletInitializationStarted = executeIfActive(handleWalletInitializationStarted);
+    var wrappedHandleWalletInitializationCompleted = executeIfActive(handleWalletInitializationCompleted);
+    var wrappedHandleWalletInitializationFailed = executeIfActive(handleWalletInitializationFailed);
     // 注册事件监听器
-    core.effects.on('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
-    core.effects.on('checkout:onPaymentStarted', handlePaymentStarted);
-    core.effects.on('checkout:onPaymentItemAdded', handlePaymentStarted);
-    core.effects.on('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
-    core.effects.on('wallet:onWalletCacheCleared', handleWalletCacheCleared);
-    core.effects.on('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
-    core.effects.on('checkout:onWalletDataInitialized', onOrderCreated);
-    core.effects.on('wallet:onWalletInitializationStarted', handleWalletInitializationStarted);
-    core.effects.on('wallet:onWalletInitializationCompleted', handleWalletInitializationCompleted);
-    core.effects.on('wallet:onWalletInitializationFailed', handleWalletInitializationFailed);
+    paymentModule.effectsOn('onWalletRecommendListUpdated', wrappedHandleWalletRecommendListUpdated);
+    // checkout 单实例，执行时判断是否active
+    checkoutModule.effectsOn('onPaymentStarted', wrappedHandlePaymentStarted);
+    checkoutModule.effectsOn('onPaymentItemAdded', wrappedHandlePaymentStarted);
+    paymentModule.effectsOn('onUserIdentificationCodesUpdated', wrappedHandleUserIdentificationCodesUpdated);
+    paymentModule.effectsOn('onWalletCacheCleared', wrappedHandleWalletCacheCleared);
+    paymentModule.effectsOn('onSearchIdentificationCodeCompleted', wrappedHandleSearchIdentificationCodeCompleted);
+    checkoutModule.effectsOn('onWalletDataInitialized', wrappedOnOrderCreated);
+    paymentModule.effectsOn('onWalletInitializationStarted', wrappedHandleWalletInitializationStarted);
+    paymentModule.effectsOn('onWalletInitializationCompleted', wrappedHandleWalletInitializationCompleted);
+    paymentModule.effectsOn('onWalletInitializationFailed', wrappedHandleWalletInitializationFailed);
 
     // 清理事件监听器
     return function () {
-      core.effects.off('wallet:onWalletRecommendListUpdated', handleWalletRecommendListUpdated);
-      core.effects.off('checkout:onPaymentStarted', handlePaymentStarted);
-      core.effects.off('checkout:onPaymentItemAdded', handlePaymentStarted);
-      core.effects.off('wallet:onUserIdentificationCodesUpdated', handleUserIdentificationCodesUpdated);
-      core.effects.off('wallet:onWalletCacheCleared', handleWalletCacheCleared);
-      core.effects.off('wallet:onSearchIdentificationCodeCompleted', handleSearchIdentificationCodeCompleted);
-      core.effects.off('checkout:onWalletDataInitialized', onOrderCreated);
-      core.effects.off('wallet:onWalletInitializationStarted', handleWalletInitializationStarted);
-      core.effects.off('wallet:onWalletInitializationCompleted', handleWalletInitializationCompleted);
-      core.effects.off('wallet:onWalletInitializationFailed', handleWalletInitializationFailed);
+      paymentModule.effectsOff('onWalletRecommendListUpdated', wrappedHandleWalletRecommendListUpdated);
+      checkoutModule.effectsOff('onPaymentStarted', wrappedHandlePaymentStarted);
+      checkoutModule.effectsOff('onPaymentItemAdded', wrappedHandlePaymentStarted);
+      paymentModule.effectsOff('onUserIdentificationCodesUpdated', wrappedHandleUserIdentificationCodesUpdated);
+      paymentModule.effectsOff('onWalletCacheCleared', wrappedHandleWalletCacheCleared);
+      paymentModule.effectsOff('onSearchIdentificationCodeCompleted', wrappedHandleSearchIdentificationCodeCompleted);
+      checkoutModule.effectsOff('onWalletDataInitialized', wrappedOnOrderCreated);
+      paymentModule.effectsOff('onWalletInitializationStarted', wrappedHandleWalletInitializationStarted);
+      paymentModule.effectsOff('onWalletInitializationCompleted', wrappedHandleWalletInitializationCompleted);
+      paymentModule.effectsOff('onWalletInitializationFailed', wrappedHandleWalletInitializationFailed);
     };
   }, [paymentModule]);
 

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "warn" | "success" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,9 +295,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "tyro" | "windcave" | "stripe" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

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

@@ -0,0 +1,5 @@
+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;