@pisell/pisellos 2.2.314 → 2.2.315

package/lib/solution/BaseSales/pickupTiming.js

@@ -0,0 +1,290 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PickupTimingController = void 0;
+var _lodashEs = require("lodash-es");
+var _FulfillmentTiming = require("../../modules/FulfillmentTiming");
+async function withTimeout(request) {
+  let timer;
+  try {
+    return await Promise.race([request, new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new Error('Unable to load pickup times. Please try again.')), 30000);
+    })]);
+  } finally {
+    if (timer !== undefined) clearTimeout(timer);
+  }
+}
+
+/** Reuses runtime configuration and schedules; every calculation still uses the live clock. */
+class PickupTimingController {
+  latest;
+  runtime;
+  writeSequence = 0;
+  constructor(host) {
+    this.host = host;
+  }
+  now() {
+    return this.host.now?.() ?? new Date();
+  }
+
+  /** A new solution context or an explicit settings refresh invalidates pending work too. */
+  invalidate() {
+    this.runtime = undefined;
+    this.latest = undefined;
+    this.writeSequence += 1;
+  }
+  assertCurrentRuntime(runtime) {
+    if (this.runtime !== runtime || runtime.scope !== this.host.getScope()) {
+      throw new Error('Store settings changed. Please try again.');
+    }
+  }
+  getRuntime() {
+    const scope = this.host.getScope();
+    if (this.runtime?.scope !== scope) {
+      this.latest = undefined;
+      this.runtime = {
+        scope
+      };
+    }
+    return this.runtime;
+  }
+  async loadConfig(runtime) {
+    if (runtime.config) return runtime.config;
+    if (!runtime.configRequest) {
+      const request = (async () => {
+        const config = (0, _FulfillmentTiming.normalizePickupTimingConfig)(await withTimeout(this.host.loadOpenData(false)));
+        this.assertCurrentRuntime(runtime);
+        runtime.config = config;
+        return config;
+      })();
+      runtime.configRequest = request;
+    }
+    const request = runtime.configRequest;
+    try {
+      return await request;
+    } finally {
+      if (runtime.configRequest === request) runtime.configRequest = undefined;
+    }
+  }
+  async loadSchedules(runtime, config) {
+    if (runtime.schedules) return runtime.schedules;
+    if (!runtime.scheduleRequest) {
+      const request = (async () => {
+        const schedule = this.host.getSchedule();
+        if (!schedule) throw new Error('Pickup schedule is unavailable. Please try again.');
+        // Reuse the catalog loaded by solution initialization, including its in-flight request.
+        await withTimeout(schedule.loadAllSchedule({
+          useCache: true
+        }));
+        this.assertCurrentRuntime(runtime);
+        const ids = [...new Set([...config.scheduleIds, ...(config.operatingHoursScheduleIds || [])])];
+        const schedules = (0, _lodashEs.cloneDeep)(schedule.getScheduleListByIds(ids) || []);
+        runtime.schedules = schedules;
+        return schedules;
+      })();
+      runtime.scheduleRequest = request;
+    }
+    const request = runtime.scheduleRequest;
+    try {
+      return await request;
+    } finally {
+      if (runtime.scheduleRequest === request) runtime.scheduleRequest = undefined;
+    }
+  }
+
+  /** Preserve an existing POS choice without adding it to the shared settings cache. */
+  getEffectiveConfig(config) {
+    if (!this.host.isPos()) return config;
+    const serviceType = this.host.getOrder().getTempOrder()?.metadata?.shop_service_data?.service_type;
+    if (serviceType !== 'dine_in' && serviceType !== 'takeaway' || config.handoverModes.includes(serviceType)) {
+      return config;
+    }
+    return {
+      ...config,
+      handoverModes: [...config.handoverModes, serviceType]
+    };
+  }
+  async snapshot(includeSchedule, tolerateScheduleError = false) {
+    const runtime = this.getRuntime();
+    const config = await this.loadConfig(runtime);
+    this.assertCurrentRuntime(runtime);
+    let schedules = [];
+    let error;
+    if (includeSchedule && config.handoverModes.includes('pick_up') && config.timingMode !== 'asap_only' && config.scheduleIds.length) {
+      try {
+        schedules = await this.loadSchedules(runtime, config);
+      } catch (reason) {
+        if (!tolerateScheduleError) throw reason;
+        error = reason instanceof Error ? reason.message : 'Pickup schedule is unavailable. Please try again.';
+      }
+    }
+    this.assertCurrentRuntime(runtime);
+    const result = {
+      config,
+      timezone: this.host.getTimezone(),
+      schedules,
+      scope: runtime.scope,
+      error
+    };
+    this.latest = result;
+    // Read the live order after async loading; cached snapshots retain only configured modes.
+    return {
+      ...result,
+      config: this.getEffectiveConfig(config)
+    };
+  }
+  async getAvailability(params = {}) {
+    // `force` remains accepted for older callers; refresh recomputes time using the runtime catalog.
+    const snapshot = await this.snapshot(true, true);
+    const now = this.now();
+    try {
+      return {
+        ...(0, _FulfillmentTiming.computePickupTimingAvailability)({
+          ...snapshot,
+          date: params.date,
+          now
+        }),
+        error: snapshot.error
+      };
+    } catch (reason) {
+      // Keep the handover selector usable when only Pickup's timezone is unavailable.
+      return {
+        config: snapshot.config,
+        timezone: snapshot.timezone,
+        now: now.toISOString(),
+        today: '',
+        maxDate: '',
+        date: params.date || '',
+        dates: [],
+        slots: [],
+        error: reason instanceof Error ? reason.message : 'Pickup times are unavailable. Please try again.'
+      };
+    }
+  }
+  getSelection() {
+    const order = this.host.getOrder();
+    const tempOrder = order.getTempOrder();
+    const booking = order.getPickupTimingBooking();
+    const config = this.latest?.scope === this.host.getScope() ? this.getEffectiveConfig(this.latest.config) : undefined;
+    const storedServiceType = String(tempOrder?.metadata?.shop_service_data?.service_type || '');
+    const serviceType = config?.handoverModes.length ? config.handoverModes.includes(storedServiceType) ? storedServiceType : config.handoverModes[0] : storedServiceType;
+    const details = serviceType === 'pick_up' ? booking?.metadata.fulfillment_timing : undefined;
+    const mode = config?.timingMode === 'asap_only' ? 'asap' : config?.timingMode === 'scheduled_only' ? 'scheduled' : details?.mode ?? 'asap';
+    const sameMode = details?.mode === mode;
+    return {
+      serviceType,
+      mode,
+      source: mode === 'asap' ? 'asap' : sameMode && details?.source || 'schedule',
+      ...(sameMode && booking ? {
+        date: booking.start_date,
+        time: booking.start_time,
+        instant: details?.instant
+      } : {})
+    };
+  }
+  async validateSnapshot(selection) {
+    const snapshot = await this.snapshot(selection.serviceType === 'pick_up' && selection.mode === 'scheduled' && selection.source !== 'pos_manual');
+    const now = this.now();
+    const result = (0, _FulfillmentTiming.validatePickupTimingSelection)(selection, {
+      ...snapshot,
+      now,
+      allowManualOverride: this.host.isPos()
+    });
+    return {
+      snapshot,
+      now,
+      result
+    };
+  }
+  async validate(selection) {
+    return (await this.validateSnapshot(selection)).result;
+  }
+  async setSelection(selection, options = {}) {
+    const order = this.host.getOrder();
+    const tempOrder = order.ensureTempOrder();
+    const sequence = ++this.writeSequence;
+    const {
+      snapshot,
+      now,
+      result
+    } = await this.validateSnapshot(selection);
+    if (sequence !== this.writeSequence || order.getTempOrder() !== tempOrder || snapshot.scope !== this.host.getScope()) {
+      throw new Error('The order changed. Please choose the pickup time again.');
+    }
+    if (!result.valid) throw new Error(result.message || 'Please choose a valid pickup time.');
+    if (!snapshot.config.handoverModes.length) {
+      order.clearPickupTimingBooking();
+      return this.getSelection();
+    }
+    if (selection.serviceType !== 'pick_up') {
+      if (this.host.setServiceType) {
+        await this.host.setServiceType(selection.serviceType);
+      } else {
+        order.updateTempOrderServiceType(selection.serviceType);
+      }
+      return this.getSelection();
+    }
+    const slot = selection.mode === 'asap' ? (0, _FulfillmentTiming.getAsapPickupTiming)({
+      ...snapshot,
+      now
+    }) : result.slot;
+    if (!slot) throw new Error('Please choose a pickup time.');
+    // Validate everything before either field is changed; notify once after the combined update.
+    tempOrder.metadata = {
+      ...(tempOrder.metadata || {}),
+      shop_service_data: {
+        ...(tempOrder.metadata?.shop_service_data || {}),
+        service_type: 'pick_up'
+      }
+    };
+    order.setPickupTimingBooking({
+      mode: selection.mode,
+      source: selection.mode === 'asap' ? 'asap' : selection.source === 'pos_manual' ? 'pos_manual' : 'schedule',
+      date: slot.date,
+      time: slot.time,
+      instant: slot.instant,
+      timezone: snapshot.timezone,
+      frozen: options.frozen ?? false
+    });
+    return this.getSelection();
+  }
+
+  /** Called before a new checkout/payment; payment callbacks keep their already prepared appointment. */
+  async prepare(options = {}) {
+    const order = this.host.getOrder();
+    const tempOrder = order.getTempOrder();
+    const sequence = this.writeSequence;
+    if (order.getOrderIdentity()?.isSubmitted) return this.getSelection();
+    const booking = order.getPickupTimingBooking();
+    if (booking?.metadata.fulfillment_timing?.frozen) return this.getSelection();
+    // An actual payment callback must never revalidate or move the time after funds have been taken.
+    const paymentStatus = order.getTempOrder()?.payment_status;
+    if (paymentStatus === 'paid' || paymentStatus === 'partially_paid') {
+      if (booking?.metadata.fulfillment_timing) {
+        const detail = booking.metadata.fulfillment_timing;
+        order.setPickupTimingBooking({
+          ...detail,
+          date: booking.start_date,
+          time: booking.start_time,
+          frozen: true
+        });
+      }
+      return this.getSelection();
+    }
+    const snapshot = await this.snapshot(false);
+    if (order !== this.host.getOrder() || order.getTempOrder() !== tempOrder || sequence !== this.writeSequence) {
+      throw new Error('The order changed. Please choose the pickup time again.');
+    }
+    const selection = this.getSelection();
+    if (!snapshot.config.handoverModes.length) {
+      order.clearPickupTimingBooking();
+      return selection;
+    }
+    return this.setSelection(selection, {
+      frozen: options.freeze ?? false
+    });
+  }
+}
+exports.PickupTimingController = PickupTimingController;

