@pisell/pisellos 0.10.40 → 0.10.42

package/lib/solution/UnifiedBookingSales/index.js

@@ -142,7 +142,7 @@ function buildPlannerDiscountResult(params) {
     const productDiscounts = [...(Array.isArray(product.discount_list) ? product.discount_list : []), ...(Array.isArray(product.product_bundle) ? product.product_bundle.flatMap(bundle => bundle?.discount_list || []) : [])];
     productDiscounts.forEach(discount => {
       const type = discount.tag || discount.type;
-      if (!['good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
+      if (!['entitlement_pass', 'good_pass', 'discount_card', 'product_discount_card'].includes(type)) return;
       const discountId = resolvePlannerDiscountId(discount);
       applications.push({
         discountId,
@@ -184,7 +184,7 @@ function isLocalOrderId(orderId) {
 }
 function isCustomerBoundDiscount(discount) {
   const type = discount?.type ?? discount?.tag;
-  return type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
+  return type === 'entitlement_pass' || type === 'good_pass' || type === 'discount_card' || type === 'product_discount_card';
 }
 function filterCustomerBoundDiscounts(discountList) {
   if (!Array.isArray(discountList)) return [];
@@ -639,6 +639,22 @@ function normalizeResource(raw, fixedOffsetMinutes = (0, _localClock.captureRunt
   const id = raw.resourceId ?? raw.resource_id ?? raw.id;
   if (id === undefined || id === null || id === '') return null;
   const rawWindows = raw.windows || raw.times || [];
+  const rawExcludedWindows = raw.excludedWindows || raw.excluded_windows || [];
+  const normalizeWindows = windows => (Array.isArray(windows) ? windows : []).flatMap(window => {
+    const range = normalizeAvailabilityLocalDateTimeRange({
+      startAt: window.startAt || window.start_at || window.start,
+      endAt: window.endAt || window.end_at || window.end,
+      fixedOffsetMinutes,
+      rollOverEnd: true
+    });
+    if (!range) return [];
+    return [{
+      startAt: range.startAt,
+      endAt: range.endAt,
+      source: window.source,
+      raw: window
+    }];
+  });
   return {
     id,
     formId: raw.formId ?? raw.form_id ?? raw.resource_form_id,
@@ -646,21 +662,8 @@ function normalizeResource(raw, fixedOffsetMinutes = (0, _localClock.captureRunt
     code: raw.code,
     resourceType: normalizeResourceType(raw.type || raw.resourceType),
     capacity: Math.max(1, Number(raw.capacity || raw.max_capacity || 1) || 1),
-    windows: (Array.isArray(rawWindows) ? rawWindows : []).flatMap(window => {
-      const range = normalizeAvailabilityLocalDateTimeRange({
-        startAt: window.startAt || window.start_at || window.start,
-        endAt: window.endAt || window.end_at || window.end,
-        fixedOffsetMinutes,
-        rollOverEnd: true
-      });
-      if (!range) return [];
-      return [{
-        startAt: range.startAt,
-        endAt: range.endAt,
-        source: window.source,
-        raw: window
-      }];
-    }),
+    windows: normalizeWindows(rawWindows),
+    excludedWindows: normalizeWindows(rawExcludedWindows),
     raw
   };
 }
@@ -679,6 +682,17 @@ function dateRangeDays(dateRange) {
   }
   return dates;
 }
+function getExcludedScheduleDateOverrideTimePoints(date, schedule) {
+  if (!schedule.repeat_rule?.excluded_date?.length) return [];
+  if ((0, _getDateIsInSchedule.getScheduleStartEndTimePoints)(date, [schedule]).length > 0) return [];
+  return (0, _getDateIsInSchedule.getScheduleStartEndTimePoints)(date, [{
+    ...schedule,
+    repeat_rule: {
+      ...schedule.repeat_rule,
+      excluded_date: []
+    }
+  }]);
+}
 function normalizeResourceOccupancy(rawEvent, resourceId, source = 'remote', fixedOffsetMinutes = (0, _localClock.captureRuntimeOffsetMinutes)()) {
   const range = normalizeAvailabilityLocalDateTimeRange({
     startAt: rawEvent.start_at ?? rawEvent.startAt ?? rawEvent.start_time ?? rawEvent.startTime,
@@ -771,7 +785,26 @@ function buildAvailabilityResourcesFromV2(params) {
         }
       }];
     })));
+    const excludedWindows = dates.flatMap(date => schedules.flatMap(schedule => getExcludedScheduleDateOverrideTimePoints(date, schedule).flatMap(slot => {
+      const range = normalizeAvailabilityLocalDateTimeRange({
+        startAt: slot.start_at,
+        endAt: slot.end_at,
+        fixedOffsetMinutes,
+        rollOverEnd: true
+      });
+      if (!range) return [];
+      return [{
+        startAt: range.startAt,
+        endAt: range.endAt,
+        source: `resource_schedule_excluded:${schedule.id}`,
+        raw: {
+          scheduleId: schedule.id,
+          excludedDate: date
+        }
+      }];
+    })));
     resource.windows = materializedWindows.length > 0 ? materializedWindows : explicitWindows;
+    resource.excludedWindows = [...(resource.excludedWindows || []), ...excludedWindows];
     if (resource.windows.length === 0 && missingScheduleIds.length > 0) {
       resource.windows = buildResourceWindowFallbackTimes({
         raw,
@@ -1012,7 +1045,7 @@ function buildBookingFromAvailabilitySelection(params) {
     }
   };
 }
-const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cutoff', 'resource_full', 'resource_unavailable', 'resource_capacity_exceeded',
+const POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES = new Set(['past', 'booking_cutoff', 'schedule_excluded_date', 'resource_full', 'resource_unavailable', 'resource_capacity_exceeded',
 // A required group whose selected resource is outside its window is surfaced
 // as missing_resource at group level. Structural validation below still
 // rejects a genuinely missing selection.
@@ -2147,11 +2180,31 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         source: `operating_schedule:${descriptor.scheduleIds.map(String).join(',')}`
       }] : [];
     }));
+    const excludedWindows = dateRangeDays(params.dateRange).flatMap(date => schedules.flatMap(schedule => getExcludedScheduleDateOverrideTimePoints(date, schedule).flatMap(slot => {
+      const range = normalizeAvailabilityLocalDateTimeRange({
+        startAt: slot.start_at,
+        endAt: slot.end_at,
+        fixedOffsetMinutes: this.getAvailabilityRuntimeOffsetMinutes(),
+        rollOverEnd: true
+      });
+      return range ? [{
+        startAt: range.startAt,
+        endAt: range.endAt,
+        source: `operating_schedule_excluded:${schedule.id}`,
+        raw: {
+          scheduleId: schedule.id,
+          excludedDate: date
+        }
+      }] : [];
+    })));
     return {
       source: descriptor.source,
       scheduleIds: [...descriptor.scheduleIds],
       missingScheduleIds,
-      windows
+      windows,
+      ...(excludedWindows.length > 0 ? {
+        excludedWindows
+      } : {})
     };
   }
   async loadAvailabilityProducts(params) {
@@ -2849,7 +2902,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       } : {})
     }, {
       evaluatedAt: this.getAvailabilityRuntimeDateTime(),
-      allowSessionCustomRanges: isPosAvailabilityRequest
+      useExactDurationCandidateMinute: isPosAvailabilityRequest,
+      allowSessionCustomRanges: isPosAvailabilityRequest,
+      allowExcludedScheduleDateOverride: isPosAvailabilityRequest
     }).map(group => ({
       ...group,
       ranges: group.ranges.map(candidate => this.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate))
@@ -2864,7 +2919,11 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       refreshed
     } = await this.ensureAvailabilityContextProjection(contextId, 'query_booking_availability');
     this.assertContextualQueryFreshness(context, request);
-    const result = (0, _ResourcePlanner.queryAvailabilityProjection)(projectionEntry.projection, request);
+    const isPosAvailabilityRequest = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
+    const result = (0, _ResourcePlanner.queryAvailabilityProjection)(projectionEntry.projection, request, {
+      useExactDurationCandidateMinute: isPosAvailabilityRequest,
+      allowExcludedScheduleDateOverride: isPosAvailabilityRequest
+    });
     const contextVersion = context.activeVersion;
     const contextualResult = result.target === 'time' ? {
       ...result,
@@ -3121,7 +3180,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
           } : {})
         } : {})
       }, {
-        allowSessionCustomRanges: allowPosAvailabilityOverride
+        useExactDurationCandidateMinute: allowPosAvailabilityOverride,
+        allowSessionCustomRanges: allowPosAvailabilityOverride,
+        allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
       }).flatMap(group => group.ranges);
       const refreshedCandidateBase = refreshedRanges.find(candidate => candidate.startAt === params.candidate.startAt && candidate.endAt === params.candidate.endAt && candidate.bookingStartAt === params.candidate.bookingStartAt && candidate.bookingEndAt === params.candidate.bookingEndAt);
       if (!refreshedCandidateBase) {
@@ -3142,6 +3203,9 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         requirementSelections: params.requirementSelections,
         partySize,
         bookingCount
+      }, {
+        useExactDurationCandidateMinute: allowPosAvailabilityOverride,
+        allowExcludedScheduleDateOverride: allowPosAvailabilityOverride
       });
       if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(conflict => POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES.has(conflict.code))) {
         const forced = buildPosForcedAvailabilityAssignments({

package/package.json

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