@pisell/private-materials 6.6.75 → 6.6.77

package/es/components/booking/components/footer/utils.js

@@ -653,7 +653,7 @@ var formatBookings = function formatBookings(data, values) {
   }
   if (!isDay && !isEvent) {
     list = list.filter(function (item) {
-      return !isNormalProductByDurationSchedule(item);
+      return !isNormalProductByDurationSchedule(item) || !!item.schedule_event_id;
     });
   }
   var dayParams = {};

package/es/components/booking/components/voucher/index.js

@@ -43,7 +43,7 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = function VoucherCard(props) {
-  var _context$appHelper, _state$client$value, _state$pet2, _state$service3;
+  var _context$appHelper, _state$client$value, _state$bookingDetail2, _state$pet2, _state$service3;
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch,
@@ -116,6 +116,12 @@ var VoucherCard = function VoucherCard(props) {
   }, [(_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id, isBooking4Shop], {
     wait: 200
   });
+  useEffect(function () {
+    if (shopDiscount !== null && shopDiscount !== void 0 && shopDiscount.setOrderId) {
+      var _shopDiscount$setOrde, _state$bookingDetail;
+      (_shopDiscount$setOrde = shopDiscount.setOrderId) === null || _shopDiscount$setOrde === void 0 || _shopDiscount$setOrde.call(shopDiscount, ((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.id) || (state === null || state === void 0 ? void 0 : state.bookingId));
+    }
+  }, [(_state$bookingDetail2 = state.bookingDetail) === null || _state$bookingDetail2 === void 0 ? void 0 : _state$bookingDetail2.id, state === null || state === void 0 ? void 0 : state.bookingId]);
 
   // 设置productList
   useEffect(function () {
@@ -199,8 +205,8 @@ var VoucherCard = function VoucherCard(props) {
     shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$setBook = shopDiscount.setBookingSubject) === null || _shopDiscount$setBook === void 0 || _shopDiscount$setBook.call(shopDiscount, (_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);
   }, [state.bookingConfig]);
   var disabled = useMemo(function () {
-    var _state$bookingDetail;
-    if (['paid', 'partially_paid'].includes((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status) && hasEveryBookingId([].concat(_toConsumableArray(state.addons.value || []), _toConsumableArray(state.service.value || [])))) {
+    var _state$bookingDetail3;
+    if (['paid', 'partially_paid'].includes((_state$bookingDetail3 = state.bookingDetail) === null || _state$bookingDetail3 === void 0 ? void 0 : _state$bookingDetail3.payment_status) && hasEveryBookingId([].concat(_toConsumableArray(state.addons.value || []), _toConsumableArray(state.service.value || [])))) {
       return true;
     }
     return false;

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/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" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -301,8 +301,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" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/booking/components/footer/utils.js

@@ -478,7 +478,7 @@ var formatBookings = (data, values) => {
     });
   }
   if (!isDay && !isEvent) {
-    list = list.filter((item) => !(0, import_utils4.isNormalProductByDurationSchedule)(item));
+    list = list.filter((item) => !(0, import_utils4.isNormalProductByDurationSchedule)(item) || !!item.schedule_event_id);
   }
   let dayParams = {};
   const eventOtherParams = data.eventOtherParams;

package/lib/components/booking/components/voucher/index.js

@@ -48,7 +48,7 @@ var import_utils3 = require("../../info/clientVariant/utils");
 var import_useShopDiscountModule = require("../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var services = {};
 var VoucherCard = (props) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const context = (0, import_useEngineContext.default)();
   const { state, dispatch, source, isInModal = false } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(isInModal ? true : false);
@@ -98,6 +98,12 @@ var VoucherCard = (props) => {
       wait: 200
     }
   );
+  (0, import_react.useEffect)(() => {
+    var _a2, _b2;
+    if (shopDiscount == null ? void 0 : shopDiscount.setOrderId) {
+      (_b2 = shopDiscount.setOrderId) == null ? void 0 : _b2.call(shopDiscount, ((_a2 = state.bookingDetail) == null ? void 0 : _a2.id) || (state == null ? void 0 : state.bookingId));
+    }
+  }, [(_c = state.bookingDetail) == null ? void 0 : _c.id, state == null ? void 0 : state.bookingId]);
   (0, import_react.useEffect)(() => {
     if (isBooking4Shop && shopDiscount) {
       shopDiscount.setProductList([
@@ -173,7 +179,7 @@ var VoucherCard = (props) => {
       holderChangedRef.current = true;
       return list || [];
     }
-  }, [(_c = state.pet) == null ? void 0 : _c.value, isBooking4Shop]);
+  }, [(_d = state.pet) == null ? void 0 : _d.value, isBooking4Shop]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2, _c2, _d2;
     console.log("update booking subject", state.bookingConfig);
@@ -370,7 +376,7 @@ var VoucherCard = (props) => {
       {
         style: { width: "100%" },
         isInModal: isInModal || false,
-        dataSource: ((_e = (_d = state.service) == null ? void 0 : _d.value) == null ? void 0 : _e.length) ? availableData : [],
+        dataSource: ((_f = (_e = state.service) == null ? void 0 : _e.value) == null ? void 0 : _f.length) ? availableData : [],
         mixedSort,
         onChange: (val) => {
           const detail = shopDiscount.setDiscountSelected({

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/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" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -301,8 +301,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" | "tyro" | "windcave" | "mx51" | "payo" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.75",
+  "version": "6.6.77",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -64,9 +64,9 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.6.18",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/materials": "6.6.18"
   },
   "peerDependencies": {
     "react": "^18.0.0",