@pisell/pisellos 2.3.143 → 2.3.145

package/dist/modules/BookingContext/utils/productExtend.d.ts

@@ -7,6 +7,13 @@ import { TimeSlicesResult, TimeSlice, DurationSlice } from './timeSlices';
  * 让 OS 这层完全可在 Node 单测下运行（dayjs 在 Node 也是纯函数）。
  */
 export interface BookingCalcContext {
+    /** Sales channel; remembered duration starts are accepted only by POS. */
+    channel?: string;
+    /** Start-only device preference for this decision; never reuse a cached end/resource. */
+    rememberedTime?: {
+        businessDate: string;
+        startAt: string;
+    };
     /** 来自 `/core/board/management/config` 的整套配置；常用路径见 sliceTimeSlices / appointmentTimingPreference。 */
     bookingConfig?: any;
     /** 资源 origin map（id → resource origin）。 */

package/dist/modules/BookingContext/utils/productExtend.js

@@ -1,4 +1,3 @@
-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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 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."); }
 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,6 +9,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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); }
+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); }
 import dayjs from 'dayjs';
 import { formatResources, getResourceByIds, getSumCapacity, getUsableTime, setDefaultCapacitys, setDefaultResource } from "./resources";
 import { hasActualResourceSelection, productNeedsResourceExtend } from "./resourceSelection";
@@ -24,6 +24,46 @@ import { flexibleObj, getDurationValue, isProductFlexibleDuration } from "./flex
  * 让 OS 这层完全可在 Node 单测下运行（dayjs 在 Node 也是纯函数）。
  */
 
