@pisell/private-materials 6.4.11 → 6.4.13

package/lib/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/PaymentModal.js

@@ -1188,15 +1188,16 @@ var PaymentModal = ({
       setOrderNote(data.order_info.order_note);
     }
   }, [data]);
-  const [isLocalOrderCreated, setIsLocalOrderCreated] = (0, import_react.useState)(false);
+  const logger = (0, import_usePaymentLogger.default)();
+  const isLocalOrderCreated = (0, import_react.useRef)(void 0);
   const unsubscribeRef = (0, import_react.useRef)(void 0);
   (0, import_react.useEffect)(() => {
     const initCheckoutData = async () => {
       var _a2, _b2;
       try {
         const checkout = pisellos == null ? void 0 : pisellos.getModule("checkout");
-        if (checkout && data && !isLocalOrderCreated) {
-          setIsLocalOrderCreated(true);
+        if (checkout && data && !isLocalOrderCreated.current) {
+          isLocalOrderCreated.current = true;
           const shop_wallet_pass_id = await (0, import_utils2.getShopWalletPassId)(interaction);
           checkout.setOtherParams({
             is_price_include_tax: getData("is_price_include_tax"),
@@ -1224,6 +1225,15 @@ var PaymentModal = ({
             setTotalAmount(orderInfo2.totalAmount);
           }
           setOrderInfo(orderInfo2);
+          if (unsubscribeRef.current) {
+            logger == null ? void 0 : logger.addLog({
+              type: "info",
+              title: "有重复的checkout:onOrderSynced，清空",
+              metadata: {}
+            });
+            unsubscribeRef.current();
+            unsubscribeRef.current = void 0;
+          }
           unsubscribeRef.current = checkout.core.effects.on("checkout:onOrderSynced", (data2) => {
             var _a3, _b3, _c2;
             const responseData = (_a3 = data2.response) == null ? void 0 : _a3.data;
@@ -1241,6 +1251,13 @@ var PaymentModal = ({
             const failureReason = responseData == null ? void 0 : responseData.failure_reason;
             if (paymentStatus) {
               console.log("print_order_onOrderSynced>>>>", responseData);
+              logger == null ? void 0 : logger.addLog({
+                type: "info",
+                title: "print_order_onOrderSynced",
+                metadata: {
+                  responseData
+                }
+              });
               try {
                 const params = {
                   type: "99",
@@ -1252,11 +1269,32 @@ var PaymentModal = ({
                   }
                 };
                 console.log("print_order_onOrderSynced_params>>>>", params);
+                logger == null ? void 0 : logger.addLog({
+                  type: "info",
+                  title: "print_order_onOrderSynced_params",
+                  metadata: {
+                    params
+                  }
+                });
                 (0, import_utils.webPrint)(params, (res) => {
                   console.log("print_order_onOrderSynced_res>>>>", res);
+                  logger == null ? void 0 : logger.addLog({
+                    type: "info",
+                    title: "print_order_onOrderSynced_res",
+                    metadata: {
+                      res
+                    }
+                  });
                 });
               } catch (error) {
                 console.error("print_order_onOrderSynced_error>>>>", error);
+                logger == null ? void 0 : logger.addLog({
+                  type: "info",
+                  title: "print_order_onOrderSynced_error",
+                  metadata: {
+                    error
+                  }
+                });
               }
               const statusClassName = (0, import_PaymentResultToastUtils.calculateStatusClassName)(paymentStatus);
               const autoCloseConfig = (0, import_PaymentResultToastUtils.calculateAutoCloseConfig)(
@@ -1288,11 +1326,11 @@ var PaymentModal = ({
               handlePaymentComplete(data2);
             }
           });
-        } else if (isLocalOrderCreated) {
+        } else if (isLocalOrderCreated.current) {
           console.log(
             "🔄 PaymentModal: data changed, updating checkout data..."
           );
-          setIsLocalOrderCreated(false);
+          isLocalOrderCreated.current = false;
           await checkout.cancelCurrentOrderAsync();
           await checkout.createLocalOrderAsync({
             orderData: data == null ? void 0 : data.order_info,
@@ -1305,7 +1343,7 @@ var PaymentModal = ({
             setTotalAmount(orderInfo2.totalAmount);
           }
           setOrderInfo(orderInfo2);
-          setIsLocalOrderCreated(true);
+          isLocalOrderCreated.current = true;
         }
       } catch (error) {
         console.error("Failed to initialize checkout data:", error);
@@ -1320,6 +1358,7 @@ var PaymentModal = ({
       var _a2;
       if (typeof unsubscribeRef.current === "function") {
         (_a2 = unsubscribeRef.current) == null ? void 0 : _a2.call(unsubscribeRef);
+        unsubscribeRef.current = void 0;
       }
     };
   }, []);

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

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

package/lib/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,10 +295,10 @@ 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;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | 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/lib/components/pay/toC/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -28,4 +29,11 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/schedules/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -68,4 +69,11 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/schedules/utils.d.ts

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

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;

package/lib/components/wallet/Detail/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    addWalletCard: any;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    walletDetailState: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/DiscountCard/model.d.ts

@@ -1 +1,14 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: number;
+    setup?: 'menu' | 'list' | 'detail' | string;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/PointCard/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: number;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/RechargeableCard/model.d.ts

@@ -1 +1,29 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    selectedGiftOptionId: string | null;
+    cardList: Array<{
+        id: string;
+        name: string;
+        price: number;
+    }>;
+    selectedItem: {
+        id?: string;
+        gift_price?: number;
+        price?: number;
+        name?: string;
+        variant_id?: string;
+    };
+    productId?: string;
+    detailId?: string;
+    total: string | number;
+    rechargeModalOpen: boolean;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/Voucher/model.d.ts

@@ -1 +1,13 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+interface RechargeState {
+    total: 0;
+}
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: RechargeState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;
+export {};

package/lib/components/wallet/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -26,4 +27,11 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    global_wallet: WalletListProps;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/package.json

@@ -1,12 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.11",
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
-    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
-  },
+  "version": "6.4.13",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -56,10 +50,6 @@
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
-    "@pisell/date-picker": "workspace:*",
-    "@pisell/icon": "workspace:*",
-    "@pisell/materials": "workspace:*",
-    "@pisell/utils": "workspace:*",
     "ahooks": "^3.7.6",
     "antd": "^5.6.3",
     "classnames": "^2.3.2",
@@ -68,7 +58,11 @@
     "rc-virtual-list": "^3.11.3",
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
-    "styled-components": "^6.0.0-rc.3"
+    "styled-components": "^6.0.0-rc.3",
+    "@pisell/date-picker": "3.0.6",
+    "@pisell/materials": "6.4.1",
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -76,5 +70,11 @@
   },
   "componentConfig": {
     "materialSchema": "https://unpkg.com/@pisell/materials@1.0.1/build/lowcode/assets-prod.json"
+  },
+  "scripts": {
+    "dev": "father dev",
+    "build": "father build",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
   }
 }