@pisell/pisellos 0.10.54 → 0.10.55

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。
@@ -23,6 +25,15 @@ export type BaseSalesHookName = typeof BaseSalesHookNames[keyof typeof BaseSales
 export declare function createBaseSalesHook(moduleName: string, hookName: BaseSalesHookName): string;
 export type BaseSalesStatus = 'idle' | 'initializing' | 'ready' | 'error';
 export type BaseSalesPaymentStatus = 'paid' | 'partially_paid' | 'unpaid' | 'payment_processing' | 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/BookingByStep/index.d.ts

@@ -326,7 +326,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 5 | 6 | 3 | 4;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -345,7 +345,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/lib/solution/BookingTicket/index.js

@@ -1672,6 +1672,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),
+        requestCustomerSwitch: guardCallback(bridge.requestCustomerSwitch),
+        openOrder: guardCallback(bridge.openOrder),
+        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 +1711,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 +1722,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/UnifiedBookingSales/businessAvailability.d.ts

@@ -0,0 +1,27 @@
+import { type BusinessAvailability } from '../../modules/BusinessAvailability';
+import type { ScheduleModule } from '../../modules/Schedule';
+interface BusinessAvailabilityHost {
+    loadOpenData: () => Promise<Record<string, unknown> | null>;
+    getSchedule: () => ScheduleModule | undefined;
+    getTimezone: () => string;
+    getScope: () => string;
+    now?: () => Date;
+}
+/** Read successful configuration once per business runtime; evaluate the clock on demand. */
+export declare class BusinessAvailabilityController {
+    private readonly host;
+    private runtime?;
+    constructor(host: BusinessAvailabilityHost);
+    invalidate(): void;
+    private now;
+    private getRuntime;
+    private assertCurrent;
+    private loadConfig;
+    private loadSchedules;
+    private error;
+    /** Synchronous final cart-commit check; deliberately never starts a load. */
+    getCachedAvailability(): BusinessAvailability;
+    getAvailability(): Promise<BusinessAvailability>;
+    assertAvailable(): void;
+}
+export {};

package/lib/solution/UnifiedBookingSales/businessAvailability.js

@@ -0,0 +1,138 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BusinessAvailabilityController = void 0;
+var _lodashEs = require("lodash-es");
+var _BusinessAvailability = require("../../modules/BusinessAvailability");
+async function withTimeout(request) {
+  let timer;
+  try {
+    return await Promise.race([request, new Promise((_, reject) => {
+      timer = setTimeout(() => reject(new Error('Unable to load business settings. Please try again.')), 30_000);
+    })]);
+  } finally {
+    if (timer !== undefined) clearTimeout(timer);
+  }
+}
+
+/** Read successful configuration once per business runtime; evaluate the clock on demand. */
+class BusinessAvailabilityController {
+  runtime;
+  constructor(host) {
+    this.host = host;
+  }
+  invalidate() {
+    this.runtime = undefined;
+  }
+  now() {
+    return this.host.now?.() ?? new Date();
+  }
+  getRuntime() {
+    const scope = this.host.getScope();
+    if (this.runtime?.scope !== scope) this.runtime = {
+      scope
+    };
+    return this.runtime;
+  }
+  assertCurrent(runtime) {
+    if (this.runtime !== runtime || runtime.scope !== this.host.getScope()) {
+      throw new Error('Store settings changed. Please try again.');
+    }
+  }
+  async loadConfig(runtime) {
+    if (runtime.config) return runtime.config;
+    if (!runtime.configRequest) {
+      runtime.configRequest = (async () => {
+        const data = await withTimeout(this.host.loadOpenData());
+        this.assertCurrent(runtime);
+        if (!data) throw new Error('Business settings are unavailable. Please try again.');
+        const config = (0, _lodashEs.cloneDeep)((0, _BusinessAvailability.normalizeBusinessAvailabilityConfig)(data));
+        runtime.config = config;
+        return config;
+      })();
+    }
+    const request = runtime.configRequest;
+    try {
+      return await request;
+    } finally {
+      if (runtime.configRequest === request) runtime.configRequest = undefined;
+    }
+  }
+  async loadSchedules(runtime) {
+    if (runtime.schedules) return runtime.schedules;
+    if (!runtime.scheduleRequest) {
+      runtime.scheduleRequest = (async () => {
+        const schedule = this.host.getSchedule();
+        if (!schedule) throw new Error('Business operating-hours schedule is unavailable. Please try again.');
+        await withTimeout(schedule.loadAllSchedule({
+          useCache: true
+        }));
+        this.assertCurrent(runtime);
+        const schedules = (0, _lodashEs.cloneDeep)(schedule.getScheduleListByIds(runtime.config.scheduleIds) || []);
+        runtime.schedules = schedules;
+        return schedules;
+      })();
+    }
+    const request = runtime.scheduleRequest;
+    try {
+      return await request;
+    } finally {
+      if (runtime.scheduleRequest === request) runtime.scheduleRequest = undefined;
+    }
+  }
+  error(reason, runtime) {
+    return {
+      status: 'error',
+      behavior: 'hide_all',
+      message: null,
+      nextChangeAt: this.now().getTime() + 60_000,
+      requirePaymentOnSubmit: runtime?.config?.requirePaymentOnSubmit ?? true,
+      error: reason instanceof Error ? reason.message : 'Business settings are unavailable. Please try again.'
+    };
+  }
+
+  /** Synchronous final cart-commit check; deliberately never starts a load. */
+  getCachedAvailability() {
+    const runtime = this.getRuntime();
+    try {
+      this.assertCurrent(runtime);
+      if (!runtime.config) throw new Error('Business settings are still loading. Please try again.');
+      return (0, _BusinessAvailability.computeBusinessAvailability)({
+        config: runtime.config,
+        schedules: runtime.schedules || [],
+        timezone: this.host.getTimezone(),
+        now: this.now()
+      });
+    } catch (reason) {
+      return this.error(reason, runtime);
+    }
+  }
+  async getAvailability() {
+    const runtime = this.getRuntime();
+    try {
+      const config = await this.loadConfig(runtime);
+      this.assertCurrent(runtime);
+      if (!config.paused && !config.invalidScheduleIds && config.scheduleIds.length) {
+        await this.loadSchedules(runtime);
+      }
+      this.assertCurrent(runtime);
+      return this.getCachedAvailability();
+    } catch (reason) {
+      return this.error(reason, runtime);
+    }
+  }
+  assertAvailable() {
+    const availability = this.getCachedAvailability();
+    if (availability.status !== 'open') {
+      const error = new Error(availability.error || (availability.status === 'paused' ? 'Ordering is temporarily paused.' : 'Ordering is currently closed.'));
+      Object.assign(error, {
+        code: 'BUSINESS_UNAVAILABLE',
+        businessAvailability: availability
+      });
+      throw error;
+    }
+  }
+}
+exports.BusinessAvailabilityController = BusinessAvailabilityController;

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

