@pisell/pisellos 2.3.92 → 2.3.94

package/dist/modules/ProductList/index.js

@@ -218,7 +218,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
                 open_quotation: 1
               }), {}, {
                 open_bundle: 0,
-                exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item', 'appointment_ticket'],
+                exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
                 with: _toConsumableArray(PRODUCT_QUERY_DATA_VARIANT_RELATIONS),
                 status: status,
                 num: 500,

package/dist/modules/ResourcePlanner/planner.js

@@ -14,8 +14,8 @@ import { AvailabilityError } from "./types";
 import { addLocalCalendarDays, addLocalHours, addLocalMinutes, captureRuntimeOffsetMinutes, ceilLocalScalarToTenMinutes, dateOrdinalFromLocalDate, extractFixedOffsetMinutes, formatLocalDate, formatLocalDateTime, formatLocalTime, localDateTimeToScalar, localDateToScalar, localDateToScalarStart, nextDate as getNextLocalDate, parseLocalDate, parseLocalDateTime, weekdayFromLocalDate } from "./localClock";
 var DEFAULT_SLOT_STEP_MINUTES = 30;
 var DEFAULT_BUSINESS_HOURS = {
-  startTime: '09:00',
-  endTime: '18:00'
+  startTime: '00:00',
+  endTime: '00:00'
 };
 function availabilityError(code, message, details) {
   return new AvailabilityError(code, message, details);
@@ -1072,7 +1072,9 @@ export function getProductTimeRanges(projection) {
         var startsInOperatingRange = operatingRanges.some(function (range) {
           return range.start <= start && start < range.end;
         });
-        if (!startsInOperatingRange) return;
+        if (!startsInOperatingRange && !request.allowOutsideOperatingHoursForRequestedStartTimes) {
+          return;
+        }
         ranges.push(createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes));
       });
     }

package/dist/modules/ResourcePlanner/types.d.ts

@@ -234,6 +234,11 @@ export interface GetProductTimeRangesRequest {
     partySize?: number;
     durationMinutesByProductId?: Record<string, number>;
     durationStartTimesByProductId?: Record<string, string[]>;
+    /**
+     * POS 手工输入时间的兼容开关：只为明确请求的 start time 补候选，
+     * 不改变常规候选列表仍按营业时间生成的规则。
+     */
+    allowOutsideOperatingHoursForRequestedStartTimes?: boolean;
 }
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];

package/dist/solution/UnifiedBookingSales/index.js

@@ -202,8 +202,9 @@ function filterCustomerBoundDiscounts(discountList) {
 }
 var DEFAULT_AVAILABILITY_SLOT_STEP_MINUTES = 30;
 var DEFAULT_AVAILABILITY_BUSINESS_HOURS = {
-  startTime: '09:00',
-  endTime: '18:00'
+  // Same start/end is interpreted as an overnight range, i.e. 24 hours.
+  startTime: '00:00',
+  endTime: '00:00'
 };
 var MAX_AVAILABILITY_RANGE_DAYS = 90;
 var MAX_AVAILABILITY_CONTEXT_REGISTRY = 128;
