@pisell/pisellos 3.0.67 → 3.0.68

package/dist/solution/BookingByStep/utils/capacity.js

@@ -24,8 +24,9 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
       var id = d.bundle_product_id;
+      var variantId = d.bundle_variant_id;
       var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id;
+        return item.product_id === id || item.product_id === variantId;
       });
       return {
         id: id,
@@ -343,8 +344,7 @@ export function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, all
         resourcesInType.forEach(function (resource) {
           // 过滤出在时间段内的资源时间片
           var availableTimes = resource.times.filter(function (time) {
-            var _time$event_list;
-            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute') && ((_time$event_list = time.event_list) === null || _time$event_list === void 0 ? void 0 : _time$event_list.length) === 0;
+            return !dayjs(time.start_at).isAfter(dayjs(timeSlotStart), 'minute') && !dayjs(time.end_at).isBefore(dayjs(timeSlotEnd), 'minute') || dayjs(time.start_at).isBefore(dayjs(timeSlotEnd), 'minute') && dayjs(time.end_at).isAfter(dayjs(timeSlotStart), 'minute');
           });
           if (availableTimes.length > 0) {
             availableResourceCount++;

package/lib/solution/BookingByStep/utils/capacity.js

@@ -47,8 +47,9 @@ var formatDefaultCapacitys = ({
   if ((capacity == null ? void 0 : capacity.type) === "package") {
     return (product_bundle || []).map((d) => {
       const id = d.bundle_product_id;
+      const variantId = d.bundle_variant_id;
       const item = ((capacity == null ? void 0 : capacity.package) || []).find(
-        (item2) => item2.product_id === id
+        (item2) => item2.product_id === id || item2.product_id === variantId
       );
       return {
         id,
@@ -248,8 +249,7 @@ function checkTimeSlotCapacity(timeSlotStart, timeSlotEnd, cartItems, allResourc
       let availableResourceCount = 0;
       resourcesInType.forEach((resource) => {
         const availableTimes = resource.times.filter((time) => {
-          var _a2;
-          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && ((_a2 = time.event_list) == null ? void 0 : _a2.length) === 0;
+          return !(0, import_dayjs.default)(time.start_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute") && !(0, import_dayjs.default)(time.end_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") || (0, import_dayjs.default)(time.start_at).isBefore((0, import_dayjs.default)(timeSlotEnd), "minute") && (0, import_dayjs.default)(time.end_at).isAfter((0, import_dayjs.default)(timeSlotStart), "minute");
         });
         if (availableTimes.length > 0) {
           availableResourceCount++;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "3.0.67",
+  "version": "3.0.68",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",