@@ -5,9 +5,11 @@ import type { LoadScheduleAvailableDateParams, ScheduleItem } from '../../module
 import type { ProductListLoadProductsParams, ProductListStoreQueryParams } from '../../modules/ProductList';
 import type { AvailabilityDateRange, AvailabilityOccupancy, AvailabilityProduct, AvailabilityResource, GetProductTimeRangesRequest } from '../../modules/ResourcePlanner';
 import type { AvailabilityContextRef, ContextualAvailabilityQuery, ContextualAvailabilityQueryResult, ContextualCommitAvailabilitySelectionParams, ContextualProductTimeRangeGroup, UnifiedBookingSalesAddRetailProductParams, UnifiedBookingSalesApplyPlannerDiscountsParams, UnifiedBookingSalesCommitAvailabilitySelectionResult, UnifiedBookingSalesDiscountResult, UnifiedBookingSalesLoadProductsByScheduleDateParams, UnifiedBookingSalesLoadOpenDataParams, UnifiedBookingSalesPrepareAvailabilityProjectionParams, UnifiedBookingSalesPolicyResponse, UnifiedBookingSalesResolveProductAllergyRequirementParams, UnifiedBookingSalesStageRetailProductsParams, UnifiedBookingSalesState } from './types';
+import type { BusinessAvailability } from '../../modules/BusinessAvailability';
 import { BookingTicket } from '../BookingTicket';
 import type { AllergyRequirement } from '../../model/strategy/adapter/itemRule';
 export * from './types';
+export type { BusinessAvailability, BusinessClosedBehavior } from '../../modules/BusinessAvailability';
 export { AvailabilityError } from '../../modules/ResourcePlanner';
 /**
  * Converts Rules/Order discount internals into a small UI-facing diagnostic. The result keeps
@@ -60,6 +62,7 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     protected defaultVersion: string;
     protected store: UnifiedBookingSalesState;
     protected pickupTimingEnabled: boolean;
+    private businessAvailabilityController?;
     private runtimeOpenDataScope;
     private runtimeOpenDataSnapshot;
     private runtimeOpenDataModule;
@@ -86,6 +89,14 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
     private allergyItemRuleConfigsPromise;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     protected getSubmitOrderSalesChannel(): string;
+    /** Only the explicit Kiosk Sales consumer entry enables this policy; POS stays unchanged. */
+    protected isBusinessAvailabilityEnabled(): boolean;
+    protected getBusinessAvailabilityScope(): string;
+    private getBusinessAvailabilityController;
+    getBusinessAvailability(): Promise<BusinessAvailability>;
+    /** Internal final-write assertion; does not fetch OpenData or Schedule. */
+    assertBusinessAvailability(): void;
+    protected getSubModuleHooks(moduleName: string): any;
     private createAvailabilityFacadeError;
     private getAvailabilityScopeDescriptor;
     private normalizeAvailabilityIdList;

