@pisell/pisellos 0.10.88 → 0.10.91
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/itemRule/adapter.d.ts +3 -1
- package/dist/model/strategy/adapter/itemRule/adapter.js +74 -7
- package/dist/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
- package/dist/model/strategy/adapter/itemRule/evaluator.js +13 -0
- package/dist/model/strategy/adapter/itemRule/type.d.ts +40 -1
- package/dist/model/strategy/adapter/itemRule/type.js +10 -0
- package/dist/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
- package/dist/model/strategy/adapter/promotion/evaluator.js +103 -112
- package/dist/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/dist/modules/BookingContext/utils/calendarBooking.js +207 -0
- package/dist/modules/BookingContext/utils/index.d.ts +1 -0
- package/dist/modules/BookingContext/utils/index.js +1 -0
- package/dist/modules/BookingContext/utils/productExtend.d.ts +21 -0
- package/dist/modules/BookingContext/utils/productExtend.js +132 -33
- package/dist/modules/BookingContext/utils/resources.js +1 -1
- package/dist/modules/Cart/index.js +4 -3
- package/dist/modules/Cart/types.d.ts +2 -0
- package/dist/modules/Cart/utils/cartProduct.d.ts +3 -1
- package/dist/modules/Cart/utils/cartProduct.js +59 -32
- package/dist/modules/Date/index.d.ts +1 -1
- package/dist/modules/Date/index.js +60 -14
- package/dist/modules/Date/types.d.ts +5 -0
- package/dist/modules/OpenData/salesSettings.js +1 -1
- package/dist/modules/OpenData/types.d.ts +9 -0
- package/dist/modules/OpenData/utils.d.ts +1 -1
- package/dist/modules/OpenData/utils.js +3 -2
- package/dist/modules/Order/index.d.ts +22 -7
- package/dist/modules/Order/index.js +1565 -1161
- package/dist/modules/Order/localEftposState.d.ts +13 -0
- package/dist/modules/Order/localEftposState.js +39 -0
- package/dist/modules/Order/types.d.ts +33 -11
- package/dist/modules/Order/types.js +2 -2
- package/dist/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/dist/modules/Order/unpaidAmountGap.js +72 -0
- package/dist/modules/Order/utils.d.ts +4 -1
- package/dist/modules/Order/utils.js +185 -129
- package/dist/modules/Payment/walletpass.js +32 -6
- package/dist/modules/Product/types.d.ts +16 -0
- package/dist/modules/ProductList/index.js +1 -1
- package/dist/modules/ResourcePlanner/planner.d.ts +2 -0
- package/dist/modules/ResourcePlanner/planner.js +383 -24
- package/dist/modules/ResourcePlanner/types.d.ts +42 -0
- package/dist/modules/Rules/index.js +86 -54
- package/dist/modules/Schedule/index.d.ts +7 -1
- package/dist/modules/Schedule/index.js +155 -39
- package/dist/modules/Schedule/types.d.ts +2 -0
- package/dist/modules/bookingReadValidation.d.ts +6 -0
- package/dist/modules/bookingReadValidation.js +72 -0
- package/dist/plugins/request.d.ts +2 -0
- package/dist/server/index.d.ts +9 -0
- package/dist/server/index.js +1928 -1462
- package/dist/server/modules/form/index.d.ts +19 -0
- package/dist/server/modules/form/index.js +205 -0
- package/dist/server/modules/form/types.d.ts +13 -0
- package/dist/server/modules/form/types.js +3 -0
- package/dist/server/modules/index.d.ts +3 -0
- package/dist/server/modules/index.js +4 -0
- package/dist/server/modules/order/index.d.ts +21 -0
- package/dist/server/modules/order/index.js +1399 -831
- package/dist/server/modules/order/types.d.ts +3 -0
- package/dist/server/modules/order/utils/filterOrders.js +20 -0
- package/dist/server/modules/products/index.d.ts +28 -7
- package/dist/server/modules/products/index.js +1295 -769
- package/dist/server/modules/products/replication.d.ts +8 -0
- package/dist/server/modules/products/replication.js +69 -0
- package/dist/server/modules/products/types.d.ts +12 -1
- package/dist/server/modules/products/types.js +4 -0
- package/dist/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/dist/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/dist/shared/receipt/small-ticket.d.ts +1 -0
- package/dist/shared/receipt/small-ticket.js +58 -26
- package/dist/shared/receipt/templateVisibility.d.ts +3 -0
- package/dist/shared/receipt/templateVisibility.js +6 -2
- package/dist/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
- package/dist/solution/BaseSales/fulfillmentItemRules.js +750 -0
- package/dist/solution/BaseSales/index.d.ts +22 -6
- package/dist/solution/BaseSales/index.js +1881 -1347
- package/dist/solution/BaseSales/pickupTiming.d.ts +4 -0
- package/dist/solution/BaseSales/pickupTiming.js +35 -8
- package/dist/solution/BaseSales/types.d.ts +4 -0
- package/dist/solution/BaseSales/types.js +1 -0
- package/dist/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
- package/dist/solution/BaseSales/utils/posDurationPricing.js +174 -0
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
- package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +8 -8
- package/dist/solution/BookingByStep/index.d.ts +19 -3
- package/dist/solution/BookingByStep/index.js +681 -361
- package/dist/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/dist/solution/BookingByStep/utils/resources.js +117 -76
- package/dist/solution/BookingTicket/index.d.ts +6 -0
- package/dist/solution/BookingTicket/index.js +666 -593
- package/dist/solution/BookingTicket/types.d.ts +1 -1
- package/dist/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
- package/dist/solution/BookingTicket/utils/addProductDecision.js +35 -8
- package/dist/solution/BookingTicket/utils/redeemArrival.d.ts +7 -7
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/dist/solution/BookingTicket/utils/resolveUniqueCartDetail.js +188 -0
- package/dist/solution/BookingTicket/utils/scan/applyGlobalScan.js +58 -94
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
- package/dist/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +33 -62
- package/dist/solution/OrderInvoicePreview/index.js +4 -3
- package/dist/solution/Sales/index.js +1 -1
- package/dist/solution/ScanOrder/index.d.ts +2 -0
- package/dist/solution/ScanOrder/index.js +230 -97
- package/dist/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/dist/solution/ScanOrder/menuAvailability.js +363 -0
- package/dist/solution/ScanOrder/types.d.ts +3 -0
- package/dist/solution/UnifiedBookingSales/index.d.ts +42 -10
- package/dist/solution/UnifiedBookingSales/index.js +2493 -1496
- package/dist/solution/UnifiedBookingSales/salesSettings.js +1 -1
- package/dist/solution/UnifiedBookingSales/types.d.ts +20 -5
- package/dist/utils/pos-receipt-auto-print.d.ts +4 -0
- package/dist/utils/pos-receipt-auto-print.js +14 -0
- package/lib/model/strategy/adapter/itemRule/adapter.d.ts +3 -1
- package/lib/model/strategy/adapter/itemRule/adapter.js +54 -4
- package/lib/model/strategy/adapter/itemRule/evaluator.d.ts +3 -1
- package/lib/model/strategy/adapter/itemRule/evaluator.js +9 -0
- package/lib/model/strategy/adapter/itemRule/type.d.ts +40 -1
- package/lib/model/strategy/adapter/itemRule/type.js +10 -0
- package/lib/model/strategy/adapter/promotion/evaluator.d.ts +2 -1
- package/lib/model/strategy/adapter/promotion/evaluator.js +22 -21
- package/lib/modules/BookingContext/utils/calendarBooking.d.ts +15 -0
- package/lib/modules/BookingContext/utils/calendarBooking.js +156 -0
- package/lib/modules/BookingContext/utils/index.d.ts +1 -0
- package/lib/modules/BookingContext/utils/index.js +11 -0
- package/lib/modules/BookingContext/utils/productExtend.d.ts +21 -0
- package/lib/modules/BookingContext/utils/productExtend.js +104 -5
- package/lib/modules/BookingContext/utils/resources.js +1 -1
- package/lib/modules/Cart/index.js +4 -2
- package/lib/modules/Cart/types.d.ts +2 -0
- package/lib/modules/Cart/utils/cartProduct.d.ts +3 -1
- package/lib/modules/Cart/utils/cartProduct.js +39 -20
- package/lib/modules/Date/index.d.ts +1 -1
- package/lib/modules/Date/index.js +28 -5
- package/lib/modules/Date/types.d.ts +5 -0
- package/lib/modules/OpenData/salesSettings.js +1 -1
- package/lib/modules/OpenData/types.d.ts +9 -0
- package/lib/modules/OpenData/utils.d.ts +1 -1
- package/lib/modules/OpenData/utils.js +3 -2
- package/lib/modules/Order/index.d.ts +22 -7
- package/lib/modules/Order/index.js +457 -174
- package/lib/modules/Order/localEftposState.d.ts +13 -0
- package/lib/modules/Order/localEftposState.js +44 -0
- package/lib/modules/Order/types.d.ts +33 -11
- package/lib/modules/Order/types.js +2 -2
- package/lib/modules/Order/unpaidAmountGap.d.ts +6 -0
- package/lib/modules/Order/unpaidAmountGap.js +60 -0
- package/lib/modules/Order/utils.d.ts +4 -1
- package/lib/modules/Order/utils.js +51 -3
- package/lib/modules/Payment/walletpass.js +23 -1
- package/lib/modules/Product/types.d.ts +16 -0
- package/lib/modules/ProductList/index.js +1 -1
- package/lib/modules/ResourcePlanner/planner.d.ts +2 -0
- package/lib/modules/ResourcePlanner/planner.js +299 -9
- package/lib/modules/ResourcePlanner/types.d.ts +42 -0
- package/lib/modules/Rules/index.js +32 -3
- package/lib/modules/Schedule/index.d.ts +7 -1
- package/lib/modules/Schedule/index.js +68 -4
- package/lib/modules/Schedule/types.d.ts +2 -0
- package/lib/modules/bookingReadValidation.d.ts +6 -0
- package/lib/modules/bookingReadValidation.js +56 -0
- package/lib/plugins/request.d.ts +2 -0
- package/lib/server/index.d.ts +9 -0
- package/lib/server/index.js +279 -30
- package/lib/server/modules/form/index.d.ts +19 -0
- package/lib/server/modules/form/index.js +73 -0
- package/lib/server/modules/form/types.d.ts +13 -0
- package/lib/server/modules/form/types.js +9 -0
- package/lib/server/modules/index.d.ts +3 -0
- package/lib/server/modules/index.js +15 -1
- package/lib/server/modules/order/index.d.ts +21 -0
- package/lib/server/modules/order/index.js +344 -35
- package/lib/server/modules/order/types.d.ts +3 -0
- package/lib/server/modules/order/utils/filterOrders.js +18 -0
- package/lib/server/modules/products/index.d.ts +28 -7
- package/lib/server/modules/products/index.js +224 -62
- package/lib/server/modules/products/replication.d.ts +8 -0
- package/lib/server/modules/products/replication.js +30 -0
- package/lib/server/modules/products/types.d.ts +12 -1
- package/lib/server/modules/products/types.js +3 -0
- package/lib/shared/receipt/customerInvoiceLanguages.d.ts +1 -1
- package/lib/shared/receipt/customerInvoiceLanguages.js +5 -3
- package/lib/shared/receipt/small-ticket.d.ts +1 -0
- package/lib/shared/receipt/small-ticket.js +53 -25
- package/lib/shared/receipt/templateVisibility.d.ts +3 -0
- package/lib/shared/receipt/templateVisibility.js +6 -2
- package/lib/solution/BaseSales/fulfillmentItemRules.d.ts +27 -0
- package/lib/solution/BaseSales/fulfillmentItemRules.js +259 -0
- package/lib/solution/BaseSales/index.d.ts +22 -6
- package/lib/solution/BaseSales/index.js +347 -59
- package/lib/solution/BaseSales/pickupTiming.d.ts +4 -0
- package/lib/solution/BaseSales/pickupTiming.js +24 -3
- package/lib/solution/BaseSales/types.d.ts +4 -0
- package/lib/solution/BaseSales/types.js +1 -0
- package/lib/solution/BaseSales/utils/posDurationPricing.d.ts +21 -0
- package/lib/solution/BaseSales/utils/posDurationPricing.js +133 -0
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.d.ts +2 -0
- package/lib/solution/BaseSales/utils/transformBaseProductToOrderProduct.js +1 -1
- package/lib/solution/BookingByStep/index.d.ts +19 -3
- package/lib/solution/BookingByStep/index.js +229 -17
- package/lib/solution/BookingByStep/utils/resources.d.ts +10 -0
- package/lib/solution/BookingByStep/utils/resources.js +25 -15
- package/lib/solution/BookingTicket/index.d.ts +6 -0
- package/lib/solution/BookingTicket/index.js +40 -5
- package/lib/solution/BookingTicket/types.d.ts +1 -1
- package/lib/solution/BookingTicket/utils/addProductDecision.d.ts +2 -1
- package/lib/solution/BookingTicket/utils/addProductDecision.js +34 -4
- package/lib/solution/BookingTicket/utils/redeemArrival.d.ts +7 -7
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.d.ts +8 -0
- package/lib/solution/BookingTicket/utils/resolveUniqueCartDetail.js +136 -0
- package/lib/solution/BookingTicket/utils/scan/applyGlobalScan.js +2 -14
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.d.ts +1 -3
- package/lib/solution/BookingTicket/utils/scan/applyProductVoucherCollectionScan.js +17 -34
- package/lib/solution/OrderInvoicePreview/index.js +1 -0
- package/lib/solution/Sales/index.js +1 -1
- package/lib/solution/ScanOrder/index.d.ts +2 -0
- package/lib/solution/ScanOrder/index.js +131 -22
- package/lib/solution/ScanOrder/menuAvailability.d.ts +24 -0
- package/lib/solution/ScanOrder/menuAvailability.js +203 -0
- package/lib/solution/ScanOrder/types.d.ts +3 -0
- package/lib/solution/UnifiedBookingSales/index.d.ts +42 -10
- package/lib/solution/UnifiedBookingSales/index.js +717 -144
- package/lib/solution/UnifiedBookingSales/salesSettings.js +1 -1
- package/lib/solution/UnifiedBookingSales/types.d.ts +20 -5
- package/lib/utils/pos-receipt-auto-print.d.ts +4 -0
- package/lib/utils/pos-receipt-auto-print.js +13 -0
- package/package.json +1 -1
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
|
+
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
3
|
+
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
+
function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
|
|
5
|
+
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
6
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
7
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
8
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
9
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
10
|
+
function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
|
|
11
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
12
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
13
|
+
function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
14
|
+
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
15
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
16
|
+
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
17
|
+
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
18
|
+
import dayjs from 'dayjs';
|
|
19
|
+
import { captureRuntimeOffsetMinutes, extractFixedOffsetMinutes, formatLocalDateTime, localDateTimeToScalar, parseLocalDateTime } from "../../ResourcePlanner/localClock";
|
|
20
|
+
import { isBookingProduct, isMultiDayProduct } from "./serviceTimes";
|
|
21
|
+
export function isManualBookingProduct(product) {
|
|
22
|
+
var _product$product_reso, _product$capacity;
|
|
23
|
+
return !isBookingProduct(product) && Boolean((product === null || product === void 0 ? void 0 : product.extension_type) === 'product_appointment' || (product === null || product === void 0 || (_product$product_reso = product.product_resource) === null || _product$product_reso === void 0 || (_product$product_reso = _product$product_reso.resources) === null || _product$product_reso === void 0 ? void 0 : _product$product_reso.some(function (group) {
|
|
24
|
+
return Number(group.status) === 1;
|
|
25
|
+
})) || ['custom', 'package'].includes(product === null || product === void 0 || (_product$capacity = product.capacity) === null || _product$capacity === void 0 ? void 0 : _product$capacity.type));
|
|
26
|
+
}
|
|
27
|
+
export function getCalendarBookingRange(product, ctx) {
|
|
28
|
+
var _product$flexible, _product$_extend;
|
|
29
|
+
var range = ctx === null || ctx === void 0 ? void 0 : ctx.bookingTimeRangeFromCalendar;
|
|
30
|
+
if (!range || (ctx === null || ctx === void 0 ? void 0 : ctx.platform) !== 'pos' || isMultiDayProduct(product) || (product === null || product === void 0 ? void 0 : product.duration_type) === 'days' || (product === null || product === void 0 || (_product$flexible = product.flexible) === null || _product$flexible === void 0 || (_product$flexible = _product$flexible.duration) === null || _product$flexible === void 0 ? void 0 : _product$flexible.type) === 'days' || (product === null || product === void 0 || (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.sub_type) === 'days' || !isBookingProduct(product) && !isManualBookingProduct(product)) return undefined;
|
|
31
|
+
try {
|
|
32
|
+
var offset = captureRuntimeOffsetMinutes();
|
|
33
|
+
var normalize = function normalize(text) {
|
|
34
|
+
var _extractFixedOffsetMi;
|
|
35
|
+
var scalar = localDateTimeToScalar(parseLocalDateTime(text));
|
|
36
|
+
var inputOffset = (_extractFixedOffsetMi = extractFixedOffsetMinutes(text)) !== null && _extractFixedOffsetMi !== void 0 ? _extractFixedOffsetMi : offset;
|
|
37
|
+
return formatLocalDateTime(scalar + (offset - inputOffset) * 60000, offset);
|
|
38
|
+
};
|
|
39
|
+
var startAt = normalize(range.startAt);
|
|
40
|
+
var endAt = normalize(range.endAt);
|
|
41
|
+
var start = localDateTimeToScalar(parseLocalDateTime(startAt));
|
|
42
|
+
var end = localDateTimeToScalar(parseLocalDateTime(endAt));
|
|
43
|
+
var duration = (end - start) / 60000;
|
|
44
|
+
if (!Number.isInteger(duration) || duration <= 0 || start % 60000 || end % 60000) throw new Error();
|
|
45
|
+
return {
|
|
46
|
+
startAt: startAt,
|
|
47
|
+
endAt: endAt,
|
|
48
|
+
duration: duration,
|
|
49
|
+
startDate: dayjs(startAt.slice(0, 19)),
|
|
50
|
+
endDate: dayjs(endAt.slice(0, 19))
|
|
51
|
+
};
|
|
52
|
+
} catch (_unused) {
|
|
53
|
+
throw Object.assign(new Error('Calendar booking requires valid complete start/end times.'), {
|
|
54
|
+
code: 'INVALID_TARGET_FILTER'
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** A prepared calendar cache is reused after SKU input; no availability-driven replacement is allowed. */
|
|
60
|
+
export function prepareCalendarBookingCacheItem(cacheItem, ctx) {
|
|
61
|
+
var _cacheItem$product_re, _cacheItem$_data;
|
|
62
|
+
var range = getCalendarBookingRange(cacheItem, ctx);
|
|
63
|
+
if (!range) return cacheItem;
|
|
64
|
+
var resource = {};
|
|
65
|
+
var forms = (((_cacheItem$product_re = cacheItem.product_resource) === null || _cacheItem$product_re === void 0 ? void 0 : _cacheItem$product_re.resources) || []).filter(function (group) {
|
|
66
|
+
return Number(group.status) === 1;
|
|
67
|
+
});
|
|
68
|
+
var entry = Number(ctx.resourceIdFromCalendar);
|
|
69
|
+
var preserveInput = ((_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 ? void 0 : _cacheItem$_data.calendarBookingEntryKey) === calendarBookingEntryKey(ctx);
|
|
70
|
+
var inputInvalid = false;
|
|
71
|
+
if (preserveInput) {
|
|
72
|
+
var ext = cacheItem._extend || {};
|
|
73
|
+
try {
|
|
74
|
+
var _ext$start_date, _ext$end_date, _ext$start_date2, _ext$end_date2;
|
|
75
|
+
if (!((_ext$start_date = ext.start_date) !== null && _ext$start_date !== void 0 ? _ext$start_date : ext.startDate) || !((_ext$end_date = ext.end_date) !== null && _ext$end_date !== void 0 ? _ext$end_date : ext.endDate) || !ext.start_time || !ext.end_time) throw new Error('Incomplete calendar input.');
|
|
76
|
+
range = getCalendarBookingRange(cacheItem, _objectSpread(_objectSpread({}, ctx), {}, {
|
|
77
|
+
bookingTimeRangeFromCalendar: {
|
|
78
|
+
startAt: "".concat(dayjs((_ext$start_date2 = ext.start_date) !== null && _ext$start_date2 !== void 0 ? _ext$start_date2 : ext.startDate).format('YYYY-MM-DD'), "T").concat(ext.start_time, ":00"),
|
|
79
|
+
endAt: "".concat(dayjs((_ext$end_date2 = ext.end_date) !== null && _ext$end_date2 !== void 0 ? _ext$end_date2 : ext.endDate).format('YYYY-MM-DD'), "T").concat(ext.end_time, ":00")
|
|
80
|
+
}
|
|
81
|
+
}));
|
|
82
|
+
} catch (_unused2) {
|
|
83
|
+
range = undefined;
|
|
84
|
+
inputInvalid = true;
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
var _iterator = _createForOfIteratorHelper(forms),
|
|
88
|
+
_step;
|
|
89
|
+
try {
|
|
90
|
+
var _loop = function _loop() {
|
|
91
|
+
var _ctx$resourcesOriginM, _cacheItem$_extend;
|
|
92
|
+
var form = _step.value;
|
|
93
|
+
var ids = [].concat(_toConsumableArray(form.optional_resource || []), _toConsumableArray(form.default_resource || []));
|
|
94
|
+
var linked = ids.some(function (id) {
|
|
95
|
+
return String(id) === String(entry);
|
|
96
|
+
});
|
|
97
|
+
var origin = (_ctx$resourcesOriginM = ctx.resourcesOriginMap) === null || _ctx$resourcesOriginM === void 0 ? void 0 : _ctx$resourcesOriginM[entry];
|
|
98
|
+
var chosen = (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 || (_cacheItem$_extend = _cacheItem$_extend.resource) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend[String(form.id)];
|
|
99
|
+
var hasChosen = preserveInput && chosen !== undefined;
|
|
100
|
+
var validChosen = hasChosen && Array.isArray(chosen) && new Set(chosen.map(function (row) {
|
|
101
|
+
return String(row.relation_id);
|
|
102
|
+
})).size === chosen.length && chosen.every(function (row) {
|
|
103
|
+
var _ctx$resourcesOriginM2;
|
|
104
|
+
return (row.form_id == null || String(row.form_id) === String(form.id)) && (Number(row.relation_id) === 0 || ids.some(function (id) {
|
|
105
|
+
return String(id) === String(row.relation_id);
|
|
106
|
+
}) && ((_ctx$resourcesOriginM2 = ctx.resourcesOriginMap) === null || _ctx$resourcesOriginM2 === void 0 ? void 0 : _ctx$resourcesOriginM2[row.relation_id]) && (ctx.resourcesOriginMap[row.relation_id].form_id == null || String(ctx.resourcesOriginMap[row.relation_id].form_id) === String(form.id)));
|
|
107
|
+
});
|
|
108
|
+
if (hasChosen && !validChosen) inputInvalid = true;
|
|
109
|
+
if (hasChosen) {
|
|
110
|
+
resource[String(form.id)] = validChosen ? chosen : [];
|
|
111
|
+
} else if (linked && origin && (origin.form_id == null || String(origin.form_id) === String(form.id))) {
|
|
112
|
+
resource[String(form.id)] = [{
|
|
113
|
+
relation_type: origin.relation_type || 'form',
|
|
114
|
+
form_id: form.id,
|
|
115
|
+
relation_id: entry,
|
|
116
|
+
like_status: 'common',
|
|
117
|
+
metadata: {
|
|
118
|
+
form_name: form.title,
|
|
119
|
+
resource_name: origin.main_field
|
|
120
|
+
}
|
|
121
|
+
}];
|
|
122
|
+
} else {
|
|
123
|
+
resource[String(form.id)] = [];
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
127
|
+
_loop();
|
|
128
|
+
}
|
|
129
|
+
} catch (err) {
|
|
130
|
+
_iterator.e(err);
|
|
131
|
+
} finally {
|
|
132
|
+
_iterator.f();
|
|
133
|
+
}
|
|
134
|
+
return _objectSpread(_objectSpread(_objectSpread({}, cacheItem), isManualBookingProduct(cacheItem) && range ? {
|
|
135
|
+
duration: {
|
|
136
|
+
type: 'minutes',
|
|
137
|
+
value: range.duration
|
|
138
|
+
}
|
|
139
|
+
} : {}), {}, {
|
|
140
|
+
_data: _objectSpread(_objectSpread({}, cacheItem._data), {}, {
|
|
141
|
+
calendarBookingInputInvalid: inputInvalid
|
|
142
|
+
}),
|
|
143
|
+
_extend: _objectSpread(_objectSpread(_objectSpread({}, cacheItem._extend), range ? {
|
|
144
|
+
startDate: range.startDate,
|
|
145
|
+
start_date: range.startDate,
|
|
146
|
+
start_time: range.startAt.slice(11, 16),
|
|
147
|
+
endDate: range.endDate,
|
|
148
|
+
end_date: range.endDate,
|
|
149
|
+
end_time: range.endAt.slice(11, 16),
|
|
150
|
+
duration: range.duration
|
|
151
|
+
} : {}), {}, {
|
|
152
|
+
resource: resource
|
|
153
|
+
})
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
export function calendarBookingEntryKey(ctx) {
|
|
157
|
+
return JSON.stringify([ctx.bookingTimeRangeFromCalendar, ctx.resourceIdFromCalendar]);
|
|
158
|
+
}
|
|
159
|
+
export function calendarBookingNeedsInput(cacheItem) {
|
|
160
|
+
var _cacheItem$_data2, _cacheItem$product_re2;
|
|
161
|
+
if ((_cacheItem$_data2 = cacheItem._data) !== null && _cacheItem$_data2 !== void 0 && _cacheItem$_data2.calendarBookingInputInvalid) return true;
|
|
162
|
+
var capacity = cacheItem.capacity;
|
|
163
|
+
if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'custom' && (!Array.isArray(capacity.custom) || !capacity.custom.length || capacity.custom.some(function (item) {
|
|
164
|
+
return !Number.isFinite(Number(item.min)) || item.max == null || Number(item.min) !== Number(item.max);
|
|
165
|
+
}))) return true;
|
|
166
|
+
var groups = (_cacheItem$product_re2 = cacheItem.product_resource) === null || _cacheItem$product_re2 === void 0 ? void 0 : _cacheItem$product_re2.resources;
|
|
167
|
+
if (groups != null && !Array.isArray(groups)) return true;
|
|
168
|
+
var seen = new Set();
|
|
169
|
+
return (groups || []).some(function (group) {
|
|
170
|
+
var _rule$min, _rule$max, _cacheItem$_extend2, _group$required;
|
|
171
|
+
if (Number(group.status) === 0) return false;
|
|
172
|
+
if (group.id == null || seen.has(String(group.id))) return true;
|
|
173
|
+
seen.add(String(group.id));
|
|
174
|
+
var rule = group.select_type;
|
|
175
|
+
if (Number(group.status) !== 1 || !rule || !['single', 'multiple'].includes(rule.type)) return true;
|
|
176
|
+
var min = Number((_rule$min = rule.min) !== null && _rule$min !== void 0 ? _rule$min : rule.type === 'single' ? 1 : NaN);
|
|
177
|
+
var max = Number((_rule$max = rule.max) !== null && _rule$max !== void 0 ? _rule$max : rule.type === 'single' ? 1 : NaN);
|
|
178
|
+
var rows = (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.resource) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2[String(group.id)];
|
|
179
|
+
var required = (_group$required = group.required) !== null && _group$required !== void 0 ? _group$required : true;
|
|
180
|
+
var minimum = Math.max(required ? 1 : 0, min);
|
|
181
|
+
return !Number.isInteger(min) || !Number.isInteger(max) || min < 0 || max < minimum || !Array.isArray(rows) || rows.length < minimum || rows.length > max;
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
export function calendarBookingPreparationKey(cacheItem, ctx) {
|
|
185
|
+
var _cacheItem$_extend3, _sku$product_variant_, _ext$start_date3, _ext$end_date3;
|
|
186
|
+
var identities = function identities(rows) {
|
|
187
|
+
return (rows || []).map(function (row) {
|
|
188
|
+
var _ref, _row$group_id, _ref2, _row$product_option_i, _row$_bundle_product_, _row$product_variant_, _ref3, _row$quantity;
|
|
189
|
+
return [(_ref = (_row$group_id = row.group_id) !== null && _row$group_id !== void 0 ? _row$group_id : row.option_group_id) !== null && _ref !== void 0 ? _ref : row.bundle_group_id, (_ref2 = (_row$product_option_i = row.product_option_item_id) !== null && _row$product_option_i !== void 0 ? _row$product_option_i : row.option_group_item_id) !== null && _ref2 !== void 0 ? _ref2 : row.id, (_row$_bundle_product_ = row._bundle_product_id) !== null && _row$_bundle_product_ !== void 0 ? _row$_bundle_product_ : row.bundle_product_id, (_row$product_variant_ = row.product_variant_id) !== null && _row$product_variant_ !== void 0 ? _row$product_variant_ : row.bundle_variant_id, (_ref3 = (_row$quantity = row.quantity) !== null && _row$quantity !== void 0 ? _row$quantity : row.num) !== null && _ref3 !== void 0 ? _ref3 : 1, identities(row.option)];
|
|
190
|
+
}).sort(function (left, right) {
|
|
191
|
+
return JSON.stringify(left).localeCompare(JSON.stringify(right));
|
|
192
|
+
});
|
|
193
|
+
};
|
|
194
|
+
var sku = ((_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.other) || {};
|
|
195
|
+
var ext = cacheItem._extend || {};
|
|
196
|
+
var dateKey = function dateKey(value) {
|
|
197
|
+
return value == null || value === '' ? null : dayjs(value).format('YYYY-MM-DD');
|
|
198
|
+
};
|
|
199
|
+
return JSON.stringify([ctx.bookingTimeRangeFromCalendar, ctx.resourceIdFromCalendar, cacheItem.capacity, cacheItem.product_resource, (_sku$product_variant_ = sku.product_variant_id) !== null && _sku$product_variant_ !== void 0 ? _sku$product_variant_ : sku.variant_id, identities(sku.option), identities(sku.bundle), dateKey((_ext$start_date3 = ext.start_date) !== null && _ext$start_date3 !== void 0 ? _ext$start_date3 : ext.startDate), ext.start_time, dateKey((_ext$end_date3 = ext.end_date) !== null && _ext$end_date3 !== void 0 ? _ext$end_date3 : ext.endDate), ext.end_time, Object.entries(ext.resource || {}).map(function (_ref4) {
|
|
200
|
+
var _ref5 = _slicedToArray(_ref4, 2),
|
|
201
|
+
formId = _ref5[0],
|
|
202
|
+
rows = _ref5[1];
|
|
203
|
+
return [formId, Array.isArray(rows) ? rows.map(function (row) {
|
|
204
|
+
return [row.form_id, row.relation_id];
|
|
205
|
+
}) : null];
|
|
206
|
+
})]);
|
|
207
|
+
}
|
|
@@ -6,6 +6,7 @@ export * from './resources';
|
|
|
6
6
|
export * from './resourceSelection';
|
|
7
7
|
export * from './resourceErrors';
|
|
8
8
|
export * from './productExtend';
|
|
9
|
+
export * from './calendarBooking';
|
|
9
10
|
export * from './cacheItemToBookingInput';
|
|
10
11
|
export * from './buildCacheItemFromOrderLine';
|
|
11
12
|
export * from './buildNormalProductCacheItemFromOrderLine';
|
|
@@ -6,6 +6,7 @@ export * from "./resources";
|
|
|
6
6
|
export * from "./resourceSelection";
|
|
7
7
|
export * from "./resourceErrors";
|
|
8
8
|
export * from "./productExtend";
|
|
9
|
+
export * from "./calendarBooking";
|
|
9
10
|
export * from "./cacheItemToBookingInput";
|
|
10
11
|
export * from "./buildCacheItemFromOrderLine";
|
|
11
12
|
export * from "./buildNormalProductCacheItemFromOrderLine";
|
|
@@ -7,6 +7,27 @@ import { TimeSlicesResult, TimeSlice, DurationSlice } from './timeSlices';
|
|
|
7
7
|
* 让 OS 这层完全可在 Node 单测下运行(dayjs 在 Node 也是纯函数)。
|
|
8
8
|
*/
|
|
9
9
|
export interface BookingCalcContext {
|
|
10
|
+
/** Real runtime platform, injected by BookingTicket rather than inferred from sales channel. */
|
|
11
|
+
platform?: string;
|
|
12
|
+
bookingTimeRangeFromCalendar?: {
|
|
13
|
+
startAt: string;
|
|
14
|
+
endAt: string;
|
|
15
|
+
};
|
|
16
|
+
/** Sales channel; remembered duration starts are accepted only by POS. */
|
|
17
|
+
channel?: string;
|
|
18
|
+
/** Current in-memory order session, supplied by the owning Order module. */
|
|
19
|
+
orderSessionId?: string;
|
|
20
|
+
/** Rejects a session while an order replacement or hydration is pending. */
|
|
21
|
+
isOrderSessionCurrent?: (sessionId: string) => boolean;
|
|
22
|
+
/** Legacy start-only preference, or an exact interval owned by the current order session. */
|
|
23
|
+
rememberedTime?: {
|
|
24
|
+
businessDate: string;
|
|
25
|
+
startAt: string;
|
|
26
|
+
endAt?: string;
|
|
27
|
+
orderSessionId?: string;
|
|
28
|
+
};
|
|
29
|
+
/** An expired memory restarts from the current entry time, without following cart bookings. */
|
|
30
|
+
useCurrentTimeAfterRememberedExpiry?: boolean;
|
|
10
31
|
/** 来自 `/core/board/management/config` 的整套配置;常用路径见 sliceTimeSlices / appointmentTimingPreference。 */
|
|
11
32
|
bookingConfig?: any;
|
|
12
33
|
/** 资源 origin map(id → resource origin)。 */
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
2
1
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
3
2
|
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
3
|
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
@@ -10,12 +9,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
10
9
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
10
|
function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
|
|
12
11
|
function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
|
|
12
|
+
function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
|
|
13
13
|
import dayjs from 'dayjs';
|
|
14
14
|
import { formatResources, getResourceByIds, getSumCapacity, getUsableTime, setDefaultCapacitys, setDefaultResource } from "./resources";
|
|
15
15
|
import { hasActualResourceSelection, productNeedsResourceExtend } from "./resourceSelection";
|
|
16
16
|
import { isMultiDayProduct, isSessionProduct, getDays, getServiceTimes } from "./serviceTimes";
|
|
17
17
|
import { sliceDayIntoFiveMinutes, findNextDuration, getEndDate } from "./timeSlices";
|
|
18
18
|
import { flexibleObj, getDurationValue, isProductFlexibleDuration } from "./flexible";
|
|
19
|
+
import { getCalendarBookingRange, prepareCalendarBookingCacheItem, calendarBookingNeedsInput, calendarBookingPreparationKey, calendarBookingEntryKey, isManualBookingProduct } from "./calendarBooking";
|
|
19
20
|
|
|
20
21
|
/**
|
|
21
22
|
* 上下文(与 info2 state.bookingConfig / state.service / state.date 一一对应)。
|
|
@@ -24,6 +25,70 @@ import { flexibleObj, getDurationValue, isProductFlexibleDuration } from "./flex
|
|
|
24
25
|
* 让 OS 这层完全可在 Node 单测下运行(dayjs 在 Node 也是纯函数)。
|
|
25
26
|
*/
|
|
26
27
|
|
|
28
|
+
/** Rebuild only the derived booking fields; SKU, quantity, notes and Holder stay intact. */
|
|
29
|
+
function seedRememberedBookingStart(cacheItem, ctx) {
|
|
30
|
+
var _cacheItem$cartDetail, _cacheItem$_extend;
|
|
31
|
+
var remembered = ctx.rememberedTime;
|
|
32
|
+
var invalid = function invalid() {
|
|
33
|
+
return Object.assign(new Error('Remembered time requires a valid POS duration interval in the current order.'), {
|
|
34
|
+
code: 'INVALID_REMEMBERED_TIME'
|
|
35
|
+
});
|
|
36
|
+
};
|
|
37
|
+
var duration = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.duration;
|
|
38
|
+
var durationType = _typeof(duration) === 'object' && duration ? String(duration.type || '').toLowerCase() : '';
|
|
39
|
+
var durationValue = _typeof(duration) === 'object' && duration ? duration.value : duration;
|
|
40
|
+
var isDuration = isProductFlexibleDuration(duration) || ['', 'fixed', 'minute', 'minutes', 'hour', 'hours'].includes(durationType) && Number.isFinite(Number(durationValue)) && Number(durationValue) > 0;
|
|
41
|
+
var isCalendarDate = function isCalendarDate(value) {
|
|
42
|
+
if (typeof value !== 'string' || !/^\d{4}-\d{2}-\d{2}$/.test(value)) return false;
|
|
43
|
+
var date = new Date("".concat(value, "T00:00:00.000Z"));
|
|
44
|
+
return Number.isFinite(date.getTime()) && date.toISOString().slice(0, 10) === value;
|
|
45
|
+
};
|
|
46
|
+
var isDateTime = function isDateTime(value) {
|
|
47
|
+
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;
|
|
48
|
+
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);
|
|
49
|
+
};
|
|
50
|
+
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();
|
|
51
|
+
// Parse the actual instant with the same runtime clock used by the legacy booking helpers.
|
|
52
|
+
// The business-day label must not replace the calendar date of an overnight start.
|
|
53
|
+
var start = dayjs(remembered.startAt);
|
|
54
|
+
if (!start.isValid()) throw invalid();
|
|
55
|
+
var hasRememberedInterval = remembered.endAt !== undefined || remembered.orderSessionId !== undefined;
|
|
56
|
+
var end;
|
|
57
|
+
var rememberedDuration;
|
|
58
|
+
if (hasRememberedInterval) {
|
|
59
|
+
if (!isDateTime(remembered.endAt) || typeof remembered.orderSessionId !== 'string' || !remembered.orderSessionId.trim() || remembered.orderSessionId !== ctx.orderSessionId || ctx.isOrderSessionCurrent && !ctx.isOrderSessionCurrent(remembered.orderSessionId)) throw invalid();
|
|
60
|
+
end = dayjs(remembered.endAt);
|
|
61
|
+
var durationMinutes = (end.valueOf() - start.valueOf()) / 60000;
|
|
62
|
+
if (!end.isValid() || !Number.isFinite(durationMinutes) || durationMinutes <= 0) throw invalid();
|
|
63
|
+
var flexible = isProductFlexibleDuration(duration);
|
|
64
|
+
var configuredDurationMinutes = Number(durationValue) * (['hour', 'hours'].includes(durationType) ? 60 : 1);
|
|
65
|
+
if (!flexible && durationMinutes !== configuredDurationMinutes) throw invalid();
|
|
66
|
+
rememberedDuration = flexible ? flexibleObj.create(durationMinutes) : durationMinutes;
|
|
67
|
+
}
|
|
68
|
+
var clockFormat = function clockFormat(value) {
|
|
69
|
+
return value.format(value.millisecond() ? 'HH:mm:ss.SSS' : value.second() ? 'HH:mm:ss' : 'HH:mm');
|
|
70
|
+
};
|
|
71
|
+
var extend = _objectSpread({}, (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend) || {});
|
|
72
|
+
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++) {
|
|
73
|
+
var key = _arr[_i];
|
|
74
|
+
delete extend[key];
|
|
75
|
+
}
|
|
76
|
+
return _objectSpread(_objectSpread({}, cacheItem), {}, {
|
|
77
|
+
new: 1,
|
|
78
|
+
autoClose: false,
|
|
79
|
+
_data: {},
|
|
80
|
+
_extend: _objectSpread(_objectSpread({}, extend), {}, {
|
|
81
|
+
start_date: start.format('YYYY-MM-DD'),
|
|
82
|
+
start_time: clockFormat(start)
|
|
83
|
+
}, end ? {
|
|
84
|
+
end_date: end.format('YYYY-MM-DD'),
|
|
85
|
+
end_time: clockFormat(end),
|
|
86
|
+
endDate: end,
|
|
87
|
+
duration: rememberedDuration
|
|
88
|
+
} : {})
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
|
|
27
92
|
/** 从 BookingContext.date 提取 HH:mm(仅当日期带有效时分时)。 */
|
|
28
93
|
export function derivePresetStartTimeFromDate(date) {
|
|
29
94
|
if (date == null) return undefined;
|
|
@@ -46,12 +111,21 @@ function getAppointmentTimingPreference(ctx) {
|
|
|
46
111
|
* 灵活时长选项(cacheItem.duration.type === 'flexible' 时)。
|
|
47
112
|
*/
|
|
48
113
|
function getFlexibleOption(params) {
|
|
49
|
-
var _cacheItem$
|
|
114
|
+
var _cacheItem$_extend2, _cacheItem$_extend3, _params$ctx$remembere, _usable$_extend, _params$ctx;
|
|
50
115
|
var cacheItem = params.cacheItem,
|
|
51
116
|
useStartTime = params.useStartTime;
|
|
52
117
|
var duration = getDurationValue(cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.duration);
|
|
53
118
|
if (duration !== 'flexible') return null;
|
|
54
|
-
var startDate = dayjs("".concat(dayjs(cacheItem === null || cacheItem === void 0 || (_cacheItem$
|
|
119
|
+
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'));
|
|
120
|
+
// The current-order interval was validated before rebuilding the cache item.
|
|
121
|
+
// Resource defaults may change, but must never extend its saved end.
|
|
122
|
+
if (((_params$ctx$remembere = params.ctx.rememberedTime) === null || _params$ctx$remembere === void 0 ? void 0 : _params$ctx$remembere.endAt) !== undefined) {
|
|
123
|
+
var _timeValue = (dayjs(params.ctx.rememberedTime.endAt).valueOf() - startDate.valueOf()) / 60000;
|
|
124
|
+
return {
|
|
125
|
+
label: String(_timeValue),
|
|
126
|
+
value: flexibleObj.create(_timeValue)
|
|
127
|
+
};
|
|
128
|
+
}
|
|
55
129
|
var usable = getUsableTime(cacheItem);
|
|
56
130
|
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;
|
|
57
131
|
var endDate = getEndDate(startDate, 'flexible', usableEndAt, (_params$ctx = params.ctx) === null || _params$ctx === void 0 ? void 0 : _params$ctx.shopOpeningHours);
|
|
@@ -97,8 +171,9 @@ export function getTimeObj(params) {
|
|
|
97
171
|
};
|
|
98
172
|
}
|
|
99
173
|
function getDefaultBookingStartFallback(cacheItem, ctx) {
|
|
100
|
-
var _ref, _cacheItem$_extend$st, _cacheItem$
|
|
101
|
-
|
|
174
|
+
var _ctx$date, _ref, _cacheItem$_extend$st, _cacheItem$_extend4;
|
|
175
|
+
if (ctx.useCurrentTimeAfterRememberedExpiry) return dayjs((_ctx$date = ctx.date) !== null && _ctx$date !== void 0 ? _ctx$date : dayjs()).format('YYYY-MM-DDTHH:mm');
|
|
176
|
+
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');
|
|
102
177
|
var time = ctx.presetStartTime || cacheItem.currentDefaultTime || dayjs().format('HH:mm');
|
|
103
178
|
return "".concat(date, "T").concat(time);
|
|
104
179
|
}
|
|
@@ -111,7 +186,7 @@ function getDefaultBookingStartFallback(cacheItem, ctx) {
|
|
|
111
186
|
* - cacheItem.isCustomItem → 直接返回 `{ duration: null }`。
|
|
112
187
|
*/
|
|
113
188
|
export function getServiceStartTimeAndEndTime(params) {
|
|
114
|
-
var _cacheItem$
|
|
189
|
+
var _cacheItem$_extend5, _cacheItem$_extend6, _cacheItem$_extend8;
|
|
115
190
|
var cacheItem = params.cacheItem,
|
|
116
191
|
timeObj = params.timeObj,
|
|
117
192
|
ctx = params.ctx;
|
|
@@ -130,7 +205,7 @@ export function getServiceStartTimeAndEndTime(params) {
|
|
|
130
205
|
var _extend = {
|
|
131
206
|
duration: resolveDuration()
|
|
132
207
|
};
|
|
133
|
-
if (ctx.resolveDefaultBookingStart && !((_cacheItem$
|
|
208
|
+
if (ctx.resolveDefaultBookingStart && !ctx.rememberedTime && !((_cacheItem$_extend5 = cacheItem._extend) !== null && _cacheItem$_extend5 !== void 0 && _cacheItem$_extend5.start_time) && !isSessionProduct(cacheItem)) {
|
|
134
209
|
var _params$defaultBookin;
|
|
135
210
|
var _fallback = (_params$defaultBookin = params.defaultBookingStartFallback) !== null && _params$defaultBookin !== void 0 ? _params$defaultBookin : getDefaultBookingStartFallback(cacheItem, ctx);
|
|
136
211
|
var start = ctx.resolveDefaultBookingStart(cacheItem, _fallback);
|
|
@@ -166,10 +241,10 @@ export function getServiceStartTimeAndEndTime(params) {
|
|
|
166
241
|
_extend = _objectSpread(_objectSpread({}, _extend), cacheItem._extend);
|
|
167
242
|
// start_date on a new cache item is a calendar anchor, not a manually selected time.
|
|
168
243
|
// Preserve the complete default after a previous booking crossed midnight.
|
|
169
|
-
if (defaultStartDate && !((_cacheItem$
|
|
170
|
-
var _cacheItem$
|
|
244
|
+
if (defaultStartDate && !((_cacheItem$_extend6 = cacheItem._extend) !== null && _cacheItem$_extend6 !== void 0 && _cacheItem$_extend6.start_time)) {
|
|
245
|
+
var _cacheItem$_extend7;
|
|
171
246
|
_extend.start_date = defaultStartDate;
|
|
172
|
-
if (isMultiDayProduct(cacheItem) && (_cacheItem$
|
|
247
|
+
if (isMultiDayProduct(cacheItem) && (_cacheItem$_extend7 = cacheItem._extend) !== null && _cacheItem$_extend7 !== void 0 && _cacheItem$_extend7.end_date) {
|
|
173
248
|
var _cacheItem$_extend$st2;
|
|
174
249
|
var originalDate = dayjs((_cacheItem$_extend$st2 = cacheItem._extend.start_date) !== null && _cacheItem$_extend$st2 !== void 0 ? _cacheItem$_extend$st2 : ctx.date).startOf('day');
|
|
175
250
|
var shiftDays = dayjs(defaultStartDate).diff(originalDate, 'day');
|
|
@@ -190,7 +265,7 @@ export function getServiceStartTimeAndEndTime(params) {
|
|
|
190
265
|
_extend.start_date = (_extend$start_date = _extend.start_date) !== null && _extend$start_date !== void 0 ? _extend$start_date : startDate;
|
|
191
266
|
_extend.end_date = (_extend$end_date = _extend.end_date) !== null && _extend$end_date !== void 0 ? _extend$end_date : endDate;
|
|
192
267
|
}
|
|
193
|
-
var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$
|
|
268
|
+
var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend8 = cacheItem._extend) === null || _cacheItem$_extend8 === void 0 || (_cacheItem$_extend8 = _cacheItem$_extend8.other) === null || _cacheItem$_extend8 === void 0 ? void 0 : _cacheItem$_extend8.session;
|
|
194
269
|
if (isSessionProduct(cacheItem) && session) {
|
|
195
270
|
var baseDate = ctx.date ? dayjs(ctx.date) : dayjs();
|
|
196
271
|
var startAt = dayjs("".concat(baseDate.format('YYYY-MM-DD'), " ").concat(dayjs(session.start_at).format('HH:mm:ss')));
|
|
@@ -215,38 +290,62 @@ export function getServiceStartTimeAndEndTime(params) {
|
|
|
215
290
|
* 入参 ctx 必须至少给:bookingConfig / resourcesOriginMap / resourcesOrigin / date。
|
|
216
291
|
*/
|
|
217
292
|
export function getProductExtend(params) {
|
|
218
|
-
var _cacheItem$
|
|
219
|
-
var
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
293
|
+
var _cacheItem$_extend9;
|
|
294
|
+
var isDisabledTime = params.isDisabledTime;
|
|
295
|
+
if (getCalendarBookingRange(params.cacheItem, params.ctx)) {
|
|
296
|
+
var _params$cacheItem$_da;
|
|
297
|
+
var prepared = prepareCalendarBookingCacheItem(params.cacheItem, params.ctx);
|
|
298
|
+
var capacity = setDefaultCapacitys({
|
|
299
|
+
capacitys: prepared.capacity,
|
|
300
|
+
cacheItem: prepared
|
|
301
|
+
});
|
|
302
|
+
return _objectSpread(_objectSpread({}, prepared), {}, {
|
|
303
|
+
_extend: _objectSpread(_objectSpread({}, prepared._extend), {}, {
|
|
304
|
+
capacity: capacity
|
|
305
|
+
}),
|
|
306
|
+
_data: _objectSpread(_objectSpread({}, prepared._data), {}, {
|
|
307
|
+
capacitys: prepared.capacity,
|
|
308
|
+
calendarManualBooking: ((_params$cacheItem$_da = params.cacheItem._data) === null || _params$cacheItem$_da === void 0 ? void 0 : _params$cacheItem$_da.calendarManualBooking) === true || isManualBookingProduct(params.cacheItem),
|
|
309
|
+
calendarBookingEntryKey: calendarBookingEntryKey(params.ctx),
|
|
310
|
+
calendarBookingPreparationKey: calendarBookingPreparationKey(prepared, params.ctx)
|
|
311
|
+
}),
|
|
312
|
+
autoClose: !calendarBookingNeedsInput(prepared)
|
|
313
|
+
});
|
|
314
|
+
}
|
|
315
|
+
var hasRememberedTime = params.ctx.rememberedTime !== undefined;
|
|
316
|
+
var cacheItem = hasRememberedTime ? seedRememberedBookingStart(params.cacheItem, params.ctx) : params.cacheItem;
|
|
317
|
+
var ctx = hasRememberedTime ? _objectSpread(_objectSpread({}, params.ctx), {}, {
|
|
318
|
+
previousService: undefined,
|
|
319
|
+
presetStartTime: undefined
|
|
320
|
+
}) : params.ctx;
|
|
321
|
+
var isNew = cacheItem.new || !((_cacheItem$_extend9 = cacheItem._extend) !== null && _cacheItem$_extend9 !== void 0 && _cacheItem$_extend9.endDate);
|
|
223
322
|
var _cacheItem = _objectSpread({}, cacheItem);
|
|
224
323
|
var resourcesOriginMap = ctx.resourcesOriginMap || {};
|
|
225
324
|
_cacheItem._data = {};
|
|
226
325
|
if (isMultiDayProduct(cacheItem)) {
|
|
227
|
-
var _cacheItem$
|
|
326
|
+
var _cacheItem$_extend10;
|
|
228
327
|
_cacheItem._extend = _cacheItem._extend || {};
|
|
229
|
-
_cacheItem._extend.holder_id = (cacheItem === null || cacheItem === void 0 || (_cacheItem$
|
|
328
|
+
_cacheItem._extend.holder_id = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend10 = cacheItem._extend) === null || _cacheItem$_extend10 === void 0 ? void 0 : _cacheItem$_extend10.holder_id) || [];
|
|
230
329
|
_cacheItem._extend.sub_type = 'days';
|
|
231
330
|
}
|
|
232
331
|
if (isNew) {
|
|
233
|
-
var
|
|
332
|
+
var _ref2, _cacheItem$_data, _ctx$bookingConfig3;
|
|
234
333
|
_cacheItem._data.timeObj = getTimeObj({
|
|
235
334
|
cacheItem: cacheItem,
|
|
236
335
|
ctx: ctx
|
|
237
336
|
});
|
|
238
|
-
var defaultBookingStartFallback = (
|
|
337
|
+
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);
|
|
239
338
|
_cacheItem._extend = getServiceStartTimeAndEndTime({
|
|
240
339
|
cacheItem: cacheItem,
|
|
241
340
|
timeObj: _cacheItem._data.timeObj,
|
|
242
341
|
ctx: ctx,
|
|
243
342
|
defaultBookingStartFallback: defaultBookingStartFallback
|
|
244
343
|
});
|
|
245
|
-
if (ctx.resolveDefaultBookingStart && !isSessionProduct(cacheItem)) {
|
|
246
|
-
var _cacheItem$_data2, _cacheItem$
|
|
344
|
+
if (ctx.resolveDefaultBookingStart && !hasRememberedTime && !isSessionProduct(cacheItem)) {
|
|
345
|
+
var _cacheItem$_data2, _cacheItem$_extend11;
|
|
247
346
|
var start = "".concat(dayjs(_cacheItem._extend.start_date).format('YYYY-MM-DD'), "T").concat(_cacheItem._extend.start_time);
|
|
248
347
|
var previousDefault = (_cacheItem$_data2 = cacheItem._data) === null || _cacheItem$_data2 === void 0 ? void 0 : _cacheItem$_data2.salesDefaultBookingStart;
|
|
249
|
-
if (!((_cacheItem$
|
|
348
|
+
if (!((_cacheItem$_extend11 = cacheItem._extend) !== null && _cacheItem$_extend11 !== void 0 && _cacheItem$_extend11.start_time) || previousDefault && dayjs(start).valueOf() === dayjs(previousDefault).valueOf()) {
|
|
250
349
|
_cacheItem._data.salesDefaultBookingStart = start;
|
|
251
350
|
_cacheItem._data.salesDefaultBookingFallback = defaultBookingStartFallback;
|
|
252
351
|
}
|
|
@@ -298,14 +397,14 @@ export function getProductExtend(params) {
|
|
|
298
397
|
_cacheItem._time = new Date().getTime();
|
|
299
398
|
}
|
|
300
399
|
} else {
|
|
301
|
-
var _cacheItem$
|
|
400
|
+
var _cacheItem$_extend13;
|
|
302
401
|
if (!_cacheItem._data.capacitys) {
|
|
303
402
|
_cacheItem._data.capacitys = cacheItem.capacity;
|
|
304
403
|
}
|
|
305
404
|
if (!_cacheItem._data.resourcesOrigin) {
|
|
306
|
-
var _cacheItem$
|
|
405
|
+
var _cacheItem$_extend12, _ctx$bookingConfig4;
|
|
307
406
|
var extraResources = [];
|
|
308
|
-
if (Array.isArray((_cacheItem$
|
|
407
|
+
if (Array.isArray((_cacheItem$_extend12 = _cacheItem._extend) === null || _cacheItem$_extend12 === void 0 ? void 0 : _cacheItem$_extend12.event_resources)) {
|
|
309
408
|
_cacheItem._extend.event_resources.forEach(function (er) {
|
|
310
409
|
extraResources.push({
|
|
311
410
|
form_id: er.form_id,
|
|
@@ -331,7 +430,7 @@ export function getProductExtend(params) {
|
|
|
331
430
|
}
|
|
332
431
|
_cacheItem._data.timeObj = getTimeObj({
|
|
333
432
|
cacheItem: _cacheItem,
|
|
334
|
-
useStartTime: (_cacheItem$
|
|
433
|
+
useStartTime: (_cacheItem$_extend13 = _cacheItem._extend) === null || _cacheItem$_extend13 === void 0 ? void 0 : _cacheItem$_extend13.start_time,
|
|
335
434
|
ctx: ctx
|
|
336
435
|
});
|
|
337
436
|
}
|
|
@@ -344,7 +443,7 @@ export function getProductExtend(params) {
|
|
|
344
443
|
* `getAutoAllocationStorage` 抽象为入参 `isAutoAllocationOn(formId)`。
|
|
345
444
|
*/
|
|
346
445
|
export function getIsAutoClose(cacheItem, isAutoAllocationOn) {
|
|
347
|
-
var _cacheItem$_data3, _cacheItem$
|
|
446
|
+
var _cacheItem$_data3, _cacheItem$_extend14;
|
|
348
447
|
if (productNeedsResourceExtend(cacheItem) && !hasActualResourceSelection(cacheItem)) {
|
|
349
448
|
return false;
|
|
350
449
|
}
|
|
@@ -359,14 +458,14 @@ export function getIsAutoClose(cacheItem, isAutoAllocationOn) {
|
|
|
359
458
|
}
|
|
360
459
|
}
|
|
361
460
|
}
|
|
362
|
-
var entries = Object.entries(((_cacheItem$
|
|
461
|
+
var entries = Object.entries(((_cacheItem$_extend14 = cacheItem._extend) === null || _cacheItem$_extend14 === void 0 ? void 0 : _cacheItem$_extend14.resource) || {});
|
|
363
462
|
if (entries.length === 0) {
|
|
364
463
|
return !productNeedsResourceExtend(cacheItem);
|
|
365
464
|
}
|
|
366
|
-
return entries.every(function (
|
|
367
|
-
var
|
|
368
|
-
key =
|
|
369
|
-
value =
|
|
465
|
+
return entries.every(function (_ref3) {
|
|
466
|
+
var _ref4 = _slicedToArray(_ref3, 2),
|
|
467
|
+
key = _ref4[0],
|
|
468
|
+
value = _ref4[1];
|
|
370
469
|
return isAutoAllocationOn(key) && Array.isArray(value) && value.length > 0;
|
|
371
470
|
});
|
|
372
471
|
}
|
|
@@ -260,7 +260,7 @@ function getResourceMaxFreeTime(resource, isAutoAllocationOn) {
|
|
|
260
260
|
return d.usable && d.id !== 0;
|
|
261
261
|
});
|
|
262
262
|
var defaultResource = [];
|
|
263
|
-
var maxFreeTime =
|
|
263
|
+
var maxFreeTime = -1;
|
|
264
264
|
usableList.forEach(function (d) {
|
|
265
265
|
var _d$times = d.times,
|
|
266
266
|
times = _d$times === void 0 ? [] : _d$times;
|
|
@@ -113,11 +113,11 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
113
113
|
key: "addItem",
|
|
114
114
|
value: (function () {
|
|
115
115
|
var _addItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
|
|
116
|
-
var account, product, bundle, options, date, _params$quantity, quantity, cartItem, newProduct, items;
|
|
116
|
+
var account, product, bundle, options, date, _params$quantity, quantity, isLegacyOrder, cartItem, newProduct, items;
|
|
117
117
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
118
118
|
while (1) switch (_context2.prev = _context2.next) {
|
|
119
119
|
case 0:
|
|
120
|
-
account = params.account, product = params.product, bundle = params.bundle, options = params.options, date = params.date, _params$quantity = params.quantity, quantity = _params$quantity === void 0 ? 1 : _params$quantity; // 生成一个唯一的 ID
|
|
120
|
+
account = params.account, product = params.product, bundle = params.bundle, options = params.options, date = params.date, _params$quantity = params.quantity, quantity = _params$quantity === void 0 ? 1 : _params$quantity, isLegacyOrder = params.isLegacyOrder; // 生成一个唯一的 ID
|
|
121
121
|
cartItem = {
|
|
122
122
|
_id: getUniqueId(),
|
|
123
123
|
_origin: createCartItemOrigin()
|
|
@@ -134,7 +134,8 @@ export var CartModule = /*#__PURE__*/function (_BaseModule) {
|
|
|
134
134
|
bundle: bundle,
|
|
135
135
|
options: options,
|
|
136
136
|
product_variant_id: newProduct.product_variant_id,
|
|
137
|
-
quantity: quantity
|
|
137
|
+
quantity: quantity,
|
|
138
|
+
isLegacyOrder: isLegacyOrder
|
|
138
139
|
});
|
|
139
140
|
}
|
|
140
141
|
if (account) {
|
|
@@ -21,6 +21,7 @@ export declare const formatProductToCartItem: (params: {
|
|
|
21
21
|
product_variant_id?: number;
|
|
22
22
|
quantity?: number;
|
|
23
23
|
discounts?: any[];
|
|
24
|
+
isLegacyOrder?: boolean;
|
|
24
25
|
}) => CartItem;
|
|
25
26
|
export declare const formatProductToCartItemOrigin: (params: {
|
|
26
27
|
cartItem: CartItem;
|
|
@@ -29,6 +30,7 @@ export declare const formatProductToCartItemOrigin: (params: {
|
|
|
29
30
|
options?: any;
|
|
30
31
|
product_variant_id?: number;
|
|
31
32
|
quantity?: number;
|
|
33
|
+
isLegacyOrder?: boolean;
|
|
32
34
|
}) => any;
|
|
33
35
|
/**
|
|
34
36
|
* 获取商品总价
|
|
@@ -61,7 +63,7 @@ export declare const getProductOriginTotalPrice: (params: {
|
|
|
61
63
|
* @param options 套餐规格信息
|
|
62
64
|
* @returns 格式化后的套餐规格信息
|
|
63
65
|
*/
|
|
64
|
-
export declare const formatOptions: (options: any) => any;
|
|
66
|
+
export declare const formatOptions: (options: any, product?: ProductData) => any;
|
|
65
67
|
export declare const formatOptionsToOrigin: (options: any) => any;
|
|
66
68
|
/**
|
|
67
69
|
* 格式化商品套餐信息
|