@pisell/pisellos 2.2.315 → 2.2.316

package/dist/solution/ScanOrder/index.js

@@ -36,7 +36,7 @@ import { attachItemRuleLimitsToTopLevelProducts, buildProductKey, buildItemRuleB
 import { createModule } from "../BookingByStep/types";
 import { ProductList } from "../../modules/ProductList";
 import { getDateIsInSchedule } from "../../modules/Schedule/getDateIsInSchedule";
-import { composeLinePrice, buildSubmitPayload, createUuidV4, getProductSkuOptions, normalizeSubmitCollectPaxValue, sumOptionUnitPrice } from "../../modules/Order/utils";
+import { composeLinePrice, buildSubmitPayload, createUuidV4, getProductSkuOptions, normalizeSubmitBooking, normalizeSubmitCollectPaxValue, resolveTableOccupancyDuration, sumOptionUnitPrice } from "../../modules/Order/utils";
 import dayjs from 'dayjs';
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
@@ -1332,6 +1332,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       }
       return prepareRetailAvailability;
     }() // ScanOrder 提交 payload enhancer：
+    // - 新单有桌台上下文但无 booking 时，补建基础预约（通用 Order 已不再自动生成）
     // - 给所有 booking 注入 appointment_status: 'started'（扫码点餐语义）
     // - 给所有 booking 的 metadata 注入 resource_select_type（来自预约规则商品的 resource.type）
     // - 给第一条 booking 补 resources 与 product_uid（仅当存在 resource / rule product）
