@pisell/pisellos 0.10.58 → 0.10.60

package/dist/server/modules/order/types.d.ts

@@ -1,4 +1,5 @@
 import type { ScheduleEventResource } from '../resource/types';
+import type { OrderHolderRelation } from '../../../modules/Order/types';
 /**
  * Order 模块主键类型（对齐标准 Sales 协议的 order_id）
  */
@@ -448,6 +449,8 @@ export interface OrderData {
     contacts_info?: unknown[];
     /** 订单级主体参数 */
     holder?: Record<string, unknown> | null;
+    /** 非预约商品 Holder 关系完整快照；缺席表示本次回包未提供 */
+    holder_relations?: OrderHolderRelation[];
     /** 订单前端扩展快照 */
     order_meta_list?: {
         point_cards_snapshot?: Array<{

package/dist/shared/receipt/small-ticket.js

@@ -20,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 Decimal from 'decimal.js';
+import { getProductHolderRelations, hasProductBooking } from "../../modules/Order/holderRelations";
 import { isFulfillmentTimingBooking } from "../../modules/Order/pickupTiming";
 import { resolveInvoiceDataVisibility } from "./templateVisibility";
 var DEFAULT_LOCALES = ['en', 'zh_CN'];
@@ -115,6 +116,7 @@ var LABELS = {
     bookingDateTime: 'Date & time',
     bookingResource: 'Resource',
     bookingHolder: 'Holder',
+    productHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     manualMarkup: 'Manual markup',
@@ -160,6 +162,7 @@ var LABELS = {
     bookingDateTime: '日期和时间',
     bookingResource: '资源',
     bookingHolder: '预约人',
+    productHolder: '持有人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     manualMarkup: '手动加价',
@@ -205,6 +208,7 @@ var LABELS = {
     bookingDateTime: '日期和時間',
     bookingResource: '資源',
     bookingHolder: '預約人',
+    productHolder: '持有人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     manualMarkup: '手動加價',
@@ -248,6 +252,7 @@ var LABELS = {
     bookingDateTime: '日時',
     bookingResource: 'リソース',
     bookingHolder: '予約者',
+    productHolder: '利用者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
     manualMarkup: '手動値上げ',
@@ -292,6 +297,7 @@ var LABELS = {
     bookingDateTime: 'Data e hora',
     bookingResource: 'Recurso',
     bookingHolder: 'Titular',
+    productHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
     manualMarkup: 'Acréscimo manual',
@@ -461,6 +467,17 @@ function buildProducts(order, locale, productMap) {
       quantity: quantity,
       originalPrice: originalPrice
     });
+    var holderName = hasProductBooking(product) ? '' : getProductHolderRelations(order, product).map(function (relation) {
+      var _relation$metadata;
+      return getLocalizedValue((_relation$metadata = relation.metadata) === null || _relation$metadata === void 0 ? void 0 : _relation$metadata.name, locale).trim();
+    }).filter(Boolean).join(', ');
+    if (holderName) {
+      // 复用 Web Invoice / 原生均支持的文本扩展行，不混入金额或商品备注。
+      extensionList.push(_objectSpread(_objectSpread({}, receiptKey(rawProduct, 'product-holder', 'text')), {}, {
+        item: "".concat(label(locale, 'productHolder'), ": ").concat(holderName),
+        value: ''
+      }));
+    }
     var productNote = resolveProductNote(product, locale);
     var allergy = isPresentId(productUid) ? allergyByProductUid.get(String(productUid).trim()) || '' : '';
     var basePrice = resolveProductBasePrice(product);

package/dist/shared/sales/loadSalesOrderSnapshot.js

@@ -4,7 +4,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); }
-export var SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes'];
+export var SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes', 'holder_relations'];
 
 /** Shared transport contract; remote callers use their host's /h5 prefix. */
 export function loadSalesOrderSnapshot(request, params) {

package/dist/solution/BaseSales/index.d.ts

@@ -1,3 +1,4 @@
+import { InventoryController, type CheckoutRuntimeSnapshot } from '../../inventory';
 import { Module, ModuleOptions, PisellCore } from '../../types';
 import { BaseModule } from '../../modules/BaseModule';
 import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentStatus, BaseSalesSubmitSalesOrderParams, BaseSalesUpdateOrderProductQuantityParams, BaseSalesCalculateProductBookingPriceParams, BaseSalesPriceRecalculationContextChange, BaseSalesProductBookingPriceResult, BaseSalesQuotationCustomerScopeInfo, BaseSalesScanCodeResult, BaseSalesCashPaymentOptions, BaseSalesCashPaymentConfig, BaseSalesPayCashParams, BaseSalesPayCashResult, BaseSalesCommitPaymentMethodParams, BaseSalesCommitPaymentMethodResult, BaseSalesConfirmWalletPaymentResult } from './types';
@@ -49,6 +50,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     protected appPlugin: AppPlugin;
     protected store: BaseSalesState;
     protected otherParams: Record<string, any>;
+    getInventory(): InventoryController | undefined;
+    prepareCheckout(signal?: AbortSignal): Promise<CheckoutRuntimeSnapshot | undefined>;
     protected cacheId: string | undefined;
     /**
      * 由已在初始化阶段解析过设备短号的业务解决方案写入。
@@ -187,6 +190,7 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * 可覆盖此方法并把未识别的 name 委托给 `super.createSubModule(name)`。
      */
     protected createSubModule(moduleName: string): Module | null;
+    private inventoryOrderHooks?;
     protected getSubModuleHooks(moduleName: string): any;
     /**
      * 构造传给 BaseSales 子模块的完整运行态参数，保证初始化和后续同步语义一致。
@@ -224,7 +228,11 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     private isActiveVirtualSettlementOrder;
     private isHistoricalVirtualSettlementOrder;
     private syncAppDataToTempOrder;
+    private initialization?;
+    /** Hosts can await readiness without changing Core's synchronous registration API. */
+    whenInitialized(): Promise<void>;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    private initializeSalesRuntime;
     destroy(): Promise<void>;
     /**
      * 加载销售订单到统一 tempOrder 工作区。