@pisell/pisellos 2.3.186 → 2.3.189
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/BookingContext/utils/productExtend.d.ts +9 -1
- package/dist/modules/BookingContext/utils/productExtend.js +47 -13
- package/dist/modules/Order/index.d.ts +15 -5
- package/dist/modules/Order/index.js +1161 -921
- package/dist/modules/Order/types.d.ts +16 -4
- package/dist/modules/ResourcePlanner/planner.js +29 -2
- package/dist/modules/ResourcePlanner/types.d.ts +6 -0
- package/dist/solution/BaseSales/index.d.ts +4 -0
- package/dist/solution/BaseSales/index.js +204 -176
- package/dist/solution/BaseSales/types.d.ts +1 -0
- package/dist/solution/BaseSales/types.js +1 -0
- package/dist/solution/BookingTicket/index.js +52 -31
- package/dist/solution/UnifiedBookingSales/index.d.ts +3 -0
- package/dist/solution/UnifiedBookingSales/index.js +279 -204
- package/dist/solution/UnifiedBookingSales/types.d.ts +6 -1
- package/lib/modules/BookingContext/utils/productExtend.d.ts +9 -1
- package/lib/modules/BookingContext/utils/productExtend.js +38 -5
- package/lib/modules/Order/index.d.ts +15 -5
- package/lib/modules/Order/index.js +167 -21
- package/lib/modules/Order/types.d.ts +16 -4
- package/lib/modules/ResourcePlanner/planner.js +25 -1
- package/lib/modules/ResourcePlanner/types.d.ts +6 -0
- package/lib/solution/BaseSales/index.d.ts +4 -0
- package/lib/solution/BaseSales/index.js +14 -0
- package/lib/solution/BaseSales/types.d.ts +1 -0
- package/lib/solution/BaseSales/types.js +1 -0
- package/lib/solution/BookingTicket/index.js +8 -2
- package/lib/solution/UnifiedBookingSales/index.d.ts +3 -0
- package/lib/solution/UnifiedBookingSales/index.js +80 -15
- package/lib/solution/UnifiedBookingSales/types.d.ts +6 -1
- package/package.json +1 -1
|
@@ -449,6 +449,17 @@ export interface ReplaceTempOrderOptions {
|
|
|
449
449
|
recalculateSummary?: boolean;
|
|
450
450
|
persist?: boolean;
|
|
451
451
|
saveDraft?: boolean;
|
|
452
|
+
/** Internal same-order updates may explicitly retain an anonymous order's session. */
|
|
453
|
+
preserveOrderSessionId?: string;
|
|
454
|
+
}
|
|
455
|
+
export interface OrderSessionChangedPayload {
|
|
456
|
+
sessionId: string | null;
|
|
457
|
+
previousSessionId: string | null;
|
|
458
|
+
}
|
|
459
|
+
export interface HydrateTempOrderOptions {
|
|
460
|
+
recalcOnHydrate?: boolean;
|
|
461
|
+
source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
|
|
462
|
+
preserveOrderSessionId?: string;
|
|
452
463
|
}
|
|
453
464
|
export type AddProductBookingInput = Record<string, any>;
|
|
454
465
|
/**
|
|
@@ -869,6 +880,10 @@ export interface OrderModuleAPI {
|
|
|
869
880
|
salesSummaryModuleName?: string;
|
|
870
881
|
}) => void;
|
|
871
882
|
getTempOrder: () => OrderTempOrder | null;
|
|
883
|
+
/** Runtime-only identity; never part of an order or a persisted draft. */
|
|
884
|
+
getOrderSessionId: () => string | null;
|
|
885
|
+
/** Also rejects a session while an asynchronous order replacement is pending. */
|
|
886
|
+
isOrderSessionCurrent: (sessionId: string) => boolean;
|
|
872
887
|
ensureTempOrder: () => OrderTempOrder;
|
|
873
888
|
replaceTempOrder: (tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions) => Promise<OrderTempOrder>;
|
|
874
889
|
addNewOrder: () => Promise<OrderTempOrder>;
|
|
@@ -999,10 +1014,7 @@ export interface OrderModuleAPI {
|
|
|
999
1014
|
}) => OrderPaymentData[];
|
|
1000
1015
|
sendCustomerPayLink: <T = any>(params: SendCustomerPayLinkParams) => Promise<T>;
|
|
1001
1016
|
saveDraft: () => Promise<void>;
|
|
1002
|
-
hydrateTempOrderFromRecord: (record: Record<string, any>, options?:
|
|
1003
|
-
recalcOnHydrate?: boolean;
|
|
1004
|
-
source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
|
|
1005
|
-
}) => Promise<OrderTempOrder>;
|
|
1017
|
+
hydrateTempOrderFromRecord: (record: Record<string, any>, options?: HydrateTempOrderOptions) => Promise<OrderTempOrder>;
|
|
1006
1018
|
syncPaymentsToOrder: <T = any>(params: SyncPaymentsToOrderParams) => Promise<SyncPaymentsToOrderResult<T>>;
|
|
1007
1019
|
getSalesOrderByLookup: (params: SalesOrderLookupParams) => Promise<any>;
|
|
1008
1020
|
getLastOrderInfo: () => Record<string, any> | undefined;
|
|
@@ -243,6 +243,16 @@ function isCandidateFromExcludedScheduleDate(params) {
|
|
|
243
243
|
return getProductTimeRangeIdentity(range) === candidateIdentity;
|
|
244
244
|
});
|
|
245
245
|
}
|
|
246
|
+
function resolveRememberedDurationRange(product, value, timezoneName) {
|
|
247
|
+
if (value === undefined) return null;
|
|
248
|
+
var range = normalizeAbsoluteRange(value, timezoneName);
|
|
249
|
+
if (!range || range.end <= range.start) {
|
|
250
|
+
throw availabilityError('INVALID_TARGET_FILTER', '记忆时间必须包含有效且递增的开始和结束时间');
|
|
251
|
+
}
|
|
252
|
+
if (product.kind !== 'duration') return null;
|
|
253
|
+
if (!product.isFlexibleDuration && (!Number.isFinite(product.durationMinutes) || range.end - range.start !== Number(product.durationMinutes) * 60000)) return null;
|
|
254
|
+
return range;
|
|
255
|
+
}
|
|
246
256
|
function evaluateCandidateTimeGate(params) {
|
|
247
257
|
var projection = params.projection,
|
|
248
258
|
product = params.product,
|
|
@@ -314,6 +324,11 @@ function evaluateCandidateTimeGate(params) {
|
|
|
314
324
|
};
|
|
315
325
|
}
|
|
316
326
|
if (policy.type === 'before_start') {
|
|
327
|
+
var _evaluationContext$re;
|
|
328
|
+
var rememberedRange = resolveRememberedDurationRange(product, (_evaluationContext$re = evaluationContext.rememberedTimeByProductId) === null || _evaluationContext$re === void 0 ? void 0 : _evaluationContext$re[String(product.id)], timezoneName);
|
|
329
|
+
// Only the exact order-scoped interval may retain its start after this
|
|
330
|
+
// cutoff. The end/past and operating-window gates above still apply.
|
|
331
|
+
if ((rememberedRange === null || rememberedRange === void 0 ? void 0 : rememberedRange.start) === candidateRange.start && rememberedRange.end === candidateRange.end) return null;
|
|
317
332
|
// POS fixed-duration candidates use the context's stable opening-minute
|
|
318
333
|
// anchor. Keep that anchored range selectable while it is still active;
|
|
319
334
|
// otherwise a minute refresh turns it into 0 capacity and incorrectly
|
|
@@ -1172,7 +1187,7 @@ export function getDurationBusinessDate(projection, startAt) {
|
|
|
1172
1187
|
return (period === null || period === void 0 ? void 0 : period.businessDate) || startAt.slice(0, 10);
|
|
1173
1188
|
}
|
|
1174
1189
|
function getAlignedDurationRanges(params) {
|
|
1175
|
-
var _request$rememberedSt, _request$editingStart;
|
|
1190
|
+
var _request$rememberedSt, _request$rememberedTi, _request$editingStart;
|
|
1176
1191
|
var projection = params.projection,
|
|
1177
1192
|
product = params.product,
|
|
1178
1193
|
request = params.request,
|
|
@@ -1314,6 +1329,14 @@ function getAlignedDurationRanges(params) {
|
|
|
1314
1329
|
addRange(start, start + duration * 60000);
|
|
1315
1330
|
}
|
|
1316
1331
|
}
|
|
1332
|
+
var rememberedRange = resolveRememberedDurationRange(product, (_request$rememberedTi = request.rememberedTimeByProductId) === null || _request$rememberedTi === void 0 ? void 0 : _request$rememberedTi[String(product.id)], projection.meta.timezone);
|
|
1333
|
+
if (rememberedRange && baseRanges.some(function (range) {
|
|
1334
|
+
return contains(range, rememberedRange);
|
|
1335
|
+
})) {
|
|
1336
|
+
// Never extend a remembered flexible interval when the resource now has a
|
|
1337
|
+
// later closing time, or rebuild a fixed interval after its duration changed.
|
|
1338
|
+
addRange(rememberedRange.start, rememberedRange.end);
|
|
1339
|
+
}
|
|
1317
1340
|
var editingAt = (_request$editingStart = request.editingStartAtByProductId) === null || _request$editingStart === void 0 ? void 0 : _request$editingStart[String(product.id)];
|
|
1318
1341
|
if (editingAt !== undefined) {
|
|
1319
1342
|
var _request$durationMinu3;
|
|
@@ -1726,7 +1749,8 @@ function buildEvaluationContext(params) {
|
|
|
1726
1749
|
durationCandidateAnchorAtMs: Number.isFinite(durationCandidateAnchorAt) ? floorToMinute(durationCandidateAnchorAt) : null,
|
|
1727
1750
|
allowExcludedScheduleDateOverride: params.allowExcludedScheduleDateOverride === true,
|
|
1728
1751
|
useDurationTimeGrid: params.useDurationTimeGrid === true,
|
|
1729
|
-
enforceSaleCutoff: params.enforceSaleCutoff === true
|
|
1752
|
+
enforceSaleCutoff: params.enforceSaleCutoff === true,
|
|
1753
|
+
rememberedTimeByProductId: params.rememberedTimeByProductId
|
|
1730
1754
|
};
|
|
1731
1755
|
}
|
|
1732
1756
|
function summarizeStatuses(statuses) {
|
|
@@ -2216,6 +2240,7 @@ export function queryAvailabilityProjection(projection, request) {
|
|
|
2216
2240
|
resourceIds: request.resourceIds,
|
|
2217
2241
|
useDurationTimeGrid: runtimeOptions.useDurationTimeGrid,
|
|
2218
2242
|
enforceSaleCutoff: runtimeOptions.enforceSaleCutoff,
|
|
2243
|
+
rememberedTimeByProductId: runtimeOptions.rememberedTimeByProductId,
|
|
2219
2244
|
useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
|
|
2220
2245
|
allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
|
|
2221
2246
|
});
|
|
@@ -2308,6 +2333,7 @@ export function queryAvailabilityProjection(projection, request) {
|
|
|
2308
2333
|
evaluatedAt: evaluatedAt,
|
|
2309
2334
|
useDurationTimeGrid: runtimeOptions.useDurationTimeGrid,
|
|
2310
2335
|
enforceSaleCutoff: runtimeOptions.enforceSaleCutoff,
|
|
2336
|
+
rememberedTimeByProductId: runtimeOptions.rememberedTimeByProductId,
|
|
2311
2337
|
useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
|
|
2312
2338
|
allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
|
|
2313
2339
|
});
|
|
@@ -2542,6 +2568,7 @@ export function validateAvailabilitySelection(projection, params) {
|
|
|
2542
2568
|
requirementSelections: params.requirementSelections,
|
|
2543
2569
|
useDurationTimeGrid: runtimeOptions.useDurationTimeGrid,
|
|
2544
2570
|
enforceSaleCutoff: runtimeOptions.enforceSaleCutoff,
|
|
2571
|
+
rememberedTimeByProductId: runtimeOptions.rememberedTimeByProductId,
|
|
2545
2572
|
useExactDurationCandidateMinute: runtimeOptions.useExactDurationCandidateMinute,
|
|
2546
2573
|
allowExcludedScheduleDateOverride: runtimeOptions.allowExcludedScheduleDateOverride
|
|
2547
2574
|
})
|
|
@@ -265,6 +265,10 @@ export interface GetProductTimeRangesRequest {
|
|
|
265
265
|
durationStartTimesByProductId?: Record<string, string[]>;
|
|
266
266
|
/** Restore only the exact remembered start; recompute the end from current product/windows. */
|
|
267
267
|
rememberedStartAtByProductId?: Record<string, string>;
|
|
268
|
+
/** Order-scoped v2 memory preserves the complete actual booking interval. */
|
|
269
|
+
rememberedTimeByProductId?: Record<string, AvailabilityAbsoluteRange>;
|
|
270
|
+
/** Required by the POS facade before accepting v2 remembered intervals. */
|
|
271
|
+
orderSessionId?: string;
|
|
268
272
|
/** Edit only: preserve the full actual start plus an explicit durationMinutesByProductId. */
|
|
269
273
|
editingStartAtByProductId?: Record<string, string>;
|
|
270
274
|
/**
|
|
@@ -279,6 +283,8 @@ export interface GetProductTimeRangesRuntimeOptions {
|
|
|
279
283
|
useDurationTimeGrid?: boolean;
|
|
280
284
|
/** Automatic remembered selection must not use POS opening-minute cutoff exceptions. */
|
|
281
285
|
enforceSaleCutoff?: boolean;
|
|
286
|
+
/** Internal POS capability, validated against the current order session by the facade. */
|
|
287
|
+
rememberedTimeByProductId?: Record<string, AvailabilityAbsoluteRange>;
|
|
282
288
|
/**
|
|
283
289
|
* Internal POS capability: fixed-duration candidates start from the stable
|
|
284
290
|
* context anchor's current minute instead of rounding up to ten minutes, and
|
|
@@ -82,6 +82,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
|
|
|
82
82
|
private salesDetailHydrateQueue;
|
|
83
83
|
private serverOrderChangeUnsubscribe;
|
|
84
84
|
private paymentMethodsChangedUnsubscribe;
|
|
85
|
+
private orderSessionChangedUnsubscribe;
|
|
85
86
|
private serverOrderChangeHydrateInFlight;
|
|
86
87
|
private queuedServerOrderChanges;
|
|
87
88
|
private serverOrderChangeSyncEnabled;
|
|
@@ -116,6 +117,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
|
|
|
116
117
|
private syncCurrentSalesDetailFromServerOrderChange;
|
|
117
118
|
private registerServerOrderChangeSync;
|
|
118
119
|
private registerPaymentMethodsChangeSync;
|
|
120
|
+
private registerOrderSessionChangeSync;
|
|
119
121
|
private hydrateLatestLoadedSalesDetail;
|
|
120
122
|
private hydrateOrderPaymentNames;
|
|
121
123
|
get payment(): PaymentModule | undefined;
|
|
@@ -265,6 +267,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
|
|
|
265
267
|
/** 获取附加费用(运费/服务费/税费等)。 */
|
|
266
268
|
getSurcharges(): ISalesSurcharge[];
|
|
267
269
|
getTempOrder(): OrderTempOrder | null;
|
|
270
|
+
getOrderSessionId(): string | null;
|
|
271
|
+
isOrderSessionCurrent(sessionId: string): boolean;
|
|
268
272
|
replaceTempOrder(tempOrder: OrderTempOrder, options?: ReplaceTempOrderOptions): Promise<OrderTempOrder>;
|
|
269
273
|
getOrderIdentity(): import("../../modules/Order/types").OrderIdentitySnapshot | null;
|
|
270
274
|
getOrderSnapshot(): import("../../modules/Order/types").OrderSnapshot | null;
|