@@ -1358,7 +1359,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
       return function (payload, _ref3) {
         var _resourceState$relati, _tempOrder$metadata, _ref4, _pickOriginal, _resourceState$table_2, _resourceState$relati2, _pickFirstCustomCapac;
         var bookingUuid = _ref3.bookingUuid,
-          tempOrder = _ref3.tempOrder;
+          tempOrder = _ref3.tempOrder,
+          now = _ref3.now;
         var resourceId = String((_resourceState$relati = resourceState === null || resourceState === void 0 ? void 0 : resourceState.relationId) !== null && _resourceState$relati !== void 0 ? _resourceState$relati : '').trim();
         var hasReservationBookingContext = Boolean(ruleProduct && resourceState && resourceId && resourceState.relationId && resourceState.tableFormId);
         if (!hasReservationBookingContext) {
@@ -1393,7 +1395,31 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         } : undefined;
         var ruleProductUid = ruleProduct ? createUuidV4() : undefined;
         var bookingCapacityDimensionId = (_pickFirstCustomCapac = pickFirstCustomCapacityDimensionId(_this5.enabledReservationRuleProducts)) !== null && _pickFirstCustomCapac !== void 0 ? _pickFirstCustomCapac : 0;
-        var nextBookings = (payload.bookings || []).map(function (booking, idx) {
+        var bookings = payload.bookings || [];
+        if (!tempOrder.order_id && bookings.length === 0) {
+          var bookingStart = dayjs(now);
+          var bookingDuration = resolveTableOccupancyDuration(tempOrder);
+          var bookingEnd = bookingStart.add(bookingDuration, 'minute');
+          bookings = [normalizeSubmitBooking({
+            relation_id: 0,
+            form_id: 0,
+            start_time: bookingStart.format('HH:mm'),
+            start_date: bookingStart.format('YYYY-MM-DD'),
+            end_time: bookingEnd.format('HH:mm'),
+            end_date: bookingEnd.format('YYYY-MM-DD'),
+            duration: bookingDuration,
+            metadata: {
+              unique_identification_number: bookingUuid
+            },
+            select_date: bookingStart.format('YYYY-MM-DD'),
+            is_all: false,
+            like_status: 'common',
+            schedule_id: 0,
+            relation_type: '',
+            number: 1
+          })];
+        }
+        var nextBookings = bookings.map(function (booking, idx) {
           var metadata = _objectSpread({}, booking.metadata || {});
           if (hasExplicitCollectPax) {
             metadata.collect_pax = normalizeSubmitCollectPaxValue(rawCollectPax);
@@ -2142,7 +2168,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee30() {
-        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator6, _step6, _prefillItem$product_, _origin2, _origin3, _origin4, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasOriginChanged;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator6, _step6, _prefillItem$product_, _origin2, _origin3, _origin4, prefillItem, productId, productVariantId, targetQuantity, sourceItem, sourceTitle, productTitle, displayFields, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct, hasQuantityChanged, hasTitleChanged, hasOriginChanged;
         return _regeneratorRuntime().wrap(function _callee30$(_context30) {
           while (1) switch (_context30.prev = _context30.next) {
             case 0:
@@ -2192,7 +2218,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
               _iterator6.s();
             case 22:
               if ((_step6 = _iterator6.n()).done) {
-                _context30.next = 47;
+                _context30.next = 51;
                 break;
               }
               prefillItem = _step6.value;
@@ -2203,25 +2229,32 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _context30.next = 29;
                 break;
               }
-              return _context30.abrupt("continue", 45);
+              return _context30.abrupt("continue", 49);
             case 29:
               if (!Number.isNaN(productVariantId)) {
                 _context30.next = 31;
                 break;
               }
-              return _context30.abrupt("continue", 45);
+              return _context30.abrupt("continue", 49);
             case 31:
               sourceItem = productSourceMap.get(buildProductKey(productId, productVariantId)) || productSourceMap.get(buildProductKey(productId, 0)) || null;
+              sourceTitle = (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.product_title) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.title) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.name);
+              productTitle = typeof sourceTitle === 'string' ? {
+                auto: sourceTitle
+              } : sourceTitle; // 标准标题在归一化后补入，供购物车展示，并由 Order 在折扣重算时保留。
+              displayFields = productTitle ? {
+                product_title: productTitle
+              } : {};
               productIndex = getProductIdentityIndex(tempOrder.products, {
                 product_id: productId,
                 product_variant_id: productVariantId
               });
               if (!(productIndex === -1)) {
-                _context30.next = 38;
+                _context30.next = 41;
                 break;
               }
               sellingPrice = toPriceString((_sourceItem$price = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _sourceItem$price !== void 0 ? _sourceItem$price : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.selling_price, '0.00');
-              tempOrder.products.push(normalizeOrderProduct(_objectSpread(_objectSpread({}, sourceItem), {}, {
+              tempOrder.products.push(_objectSpread(_objectSpread({}, normalizeOrderProduct(_objectSpread(_objectSpread({}, sourceItem), {}, {
                 product_id: productId,
                 product_variant_id: productVariantId,
                 num: targetQuantity,
@@ -2235,14 +2268,14 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   item_rule_prefill: true,
                   item_rule_id: prefillItem.ruleId
                 })
-              })));
+              }))), displayFields));
               hasChanges = true;
-              return _context30.abrupt("continue", 45);
-            case 38:
+              return _context30.abrupt("continue", 49);
+            case 41:
               targetProduct = tempOrder.products[productIndex];
               existedQuantity = toNonNegativeInt(targetProduct.num);
               delta = targetQuantity - existedQuantity;
-              nextProduct = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), delta > 0 ? {
+              nextProduct = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, targetProduct), displayFields), delta > 0 ? {
                 num: getSafeProductNum(existedQuantity + delta)
               } : {}), {}, {
                 metadata: _objectSpread(_objectSpread({}, targetProduct.metadata || {}), {}, {
@@ -2252,52 +2285,53 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                 _origin: sourceItem ? _objectSpread(_objectSpread({}, targetProduct._origin || {}), sourceItem) : targetProduct._origin
               });
               hasQuantityChanged = delta > 0;
+              hasTitleChanged = Boolean(productTitle && JSON.stringify(targetProduct.product_title) !== JSON.stringify(productTitle));
               hasOriginChanged = Boolean(sourceItem && (!targetProduct._origin || ((_origin2 = targetProduct._origin) === null || _origin2 === void 0 ? void 0 : _origin2.name) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.name) || ((_origin3 = targetProduct._origin) === null || _origin3 === void 0 ? void 0 : _origin3.title) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.title) || ((_origin4 = targetProduct._origin) === null || _origin4 === void 0 ? void 0 : _origin4.price) !== (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price)));
-              if (hasQuantityChanged || hasOriginChanged) {
+              if (hasQuantityChanged || hasTitleChanged || hasOriginChanged) {
                 tempOrder.products[productIndex] = nextProduct;
                 hasChanges = true;
               }
-            case 45:
+            case 49:
               _context30.next = 22;
               break;
-            case 47:
-              _context30.next = 52;
+            case 51:
+              _context30.next = 56;
               break;
-            case 49:
-              _context30.prev = 49;
+            case 53:
+              _context30.prev = 53;
               _context30.t0 = _context30["catch"](20);
               _iterator6.e(_context30.t0);
-            case 52:
-              _context30.prev = 52;
+            case 56:
+              _context30.prev = 56;
               _iterator6.f();
-              return _context30.finish(52);
-            case 55:
+              return _context30.finish(56);
+            case 59:
               if (!hasChanges) {
-                _context30.next = 60;
+                _context30.next = 64;
                 break;
               }
               // Prefill 属于 products CRUD 的一种形式：新增后让 Rules 重算，以支持自动应用可用优惠券。
               this.store.order.applyDiscount();
-              _context30.next = 59;
+              _context30.next = 63;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 59:
+            case 63:
               this.store.order.persistTempOrder();
-            case 60:
-              _context30.next = 62;
+            case 64:
+              _context30.next = 66;
               return this.refreshItemRuleQuantityLimits();
-            case 62:
+            case 66:
               this.itemRulePrefillApplied = true;
               this.logMethodSuccess('applyPrefillByItemRule', {
                 prefillCount: prefillItems.length,
                 hasChanges: hasChanges
               });
-            case 64:
+            case 68:
             case "end":
               return _context30.stop();
           }
-        }, _callee30, this, [[20, 49, 52, 55]]);
+        }, _callee30, this, [[20, 53, 56, 59]]);
       }));
       function applyPrefillByItemRule() {
         return _applyPrefillByItemRule.apply(this, arguments);

package/dist/solution/ScanOrder/types.d.ts

@@ -1,5 +1,6 @@
 import { OrderModule, ProductList, SalesSummaryModule, ScanOrderLogInput, ScanOrderLoggerModule, ScanOrderLoggerProviderConfig, ScanOrderLoggerProviderType, ScheduleModule } from '../../modules';
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
+import type { OrderLocalizedText } from '../../modules/Order/types';
 /**
  * 扫码下单流程 hook
  */
@@ -43,6 +44,8 @@ export interface ScanOrderProductSku {
 }
 export interface ScanOrderOrderProduct extends ScanOrderOrderProductIdentity {
     order_detail_id: number | null;
+    /** 与 Order 一致的商品展示名称。 */
+    product_title?: OrderLocalizedText;
     num: number;
     /** Product 或当前 Variant 的生产编码 */
     production_code?: string;

package/dist/solution/UnifiedBookingSales/index.js

@@ -2421,7 +2421,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               (_this$store$customer = this.store.customer) === null || _this$store$customer === void 0 || (_this$store$customer$ = _this$store$customer.setSelectedCustomer) === null || _this$store$customer$ === void 0 || _this$store$customer$.call(_this$store$customer, authenticatedCustomer);
               this.setOrderCustomer(authenticatedCustomer);
               _context10.next = 15;
-              return Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh()]);
+              return Promise.all([this.refreshDiscountConfigAfterOrderCustomerChange(authenticatedCustomerId), this.waitForOrderCustomerPromotionRefresh(), this.waitForOrderCustomerContactInfo()]);
             case 15:
               return _context10.abrupt("return", true);
             case 16:

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/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/Holder/utils.d.ts

