@pisell/pisellos 2.2.314 → 2.2.316

package/lib/model/strategy/adapter/itemRule/evaluator.d.ts

@@ -1,5 +1,5 @@
 import type { StrategyConfig } from '../../type';
-import { type ItemRuleBusinessData, type ItemRuleEvaluationResult, type QuantityCheckResult, type QuantityLimitResult, type PrefillItemResult, type AllergyRequirement } from './type';
+import { type ItemRuleBusinessData, type ItemRuleEvaluationResult, type QuantityCheckResult, type QuantityLimitResult, type PrefillItemResult, type ItemRuleCartAction, type AllergyRequirement } from './type';
 /**
  * ItemRule 评估器
  *
@@ -47,4 +47,6 @@ export declare class ItemRuleEvaluator {
      * 便捷方法：仅获取需要预填到购物车的商品
      */
     getPrefillItems(businessData: ItemRuleBusinessData): PrefillItemResult[];
+    /** 获取按优先级排序的购物车动作，交由销售业务层执行。 */
+    getCartActions(businessData: ItemRuleBusinessData): ItemRuleCartAction[];
 }

package/lib/model/strategy/adapter/itemRule/evaluator.js

@@ -43,6 +43,7 @@ class ItemRuleEvaluator {
     const configs = businessData.strategyConfigs ? businessData.strategyConfigs.filter(c => c.metadata.type === 'item_rule') : this.strategyConfigs;
     const allQuantityChecks = [];
     const allPrefillItems = [];
+    const allCartActions = [];
     const allAllergyRequirements = [];
     const rawResults = [];
     const context = this.adapter.prepareContext(businessData);
@@ -52,16 +53,19 @@ class ItemRuleEvaluator {
       const {
         quantityChecks,
         prefillItems,
+        cartActions,
         allergyRequirements
       } = this.adapter.transformResult(evalResult, businessData);
       allQuantityChecks.push(...quantityChecks);
       allPrefillItems.push(...prefillItems);
+      allCartActions.push(...cartActions);
       allAllergyRequirements.push(...allergyRequirements);
     }
     const failedChecks = allQuantityChecks.filter(c => !c.passed);
     return {
       quantityChecks: allQuantityChecks,
       prefillItems: allPrefillItems,
+      cartActions: allCartActions.sort((left, right) => right.priority - left.priority),
       allergyRequirements: allAllergyRequirements,
       allPassed: failedChecks.length === 0,
       failedChecks,
@@ -130,5 +134,10 @@ class ItemRuleEvaluator {
     const result = this.evaluate(businessData);
     return result.prefillItems;
   }
+
+  /** 获取按优先级排序的购物车动作，交由销售业务层执行。 */
+  getCartActions(businessData) {
+    return this.evaluate(businessData).cartActions;
+  }
 }
 exports.ItemRuleEvaluator = ItemRuleEvaluator;

package/lib/model/strategy/adapter/itemRule/type.d.ts

@@ -4,6 +4,8 @@ export declare const ITEM_RULE_ACTION_TYPES: {
     readonly QUANTITY_CHECK: "QUANTITY_CHECK";
     /** 预填购物车 */
     readonly PREFILL_CART: "PREFILL_CART";
+    /** 按商品 ID 删除购物车商品 */
+    readonly DELETE_PRODUCT: "DELETE_PRODUCT";
     /** 加购前过敏信息确认 */
     readonly ALLERGY_CHECK: "ALLERGY_CHECK";
 };
@@ -101,6 +103,10 @@ export interface AllergyRequirement {
     promptScope: AllergyPromptScope;
     allowNote: boolean;
 }
+/** 购物车动作触发时机，与数量校验的提交范围相互独立。 */
+export type ItemRuleExecutionScope = 'set_handover';
+/** 预填数量来源；主商品数量不扩展到 QUANTITY_CHECK。 */
+export type PrefillQuantitySource = QuantitySource | 'main_product_number';
 /**
  * 预填商品项
  */
@@ -110,9 +116,11 @@ export interface PrefillProduct {
     /** 变体 ID（可选，0 或不填表示无变体/默认） */
     product_variant_id?: number;
     /** 数量来源 */
-    quantityFrom: QuantitySource;
+    quantityFrom: PrefillQuantitySource;
     /** 固定数量（当 quantityFrom 为 'fixed' 时使用） */
     quantity?: number;
+    /** 设置取餐方式时同步自动附加行的数量，重复执行不累加。 */
+    repeat_skip?: boolean;
 }
 /**
  * Prefill Cart Action 的详细配置
@@ -120,9 +128,18 @@ export interface PrefillProduct {
  * 存储在 ActionEffect.config 中
  */
 export interface PrefillCartConfig {
+    /** 不填时保持原有预填时机；set_handover 仅在设置取餐方式时执行。 */
+    scope?: ItemRuleExecutionScope;
     /** 要预填的商品列表 */
     products: PrefillProduct[];
 }
+/** 删除指定商品的全部购物车行，不区分变体或是否为自动添加。 */
+export interface DeleteProductConfig {
+    scope: ItemRuleExecutionScope;
+    products: Array<{
+        product_id: number;
+    }>;
+}
 /**
  * 购物车商品摘要
  */
@@ -157,6 +174,10 @@ export interface ItemRuleBusinessData {
     historicalItems?: CartItemSummary[];
     /** 服务类型（如 'dine-in', 'takeaway'） */
     serviceType?: string;
+    /** 当前购物车动作触发时机；未填时不评估 set_handover 动作。 */
+    executionScope?: ItemRuleExecutionScope;
+    /** 由销售业务层提供的主商品总数量，不包含附加费用商品。 */
+    mainProductNumber?: number;
     /** 当前业务渠道（如 'kiosk', 'pos', 'online_store'） */
     channel?: string;
     /** 当前正在加入购物车的商品；ALLERGY_CHECK 只读取该商品的 Target。 */
@@ -209,7 +230,23 @@ export interface PrefillItemResult {
     product_variant_id?: number;
     /** 应添加的数量 */
     quantity: number;
+    /** true 时执行器同步自动附加行数量；quantity=0 表示移除该自动行。 */
+    repeat_skip?: boolean;
 }
+/** 保留不同购物车动作之间的优先级与执行顺序。 */
+export type ItemRuleCartAction = {
+    strategyId: string;
+    ruleId: string;
+    priority: number;
+} & ({
+    type: 'PREFILL_CART';
+    products: PrefillItemResult[];
+} | {
+    type: 'DELETE_PRODUCT';
+    products: Array<{
+        product_id: number;
+    }>;
+});
 /**
  * 单条规则的数量限制（不含校验结果，仅描述配置中的约束）
  */
@@ -258,6 +295,8 @@ export interface ItemRuleEvaluationResult {
     quantityChecks: QuantityCheckResult[];
     /** 需要预填的商品列表 */
     prefillItems: PrefillItemResult[];
+    /** 按 priority 降序排列的购物车动作；同优先级保持策略与动作顺序。 */
+    cartActions: ItemRuleCartAction[];
     /** 当前商品命中的过敏门禁要求；不同 Action/商品不会合并。 */
     allergyRequirements: AllergyRequirement[];
     /** 所有校验是否全部通过 */

package/lib/model/strategy/adapter/itemRule/type.js

@@ -13,6 +13,8 @@ const ITEM_RULE_ACTION_TYPES = exports.ITEM_RULE_ACTION_TYPES = {
   QUANTITY_CHECK: 'QUANTITY_CHECK',
   /** 预填购物车 */
   PREFILL_CART: 'PREFILL_CART',
+  /** 按商品 ID 删除购物车商品 */
+  DELETE_PRODUCT: 'DELETE_PRODUCT',
   /** 加购前过敏信息确认 */
   ALLERGY_CHECK: 'ALLERGY_CHECK'
 };
@@ -78,6 +80,10 @@ const ITEM_RULE_TEMPLATES = exports.ITEM_RULE_TEMPLATES = {
 // Prefill Cart 相关类型
 // ============================================
 
+/** 购物车动作触发时机，与数量校验的提交范围相互独立。 */
+
+/** 预填数量来源；主商品数量不扩展到 QUANTITY_CHECK。 */
+
 /**
  * 预填商品项
  */
@@ -88,6 +94,8 @@ const ITEM_RULE_TEMPLATES = exports.ITEM_RULE_TEMPLATES = {
  * 存储在 ActionEffect.config 中
  */
 
+/** 删除指定商品的全部购物车行，不区分变体或是否为自动添加。 */
+
 // ============================================
 // 业务数据类型（Evaluator 输入）
 // ============================================
@@ -116,6 +124,8 @@ const ITEM_RULE_TEMPLATES = exports.ITEM_RULE_TEMPLATES = {
  * 单个 Prefill Cart 的预填结果
  */
 
+/** 保留不同购物车动作之间的优先级与执行顺序。 */
+
 /**
  * 单条规则的数量限制（不含校验结果，仅描述配置中的约束）
  */

package/lib/model/strategy/adapter/promotion/evaluator.js

@@ -227,10 +227,13 @@ class PromotionEvaluator {
     const productResults = this.evaluateProducts(input);
 
     // 2. 收集所有适用的促销（去重）
+    // strategyId is metadata and is not guaranteed to be unique. Use the actual
+    // configuration as the key so one strategy cannot overwrite another strategy's
+    // label/action when their IDs happen to be the same.
     const promotionMap = new Map();
     for (const productResult of productResults) {
       for (const promo of productResult.applicablePromotions) {
-        const existing = promotionMap.get(promo.strategyId);
+        const existing = promotionMap.get(promo.strategyConfig);
         const product = productResult.product;
 
         // 计算促销数量：如果是 bundle 子商品匹配，数量 = 主商品数量 × 子商品数量
@@ -253,7 +256,7 @@ class PromotionEvaluator {
           // 新促销
           const productMatchedBundleIndexMap = new Map();
           productMatchedBundleIndexMap.set(product.id, promo.matchedBundleIndex);
-          promotionMap.set(promo.strategyId, {
+          promotionMap.set(promo.strategyConfig, {
             ...promo,
             applicableProducts: [product],
             totalQuantity: promoQuantity,
@@ -305,7 +308,7 @@ class PromotionEvaluator {
     const cartResult = this.evaluateCart(input);
 
     // 2. 按 action priority 排序促销组（从 strategyConfig 获取 priority）
-    const sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups, cartResult.applicablePromotions);
+    const sortedGroups = this.sortPromotionGroupsByPriority(cartResult.promotionGroups);
 
     // 3. 追踪已处理的商品（避免重复处理）
     // key: `${product_id}_${product_variant_id}`
@@ -544,19 +547,11 @@ class PromotionEvaluator {
    * 按优先级排序促销组
    * 优先级从 strategyConfig.actions[0].priority 获取，数值越小优先级越高
    */
-  sortPromotionGroupsByPriority(groups, promotions) {
-    // 创建策略ID到优先级的映射
-    const priorityMap = new Map();
-    for (const promo of promotions) {
-      const actions = promo.strategyConfig?.actions || [];
-      const priority = actions[0]?.priority ?? 999;
-      priorityMap.set(promo.strategyId, priority);
-    }
-
+  sortPromotionGroupsByPriority(groups) {
     // 按优先级排序（数值越小优先级越高）
     return [...groups].sort((a, b) => {
-      const priorityA = priorityMap.get(a.strategyId) ?? 999;
-      const priorityB = priorityMap.get(b.strategyId) ?? 999;
+      const priorityA = a.strategyConfig?.actions?.[0]?.priority ?? 999;
+      const priorityB = b.strategyConfig?.actions?.[0]?.priority ?? 999;
       return priorityA - priorityB;
     });
   }

package/lib/model/strategy/adapter/promotion/index.js

@@ -1 +1,46 @@
-"use strict";
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.BUY_X_GET_Y_FREE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.ITEM_REWARD_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "PromotionAdapter", {
+  enumerable: true,
+  get: function () {
+    return _adapter.PromotionAdapter;
+  }
+});
+Object.defineProperty(exports, "PromotionEvaluator", {
+  enumerable: true,
+  get: function () {
+    return _evaluator.PromotionEvaluator;
+  }
+});
+Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
+  enumerable: true,
+  get: function () {
+    return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
+  }
+});
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function () {
+    return _adapter.default;
+  }
+});
+var _evaluator = require("./evaluator");
+var _adapter = _interopRequireWildcard(require("./adapter"));
+var _examples = require("./examples");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.d.ts

@@ -1,8 +1,10 @@
-import type { OrderProduct } from '../../Order/types';
+import type { OrderHolderRelation, OrderProduct } from '../../Order/types';
 export interface BuildNormalProductCacheItemFromOrderLineInput {
     /** tempOrder.products 中的一行（普通商品，无关联 booking） */
     product: OrderProduct;
     /** 商品 catalog / 详情，用于 variant / option / bundle 模板字段 */
     sourceProduct?: Record<string, any> | null;
+    /** 整单关系集合，按商品行 UID 回填。 */
+    holder_relations?: OrderHolderRelation[];
 }
 export declare function buildNormalProductCacheItemFromOrderLine(input: BuildNormalProductCacheItemFromOrderLineInput): Record<string, any>;

package/lib/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -4,13 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildNormalProductCacheItemFromOrderLine = buildNormalProductCacheItemFromOrderLine;
+var _lodashEs = require("lodash-es");
+var _holderRelations = require("../../Order/holderRelations");
 var _utils = require("../../Order/utils");
 var _entitlementPass = require("../../Discount/entitlementPass");
+var _utils2 = require("../../Holder/utils");
 var _orderLineDisplay = require("./orderLineDisplay");
 /**
  * 从已加车的普通商品 order line 反查 SkuDetailModal edit 所需的 cacheItem。
  *
- * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；不含 resource / duration / holder 等预约字段。
+ * 与 `buildCacheItemFromOrderLine`（预约行 + booking）并列；Holder 从订单关系回填，不生成预约字段。
  */
 /**
  * 解析 v2 主商品 source 价（不含 option、不含 bundle），供 SkuDetailModal / transform 使用。
@@ -84,6 +87,15 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   const original = Number(product.original_price ?? selling);
   const uid = product.metadata?.unique_identification_number;
   const originExtend = product.metadata?.origin?._extend;
+  const holderRelations = (0, _lodashEs.cloneDeep)((0, _holderRelations.getProductHolderRelations)(input, product));
+  const formRelations = holderRelations.filter(relation => relation.holder_type === 'form');
+  const holderIds = formRelations.map(relation => relation.holder_id);
+  const holderNames = formRelations.map(relation => relation.metadata?.name).filter(name => typeof name === 'string' && name.length > 0);
+  const holder = formRelations.length > 0 ? {
+    ...(formRelations[0].metadata || {}),
+    form_record: holderIds,
+    name: holderNames.join(',')
+  } : null;
   const shouldPreserveEntitlementPriceOverride = hasEntitlementPassDiscount(product) && (originExtend?.priceOverride !== undefined || product.metadata?.price_override != null);
   const hasPriceOverride = originExtend?.priceOverride !== undefined || shouldPreserveEntitlementPriceOverride;
   const option = (0, _utils.getProductSkuOptions)(product);
@@ -115,6 +127,9 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     skuValue: JSON.parse(JSON.stringify(skuValue)),
     _skuValue: JSON.parse(JSON.stringify(skuValue)),
     isNormalProduct: true,
+    holder_relations: holderRelations,
+    holder,
+    holder_id: holderIds,
     metadata: {
       product_add_schedule_time: product.metadata?.product_add_schedule_time
     },
@@ -134,6 +149,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   }
   return {
     ...(sourceProduct || {}),
+    holder_config: (0, _utils2.resolveProductHolderConfig)(sourceProduct) ?? (0, _utils2.resolveProductHolderConfig)(product) ?? undefined,
     id: resolvedId,
     product_id: resolvedId,
     _id: uid,

package/lib/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/lib/modules/BookingContext/utils/productExtend.js

@@ -28,6 +28,44 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * 让 OS 这层完全可在 Node 单测下运行（dayjs 在 Node 也是纯函数）。
  */
 
+/** Rebuild only the derived booking fields; SKU, quantity, notes and Holder stay intact. */
+function seedRememberedBookingStart(cacheItem, ctx) {
+  const remembered = ctx.rememberedTime;
+  const invalid = () => Object.assign(new Error('Remembered time requires a valid POS duration start.'), {
+    code: 'INVALID_REMEMBERED_TIME'
+  });
+  const duration = cacheItem?.duration;
+  const durationType = typeof duration === 'object' && duration ? String(duration.type || '').toLowerCase() : '';
+  const durationValue = typeof duration === 'object' && duration ? duration.value : duration;
+  const isDuration = (0, _flexible.isProductFlexibleDuration)(duration) || ['', 'fixed', 'minute', 'minutes', 'hour', 'hours'].includes(durationType) && Number.isFinite(Number(durationValue)) && Number(durationValue) > 0;
+  const isCalendarDate = value => {
+    if (typeof value !== 'string' || !/^\d{4}-\d{2}-\d{2}$/.test(value)) return false;
+    const date = new Date(`${value}T00:00:00.000Z`);
+    return Number.isFinite(date.getTime()) && date.toISOString().slice(0, 10) === value;
+  };
+  const parts = typeof 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 || (0, _serviceTimes.isMultiDayProduct)(cacheItem) || (0, _serviceTimes.isSessionProduct)(cacheItem) || cacheItem?.cartDetailValue?.session || cacheItem?._extend?.other?.session || !isCalendarDate(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.
+  const start = (0, _dayjs.default)(remembered.startAt);
+  if (!start.isValid()) throw invalid();
+  const extend = {
+    ...(cacheItem?._extend || {})
+  };
+  for (const key of ['start_date', 'startDate', 'start_time', 'end_date', 'endDate', 'end_time', 'duration', 'resource', 'resources', 'capacity', 'booking', 'availabilitySelection']) delete extend[key];
+  return {
+    ...cacheItem,
+    new: 1,
+    autoClose: false,
+    _data: {},
+    _extend: {
+      ...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（仅当日期带有效时分时）。 */
 function derivePresetStartTimeFromDate(date) {
   if (date == null) return undefined;
@@ -195,10 +233,15 @@ function getServiceStartTimeAndEndTime(params) {
  */
 function getProductExtend(params) {
   const {
-    cacheItem,
-    ctx,
     isDisabledTime
   } = params;
+  const hasRememberedTime = params.ctx.rememberedTime !== undefined;
+  const cacheItem = hasRememberedTime ? seedRememberedBookingStart(params.cacheItem, params.ctx) : params.cacheItem;
+  const ctx = hasRememberedTime ? {
+    ...params.ctx,
+    previousService: undefined,
+    presetStartTime: undefined
+  } : params.ctx;
   const isNew = cacheItem.new || !cacheItem._extend?.endDate;
   const _cacheItem = {
     ...cacheItem

package/lib/modules/BookingContext/utils/resources.js

@@ -241,7 +241,7 @@ function getResourceMaxFreeTime(resource, isAutoAllocationOn) {
   if (!isAutoAllocationOn(form_id)) return [];
   const usableList = (renderList || []).filter(d => d.usable && d.id !== 0);
   let defaultResource = [];
-  let maxFreeTime = 0;
+  let maxFreeTime = -1;
   usableList.forEach(d => {
     const {
       times = []

package/lib/modules/BusinessAvailability/index.d.ts

@@ -0,0 +1,30 @@
+import type { MultiLangObject } from '../OpenData/types';
+import type { ScheduleItem } from '../Schedule/types';
+export type BusinessClosedBehavior = 'show_menu_disabled' | 'hide_all';
+export interface BusinessAvailability {
+    status: 'open' | 'paused' | 'closed' | 'error';
+    behavior: BusinessClosedBehavior | null;
+    message: string | MultiLangObject | null;
+    /** Epoch milliseconds. Re-evaluate the cached configuration at this time. */
+    nextChangeAt: number;
+    requirePaymentOnSubmit: boolean;
+    error?: string;
+}
+export interface BusinessAvailabilityConfig {
+    paused: boolean;
+    pauseBehavior: BusinessClosedBehavior;
+    closedBehavior: BusinessClosedBehavior;
+    pauseMessage: BusinessAvailability['message'];
+    closedMessage: BusinessAvailability['message'];
+    scheduleIds: number[];
+    invalidScheduleIds: boolean;
+    requirePaymentOnSubmit: boolean;
+}
+export declare function normalizeBusinessAvailabilityConfig(data: Record<string, unknown>): BusinessAvailabilityConfig;
+/** Business ordering is independent of reservation switches and Pickup slot availability. */
+export declare function computeBusinessAvailability(input: {
+    config: BusinessAvailabilityConfig;
+    schedules: ScheduleItem[];
+    timezone: string;
+    now: Date;
+}): BusinessAvailability;

package/lib/modules/BusinessAvailability/index.js

@@ -0,0 +1,146 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.computeBusinessAvailability = computeBusinessAvailability;
+exports.normalizeBusinessAvailabilityConfig = normalizeBusinessAvailabilityConfig;
+var _dayjs = _interopRequireDefault(require("dayjs"));
+var _isSameOrAfter = _interopRequireDefault(require("dayjs/plugin/isSameOrAfter"));
+var _isSameOrBefore = _interopRequireDefault(require("dayjs/plugin/isSameOrBefore"));
+var _getDateIsInSchedule = require("../Schedule/getDateIsInSchedule");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+_dayjs.default.extend(_isSameOrAfter.default);
+_dayjs.default.extend(_isSameOrBefore.default);
+const DAY = 86_400_000;
+const behavior = value => value === 'show_menu_disabled' ? value : 'hide_all';
+const message = value => typeof value === 'string' || value !== null && typeof value === 'object' && !Array.isArray(value) ? value : null;
+function normalizeBusinessAvailabilityConfig(data) {
+  const rawIds = data['availability.operating_hours'];
+  const ids = Array.isArray(rawIds) ? rawIds.map(id => typeof id === 'number' || typeof id === 'string' ? Number(id) : NaN) : [];
+  const validIds = ids.filter(id => Number.isInteger(id) && id > 0);
+  const paused = data['availability.paused'];
+  return {
+    paused: paused === true || paused === 1 || paused === 'true' || paused === '1',
+    pauseBehavior: behavior(data['availability.pause_behavior']),
+    closedBehavior: behavior(data['availability.closed_behavior']),
+    pauseMessage: message(data['availability.pause_message']),
+    closedMessage: message(data['availability.closed_message']),
+    scheduleIds: [...new Set(validIds)],
+    invalidScheduleIds: rawIds != null && (!Array.isArray(rawIds) || validIds.length !== ids.length),
+    // Only an explicitly disabled setting changes the existing payment flow.
+    requirePaymentOnSubmit: data['sale.require_payment_on_submit'] !== false
+  };
+}
+function createClock(timezone) {
+  if (!timezone) throw new Error('Store timezone is unavailable.');
+  const formatter = new Intl.DateTimeFormat('en-GB', {
+    timeZone: timezone,
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hourCycle: 'h23'
+  });
+  const local = timestamp => {
+    const parts = {};
+    formatter.formatToParts(timestamp).forEach(part => {
+      parts[part.type] = part.value;
+    });
+    const date = `${parts.year}-${parts.month}-${parts.day}`;
+    return {
+      date,
+      scalar: Date.parse(`${date}T${parts.hour}:${parts.minute}:${parts.second}Z`)
+    };
+  };
+  const offsets = new Set();
+  const instants = scalar => {
+    offsets.clear();
+    for (let hours = -36; hours <= 36; hours += 6) {
+      const sample = scalar + hours * 3_600_000;
+      offsets.add(local(sample).scalar - sample);
+    }
+    return [...offsets].map(offset => scalar - offset).filter(instant => local(instant).scalar === scalar).sort((a, b) => a - b);
+  };
+  return {
+    local,
+    instants
+  };
+}
+
+/** Business ordering is independent of reservation switches and Pickup slot availability. */
+function computeBusinessAvailability(input) {
+  const {
+    config,
+    schedules,
+    timezone,
+    now
+  } = input;
+  const nowAt = now.getTime();
+  const base = {
+    requirePaymentOnSubmit: config.requirePaymentOnSubmit,
+    nextChangeAt: nowAt + DAY
+  };
+  if (config.paused) {
+    return {
+      ...base,
+      status: 'paused',
+      behavior: config.pauseBehavior,
+      message: config.pauseMessage
+    };
+  }
+  if (config.invalidScheduleIds) throw new Error('Business operating-hours configuration is invalid.');
+  if (!config.scheduleIds.length) return {
+    ...base,
+    status: 'open',
+    behavior: null,
+    message: null
+  };
+  const selected = schedules.filter(schedule => config.scheduleIds.includes(Number(schedule.id)));
+  if (config.scheduleIds.some(id => !selected.some(schedule => Number(schedule.id) === id))) {
+    throw new Error('A configured business operating-hours schedule is unavailable.');
+  }
+  const clock = createClock(timezone);
+  const current = clock.local(nowAt);
+  const today = Date.parse(`${current.date}T00:00:00Z`);
+  const nextMidnight = clock.instants(today + DAY).find(instant => instant > nowAt);
+  let nextChangeAt = nextMidnight ?? nowAt + 60_000;
+  let open = false;
+  // Yesterday contributes the tail of overnight windows; today supplies the next boundary.
+  for (const dateAt of [today - DAY, today]) {
+    const date = new Date(dateAt).toISOString().slice(0, 10);
+    // Schedule's resolver merges by time-of-day, so resolve each schedule independently.
+    for (const schedule of selected) {
+      for (const window of (0, _getDateIsInSchedule.getScheduleStartEndTimePoints)(date, [schedule])) {
+        const toMinutes = value => {
+          if (!/^(?:[01]\d|2[0-3]):[0-5]\d$/.test(value) && value !== '24:00') {
+            throw new Error('Business operating-hours schedule contains an invalid time.');
+          }
+          const [hours, minutes] = value.split(':').map(Number);
+          return hours * 60 + minutes;
+        };
+        const start = dateAt + toMinutes(window.start_time) * 60_000;
+        let end = dateAt + toMinutes(window.end_time) * 60_000;
+        if (end <= start) end += DAY;
+        if (current.scalar >= start && current.scalar < end) open = true;
+        for (const boundary of [start, end]) {
+          for (const instant of clock.instants(boundary)) {
+            if (instant > nowAt) nextChangeAt = Math.min(nextChangeAt, instant);
+          }
+        }
+      }
+    }
+  }
+  // A timezone offset change can repeat/skip a wall-clock boundary. A local-only safety
+  // check also covers throttled timers; it does not fetch either configuration source.
+  nextChangeAt = Math.min(nextChangeAt, nowAt + 60_000);
+  return {
+    ...base,
+    nextChangeAt,
+    status: open ? 'open' : 'closed',
+    behavior: open ? null : config.closedBehavior,
+    message: open ? null : config.closedMessage
+  };
+}

package/lib/modules/Cart/index.js

@@ -89,7 +89,8 @@ class CartModule extends _BaseModule.BaseModule {
       bundle,
       options,
       date,
-      quantity = 1
+      quantity = 1,
+      isLegacyOrder
     } = params;
     // 生成一个唯一的 ID
     let cartItem = {
@@ -108,7 +109,8 @@ class CartModule extends _BaseModule.BaseModule {
         bundle,
         options,
         product_variant_id: newProduct.product_variant_id,
-        quantity
+        quantity,
+        isLegacyOrder
       });
     }
     if (account) {

package/lib/modules/Cart/types.d.ts

@@ -180,6 +180,8 @@ export interface IAddItemParams {
     };
     /** 商品组合规格ID */
     product_variant_id?: number;
+    /** 是否由旧版下单流程加入购物车 */
+    isLegacyOrder?: boolean;
 }
 /**
  * 更新购物车信息参数