+/** Rebuild only the derived booking fields; SKU, quantity, notes and Holder stay intact. */
+function seedRememberedBookingStart(cacheItem, ctx) {
+  var _cacheItem$cartDetail, _cacheItem$_extend;
+  var remembered = ctx.rememberedTime;
+  var invalid = function invalid() {
+    return Object.assign(new Error('Remembered time requires a valid POS duration start.'), {
+      code: 'INVALID_REMEMBERED_TIME'
+    });
+  };
+  var duration = cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.duration;
+  var durationType = _typeof(duration) === 'object' && duration ? String(duration.type || '').toLowerCase() : '';
+  var durationValue = _typeof(duration) === 'object' && duration ? duration.value : duration;
+  var isDuration = isProductFlexibleDuration(duration) || ['', 'fixed', 'minute', 'minutes', 'hour', 'hours'].includes(durationType) && Number.isFinite(Number(durationValue)) && Number(durationValue) > 0;
+  var isCalendarDate = function isCalendarDate(value) {
+    if (typeof value !== 'string' || !/^\d{4}-\d{2}-\d{2}$/.test(value)) return false;
+    var date = new Date("".concat(value, "T00:00:00.000Z"));
+    return Number.isFinite(date.getTime()) && date.toISOString().slice(0, 10) === value;
+  };
+  var parts = typeof (remembered === null || remembered === void 0 ? void 0 : remembered.startAt) === 'string' ? /^(\d{4}-\d{2}-\d{2})T(\d{2}):(\d{2})(?::(\d{2})(?:\.\d{1,3})?)?(?:Z|[+-](\d{2}):(\d{2}))?$/.exec(remembered.startAt) : null;
+  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) || !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) throw invalid();
+  // Parse the actual instant with the same runtime clock used by the legacy booking helpers.
+  // The business-day label must not replace the calendar date of an overnight start.
+  var start = dayjs(remembered.startAt);
+  if (!start.isValid()) throw invalid();
+  var extend = _objectSpread({}, (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem._extend) || {});
+  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++) {
+    var key = _arr[_i];
+    delete extend[key];
+  }
+  return _objectSpread(_objectSpread({}, cacheItem), {}, {
+    new: 1,
+    autoClose: false,
+    _data: {},
+    _extend: _objectSpread(_objectSpread({}, extend), {}, {
+      start_date: start.format('YYYY-MM-DD'),
+      start_time: start.format(start.millisecond() ? 'HH:mm:ss.SSS' : start.second() ? 'HH:mm:ss' : 'HH:mm')
+    })
+  });
+}
+
 /** 从 BookingContext.date 提取 HH:mm（仅当日期带有效时分时）。 */
 export function derivePresetStartTimeFromDate(date) {
   if (date == null) return undefined;
@@ -46,12 +86,12 @@ function getAppointmentTimingPreference(ctx) {
  * 灵活时长选项（cacheItem.duration.type === 'flexible' 时）。
  */
 function getFlexibleOption(params) {
-  var _cacheItem$_extend, _cacheItem$_extend2, _usable$_extend, _params$ctx;
+  var _cacheItem$_extend2, _cacheItem$_extend3, _usable$_extend, _params$ctx;
   var cacheItem = params.cacheItem,
     useStartTime = params.useStartTime;
   var duration = getDurationValue(cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.duration);
   if (duration !== 'flexible') return null;
-  var startDate = dayjs("".concat(dayjs(cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.start_date).format('YYYY-MM-DD'), " ").concat(useStartTime || (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.start_time) || '00:00'));
+  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'));
   var usable = getUsableTime(cacheItem);
   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;
   var endDate = getEndDate(startDate, 'flexible', usableEndAt, (_params$ctx = params.ctx) === null || _params$ctx === void 0 ? void 0 : _params$ctx.shopOpeningHours);
@@ -105,7 +145,7 @@ export function getTimeObj(params) {
  *   - cacheItem.isCustomItem → 直接返回 `{ duration: null }`。
  */
 export function getServiceStartTimeAndEndTime(params) {
-  var _cacheItem$_extend3;
+  var _cacheItem$_extend4;
   var cacheItem = params.cacheItem,
     timeObj = params.timeObj,
     ctx = params.ctx;
@@ -163,7 +203,7 @@ export function getServiceStartTimeAndEndTime(params) {
     _extend.start_date = (_extend$start_date = _extend.start_date) !== null && _extend$start_date !== void 0 ? _extend$start_date : startDate;
     _extend.end_date = (_extend$end_date = _extend.end_date) !== null && _extend$end_date !== void 0 ? _extend$end_date : endDate;
   }
-  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend3 = cacheItem._extend) === null || _cacheItem$_extend3 === void 0 || (_cacheItem$_extend3 = _cacheItem$_extend3.other) === null || _cacheItem$_extend3 === void 0 ? void 0 : _cacheItem$_extend3.session;
+  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend4 = cacheItem._extend) === null || _cacheItem$_extend4 === void 0 || (_cacheItem$_extend4 = _cacheItem$_extend4.other) === null || _cacheItem$_extend4 === void 0 ? void 0 : _cacheItem$_extend4.session;
   if (isSessionProduct(cacheItem) && session) {
     var baseDate = ctx.date ? dayjs(ctx.date) : dayjs();
     var startAt = dayjs("".concat(baseDate.format('YYYY-MM-DD'), " ").concat(dayjs(session.start_at).format('HH:mm:ss')));
@@ -188,18 +228,22 @@ export function getServiceStartTimeAndEndTime(params) {
  * 入参 ctx 必须至少给：bookingConfig / resourcesOriginMap / resourcesOrigin / date。
  */
 export function getProductExtend(params) {
-  var _cacheItem$_extend4;
-  var cacheItem = params.cacheItem,
-    ctx = params.ctx,
-    isDisabledTime = params.isDisabledTime;
-  var isNew = cacheItem.new || !((_cacheItem$_extend4 = cacheItem._extend) !== null && _cacheItem$_extend4 !== void 0 && _cacheItem$_extend4.endDate);
+  var _cacheItem$_extend5;
+  var isDisabledTime = params.isDisabledTime;
+  var hasRememberedTime = params.ctx.rememberedTime !== undefined;
+  var cacheItem = hasRememberedTime ? seedRememberedBookingStart(params.cacheItem, params.ctx) : params.cacheItem;
+  var ctx = hasRememberedTime ? _objectSpread(_objectSpread({}, params.ctx), {}, {
+    previousService: undefined,
+    presetStartTime: undefined
+  }) : params.ctx;
+  var isNew = cacheItem.new || !((_cacheItem$_extend5 = cacheItem._extend) !== null && _cacheItem$_extend5 !== void 0 && _cacheItem$_extend5.endDate);
   var _cacheItem = _objectSpread({}, cacheItem);
   var resourcesOriginMap = ctx.resourcesOriginMap || {};
   _cacheItem._data = {};
   if (isMultiDayProduct(cacheItem)) {
-    var _cacheItem$_extend5;
+    var _cacheItem$_extend6;
     _cacheItem._extend = _cacheItem._extend || {};
-    _cacheItem._extend.holder_id = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend5 = cacheItem._extend) === null || _cacheItem$_extend5 === void 0 ? void 0 : _cacheItem$_extend5.holder_id) || [];
+    _cacheItem._extend.holder_id = (cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend6 = cacheItem._extend) === null || _cacheItem$_extend6 === void 0 ? void 0 : _cacheItem$_extend6.holder_id) || [];
     _cacheItem._extend.sub_type = 'days';
   }
   if (isNew) {
@@ -260,14 +304,14 @@ export function getProductExtend(params) {
       _cacheItem._time = new Date().getTime();
     }
   } else {
-    var _cacheItem$_extend7;
+    var _cacheItem$_extend8;
     if (!_cacheItem._data.capacitys) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
-      var _cacheItem$_extend6, _ctx$bookingConfig4;
+      var _cacheItem$_extend7, _ctx$bookingConfig4;
       var extraResources = [];
-      if (Array.isArray((_cacheItem$_extend6 = _cacheItem._extend) === null || _cacheItem$_extend6 === void 0 ? void 0 : _cacheItem$_extend6.event_resources)) {
+      if (Array.isArray((_cacheItem$_extend7 = _cacheItem._extend) === null || _cacheItem$_extend7 === void 0 ? void 0 : _cacheItem$_extend7.event_resources)) {
         _cacheItem._extend.event_resources.forEach(function (er) {
           extraResources.push({
             form_id: er.form_id,
@@ -293,7 +337,7 @@ export function getProductExtend(params) {
     }
     _cacheItem._data.timeObj = getTimeObj({
       cacheItem: _cacheItem,
-      useStartTime: (_cacheItem$_extend7 = _cacheItem._extend) === null || _cacheItem$_extend7 === void 0 ? void 0 : _cacheItem$_extend7.start_time,
+      useStartTime: (_cacheItem$_extend8 = _cacheItem._extend) === null || _cacheItem$_extend8 === void 0 ? void 0 : _cacheItem$_extend8.start_time,
       ctx: ctx
     });
   }
@@ -306,7 +350,7 @@ export function getProductExtend(params) {
  * `getAutoAllocationStorage` 抽象为入参 `isAutoAllocationOn(formId)`。
  */
 export function getIsAutoClose(cacheItem, isAutoAllocationOn) {
-  var _cacheItem$_data, _cacheItem$_extend8;
+  var _cacheItem$_data, _cacheItem$_extend9;
   if (productNeedsResourceExtend(cacheItem) && !hasActualResourceSelection(cacheItem)) {
     return false;
   }
@@ -321,7 +365,7 @@ export function getIsAutoClose(cacheItem, isAutoAllocationOn) {
       }
     }
   }
-  var entries = Object.entries(((_cacheItem$_extend8 = cacheItem._extend) === null || _cacheItem$_extend8 === void 0 ? void 0 : _cacheItem$_extend8.resource) || {});
+  var entries = Object.entries(((_cacheItem$_extend9 = cacheItem._extend) === null || _cacheItem$_extend9 === void 0 ? void 0 : _cacheItem$_extend9.resource) || {});
   if (entries.length === 0) {
     return !productNeedsResourceExtend(cacheItem);
   }

package/dist/modules/Order/index.d.ts

@@ -332,6 +332,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private applyOrderProductsDepositSummary;
     recalculateSummary(options?: {
         createIfMissing?: boolean;
+        isCurrentOrder?: () => boolean;
     }): Promise<OrderSummary | null>;
     getOrderSummary(): Promise<OrderSummary>;
     updateTempOrderNote(note: string): string;
@@ -592,7 +593,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;