@@ -1,5 +1,7 @@
 import { ProductData } from '../Product/types';
 import { IFormItemData, IHolderConfig } from './types';
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+export declare function resolveProductHolderConfig(product?: ProductData | Record<string, any> | null): Record<string, any> | null;
 export declare function getProductHolderConfig(product?: ProductData | Record<string, any> | null): IHolderConfig | null;
 export declare function getFormIdFromHolderConfig(config: IHolderConfig): number;
 export declare function normalizeFormId(formId: number | string): number;

package/lib/modules/Holder/utils.js

@@ -8,9 +8,35 @@ exports.getFormIdFromHolderConfig = getFormIdFromHolderConfig;
 exports.getProductHolderConfig = getProductHolderConfig;
 exports.normalizeFormId = normalizeFormId;
 exports.resolveFormMetaFromHolderItem = resolveFormMetaFromHolderItem;
+exports.resolveProductHolderConfig = resolveProductHolderConfig;
+/** 保留显式禁用配置；仅在新配置缺失时兼容商品旧 holder 定义。 */
+function resolveProductHolderConfig(product) {
+  if (!product || typeof product !== 'object') return null;
+  const source = product;
+  const configSources = [source.holder_config, source.metadata?.holder_config, source.origin?.holder_config, source.metadata?.origin?.holder_config, source._origin?.holder_config, source._extend?.holder_config, source._extend?.product?.holder_config, source._extend?.product?.origin?.holder_config, source._extend?.product?.metadata?.holder_config, source._extend?.product?.metadata?.origin?.holder_config, source._extend?.product?._origin?.holder_config, source._extend?.product?._extend?.holder_config];
+  const config = configSources.find(value => value !== null && typeof value === 'object');
+  if (config) return config;
+
+  // metadata.holder / _extend.holder 是选择结果，不能作为商品配置读取。
+  const legacySources = [source.holder, source.origin?.holder, source.metadata?.origin?.holder, source._origin?.holder, source._extend?.product?.holder, source._extend?.product?.origin?.holder, source._extend?.product?.metadata?.origin?.holder, source._extend?.product?._origin?.holder];
+  const legacy = legacySources.find(value => value && typeof value === 'object' && !Array.isArray(value) && typeof value.type === 'string');
+  if (!legacy) return null;
+  const formId = legacy.custom?.custom_id;
+  if (legacy.type === 'custom' && legacy.custom?.type === 'form' && (typeof formId === 'number' || typeof formId === 'string') && Number.isInteger(Number(formId)) && Number(formId) > 0) {
+    return {
+      status: 'enable',
+      required: 0,
+      resource_id: formId
+    };
+  }
+  return {
+    status: 'disable',
+    required: 0
+  };
+}
 function getProductHolderConfig(product) {
   if (!product) return null;
-  const config = product?.holder_config ?? product?.origin?.holder_config;
+  const config = resolveProductHolderConfig(product);
   if (config?.status && config?.status !== 'enable') return null;
   if (!config?.resource_id) return null;
   return config;

package/lib/modules/OpenData/contactInfo.d.ts

@@ -0,0 +1,20 @@
+import type { OpenDataConfig } from './types';
+export declare const CONTACT_INFO_FIELDS: readonly ["first_name", "last_name", "phone", "email"];
+export type ContactInfoField = typeof CONTACT_INFO_FIELDS[number];
+export interface ContactInfoConfig {
+    enabled: boolean;
+    fields: Record<ContactInfoField, {
+        visible: boolean;
+        required: boolean;
+    }>;
+}
+export declare function resolveContactInfoConfig(data?: OpenDataConfig | null): ContactInfoConfig;
+export declare function getMissingContactInfoFields(config: ContactInfoConfig, value: unknown): ContactInfoField[];
+export declare function isContactRecord(value: unknown): value is Record<string, any>;
+/** Customer relations wrap the contact in value; sales orders store the object itself. */
+export declare function extractCustomerContactInfo(customer: unknown): Record<string, any> | null;
+export declare class ContactInfoRequiredError extends Error {
+    readonly fields: ContactInfoField[];
+    readonly code = "CONTACT_INFO_REQUIRED";
+    constructor(fields: ContactInfoField[]);
+}

package/lib/modules/OpenData/contactInfo.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ContactInfoRequiredError = exports.CONTACT_INFO_FIELDS = void 0;
+exports.extractCustomerContactInfo = extractCustomerContactInfo;
+exports.getMissingContactInfoFields = getMissingContactInfoFields;
+exports.isContactRecord = isContactRecord;
+exports.resolveContactInfoConfig = resolveContactInfoConfig;
+const CONTACT_INFO_FIELDS = exports.CONTACT_INFO_FIELDS = ['first_name', 'last_name', 'phone', 'email'];
+function resolveContactInfoConfig(data) {
+  const enabled = data?.['sale.enable_contact_info'] === true;
+  const fields = CONTACT_INFO_FIELDS.reduce((result, field) => {
+    const visible = data?.[`sale.${field}.visible`] !== false;
+    result[field] = {
+      visible,
+      required: enabled && visible && data?.[`sale.${field}.required`] === true
+    };
+    return result;
+  }, {});
+  return {
+    enabled: enabled && CONTACT_INFO_FIELDS.some(field => fields[field].visible),
+    fields
+  };
+}
+function getMissingContactInfoFields(config, value) {
+  if (!config.enabled) return [];
+  const contact = isContactRecord(value) ? value : {};
+  return CONTACT_INFO_FIELDS.filter(field => {
+    if (!config.fields[field].visible || !config.fields[field].required) return false;
+    const fieldValue = field === 'phone' ? isContactRecord(contact.phone) ? contact.phone.phone : undefined : contact[field];
+    return typeof fieldValue !== 'string' || !fieldValue.trim();
+  });
+}
+function isContactRecord(value) {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+
+/** Customer relations wrap the contact in value; sales orders store the object itself. */
+function extractCustomerContactInfo(customer) {
+  if (!isContactRecord(customer)) return null;
+  const contact = customer.contacts_info;
+  if (!isContactRecord(contact)) return null;
+  const value = Object.prototype.hasOwnProperty.call(contact, 'value') ? contact.value : contact;
+  return isContactRecord(value) ? value : null;
+}
+class ContactInfoRequiredError extends Error {
+  code = 'CONTACT_INFO_REQUIRED';
+  constructor(fields) {
+    super(`Contact information is required: ${fields.join(', ')}`);
+    this.fields = fields;
+    this.name = 'ContactInfoRequiredError';
+  }
+}
+exports.ContactInfoRequiredError = ContactInfoRequiredError;

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

@@ -3,6 +3,7 @@ import { BaseModule } from '../BaseModule';
 import type { ScheduleModule } from '../Schedule';
 import type { OpenDataConfig, OpenDataFetchParams, OpenDataAvailabilityResult, InvoiceLayoutConfig, InvoiceTemplateSettings } from './types';
 export * from './types';
+export * from './contactInfo';
 export { computeAvailability, getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeInvoiceLayoutConfig, normalizeInvoiceLayoutFromTemplateSettings, normalizeInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales, } from './utils';
 export declare class OpenDataModule extends BaseModule implements Module {
     protected defaultName: string;

package/lib/modules/OpenData/index.js

@@ -77,6 +77,18 @@ Object.keys(_types).forEach(function (key) {
     }
   });
 });
