@pisell/pisellos 2.3.219 → 2.3.220
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/Product/index.d.ts +1 -1
- package/dist/solution/BaseSales/index.d.ts +2 -0
- package/dist/solution/BaseSales/index.js +65 -37
- package/dist/solution/BaseSales/types.d.ts +2 -0
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.d.ts +7 -0
- package/dist/solution/BookingTicket/index.js +510 -385
- package/lib/model/strategy/adapter/promotion/index.js +46 -1
- package/lib/modules/Product/index.d.ts +1 -1
- package/lib/solution/BaseSales/index.d.ts +2 -0
- package/lib/solution/BaseSales/index.js +27 -6
- package/lib/solution/BaseSales/types.d.ts +2 -0
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.d.ts +7 -0
- package/lib/solution/BookingTicket/index.js +50 -4
- 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";
|
|
@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
|
|
|
49
49
|
getCategories(): ProductCategory[];
|
|
50
50
|
setOtherParams(key: string, value: any): void;
|
|
51
51
|
getOtherParams(): any;
|
|
52
|
-
getProductType(): "normal" | "
|
|
52
|
+
getProductType(): "normal" | "session" | "duration";
|
|
53
53
|
}
|
|
@@ -55,6 +55,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
|
|
|
55
55
|
protected store: BaseSalesState;
|
|
56
56
|
protected otherParams: Record<string, any>;
|
|
57
57
|
getInventory(): InventoryController | undefined;
|
|
58
|
+
/** Retail and standard POS opt in per sales instance; other hosts retain their member flow. */
|
|
59
|
+
isMemberCartConsistencyEnabled(): boolean;
|
|
58
60
|
prepareCheckout(signal?: AbortSignal): Promise<CheckoutRuntimeSnapshot | undefined>;
|
|
59
61
|
protected cacheId: string | undefined;
|
|
60
62
|
/**
|
|
@@ -38,6 +38,7 @@ import { BaseModule } from "../../modules/BaseModule";
|
|
|
38
38
|
import { isLocalFinalizedPayment, PAYMENT_REFRESH_MESSAGE, requiresLocalPaymentRefresh } from "../../modules/Order/localEftposState";
|
|
39
39
|
import { BaseSalesHookNames } from "./types";
|
|
40
40
|
import { OrderModule } from "../../modules/Order";
|
|
41
|
+
import { ensureUniqueProductLineUids, consolidateDiscountFreeProductLines } from "../../modules/Order/utils/discountProductLineIdentity";
|
|
41
42
|
import { isFulfillmentTimingBooking } from "../../modules/Order/pickupTiming";
|
|
42
43
|
import { PickupTimingController } from "./pickupTiming";
|
|
43
44
|
import { FulfillmentItemRulesController } from "./fulfillmentItemRules";
|
|
@@ -176,6 +177,14 @@ function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
|
|
|
176
177
|
return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
|
|
177
178
|
});
|
|
178
179
|
}
|
|
180
|
+
|
|
181
|
+
/** Rules may split a coupon quantity into rows that still share the original UID. */
|
|
182
|
+
function applyDiscountProductLines(tempOrder, products, discounts, enableMemberCartConsistency) {
|
|
183
|
+
tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, products);
|
|
184
|
+
if (!enableMemberCartConsistency) return;
|
|
185
|
+
ensureUniqueProductLineUids(tempOrder, discounts);
|
|
186
|
+
consolidateDiscountFreeProductLines(tempOrder);
|
|
187
|
+
}
|
|
179
188
|
function isBaseSalesHistoricalDiscountEntry(discount) {
|
|
180
189
|
return Boolean((discount === null || discount === void 0 ? void 0 : discount.isEditMode) || (discount === null || discount === void 0 ? void 0 : discount.isDisabled) || (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) != null);
|
|
181
190
|
}
|
|
@@ -652,6 +661,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
652
661
|
value: function getInventory() {
|
|
653
662
|
return this.otherParams.inventory;
|
|
654
663
|
}
|
|
664
|
+
|
|
665
|
+
/** Retail and standard POS opt in per sales instance; other hosts retain their member flow. */
|
|
666
|
+
}, {
|
|
667
|
+
key: "isMemberCartConsistencyEnabled",
|
|
668
|
+
value: function isMemberCartConsistencyEnabled() {
|
|
669
|
+
return this.otherParams.enableMemberCartConsistency === true;
|
|
670
|
+
}
|
|
655
671
|
}, {
|
|
656
672
|
key: "prepareCheckout",
|
|
657
673
|
value: function () {
|
|
@@ -3707,7 +3723,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3707
3723
|
isCurrentRequest = function isCurrentRequest() {
|
|
3708
3724
|
var _this20$store$order, _this20$store$order$g, _this20$store$order2, _this20$store$order2$;
|
|
3709
3725
|
var currentTempOrder = (_this20$store$order = _this20.store.order) === null || _this20$store$order === void 0 || (_this20$store$order$g = _this20$store$order.getTempOrder) === null || _this20$store$order$g === void 0 ? void 0 : _this20$store$order$g.call(_this20$store$order);
|
|
3710
|
-
|
|
3726
|
+
var current = Boolean(currentTempOrder && (requestEpoch === undefined || ((_this20$store$order2 = _this20.store.order) === null || _this20$store$order2 === void 0 || (_this20$store$order2$ = _this20$store$order2.getCustomerWalletPrepareConfigEpoch) === null || _this20$store$order2$ === void 0 ? void 0 : _this20$store$order2$.call(_this20$store$order2)) === requestEpoch) && _this20.resolveDiscountConfigCustomerId(currentTempOrder) === customerId && _this20.getDiscountConfigOrderIdentityKey(currentTempOrder) === requestOrderIdentityKey);
|
|
3727
|
+
// Cart edits can replace the object while member configuration is pending.
|
|
3728
|
+
// Keep the logical-order guard, but apply coupons to its latest rows.
|
|
3729
|
+
if (current && _this20.isMemberCartConsistencyEnabled()) tempOrder = currentTempOrder;
|
|
3730
|
+
return current;
|
|
3711
3731
|
};
|
|
3712
3732
|
getCurrentResult = function getCurrentResult() {
|
|
3713
3733
|
var _this20$store$order3, _this20$store$order3$, _discountModule$getDi2;
|
|
@@ -3959,7 +3979,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
3959
3979
|
discountList: nextDiscountList
|
|
3960
3980
|
};
|
|
3961
3981
|
if (result.productList) {
|
|
3962
|
-
tempOrder
|
|
3982
|
+
applyDiscountProductLines(tempOrder, result.productList, result.discountList || nextDiscountList, this.isMemberCartConsistencyEnabled());
|
|
3963
3983
|
}
|
|
3964
3984
|
_iterator5 = _createForOfIteratorHelper(tempOrder.products || []);
|
|
3965
3985
|
_context36.prev = 93;
|
|
@@ -4160,7 +4180,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4160
4180
|
preserveEntitlementSelection: false
|
|
4161
4181
|
}) || result;
|
|
4162
4182
|
if (result.productList) {
|
|
4163
|
-
tempOrder
|
|
4183
|
+
applyDiscountProductLines(tempOrder, result.productList, result.discountList || nextDiscountList, this.isMemberCartConsistencyEnabled());
|
|
4164
4184
|
}
|
|
4165
4185
|
if (!result.discountList) {
|
|
4166
4186
|
_context37.next = 28;
|
|
@@ -4273,7 +4293,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4273
4293
|
key: "scanPromotionCode",
|
|
4274
4294
|
value: function () {
|
|
4275
4295
|
var _scanPromotionCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee39(code, customerId, options) {
|
|
4276
|
-
var raw,
|
|
4296
|
+
var raw, _tempOrder;
|
|
4277
4297
|
return _regeneratorRuntime().wrap(function _callee39$(_context39) {
|
|
4278
4298
|
while (1) switch (_context39.prev = _context39.next) {
|
|
4279
4299
|
case 0:
|
|
@@ -4298,13 +4318,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4298
4318
|
});
|
|
4299
4319
|
case 9:
|
|
4300
4320
|
this.store.order.persistTempOrder();
|
|
4301
|
-
|
|
4321
|
+
_tempOrder = this.store.order.ensureTempOrder();
|
|
4302
4322
|
_context39.next = 13;
|
|
4303
4323
|
return this.effectsEmit('onDiscountApplied', {
|
|
4304
|
-
productList:
|
|
4324
|
+
productList: _tempOrder.products || [],
|
|
4305
4325
|
discountList: this.store.order.getDiscountList(),
|
|
4306
|
-
selectedDiscountList:
|
|
4307
|
-
tempOrder:
|
|
4326
|
+
selectedDiscountList: _tempOrder.discount_list || [],
|
|
4327
|
+
tempOrder: _tempOrder
|
|
4308
4328
|
});
|
|
4309
4329
|
case 13:
|
|
4310
4330
|
return _context39.abrupt("return", _objectSpread(_objectSpread({
|
|
@@ -4336,7 +4356,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4336
4356
|
key: "setDiscountSelected",
|
|
4337
4357
|
value: function () {
|
|
4338
4358
|
var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
|
|
4339
|
-
var currentOrder, _store3, _store3$setDiscountLi, list, updated,
|
|
4359
|
+
var currentOrder, _store3, _store3$setDiscountLi, list, updated, _tempOrder2, orderStore, _discountModule, rulesModule, nextDiscountList, _orderStore$summary3, orderTotalAmount, result, beforeSelectedIds, promotionCardIds, _iterator6, _step6, d, selectedResourceIds, filterSelectedDiscountDetails, _iterator7, _step7, _product$metadata8, _tempOrder2$_extend, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
|
|
4340
4360
|
return _regeneratorRuntime().wrap(function _callee40$(_context40) {
|
|
4341
4361
|
while (1) switch (_context40.prev = _context40.next) {
|
|
4342
4362
|
case 0:
|
|
@@ -4373,7 +4393,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4373
4393
|
}) : d;
|
|
4374
4394
|
});
|
|
4375
4395
|
this.hasManualDiscountSelection = true;
|
|
4376
|
-
|
|
4396
|
+
_tempOrder2 = this.store.order.ensureTempOrder();
|
|
4377
4397
|
orderStore = this.store.order.store || {};
|
|
4378
4398
|
_discountModule = orderStore.discount;
|
|
4379
4399
|
rulesModule = orderStore.rules;
|
|
@@ -4384,22 +4404,22 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4384
4404
|
if (rulesModule) {
|
|
4385
4405
|
orderTotalAmount = Number(((_orderStore$summary3 = orderStore.summary) === null || _orderStore$summary3 === void 0 ? void 0 : _orderStore$summary3.total_amount) || 0);
|
|
4386
4406
|
result = rulesModule.calcDiscount({
|
|
4387
|
-
productList:
|
|
4407
|
+
productList: _tempOrder2.products,
|
|
4388
4408
|
discountList: updated,
|
|
4389
4409
|
holders: [],
|
|
4390
4410
|
isFormSubject: function isFormSubject(product) {
|
|
4391
|
-
return resolveIsFormSubject(
|
|
4411
|
+
return resolveIsFormSubject(_tempOrder2, product);
|
|
4392
4412
|
},
|
|
4393
4413
|
orderTotalAmount: orderTotalAmount
|
|
4394
4414
|
}, {
|
|
4395
4415
|
discountId: params.discountId,
|
|
4396
4416
|
isSelected: params.isSelected
|
|
4397
4417
|
}) || {
|
|
4398
|
-
productList:
|
|
4418
|
+
productList: _tempOrder2.products,
|
|
4399
4419
|
discountList: updated
|
|
4400
4420
|
};
|
|
4401
4421
|
if (result !== null && result !== void 0 && result.productList) {
|
|
4402
|
-
|
|
4422
|
+
applyDiscountProductLines(_tempOrder2, result.productList, result.discountList || updated, this.isMemberCartConsistencyEnabled());
|
|
4403
4423
|
}
|
|
4404
4424
|
if (result !== null && result !== void 0 && result.discountList) {
|
|
4405
4425
|
nextDiscountList = result.discountList;
|
|
@@ -4450,7 +4470,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4450
4470
|
return rid != null && selectedResourceIds.has(rid);
|
|
4451
4471
|
});
|
|
4452
4472
|
};
|
|
4453
|
-
_iterator7 = _createForOfIteratorHelper(
|
|
4473
|
+
_iterator7 = _createForOfIteratorHelper(_tempOrder2.products);
|
|
4454
4474
|
_context40.prev = 27;
|
|
4455
4475
|
_iterator7.s();
|
|
4456
4476
|
case 29:
|
|
@@ -4460,7 +4480,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4460
4480
|
}
|
|
4461
4481
|
product = _step7.value;
|
|
4462
4482
|
productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
|
|
4463
|
-
runtimeOrigin = productUid ? (
|
|
4483
|
+
runtimeOrigin = productUid ? (_tempOrder2$_extend = _tempOrder2._extend) === null || _tempOrder2$_extend === void 0 || (_tempOrder2$_extend = _tempOrder2$_extend.productsByUid) === null || _tempOrder2$_extend === void 0 || (_tempOrder2$_extend = _tempOrder2$_extend[productUid]) === null || _tempOrder2$_extend === void 0 ? void 0 : _tempOrder2$_extend.origin : undefined;
|
|
4464
4484
|
if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
|
|
4465
4485
|
_context40.next = 35;
|
|
4466
4486
|
break;
|
|
@@ -4515,11 +4535,11 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4515
4535
|
_iterator7.f();
|
|
4516
4536
|
return _context40.finish(51);
|
|
4517
4537
|
case 54:
|
|
4518
|
-
OrderModule.populateSavedAmounts(
|
|
4538
|
+
OrderModule.populateSavedAmounts(_tempOrder2.products, nextDiscountList);
|
|
4519
4539
|
_context40.next = 57;
|
|
4520
4540
|
return _discountModule === null || _discountModule === void 0 ? void 0 : _discountModule.setDiscountList(nextDiscountList);
|
|
4521
4541
|
case 57:
|
|
4522
|
-
|
|
4542
|
+
_tempOrder2.discount_list = (nextDiscountList || []).filter(function (d) {
|
|
4523
4543
|
return d.isSelected;
|
|
4524
4544
|
});
|
|
4525
4545
|
_context40.next = 60;
|
|
@@ -4529,10 +4549,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4529
4549
|
case 60:
|
|
4530
4550
|
this.store.order.persistTempOrder();
|
|
4531
4551
|
this.effectsEmit('onDiscountApplied', {
|
|
4532
|
-
productList:
|
|
4552
|
+
productList: _tempOrder2.products,
|
|
4533
4553
|
discountList: nextDiscountList,
|
|
4534
|
-
selectedDiscountList:
|
|
4535
|
-
tempOrder:
|
|
4554
|
+
selectedDiscountList: _tempOrder2.discount_list,
|
|
4555
|
+
tempOrder: _tempOrder2
|
|
4536
4556
|
});
|
|
4537
4557
|
_context40.next = 67;
|
|
4538
4558
|
break;
|
|
@@ -4555,7 +4575,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4555
4575
|
key: "applyDiscountCalculationResult",
|
|
4556
4576
|
value: function () {
|
|
4557
4577
|
var _applyDiscountCalculationResult = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee41(result) {
|
|
4558
|
-
var
|
|
4578
|
+
var _tempOrder3, orderStore, _discountModule2;
|
|
4559
4579
|
return _regeneratorRuntime().wrap(function _callee41$(_context41) {
|
|
4560
4580
|
while (1) switch (_context41.prev = _context41.next) {
|
|
4561
4581
|
case 0:
|
|
@@ -4572,21 +4592,21 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4572
4592
|
}
|
|
4573
4593
|
return _context41.abrupt("return");
|
|
4574
4594
|
case 5:
|
|
4575
|
-
|
|
4595
|
+
_tempOrder3 = this.store.order.ensureTempOrder();
|
|
4576
4596
|
orderStore = this.store.order.store || {};
|
|
4577
4597
|
_discountModule2 = orderStore.discount;
|
|
4578
4598
|
if (result.productList) {
|
|
4579
|
-
|
|
4599
|
+
applyDiscountProductLines(_tempOrder3, result.productList, result.discountList || this.getDiscountList(), this.isMemberCartConsistencyEnabled());
|
|
4580
4600
|
}
|
|
4581
4601
|
if (!result.discountList) {
|
|
4582
4602
|
_context41.next = 14;
|
|
4583
4603
|
break;
|
|
4584
4604
|
}
|
|
4585
|
-
OrderModule.populateSavedAmounts(
|
|
4605
|
+
OrderModule.populateSavedAmounts(_tempOrder3.products, result.discountList);
|
|
4586
4606
|
_context41.next = 13;
|
|
4587
4607
|
return _discountModule2 === null || _discountModule2 === void 0 ? void 0 : _discountModule2.setDiscountList(result.discountList);
|
|
4588
4608
|
case 13:
|
|
4589
|
-
|
|
4609
|
+
_tempOrder3.discount_list = result.discountList.filter(function (discount) {
|
|
4590
4610
|
return discount.isSelected;
|
|
4591
4611
|
});
|
|
4592
4612
|
case 14:
|
|
@@ -4598,10 +4618,10 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
4598
4618
|
this.store.order.persistTempOrder();
|
|
4599
4619
|
_context41.next = 19;
|
|
4600
4620
|
return this.effectsEmit('onDiscountApplied', {
|
|
4601
|
-
productList:
|
|
4621
|
+
productList: _tempOrder3.products || [],
|
|
4602
4622
|
discountList: result.discountList || [],
|
|
4603
|
-
selectedDiscountList:
|
|
4604
|
-
tempOrder:
|
|
4623
|
+
selectedDiscountList: _tempOrder3.discount_list || [],
|
|
4624
|
+
tempOrder: _tempOrder3
|
|
4605
4625
|
});
|
|
4606
4626
|
case 19:
|
|
4607
4627
|
_context41.next = 24;
|
|
@@ -7481,6 +7501,14 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
7481
7501
|
return this.resolveProductBookingPriceGroups(paramsList, currentOrderCustomerId);
|
|
7482
7502
|
case 9:
|
|
7483
7503
|
authoritativeProducts = _context75.sent;
|
|
7504
|
+
if (!paramsList.some(function (params, index) {
|
|
7505
|
+
return params.requireAuthoritativePrice && !authoritativeProducts[index];
|
|
7506
|
+
})) {
|
|
7507
|
+
_context75.next = 12;
|
|
7508
|
+
break;
|
|
7509
|
+
}
|
|
7510
|
+
throw new Error('The current customer product price is unavailable. Please retry before paying.');
|
|
7511
|
+
case 12:
|
|
7484
7512
|
plans = paramsList.map(function (params, index) {
|
|
7485
7513
|
if (!isPos) return null;
|
|
7486
7514
|
var product = authoritativeProducts[index];
|
|
@@ -7510,20 +7538,20 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
7510
7538
|
return queryIndex;
|
|
7511
7539
|
})) || [];
|
|
7512
7540
|
});
|
|
7513
|
-
_context75.next =
|
|
7541
|
+
_context75.next = 17;
|
|
7514
7542
|
return this.resolveProductBookingPriceGroups(segmentQueries, currentOrderCustomerId, true);
|
|
7515
|
-
case
|
|
7543
|
+
case 17:
|
|
7516
7544
|
segmentProducts = _context75.sent;
|
|
7517
7545
|
if (!segmentProducts.some(function (product) {
|
|
7518
7546
|
return !product;
|
|
7519
7547
|
})) {
|
|
7520
|
-
_context75.next =
|
|
7548
|
+
_context75.next = 20;
|
|
7521
7549
|
break;
|
|
7522
7550
|
}
|
|
7523
7551
|
throw durationPricingUnavailable('An authoritative product is missing for a billing unit.');
|
|
7524
|
-
case
|
|
7552
|
+
case 20:
|
|
7525
7553
|
if (useCustomerUserPricing) {
|
|
7526
|
-
_context75.next =
|
|
7554
|
+
_context75.next = 25;
|
|
7527
7555
|
break;
|
|
7528
7556
|
}
|
|
7529
7557
|
quotationContexts = new Map();
|
|
@@ -7538,13 +7566,13 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
7538
7566
|
customer_id: (_params$customer_id3 = params.customer_id) !== null && _params$customer_id3 !== void 0 ? _params$customer_id3 : currentOrderCustomerId
|
|
7539
7567
|
});
|
|
7540
7568
|
});
|
|
7541
|
-
_context75.next =
|
|
7569
|
+
_context75.next = 25;
|
|
7542
7570
|
return Promise.all(Array.from(quotationContexts.values()).map(function (context) {
|
|
7543
7571
|
return _this25.loadQuotationForPriceQuery(_objectSpread({
|
|
7544
7572
|
quotation: quotation
|
|
7545
7573
|
}, context));
|
|
7546
7574
|
}));
|
|
7547
|
-
case
|
|
7575
|
+
case 25:
|
|
7548
7576
|
return _context75.abrupt("return", paramsList.map(function (params, index) {
|
|
7549
7577
|
var _params$customer_id4, _authoritativeProduct2, _params$duration;
|
|
7550
7578
|
var productInput = params.product || {};
|
|
@@ -7595,7 +7623,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
|
|
|
7595
7623
|
duration: undefined
|
|
7596
7624
|
}) : result;
|
|
7597
7625
|
}));
|
|
7598
|
-
case
|
|
7626
|
+
case 26:
|
|
7599
7627
|
case "end":
|
|
7600
7628
|
return _context75.stop();
|
|
7601
7629
|
}
|
|
@@ -305,6 +305,8 @@ export interface BaseSalesQuotationDurationConfig {
|
|
|
305
305
|
}
|
|
306
306
|
export interface BaseSalesCalculateProductBookingPriceParams {
|
|
307
307
|
product: Record<string, any>;
|
|
308
|
+
/** Fail closed when the current customer price cannot be resolved; no old-line fallback. */
|
|
309
|
+
requireAuthoritativePrice?: boolean;
|
|
308
310
|
booking?: {
|
|
309
311
|
start_date?: string;
|
|
310
312
|
start_time?: string;
|
|
@@ -342,7 +342,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
342
342
|
date: string;
|
|
343
343
|
status: string;
|
|
344
344
|
week: string;
|
|
345
|
-
weekNum: 0 |
|
|
345
|
+
weekNum: 0 | 1 | 2 | 6 | 4 | 5 | 3;
|
|
346
346
|
}[]>;
|
|
347
347
|
submitTimeSlot(timeSlots: TimeSliceItem): void;
|
|
348
348
|
private getScheduleDataByIds;
|
|
@@ -32,6 +32,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
32
32
|
private orderCustomerDiscountRefreshCustomerId;
|
|
33
33
|
private orderCustomerDiscountRefreshTarget;
|
|
34
34
|
private orderCustomerPromotionRefreshInFlight;
|
|
35
|
+
private orderCustomerRefreshTask;
|
|
36
|
+
private orderCustomerRefreshRevision;
|
|
35
37
|
private orderCustomerContactRequest;
|
|
36
38
|
private readonly customerResolveRequests;
|
|
37
39
|
protected loadOpenDataInFlight: Promise<OpenDataConfig> | null;
|
|
@@ -283,6 +285,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
283
285
|
setOrderCustomer(customer: ICustomer | null, options?: {
|
|
284
286
|
source?: OrderCustomerChangePayload['source'];
|
|
285
287
|
}): void;
|
|
288
|
+
/** Shared by customer changes and an explicit retry; keep the selected customer/cart intact. */
|
|
289
|
+
private refreshMemberCartContext;
|
|
290
|
+
retryOrderCustomerRefresh(): Promise<void>;
|
|
286
291
|
private resetOrderCustomerContactInfo;
|
|
287
292
|
/** Explicit edits, including clearing the contact, must win over a pending default. */
|
|
288
293
|
updateTempOrderContactsInfo(contact: Record<string, any> | null): Record<string, any> | null;
|
|
@@ -321,6 +326,8 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
321
326
|
private buildOrderCustomerPayload;
|
|
322
327
|
protected refreshDiscountConfigAfterOrderCustomerChange(customerId: number | null): Promise<void>;
|
|
323
328
|
protected waitForOrderCustomerPromotionRefresh(): Promise<void>;
|
|
329
|
+
/** Wait before reading cart rows: member coupons can split or consolidate them. */
|
|
330
|
+
waitForOrderCustomerRefresh(): Promise<void>;
|
|
324
331
|
protected prepareProductPriceQueryContext(customerId?: number | string): Promise<void>;
|
|
325
332
|
protected preferAuthoritativeProductQueryPrice(): boolean;
|
|
326
333
|
/**
|