@pisell/private-materials 6.4.67 → 6.4.69

package/es/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

package/es/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/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     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<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/es/components/eftposPay/tyro/index.js

@@ -180,6 +180,12 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;
@@ -254,6 +260,12 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -57,7 +57,6 @@ var AddSerivce = function AddSerivce(props) {
     productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
   var notAvailableRef = useRef(null);
-  var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
   var isActive = useIsActive();
   var Toast = useToast();
@@ -160,90 +159,6 @@ var AddSerivce = function AddSerivce(props) {
       setHandleSetService(scanAddService);
     }
   }, [isActive]);
-
-  /*
-  const removeNotAvailableService = (list: any) => {
-    if (!stateRef.current?.service?.value?.length) return;
-    const listMap = list.reduce((acc: any, cur: any) => {
-      acc[cur.id] = cur;
-      return acc;
-    }, {});
-    const newValue = (stateRef.current?.service?.value || []).filter(
-      (item: any) => listMap[item.product_id]
-    );
-    dispatch({
-      type: 'setService',
-      payload: {
-        value: newValue,
-        edit: true,
-      },
-    });
-  };
-   const getServices = async (params?: any) => {
-    setLoading(true);
-    // 活动预约如果没有绑定商品id不查询
-    if (
-      state.renderType === 'eventBooking' &&
-      !state.eventOtherParams?.productIds?.length
-    ) {
-      dispatch({
-        type: 'setService',
-        payload: {
-          services: [],
-        },
-      });
-      setLoading(false);
-      return;
-    }
-     let data = await getProductList({
-      skip: 1,
-      num: 500,
-      // extension_type: state.productExtensionType,
-      exclude_extension_type: [
-        'product_party',
-        'product_event',
-        'product_series_event',
-        'product_package_ticket',
-        'ticket',
-        'event_item',
-      ],
-      with: ['category'],
-      open_quotation: 1,
-      with_schedule: 1,
-      with_count: ['bundleGroup', 'optionGroup'],
-      order_by_string: 'sort:desc',
-      status: 'published',
-      schedule_date: params?.schedule_date,
-      schedule_datetime: params?.schedule_datetime,
-      customer_id: params?.customer_id,
-      menu_list_ids: params?.menu_list_ids,
-      _config: {
-        fullResult: true,
-        customResponse: true,
-      },
-    });
-     setLoading(false);
-     if (data?.code === 607100) {
-      // 第一次加载时，或者之前有数据
-      if (!isLoadedServiceRef.current || state.service?.services?.length) {
-        notAvailableRef.current?.open();
-      }
-    }
-     // 只有自动获取列表的时候才设置商品, 手动点击添加按钮的时候不设置
-    if (!state.service.addModal) {
-      setDefaultService(data?.data?.list);
-    }
-     removeNotAvailableService(data?.data?.list);
-     isLoadedServiceRef.current = true;
-     dispatch({
-      type: 'setService',
-      payload: {
-        services: data?.data?.list || [],
-      },
-    });
-  };
-  */
-
   var handleAddToast = function handleAddToast(title, quantity) {
     var _Toast$success;
     Toast === null || Toast === void 0 || (_Toast$success = Toast.success) === null || _Toast$success === void 0 || _Toast$success.call(Toast, /*#__PURE__*/React.createElement("div", {

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     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<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/eftposPay/tyro/index.js

@@ -158,6 +158,12 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;
@@ -229,6 +235,12 @@ var tyro_default = ({
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then((res) => {
       requestIdRef.current = res.data.id;

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -73,7 +73,6 @@ var AddSerivce = (props) => {
   } = props;
   const context = (0, import_useEngineContext.default)();
   const notAvailableRef = (0, import_react.useRef)(null);
-  const isLoadedServiceRef = (0, import_react.useRef)(false);
   import_utils2.request.setRequest(context.appHelper.utils.request);
   const isActive = (0, import_IsActiveContext.useIsActive)();
   const Toast = (0, import_materials.useToast)();

package/package.json

@@ -1,12 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.67",
-  "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.69",
   "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",
@@ -70,7 +60,11 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
-    "@use-gesture/react": "^10.3.1"
+    "@use-gesture/react": "^10.3.1",
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/utils": "3.0.2",
+    "@pisell/materials": "6.4.17"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -78,5 +72,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"
   }
-}
+}