package/lib/solution/UnifiedBookingSales/index.js

@@ -49,6 +49,7 @@ Object.keys(_types).forEach(function (key) {
   });
 });
 var _remoteOccupancyCache = require("./remoteOccupancyCache");
+var _businessAvailability = require("./businessAvailability");
 var _BookingTicket = require("../BookingTicket");
 var _localClock = require("../../modules/ResourcePlanner/localClock");
 var _platform = require("../../utils/platform");
@@ -1199,6 +1200,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   defaultVersion = '1.0.0';
   store = {};
   pickupTimingEnabled = true;
+  businessAvailabilityController;
   runtimeOpenDataScope = null;
   runtimeOpenDataSnapshot = null;
   runtimeOpenDataModule = null;
@@ -1241,6 +1243,57 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     const channel = String(this.otherParams?.channel ?? '').trim();
     return channel || super.getSubmitOrderSalesChannel();
   }
+
+  /** Only the explicit Kiosk Sales consumer entry enables this policy; POS stays unchanged. */
+  isBusinessAvailabilityEnabled() {
+    return this.otherParams?.enableBusinessAvailability === true && ['pc', 'h5', 'kiosk'].includes((0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform));
+  }
+  getBusinessAvailabilityScope() {
+    return `${this.getRuntimeOpenDataScope()}:${this.runtimeOpenDataGeneration}`;
+  }
+  getBusinessAvailabilityController() {
+    if (!this.businessAvailabilityController) {
+      this.businessAvailabilityController = new _businessAvailability.BusinessAvailabilityController({
+        loadOpenData: () => this.loadOpenDataConfig(),
+        getSchedule: () => this.store.schedule,
+        getTimezone: () => String(this.otherParams?.businessTimezone || this.getPickupTimingContextData('timezone') || ''),
+        getScope: () => this.getBusinessAvailabilityScope()
+      });
+    }
+    return this.businessAvailabilityController;
+  }
+  getBusinessAvailability() {
+    return this.getBusinessAvailabilityController().getAvailability();
+  }
+
+  /** Internal final-write assertion; does not fetch OpenData or Schedule. */
+  assertBusinessAvailability() {
+    if (this.isBusinessAvailabilityEnabled()) this.getBusinessAvailabilityController().assertAvailable();
+  }
+  getSubModuleHooks(moduleName) {
+    const hooks = super.getSubModuleHooks(moduleName);
+    if (moduleName !== 'order' || !this.isBusinessAvailabilityEnabled()) return hooks;
+    let lastScope;
+    let lastExistingScope;
+    let scopeToken = {};
+    return {
+      ...hooks,
+      getCartIntentScope: () => {
+        const scope = this.getBusinessAvailabilityScope();
+        const existingScope = hooks?.getCartIntentScope?.();
+        if (scope !== lastScope || !Object.is(existingScope, lastExistingScope)) {
+          lastScope = scope;
+          lastExistingScope = existingScope;
+          scopeToken = {};
+        }
+        return scopeToken;
+      },
+      beforeCartIntentCommit: context => {
+        this.assertBusinessAvailability();
+        hooks?.beforeCartIntentCommit?.(context);
+      }
+    };
+  }
   createAvailabilityFacadeError(code, message, details) {
     return new _ResourcePlanner.AvailabilityError(code, message, details);
   }
@@ -1714,6 +1767,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
     });
   }
   resetRuntimeOpenData() {
+    this.businessAvailabilityController?.invalidate();
     this.runtimeOpenDataGeneration += 1;
     this.runtimeOpenDataScope = null;
     this.runtimeOpenDataSnapshot = null;

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

@@ -216,6 +216,8 @@ export interface UnifiedBookingSalesDiscountResult {
     summaryAfter?: unknown;
 }
 export interface UnifiedBookingSalesApi {
+    /** Uses cached business settings and evaluates the current store-local clock. */
+    getBusinessAvailability: () => Promise<import('../../modules/BusinessAvailability').BusinessAvailability>;
     loadOpenData: (params: UnifiedBookingSalesLoadOpenDataParams) => Promise<OpenDataConfig>;
     /** Returns the latest OpenData payload cached by this solution instance. */
     getOpenData: () => Promise<OpenDataConfig | null>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.10.54",
+  "version": "0.10.55",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",