@pisell/private-materials 3.0.166 → 3.0.168

package/lib/components/booking/info2/utilsByBooking.js

@@ -70,6 +70,7 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
   const currentCount = getSumCapacity({ cacheItem });
   const eventList = time.event_list || [];
   let endDate = null;
+  let isCalcCount = true;
   if (isFlexible) {
     if (eventList.length) {
       timeStartDate = eventList.reduce((max, event) => {
@@ -78,6 +79,11 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
       }, (0, import_dayjs.default)(eventList[0].end_at));
     }
     isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
+    if (!isDateRange && eventList.length) {
+      isCalcCount = false;
+      isDateRange = true;
+      isCountRange = false;
+    }
   } else {
     endDate = startDate.add(import_utils2.flexibleObj.getValue(cacheItem._extend.duration), "minute");
     const isTimeRange = startDate.isAfter(timeStartDate) && endDate.isBefore(timeEndDate);
@@ -85,21 +91,23 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
       isDateRange = true;
     }
   }
-  let conflict = (time.event_list || []).filter((d) => {
-    return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
-  });
-  if (resourceItem.resourceType === "single") {
-    if (conflict.length === 0) {
-      isCountRange = true;
-    } else {
-      isCountRange = false;
-    }
-  } else {
-    let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
-    if (currentCount <= conflictCount) {
-      isCountRange = true;
+  if (isCalcCount) {
+    let conflict = (time.event_list || []).filter((d) => {
+      return isConflict({ start_at: d.start_at, end_at: d.end_at }, { start_at: startDate, end_at: endDate });
+    });
+    if (resourceItem.resourceType === "single") {
+      if (conflict.length === 0) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     } else {
-      isCountRange = false;
+      let conflictCount = getUseableEventCount(conflict, resourceItem.capacity);
+      if (currentCount <= conflictCount) {
+        isCountRange = true;
+      } else {
+        isCountRange = false;
+      }
     }
   }
   const isUsable = isDateRange && isCountRange;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,5 +1,5 @@
-import { SelectProps } from "antd";
-import React from "react";
+import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.166",
+  "version": "3.0.168",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "1.0.100",
+    "@pisell/icon": "0.0.11",
     "@pisell/materials": "3.0.50"
   },
   "peerDependencies": {