@pisell/pisellos 2.3.187 → 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/model/strategy/adapter/promotion/index.js +0 -9
- 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/Order/utils.d.ts +1 -3
- package/dist/modules/Order/utils.js +2 -5
- package/dist/modules/ResourcePlanner/planner.js +29 -2
- package/dist/modules/ResourcePlanner/types.d.ts +6 -0
- package/dist/modules/Rules/index.js +19 -30
- 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/BookingByStep/index.d.ts +1 -1
- 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/Order/utils.d.ts +1 -3
- package/lib/modules/Order/utils.js +2 -5
- package/lib/modules/ResourcePlanner/planner.js +25 -1
- package/lib/modules/ResourcePlanner/types.d.ts +6 -0
- package/lib/modules/Rules/index.js +9 -19
- 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/BookingByStep/index.d.ts +1 -1
- 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
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
// 导出评估器
|
|
2
|
-
export { PromotionEvaluator } from "./evaluator";
|
|
3
|
-
|
|
4
|
-
// 导出适配器
|
|
5
|
-
export { PromotionAdapter } from "./adapter";
|
|
6
|
-
export { default } from "./adapter";
|
|
7
|
-
|
|
8
|
-
// 导出策略配置示例常量
|
|
9
|
-
export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";
|
|
@@ -9,11 +9,19 @@ import { TimeSlicesResult, TimeSlice, DurationSlice } from './timeSlices';
|
|
|
9
9
|
export interface BookingCalcContext {
|
|
10
10
|
/** Sales channel; remembered duration starts are accepted only by POS. */
|
|
11
11
|
channel?: string;
|
|
12
|
-
/**
|
|
12
|
+
/** Current in-memory order session, supplied by the owning Order module. */
|
|
13
|
+
orderSessionId?: string;
|
|
14
|
+
/** Rejects a session while an order replacement or hydration is pending. */
|
|
15
|
+
isOrderSessionCurrent?: (sessionId: string) => boolean;
|
|
16
|
+
/** Legacy start-only preference, or an exact interval owned by the current order session. */
|
|
13
17
|
rememberedTime?: {
|
|
14
18
|
businessDate: string;
|
|
15
19
|
startAt: string;
|
|
20
|
+
endAt?: string;
|
|
21
|
+
orderSessionId?: string;
|
|
16
22
|
};
|
|
23
|
+
/** An expired memory restarts from the current entry time, without following cart bookings. */
|
|
24
|
+
useCurrentTimeAfterRememberedExpiry?: boolean;
|
|
17
25
|
/** 来自 `/core/board/management/config` 的整套配置;常用路径见 sliceTimeSlices / appointmentTimingPreference。 */
|
|
18
26
|
bookingConfig?: any;
|
|
19
27
|
/** 资源 origin map(id → resource origin)。 */
|
|
@@ -29,7 +29,7 @@ function seedRememberedBookingStart(cacheItem, ctx) {
|
|
|
29
29
|
var _cacheItem$cartDetail, _cacheItem$_extend;
|
|
30
30
|
var remembered = ctx.rememberedTime;
|
|
31
31
|
var invalid = function invalid() {
|
|
32
|
-
return Object.assign(new Error('Remembered time requires a valid POS duration
|
|
32
|
+
return Object.assign(new Error('Remembered time requires a valid POS duration interval in the current order.'), {
|
|
33
33
|
code: 'INVALID_REMEMBERED_TIME'
|
|
34
34
|
});
|
|
35
35
|
};
|
|
@@ -42,12 +42,31 @@ function seedRememberedBookingStart(cacheItem, ctx) {
|
|
|
42
42
|
var date = new Date("".concat(value, "T00:00:00.000Z"));
|
|
43
43
|
return Number.isFinite(date.getTime()) && date.toISOString().slice(0, 10) === value;
|
|
44
44
|
};
|
|
45
|
-
var
|
|
46
|
-
|
|
45
|
+
var isDateTime = function isDateTime(value) {
|
|
46
|
+
var parts = typeof value === 'string' ? /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2})(?::(\d{2})(?:\.\d{1,3})?)?(?:Z|[+-](\d{2}):(\d{2}))?$/.exec(value) : null;
|
|
47
|
+
return Boolean(parts && isCalendarDate(parts[1]) && Number(parts[2]) <= 23 && Number(parts[3]) <= 59 && Number(parts[4] || 0) <= 59 && Number(parts[5] || 0) <= 23 && Number(parts[6] || 0) <= 59);
|
|
48
|
+
};
|
|
49
|
+
if (String(ctx.channel || '').trim().toLowerCase() !== 'pos' || !isDuration || isMultiDayProduct(cacheItem) || isSessionProduct(cacheItem) || cacheItem !== null && cacheItem !== void 0 && (_cacheItem$cartDetail = cacheItem.cartDetailValue) !== null && _cacheItem$cartDetail !== void 0 && _cacheItem$cartDetail.session || cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.session || !isCalendarDate(remembered === null || remembered === void 0 ? void 0 : remembered.businessDate) || !isDateTime(remembered === null || remembered === void 0 ? void 0 : remembered.startAt)) throw invalid();
|
|
47
50
|
// Parse the actual instant with the same runtime clock used by the legacy booking helpers.
|
|
48
51
|
// The business-day label must not replace the calendar date of an overnight start.
|
|
49
52
|
var start = dayjs(remembered.startAt);
|
|
50
53
|
if (!start.isValid()) throw invalid();
|
|
54
|
+
var hasRememberedInterval = remembered.endAt !== undefined || remembered.orderSessionId !== undefined;
|
|
55
|
+
var end;
|
|
56
|
+
var rememberedDuration;
|
|
57
|
+
if (hasRememberedInterval) {
|
|
58
|
+
if (!isDateTime(remembered.endAt) || typeof remembered.orderSessionId !== 'string' || !remembered.orderSessionId.trim() || remembered.orderSessionId !== ctx.orderSessionId || ctx.isOrderSessionCurrent && !ctx.isOrderSessionCurrent(remembered.orderSessionId)) throw invalid();
|
|
59
|
+
end = dayjs(remembered.endAt);
|
|
60
|
+
var durationMinutes = (end.valueOf() - start.valueOf()) / 60000;
|
|
61
|
+
if (!end.isValid() || !Number.isFinite(durationMinutes) || durationMinutes <= 0) throw invalid();
|
|
62
|
+
var flexible = isProductFlexibleDuration(duration);
|
|
63
|
+
var configuredDurationMinutes = Number(durationValue) * (['hour', 'hours'].includes(durationType) ? 60 : 1);
|
|
64
|
+
if (!flexible && durationMinutes !== configuredDurationMinutes) throw invalid();
|
|
65
|
+
rememberedDuration = flexible ? flexibleObj.create(durationMinutes) : durationMinutes;
|
|
66
|
+
}
|
|
67
|
+
var clockFormat = function clockFormat(value) {
|
|
68
|
+
return value.format(value.millisecond() ? 'HH:mm:ss.SSS' : value.second() ? 'HH:mm:ss' : 'HH:mm');
|
|
69
|
+
};
|
|
51
70
|
var extend = _objectSpread({}, (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend) || {});
|
|
52
71
|
for (var _i = 0, _arr = ['start_date', 'startDate', 'start_time', 'end_date', 'endDate', 'end_time', 'duration', 'resource', 'resources', 'capacity', 'booking', 'availabilitySelection']; _i < _arr.length; _i++) {
|
|
53
72
|
var key = _arr[_i];
|
|
@@ -59,8 +78,13 @@ function seedRememberedBookingStart(cacheItem, ctx) {
|
|
|
59
78
|
_data: {},
|
|
60
79
|
_extend: _objectSpread(_objectSpread({}, extend), {}, {
|
|
61
80
|
start_date: start.format('YYYY-MM-DD'),
|
|
62
|
-
start_time:
|
|
63
|
-
}
|
|
81
|
+
start_time: clockFormat(start)
|
|
82
|
+
}, end ? {
|
|
83
|
+
end_date: end.format('YYYY-MM-DD'),
|
|
84
|
+
end_time: clockFormat(end),
|
|
85
|
+
endDate: end,
|
|
86
|
+
duration: rememberedDuration
|
|
87
|
+
} : {})
|
|
64
88
|
});
|
|
65
89
|
}
|
|
66
90
|
|
|
@@ -86,12 +110,21 @@ function getAppointmentTimingPreference(ctx) {
|
|
|
86
110
|
* 灵活时长选项(cacheItem.duration.type === 'flexible' 时)。
|
|
87
111
|
*/
|
|
88
112
|
function getFlexibleOption(params) {
|
|
89
|
-
var _cacheItem$_extend2, _cacheItem$_extend3, _usable$_extend, _params$ctx;
|
|
113
|
+
var _cacheItem$_extend2, _cacheItem$_extend3, _params$ctx$remembere, _usable$_extend, _params$ctx;
|
|
90
114
|
var cacheItem = params.cacheItem,
|
|
91
115
|
useStartTime = params.useStartTime;
|
|
92
116
|
var duration = getDurationValue(cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.duration);
|
|
93
117
|
if (duration !== 'flexible') return null;
|
|
94
118
|
var startDate = dayjs("".concat(dayjs(cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.start_date).format('YYYY-MM-DD'), " ").concat(useStartTime || (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.start_time) || '00:00'));
|
|
119
|
+
// The current-order interval was validated before rebuilding the cache item.
|
|
120
|
+
// Resource defaults may change, but must never extend its saved end.
|
|
121
|
+
if (((_params$ctx$remembere = params.ctx.rememberedTime) === null || _params$ctx$remembere === void 0 ? void 0 : _params$ctx$remembere.endAt) !== undefined) {
|
|
122
|
+
var _timeValue = (dayjs(params.ctx.rememberedTime.endAt).valueOf() - startDate.valueOf()) / 60000;
|
|
123
|
+
return {
|
|
124
|
+
label: String(_timeValue),
|
|
125
|
+
value: flexibleObj.create(_timeValue)
|
|
126
|
+
};
|
|
127
|
+
}
|
|
95
128
|
var usable = getUsableTime(cacheItem);
|
|
96
129
|
var usableEndAt = usable !== null && usable !== void 0 && (_usable$_extend = usable._extend) !== null && _usable$_extend !== void 0 && (_usable$_extend = _usable$_extend.usableTime) !== null && _usable$_extend !== void 0 && _usable$_extend.end_at ? dayjs(usable._extend.usableTime.end_at) : null;
|
|
97
130
|
var endDate = getEndDate(startDate, 'flexible', usableEndAt, (_params$ctx = params.ctx) === null || _params$ctx === void 0 ? void 0 : _params$ctx.shopOpeningHours);
|
|
@@ -137,7 +170,8 @@ export function getTimeObj(params) {
|
|
|
137
170
|
};
|
|
138
171
|
}
|
|
139
172
|
function getDefaultBookingStartFallback(cacheItem, ctx) {
|
|
140
|
-
var _ref, _cacheItem$_extend$st, _cacheItem$_extend4;
|
|
173
|
+
var _ctx$date, _ref, _cacheItem$_extend$st, _cacheItem$_extend4;
|
|
174
|
+
if (ctx.useCurrentTimeAfterRememberedExpiry) return dayjs((_ctx$date = ctx.date) !== null && _ctx$date !== void 0 ? _ctx$date : dayjs()).format('YYYY-MM-DDTHH:mm');
|
|
141
175
|
var date = dayjs((_ref = (_cacheItem$_extend$st = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.start_date) !== null && _cacheItem$_extend$st !== void 0 ? _cacheItem$_extend$st : ctx.date) !== null && _ref !== void 0 ? _ref : dayjs()).format('YYYY-MM-DD');
|
|
142
176
|
var time = ctx.presetStartTime || cacheItem.currentDefaultTime || dayjs().format('HH:mm');
|
|
143
177
|
return "".concat(date, "T").concat(time);
|
|
@@ -274,12 +308,12 @@ export function getProductExtend(params) {
|
|
|
274
308
|
_cacheItem._extend.sub_type = 'days';
|
|
275
309
|
}
|
|
276
310
|
if (isNew) {
|
|
277
|
-
var
|
|
311
|
+
var _ref2, _cacheItem$_data, _ctx$bookingConfig3;
|
|
278
312
|
_cacheItem._data.timeObj = getTimeObj({
|
|
279
313
|
cacheItem: cacheItem,
|
|
280
314
|
ctx: ctx
|
|
281
315
|
});
|
|
282
|
-
var defaultBookingStartFallback = (
|
|
316
|
+
var defaultBookingStartFallback = (_ref2 = !ctx.useCurrentTimeAfterRememberedExpiry ? (_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 ? void 0 : _cacheItem$_data.salesDefaultBookingFallback : undefined) !== null && _ref2 !== void 0 ? _ref2 : getDefaultBookingStartFallback(cacheItem, ctx);
|
|
283
317
|
_cacheItem._extend = getServiceStartTimeAndEndTime({
|
|
284
318
|
cacheItem: cacheItem,
|
|
285
319
|
timeObj: _cacheItem._data.timeObj,
|
|
@@ -407,10 +441,10 @@ export function getIsAutoClose(cacheItem, isAutoAllocationOn) {
|
|
|
407
441
|
if (entries.length === 0) {
|
|
408
442
|
return !productNeedsResourceExtend(cacheItem);
|
|
409
443
|
}
|
|
410
|
-
return entries.every(function (
|
|
411
|
-
var
|
|
412
|
-
key =
|
|
413
|
-
value =
|
|
444
|
+
return entries.every(function (_ref3) {
|
|
445
|
+
var _ref4 = _slicedToArray(_ref3, 2),
|
|
446
|
+
key = _ref4[0],
|
|
447
|
+
value = _ref4[1];
|
|
414
448
|
return isAutoAllocationOn(key) && Array.isArray(value) && value.length > 0;
|
|
415
449
|
});
|
|
416
450
|
}
|
|
@@ -5,7 +5,7 @@ import { CartItem } from '../Cart/types';
|
|
|
5
5
|
import { type SubmitPayloadEnhancer } from './utils';
|
|
6
6
|
import { type PickupTimingBooking, type PickupTimingBookingInput } from './pickupTiming';
|
|
7
7
|
import { type ProductVoucherGroup } from './utils/productVoucherGroups';
|
|
8
|
-
import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, OrderHooksConfig, OrderCartIntentCommitContext, ReplaceTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, PointCardSnapshotMergeContext, PointCardSnapshotItem, ShopServiceData, ShopServiceType } from './types';
|
|
8
|
+
import type { OrderAmountSnapshot, AddProductBookingInput, AddProductToOrderOptions, OrderIdentitySnapshot, OrderPaymentSource, OrderSnapshot, OrderSyncState, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, SubmitSalesOrderParams, OrderProduct, OrderProductIdentity, OrderSummary, OrderTempOrder, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, SendCustomerPayLinkParams, UpdateTempOrderCustomerInput, OrderCustomerPatch, OrderCustomerView, OrderHooksConfig, OrderCartIntentCommitContext, ReplaceTempOrderOptions, HydrateTempOrderOptions, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, PointCardSnapshotMergeContext, PointCardSnapshotItem, ShopServiceData, ShopServiceType } from './types';
|
|
9
9
|
import type { ICustomer } from '../AccountList/types';
|
|
10
10
|
import type { Discount } from '../Discount/types';
|
|
11
11
|
import { UnavailableReason } from '../Rules/types';
|
|
@@ -22,6 +22,10 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
22
22
|
private openCache;
|
|
23
23
|
private sessionStoragePersistEnabled;
|
|
24
24
|
private sessionStorageRestoreRecord;
|
|
25
|
+
private orderSessionId;
|
|
26
|
+
private orderSessionDestroyed;
|
|
27
|
+
private orderSessionAliases;
|
|
28
|
+
private orderReplacement;
|
|
25
29
|
/** 只允许当前订单最新的 prepare/config 请求回写客户资产态。 */
|
|
26
30
|
private customerWalletPrepareConfigEpoch;
|
|
27
31
|
/** Payment 可能早于 prepare/config 返回;先按实例 ID 暂存卡号等待 Snapshot。 */
|
|
@@ -205,6 +209,14 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
205
209
|
clearSessionStoragePersistedTempOrder(): void;
|
|
206
210
|
consumeSessionStorageRestore(): Record<string, any> | null;
|
|
207
211
|
notifyTempOrderChanged(): void;
|
|
212
|
+
private getOrderSessionAliases;
|
|
213
|
+
private publishOrderSession;
|
|
214
|
+
getOrderSessionId(): string | null;
|
|
215
|
+
isOrderSessionCurrent(sessionId: string): boolean;
|
|
216
|
+
private beginOrderReplacement;
|
|
217
|
+
private assertOrderReplacementCurrent;
|
|
218
|
+
private completeOrderReplacement;
|
|
219
|
+
private rollbackOrderReplacement;
|
|
208
220
|
private createDefaultTempOrderInstance;
|
|
209
221
|
private clearTempOrderCustomerWalletSnapshots;
|
|
210
222
|
private clearCustomerWalletState;
|
|
@@ -666,10 +678,8 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
|
|
|
666
678
|
* 数据源应尽量返回 tempOrder 所需结构;这里仅做 SDK 运行必须字段兜底,
|
|
667
679
|
* 例如数组字段、商品行唯一值、价格 metadata、summary 派生状态和 _extend。
|
|
668
680
|
*/
|
|
669
|
-
hydrateTempOrderFromRecord(record: Record<string, any>, options?:
|
|
670
|
-
|
|
671
|
-
source?: 'salesDetail' | 'mergedSalesDetail' | 'sessionStorage';
|
|
672
|
-
}): Promise<OrderTempOrder>;
|
|
681
|
+
hydrateTempOrderFromRecord(record: Record<string, any>, options?: HydrateTempOrderOptions): Promise<OrderTempOrder>;
|
|
682
|
+
private prepareHydratedTempOrder;
|
|
673
683
|
/**
|
|
674
684
|
* 兼容后端详情将 holder 放在 metadata.holder 的历史形态,统一补到运行时展示路径。
|
|
675
685
|
*
|