package/lib/solution/BaseSales/types.d.ts

@@ -4,6 +4,8 @@ import type { ScanOrderLogInput as BaseSalesLogInput, ScanOrderLoggerProviderCon
 import type { QuantityCheckResult, QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { QuotationCustomerScopeInfo } from '../../modules/Quotation/types';
 import type { PaymentMethod } from '../../modules/Payment/types';
+import type { OrderPaymentSource } from '../../modules/Order/types';
+import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 /**
  * BaseSales 流程 hook 后缀。
  * 完整事件名应由当前模块名动态拼接，避免多个实例共享固定事件 key。
@@ -27,6 +29,15 @@ export interface BaseSalesCashPaymentOptions {
     /** 指定现金支付方式；省略时使用默认 CASHMANUAL。 */
     paymentMethodId?: number | string;
 }
+export interface BaseSalesSubmitSalesOrderParams {
+    payments?: OrderPaymentSource[];
+    paymentStatus?: BaseSalesPaymentStatus;
+    smallTicketDataFlag?: number;
+    confirmPendingVoucherPayments?: boolean;
+    enhancePayload?: SubmitPayloadEnhancer;
+    /** Create the order without executing payment; payment status comes from the server. */
+    paymentExecution?: 'deferred';
+}
 export interface BaseSalesCashPaymentConfig {
     available: boolean;
     paymentMethod?: PaymentMethod;

package/lib/solution/BaseSales/utils/parseSalesResponse.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.parseSalesResponse = parseSalesResponse;
 var _orderCollectionIdentity = require("../../../modules/Order/utils/orderCollectionIdentity");
+var _pickupTiming = require("../../../modules/Order/pickupTiming");
 /**
  * 把 `/order/sales/{id}` 响应（OrderData）解析为 ISalesDetail。
  *
@@ -64,6 +65,7 @@ function pickCustomer(raw) {
  */
 function isRootBooking(booking) {
   if (!booking || typeof booking !== 'object') return false;
+  if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return false;
   const parentId = booking.parent_id;
   if (parentId === 0 || parentId === null || parentId === undefined) return true;
   return false;
@@ -71,6 +73,7 @@ function isRootBooking(booking) {
 function indexBookingsByProductUid(bookings) {
   const result = {};
   for (const b of bookings) {
+    if ((0, _pickupTiming.isFulfillmentTimingBooking)(b)) continue;
     const uid = b && (b.product_uid || b.metadata?.product_uid) || '';
     if (!uid) continue;
     const key = String(uid);

package/lib/solution/BookingByStep/index.d.ts

@@ -210,6 +210,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      *     product: ProductData;
      *     date?: { startTime: string; endTime: string } | null;
      *     account?: Account | null;
+     *     isLegacyOrder?: boolean;
      *   })} {
      *     product,
      *     date,
@@ -218,13 +219,14 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
      * @return {*}
      * @memberof BookingByStepImpl
      */
-    addProductToCart({ product, date, account, }: {
+    addProductToCart({ product, date, account, isLegacyOrder, }: {
         product: ProductData;
         date?: {
             startTime: string;
             endTime: string;
         } | null;
         account?: Account | null;
+        isLegacyOrder?: boolean;
     }): {
         success: boolean;
         errorCode?: string;

package/lib/solution/BookingByStep/index.js

@@ -636,7 +636,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
     // 直接调用 addProductToCart，不传递 date 参数以避免日期检查逻辑
     return this.addProductToCart({
       product: productData,
-      account: activeAccount
+      account: activeAccount,
+      isLegacyOrder: true
     });
   }
 
@@ -647,6 +648,7 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
    *     product: ProductData;
    *     date?: { startTime: string; endTime: string } | null;
    *     account?: Account | null;
+   *     isLegacyOrder?: boolean;
    *   })} {
    *     product,
    *     date,
@@ -658,7 +660,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
   addProductToCart({
     product,
     date,
-    account
+    account,
+    isLegacyOrder = false
   }) {
     const {
       bundle,
@@ -725,7 +728,8 @@ class BookingByStepImpl extends _BaseModule.BaseModule {
       product: productData,
       bundle,
       options,
-      quantity
+      quantity,
+      isLegacyOrder
     };
     if (date) {
       addItemParams.date = date;

package/lib/solution/BookingTicket/index.d.ts

@@ -42,6 +42,10 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      */
     protected getRegisteredModuleNames(): readonly string[];
     protected getSubmitOrderSalesChannel(): string;
+    /** 供销售展示层按 booking.resources[].form_id 读取当前多语言表单标题。 */
+    getFormTitleMap(): Record<string, Record<string, string> | string>;
+    /** 表单定义由 Ably 更新后通知展示层刷新，不改动订单里的历史 metadata。 */
+    onFormTitlesChanged(callback: (titles: Record<string, Record<string, string> | string>) => void): () => void;
     /**
      * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
      * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -53,11 +57,12 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 在解决方案对外 ready 前准备 Invoice Document；失败只降级模板，不阻断销售。
      * 已由页面取得的 OpenData 直接交给模块接管，没有注入数据时再走 target-scoped 加载。
      */
-    private prepareInvoiceTemplateAtSolutionReady;
+    protected prepareInvoiceTemplateAtSolutionReady(injectedOpenData?: OpenDataConfig): Promise<void>;
     protected getBookingTicketBusinessCode(): string | null;
     private getIdGeneratorPlugin;
-    private loadOpenDataConfig;
+    protected loadOpenDataConfig(): Promise<OpenDataConfig | null>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    protected loadFulfillmentItemRuleOpenData(): Promise<OpenDataConfig | null>;
     getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
     getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
     protected isInvoiceOpenDataCacheCurrent(): boolean;
@@ -66,6 +71,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getShortNumberOrDeviceId;
     private configureIdGeneratorFromOpenData;
     private normalizePositiveInteger;
+    private normalizeShortNumberMaximum;
     private normalizeIdPrefix;
     /**
      * 加载销售详情，并在父类基础上把 customer 信息装配到 CustomerModule。

package/lib/solution/BookingTicket/index.js

@@ -39,6 +39,7 @@ var _orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDis
 var _bookingStatus = require("./utils/bookingStatus");
 var _resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
 var _utils = require("../../modules/Order/utils");
+var _types2 = require("../../server/modules/form/types");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents'];
 const OPEN_DATA_CACHE_TTL = 5 * 60 * 1000;
@@ -179,6 +180,16 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     return !channel || channel === 'system' ? 'pos' : channel;
   }
 
+  /** 供销售展示层按 booking.resources[].form_id 读取当前多语言表单标题。 */
+  getFormTitleMap() {
+    return this.core?.server?.form?.getTitleMap?.() || {};
+  }
+
+  /** 表单定义由 Ably 更新后通知展示层刷新，不改动订单里的历史 metadata。 */
+  onFormTitlesChanged(callback) {
+    return this.core.effects.on(_types2.FormHooks.onChanged, callback);
+  }
+
   /**
    * 业务侧子模块工厂：BookingTicket 自带的 createBookingTicketModule 优先匹配；
    * 未识别的模块名（如 BookingByStep 公共类型）回退到父类工厂。
@@ -289,6 +300,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   async getOpenData() {
     return this.loadOpenDataConfig();
   }
+  async loadFulfillmentItemRuleOpenData() {
+    return this.store.openData ? this.getOpenData() : super.loadFulfillmentItemRuleOpenData();
+  }
   async getInvoiceLayoutConfig() {
     const openData = await this.loadOpenDataConfig();
     if (!openData) return (0, _OpenData.getDefaultInvoiceLayoutConfig)();
@@ -364,9 +378,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         config: {
           prefix,
           deviceCode: deviceId,
-          // TODO 现在 picoding 没这个配置的 key
-          padReceiptSequence: false,
+          padReceiptSequence: openDataConfig?.['sale.pad_with_leading_zeros'] === true,
           receiptSequenceLength,
+          receiptSequenceMax: this.normalizeShortNumberMaximum(openDataConfig?.['sale.maximum_number']),
+          randomReceiptSequence: openDataConfig?.['sale.short_number_random'] === true,
           resetReceiptSequenceDaily,
           receiptSequenceResetTime: operatingDayBoundary?.time,
           receiptSequenceStart,
@@ -382,6 +397,17 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
     if (!Number.isInteger(numeric) || numeric <= 0) return fallback;
     return numeric;
   }
+  normalizeShortNumberMaximum(value) {
+    if (value === undefined || value === null || typeof value === 'string' && !value.trim()) return null;
+    if (typeof value !== 'number' && typeof value !== 'string') {
+      throw new Error('sale.maximum_number 必须是安全正整数或空值');
+    }
+    const numeric = Number(value);
+    if (!Number.isSafeInteger(numeric) || numeric <= 0) {
+      throw new Error('sale.maximum_number 必须是安全正整数或空值');
+    }
+    return numeric;
+  }
   normalizeIdPrefix(value, fallback) {
     if (value === undefined || value === null) return fallback;
     const normalized = String(value).trim().toUpperCase();
@@ -1672,6 +1698,30 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       };
     }
     try {
+      // Capture before lookup/UI awaits, so a result cannot land in a new cart.
+      // Unscoped POS Order modules return a no-op guard.
+      const beforeScanCommit = this.store.order.createCartIntentCommitGuard('add_product');
+      const beforeScanDialog = this.store.order.createCartIntentCommitGuard('add_product');
+      const guardCallback = callback => callback ? (...args) => {
+        beforeScanCommit();
+        return callback(...args);
+      } : undefined;
+      const guardedBridge = bridge ? {
+        ...bridge,
+        confirmDetail: guardCallback(bridge.confirmDetail),
+        confirmBookingEdit: guardCallback(bridge.confirmBookingEdit),
+        applyPromotionCode: guardCallback(bridge.applyPromotionCode),
+        openOrder: guardCallback(bridge.openOrder),
+        requestCustomerSwitch: guardCallback(bridge.requestCustomerSwitch),
+        openProductDetail: bridge.openProductDetail ? payload => {
+          beforeScanDialog();
+          return bridge.openProductDetail(payload);
+        } : undefined,
+        openBookingEdit: bridge.openBookingEdit ? payload => {
+          beforeScanDialog();
+          return bridge.openBookingEdit(payload);
+        } : undefined
+      } : undefined;
       const localSearch = v => this.store.products.findProductsByCodeOrBarcode(v);
       const scanCallback = (0, _handleScan.handleGlobalScan)(this.request, localSearch, this.getSubmitOrderSalesChannel());
       const raw = await scanCallback({
@@ -1687,7 +1737,10 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         };
       }
       const result = await (0, _applyGlobalScan.applyGlobalScan)({
-        setOrderCustomer: customer => this.setOrderCustomer(customer),
+        setOrderCustomer: customer => {
+          beforeScanCommit();
+          this.setOrderCustomer(customer);
+        },
         getOrderCustomerSnapshot: () => this.getOrderCustomerSnapshot(),
         resolveCustomerById: customerId => this.resolveCustomerById(customerId),
         getBusinessCode: () => this.otherParams?.businessCode,
@@ -1695,10 +1748,16 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
         decideAddProduct: (item, options) => this.decideAddProduct(item, options),
         decideAfterDetail: (cacheItem, options) => this.decideAfterDetail(cacheItem, options),
         transformDetailToProductAndBooking: input => this.transformDetailToProductAndBooking(input),
-        addProductToOrder: (product, booking) => this.addProductToOrder(product, booking),
+        addProductToOrder: (product, booking) => {
+          beforeScanCommit();
+          return this.addProductToOrder(product, booking);
+        },
         refreshWalletAssets: params => this.refreshWalletAssets(params),
-        scanWalletAsset: scanCode => this.scanWalletAsset(scanCode)
-      }, formatted, bridge);
+        scanWalletAsset: scanCode => {
+          beforeScanCommit();
+          return this.scanWalletAsset(scanCode);
+        }
+      }, formatted, guardedBridge);
       bridge?.refresh?.();
       return result;
     } catch (error) {

package/lib/solution/BookingTicket/utils/addProductDecision.d.ts

@@ -65,7 +65,6 @@ export interface AddProductDecideContext extends BookingCalcContext {
     type?: 'select' | 'detail';
     quantity?: number;
     customerId?: number | string;
-    channel?: string;
 }
 /**
  * 统一补齐预约商品的运行态字段。

package/lib/solution/BookingTicket/utils/addProductDecision.js

@@ -146,7 +146,7 @@ function isMultiDayLike(cacheItem) {
  * `_extend.resource / capacity / startDate / endDate` 等后续 booking mapper 需要的字段。
  */
 function prepareBookingCacheItem(cacheItem, ctx) {
-  if (isNormalBookingProduct(cacheItem) || hasPreparedBookingExtend(cacheItem)) {
+  if (ctx?.rememberedTime === undefined && (isNormalBookingProduct(cacheItem) || hasPreparedBookingExtend(cacheItem))) {
     return cacheItem;
   }
   return (0, _BookingContext.getProductExtend)({

package/lib/solution/BookingTicket/utils/cartView.js

@@ -8,12 +8,14 @@ exports.buildCustomerView = buildCustomerView;
 exports.indexBookingsByProductUid = indexBookingsByProductUid;
 exports.isWalkInCustomer = isWalkInCustomer;
 var _addTimeAvailability = require("./addTimeAvailability");
+var _pickupTiming = require("../../../modules/Order/pickupTiming");
 /**
  * 仅按 booking.product_uid 建索引，避免发明 booking 与商品行之间的其它等价关系。
  */
 function indexBookingsByProductUid(bookings) {
   if (!Array.isArray(bookings) || bookings.length === 0) return {};
   return bookings.reduce((acc, booking) => {
+    if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return acc;
     const uid = booking?.product_uid;
     if (uid === undefined || uid === null || uid === '') return acc;
     const key = String(uid);
@@ -105,7 +107,7 @@ function isGiftProductLine(line) {
 function buildCartView(lines, bookings, options = {}) {
   const productLines = Array.isArray(lines) ? lines : [];
   const bookingList = Array.isArray(bookings) ? bookings : [];
-  const childBookings = bookingList.filter(booking => booking.parent_id !== 0);
+  const childBookings = bookingList.filter(booking => booking.parent_id !== 0 && !(0, _pickupTiming.isFulfillmentTimingBooking)(booking));
   const bookingsByProductUid = indexBookingsByProductUid(childBookings);
   const linesByUid = indexProductsByUid(productLines);
   const addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);

package/lib/solution/OrderInvoicePreview/index.d.ts

@@ -0,0 +1,66 @@
+import type { Module, ModuleOptions, PisellCore } from '../../types';
+import { BaseModule } from '../../modules/BaseModule';
+import { type CustomerInvoiceLanguageCode, type CustomerInvoiceLanguageOption } from '../../shared/receipt/customerInvoiceLanguages';
+export type { CustomerInvoiceLanguageCode, CustomerInvoiceLanguageOption, } from '../../shared/receipt/customerInvoiceLanguages';
+import type { InvoiceLayoutConfig } from '../../modules/OpenData';
+import { type SmallTicketData } from '../../shared/receipt/small-ticket';
+export interface OrderInvoicePreviewInput {
+    orderId: string | number;
+    tenantId: string | number;
+    shopId: string | number;
+    /** Changes on login/logout, without exposing credentials in state or cache keys. */
+    identity: string;
+    businessCode: string;
+    channel: string;
+    locale: string;
+    sourceRevision: string;
+    shop?: Record<string, any>;
+}
+export interface OrderInvoicePreviewResult {
+    identity: string;
+    sourceRevision: string;
+    generatedAt: string;
+    locale: string;
+    secondaryLocale?: string;
+    languageOptions: CustomerInvoiceLanguageOption[];
+    selectedLanguage: CustomerInvoiceLanguageCode;
+    orderId: string | number;
+    source: Record<string, any>;
+    shop: Record<string, any>;
+    layout: InvoiceLayoutConfig;
+    smallTicketData: SmallTicketData;
+}
+export interface OrderInvoicePreviewState {
+    status: 'idle' | 'loading' | 'ready' | 'error';
+    result: OrderInvoicePreviewResult | null;
+    error: string | null;
+}
+/** Read-only, page-owned solution. No Order, Schedule, quotation or payment modules. */
+export declare class OrderInvoicePreviewImpl extends BaseModule implements Module {
+    isSolution: boolean;
+    private request;
+    private state;
+    private listeners;
+    private generation;
+    private disposed;
+    private input?;
+    private activeKey;
+    private languageSelection?;
+    private pending?;
+    private snapshotCache;
+    constructor(name?: string);
+    initialize(core: PisellCore, _options: ModuleOptions): void;
+    getState: () => OrderInvoicePreviewState;
+    subscribe: (listener: () => void) => (() => void);
+    private publish;
+    private getScope;
+    private loadContext;
+    private loadSource;
+    prepare(input: OrderInvoicePreviewInput): Promise<OrderInvoicePreviewResult>;
+    private getSelectionScope;
+    private documentIdentity;
+    /** Switch only the ready receipt projection; no fetching or rebuilding data. */
+    selectLanguage(code: string): OrderInvoicePreviewResult;
+    retry(): Promise<OrderInvoicePreviewResult>;
+    destroy(): void;
+}