@@ -4195,12 +4196,15 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "getProductTimeRanges",
     value: (function () {
       var _getProductTimeRanges = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee35(contextId) {
-        var _this9 = this;
+        var _this$otherParams$pla,
+          _this$otherParams17,
+          _this9 = this;
         var request,
           _yield$this$ensureAva,
           context,
           projectionEntry,
           contextVersion,
+          allowOutsideOperatingHoursForRequestedStartTimes,
           _args35 = arguments;
         return _regeneratorRuntime().wrap(function _callee35$(_context35) {
           while (1) switch (_context35.prev = _context35.next) {
@@ -4213,14 +4217,19 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               context = _yield$this$ensureAva.context;
               projectionEntry = _yield$this$ensureAva.projectionEntry;
               contextVersion = context.activeVersion;
-              return _context35.abrupt("return", getProjectionProductTimeRanges(projectionEntry.projection, request).map(function (group) {
+              allowOutsideOperatingHoursForRequestedStartTimes = String((_this$otherParams$pla = (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos' && Object.values(request.durationStartTimesByProductId || {}).some(function (startTimes) {
+                return Array.isArray(startTimes) && startTimes.length > 0;
+              });
+              return _context35.abrupt("return", getProjectionProductTimeRanges(projectionEntry.projection, _objectSpread(_objectSpread({}, request), allowOutsideOperatingHoursForRequestedStartTimes ? {
+                allowOutsideOperatingHoursForRequestedStartTimes: true
+              } : {})).map(function (group) {
                 return _objectSpread(_objectSpread({}, group), {}, {
                   ranges: group.ranges.map(function (candidate) {
                     return _this9.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate);
                   })
                 });
               }));
-            case 8:
+            case 9:
             case "end":
               return _context35.stop();
           }
@@ -4356,7 +4365,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "commitAvailabilitySelection",
     value: (function () {
       var _commitAvailabilitySelection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee37(contextId, params) {
-        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla, _this$otherParams17, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, refreshedRanges, refreshedCandidateBase, product, validation, allowPosAvailabilityOverride, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
+        var normalizedContextId, _params$bookingCount, _ref46, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla2, _this$otherParams18, _ref47, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref48, _ref49, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref50, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
         return _regeneratorRuntime().wrap(function _callee37$(_context37) {
           while (1) switch (_context37.prev = _context37.next) {
             case 0:
@@ -4586,6 +4595,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
               candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
               candidateStartTime = getCandidateStartTime(params.candidate);
+              allowPosAvailabilityOverride = String((_this$otherParams$pla2 = (_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
               refreshedRanges = getProjectionProductTimeRanges(refreshedProjection, _objectSpread({
                 productIds: [params.candidate.productId],
                 dateRange: {
@@ -4594,16 +4604,18 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 }
               }, candidateDurationMinutes ? _objectSpread({
                 durationMinutesByProductId: _defineProperty({}, String(params.candidate.productId), candidateDurationMinutes)
-              }, candidateStartTime ? {
+              }, candidateStartTime ? _objectSpread({
                 durationStartTimesByProductId: _defineProperty({}, String(params.candidate.productId), [candidateStartTime])
-              } : {}) : {})).flatMap(function (group) {
+              }, allowPosAvailabilityOverride ? {
+                allowOutsideOperatingHoursForRequestedStartTimes: true
+              } : {}) : {}) : {})).flatMap(function (group) {
                 return group.ranges;
               });
               refreshedCandidateBase = refreshedRanges.find(function (candidate) {
                 return candidate.startAt === params.candidate.startAt && candidate.endAt === params.candidate.endAt && candidate.bookingStartAt === params.candidate.bookingStartAt && candidate.bookingEndAt === params.candidate.bookingEndAt;
               });
               if (refreshedCandidateBase) {
-                _context37.next = 74;
+                _context37.next = 75;
                 break;
               }
               throw new AvailabilityError('REVALIDATION_FAILED', '缓存重校验后候选时间已不在商品配置中', {
@@ -4611,25 +4623,24 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 candidate: params.candidate,
                 refreshedSnapshotId: refreshedProjection.meta.snapshotId
               });
-            case 74:
+            case 75:
               product = refreshedProjection.products.find(function (item) {
                 return sameAvailabilityId(item.id, refreshedCandidateBase.productId);
               });
               if (product) {
-                _context37.next = 77;
+                _context37.next = 78;
                 break;
               }
               throw new AvailabilityError('REVALIDATION_FAILED', '缓存重校验后商品不在 projection 中', {
                 productId: refreshedCandidateBase.productId
               });
-            case 77:
+            case 78:
               validation = validateAvailabilitySelection(refreshedProjection, {
                 candidate: refreshedCandidateBase,
                 requirementSelections: params.requirementSelections,
                 partySize: partySize,
                 bookingCount: bookingCount
               });
-              allowPosAvailabilityOverride = String((_this$otherParams$pla = (_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos';
               if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(function (conflict) {
                 return POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES.has(conflict.code);
               })) {

package/lib/modules/ProductList/index.js

@@ -126,7 +126,7 @@ class ProductList extends _BaseModule.BaseModule {
         open_quotation: 1
       }),
       open_bundle: 0,
-      exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item', 'appointment_ticket'],
+      exclude_extension_type: ['product_party', 'product_event', 'product_series_event', 'product_package_ticket', 'ticket', 'event_item'],
       with: [..._clientDataVariants.PRODUCT_QUERY_DATA_VARIANT_RELATIONS],
       status,
       num: 500,

package/lib/modules/ResourcePlanner/planner.js

@@ -11,8 +11,8 @@ var _types = require("./types");
 var _localClock = require("./localClock");
 const DEFAULT_SLOT_STEP_MINUTES = 30;
 const DEFAULT_BUSINESS_HOURS = {
-  startTime: '09:00',
-  endTime: '18:00'
+  startTime: '00:00',
+  endTime: '00:00'
 };
 function availabilityError(code, message, details) {
   return new _types.AvailabilityError(code, message, details);
@@ -959,7 +959,9 @@ function getProductTimeRanges(projection, request = {}) {
         if (!Number.isFinite(start)) return;
         const end = addMinutesZoned(start, durationMinutes, projection.meta.timezone);
         const startsInOperatingRange = operatingRanges.some(range => range.start <= start && start < range.end);
-        if (!startsInOperatingRange) return;
+        if (!startsInOperatingRange && !request.allowOutsideOperatingHoursForRequestedStartTimes) {
+          return;
+        }
         ranges.push(createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes));
       });
     }

package/lib/modules/ResourcePlanner/types.d.ts

@@ -234,6 +234,11 @@ export interface GetProductTimeRangesRequest {
     partySize?: number;
     durationMinutesByProductId?: Record<string, number>;
     durationStartTimesByProductId?: Record<string, string[]>;
+    /**
+     * POS 手工输入时间的兼容开关：只为明确请求的 start time 补候选，
+     * 不改变常规候选列表仍按营业时间生成的规则。
+     */
+    allowOutsideOperatingHoursForRequestedStartTimes?: boolean;
 }
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];

package/lib/solution/UnifiedBookingSales/index.js

@@ -190,8 +190,9 @@ function filterCustomerBoundDiscounts(discountList) {
 }
 const DEFAULT_AVAILABILITY_SLOT_STEP_MINUTES = 30;
 const DEFAULT_AVAILABILITY_BUSINESS_HOURS = {
-  startTime: '09:00',
-  endTime: '18:00'
+  // Same start/end is interpreted as an overnight range, i.e. 24 hours.
+  startTime: '00:00',
+  endTime: '00:00'
 };
 const MAX_AVAILABILITY_RANGE_DAYS = 90;
 const MAX_AVAILABILITY_CONTEXT_REGISTRY = 128;
@@ -2803,7 +2804,13 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       projectionEntry
     } = await this.ensureAvailabilityContextProjection(contextId, 'get_product_time_ranges');
     const contextVersion = context.activeVersion;
-    return (0, _ResourcePlanner.getProductTimeRanges)(projectionEntry.projection, request).map(group => ({
+    const allowOutsideOperatingHoursForRequestedStartTimes = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos' && Object.values(request.durationStartTimesByProductId || {}).some(startTimes => Array.isArray(startTimes) && startTimes.length > 0);
+    return (0, _ResourcePlanner.getProductTimeRanges)(projectionEntry.projection, {
+      ...request,
+      ...(allowOutsideOperatingHoursForRequestedStartTimes ? {
+        allowOutsideOperatingHoursForRequestedStartTimes: true
+      } : {})
+    }).map(group => ({
       ...group,
       ranges: group.ranges.map(candidate => this.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate))
     }));
@@ -3053,6 +3060,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
       const candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
       const candidateStartTime = getCandidateStartTime(params.candidate);
+      const allowPosAvailabilityOverride = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
       const refreshedRanges = (0, _ResourcePlanner.getProductTimeRanges)(refreshedProjection, {
         productIds: [params.candidate.productId],
         dateRange: {
@@ -3066,7 +3074,10 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
           ...(candidateStartTime ? {
             durationStartTimesByProductId: {
               [String(params.candidate.productId)]: [candidateStartTime]
-            }
+            },
+            ...(allowPosAvailabilityOverride ? {
+              allowOutsideOperatingHoursForRequestedStartTimes: true
+            } : {})
           } : {})
         } : {})
       }).flatMap(group => group.ranges);
@@ -3090,7 +3101,6 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
         partySize,
         bookingCount
       });
-      const allowPosAvailabilityOverride = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
       if (allowPosAvailabilityOverride && !validation.ok && validation.conflicts.every(conflict => POS_OVERRIDABLE_AVAILABILITY_CONFLICT_CODES.has(conflict.code))) {
         const forced = buildPosForcedAvailabilityAssignments({
           product,

package/package.json

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