+var _contactInfo = require("./contactInfo");
+Object.keys(_contactInfo).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _contactInfo[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _contactInfo[key];
+    }
+  });
+});
 function isRecord(value) {
   return !!value && typeof value === 'object' && !Array.isArray(value);
 }

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

@@ -69,6 +69,15 @@ export interface OpenDataConfig {
     'reservation.time_slice'?: number | string;
     'sale.allow_item_notes'?: boolean;
     'sale.allow_order_notes'?: boolean;
+    'sale.enable_contact_info'?: boolean;
+    'sale.first_name.visible'?: boolean;
+    'sale.first_name.required'?: boolean;
+    'sale.last_name.visible'?: boolean;
+    'sale.last_name.required'?: boolean;
+    'sale.phone.visible'?: boolean;
+    'sale.phone.required'?: boolean;
+    'sale.email.visible'?: boolean;
+    'sale.email.required'?: boolean;
     /** False submits an order without starting or confirming payment. */
     'sale.require_payment_on_submit'?: boolean | null;
     'sale.enable_item_rules'?: boolean;

package/lib/modules/Order/holderRelations.d.ts

@@ -0,0 +1,14 @@
+import type { OrderHolderRelation, OrderTempOrder } from './types';
+/** 在原订单上补齐关系身份，让缓存、提交和重试共用同一个 UUID。 */
+export declare function ensureHolderRelationUuids(order: {
+    holder_relations?: OrderHolderRelation[];
+}): void;
+export declare function hasProductBooking(product: Record<string, any>): boolean;
+export declare function getProductHolderRelations(order: {
+    holder_relations?: OrderHolderRelation[];
+}, product: Record<string, any>): OrderHolderRelation[];
+export declare function replaceProductHolderRelations(order: OrderTempOrder, product: Record<string, any>, patch: OrderHolderRelation[] | undefined): void;
+/** 只删除明确被用户删除的行，不从稀疏远端快照推断删除。 */
+export declare function removeProductHolderRelations(order: OrderTempOrder, products: Array<Record<string, any>>): void;
+/** 仅兼容尚无新字段的旧测试草稿；显式 [] 永远不恢复旧 product 数据。 */
+export declare function restoreLegacyHolderRelations(order: Record<string, any>): OrderHolderRelation[] | undefined;

package/lib/modules/Order/holderRelations.js

@@ -0,0 +1,98 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ensureHolderRelationUuids = ensureHolderRelationUuids;
+exports.getProductHolderRelations = getProductHolderRelations;
+exports.hasProductBooking = hasProductBooking;
+exports.removeProductHolderRelations = removeProductHolderRelations;
+exports.replaceProductHolderRelations = replaceProductHolderRelations;
+exports.restoreLegacyHolderRelations = restoreLegacyHolderRelations;
+var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+function getHolderRelationUuid(relation) {
+  return typeof relation?.uuid === 'string' && relation.uuid.trim() ? relation.uuid : undefined;
+}
+
+/** 在原订单上补齐关系身份，让缓存、提交和重试共用同一个 UUID。 */
+function ensureHolderRelationUuids(order) {
+  if (!Array.isArray(order.holder_relations)) return;
+  for (const relation of order.holder_relations) {
+    if (relation && typeof relation === 'object' && !getHolderRelationUuid(relation)) {
+      relation.uuid = (0, _orderCollectionIdentity.createUuidV4)();
+    }
+  }
+}
+function hasProductBooking(product) {
+  const bookingIds = [product.booking_id, product.metadata?.booking_id, product.schedule_event_id];
+  return Boolean(product.booking_uid || product.metadata?.booking_uid) || bookingIds.some(id => id !== undefined && id !== null && String(id) !== '' && String(id) !== '0');
+}
+function getProductHolderRelations(order, product) {
+  const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return [];
+  return (order.holder_relations || []).filter(relation => relation.relation_model === 'order_detail' && String(relation.relation_uuid) === String(uid));
+}
+function replaceProductHolderRelations(order, product, patch) {
+  if (patch === undefined || hasProductBooking(product)) return;
+  const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+  if (uid === undefined || uid === null || uid === '') return;
+  const existing = getProductHolderRelations(order, product);
+  const next = new Map();
+  for (const relation of patch) {
+    const key = `${relation.holder_type}:${relation.holder_id}`;
+    const previous = existing.find(item => item.holder_type === relation.holder_type && String(item.holder_id) === String(relation.holder_id));
+    next.set(key, {
+      ...previous,
+      ...relation,
+      uuid: getHolderRelationUuid(previous) || getHolderRelationUuid(relation) || (0, _orderCollectionIdentity.createUuidV4)(),
+      relation_model: 'order_detail',
+      relation_uuid: String(uid),
+      ...(previous?.metadata || relation.metadata ? {
+        metadata: {
+          ...previous?.metadata,
+          ...relation.metadata
+        }
+      } : {})
+    });
+  }
+  order.holder_relations = [...(order.holder_relations || []).filter(relation => relation.relation_model !== 'order_detail' || String(relation.relation_uuid) !== String(uid)), ...next.values()];
+}
+
+/** 只删除明确被用户删除的行，不从稀疏远端快照推断删除。 */
+function removeProductHolderRelations(order, products) {
+  if (!Array.isArray(order.holder_relations)) return;
+  const removedUids = new Set(products.map(product => String(product.metadata?.unique_identification_number ?? product.unique_identification_number ?? '')));
+  order.holder_relations = order.holder_relations.filter(relation => relation.relation_model !== 'order_detail' || !removedUids.has(String(relation.relation_uuid)));
+}
+
+/** 仅兼容尚无新字段的旧测试草稿；显式 [] 永远不恢复旧 product 数据。 */
+function restoreLegacyHolderRelations(order) {
+  if (Object.prototype.hasOwnProperty.call(order, 'holder_relations')) {
+    return Array.isArray(order.holder_relations) ? order.holder_relations : undefined;
+  }
+  const relations = [];
+  const bookingProductUids = new Set((order.bookings || []).map(booking => String(booking.product_uid ?? booking.metadata?.product_uid ?? '')));
+  for (const product of order.products || []) {
+    if (hasProductBooking(product)) continue;
+    const uid = product.metadata?.unique_identification_number ?? product.unique_identification_number;
+    if (uid === undefined || uid === null || uid === '' || bookingProductUids.has(String(uid))) continue;
+    const holder = product.metadata?.holder || {};
+    const rawIds = product.metadata?.holder_id ?? holder.form_record;
+    const ids = (Array.isArray(rawIds) ? rawIds : [rawIds]).filter(id => id !== undefined && id !== null && id !== '' && Number.isInteger(Number(id)) && Number(id) >= 0);
+    for (const id of ids) {
+      const metadata = {
+        ...holder,
+        form_record: [Number(id)]
+      };
+      if (ids.length !== 1) delete metadata.name;
+      relations.push({
+        relation_model: 'order_detail',
+        relation_uuid: String(uid),
+        holder_type: 'form',
+        holder_id: Number(id),
+        metadata
+      });
+    }
+  }
+  return relations.length ? relations : undefined;
+}