@pisell/pisellos 0.10.56 → 0.10.57

package/lib/solution/OrderInvoicePreview/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.OrderInvoicePreviewImpl = void 0;
 var _BaseModule = require("../../modules/BaseModule");
 var _loadCustomerInvoiceLayout = require("../../shared/receipt/loadCustomerInvoiceLayout");
+var _customerInvoiceLanguages = require("../../shared/receipt/customerInvoiceLanguages");
 var _smallTicket = require("../../shared/receipt/small-ticket");
 var _loadSalesOrderSnapshot = require("../../shared/sales/loadSalesOrderSnapshot");
 var _loadPaymentMethods = require("../../shared/payment/loadPaymentMethods");
@@ -25,6 +26,8 @@ class OrderInvoicePreviewImpl extends _BaseModule.BaseModule {
   disposed = false;
   input;
   activeKey = '';
+  // Hosts retain this readonly instance while the same order modal is closed.
+  languageSelection;
   pending;
   snapshotCache = new Map();
   constructor(name = 'orderInvoicePreview') {
@@ -56,7 +59,7 @@ class OrderInvoicePreviewImpl extends _BaseModule.BaseModule {
       cache = new Map();
       contextCaches.set(this.request, cache);
     }
-    const key = JSON.stringify([input.tenantId, input.shopId, input.identity, input.locale]);
+    const key = JSON.stringify([input.tenantId, input.shopId, input.identity]);
     const cached = cache.get(key);
     if (cached) return cached;
     const task = Promise.all([this.request.get('/shop/show', {}, {
@@ -115,6 +118,7 @@ class OrderInvoicePreviewImpl extends _BaseModule.BaseModule {
       if (this.state.status === 'ready' && this.state.result) return Promise.resolve(this.state.result);
     }
     if (this.input && this.getScope(this.input) !== this.getScope(input)) this.snapshotCache.clear();
+    if (this.languageSelection?.scope !== this.getSelectionScope(input)) this.languageSelection = undefined;
     this.input = input;
     this.activeKey = key;
     const generation = ++this.generation;
@@ -124,7 +128,7 @@ class OrderInvoicePreviewImpl extends _BaseModule.BaseModule {
       error: null
     });
     const task = (async () => {
-      const [snapshot, context, layout] = await Promise.all([this.loadSource(input), this.loadContext(input), (0, _loadCustomerInvoiceLayout.loadCustomerInvoiceLayout)(this.request, input)]);
+      const [snapshot, context, template] = await Promise.all([this.loadSource(input), this.loadContext(input), (0, _loadCustomerInvoiceLayout.loadCustomerInvoiceTemplate)(this.request, input)]);
       const source = (0, _loadPaymentMethods.withPaymentMethodNames)(snapshot, context.methods);
       const getData = this.core.getPlugin('app')?.getData?.();
       if (getData?.('shop_id') != null && String(getData('shop_id')) !== String(input.shopId)) throw new Error('Invoice shop changed');
@@ -139,21 +143,30 @@ class OrderInvoicePreviewImpl extends _BaseModule.BaseModule {
         } : {})
       };
       if (generation !== this.generation || this.disposed) throw new Error('Invoice request superseded');
-      const requestedLocale = input.locale.toLowerCase().replace(/_/g, '-');
-      const locale = requestedLocale.startsWith('zh-tw') || requestedLocale.startsWith('zh-hk') ? 'zh_HK' : requestedLocale.startsWith('zh') ? 'zh_CN' : requestedLocale.startsWith('ja') ? 'ja' : requestedLocale.startsWith('pt') ? 'pt' : 'en';
+      const languageOptions = (0, _customerInvoiceLanguages.resolveCustomerInvoiceLanguages)(template.language, input.locale);
+      const remembered = this.languageSelection?.code;
+      const selected = languageOptions.find(option => option.code === remembered) || languageOptions[0];
+      const locale = selected.locales[0];
       const result = {
-        identity: key,
+        identity: this.documentIdentity(key, selected.code),
+        languageOptions,
+        selectedLanguage: selected.code,
+        ...(selected.locales[1] ? {
+          secondaryLocale: selected.locales[1]
+        } : {}),
         orderId: input.orderId,
         sourceRevision: input.sourceRevision,
         generatedAt: new Date().toISOString(),
         locale,
         source,
         shop,
-        layout,
+        layout: template.layout,
         smallTicketData: (0, _smallTicket.buildSmallTicketData)({
           order: source,
           shopInfo: shop,
-          locales: [locale]
+          locales: [...new Set(languageOptions.flatMap(option => option.locales))],
+          includeReceiptKeys: true,
+          templateSettings: template.layout
         })
       };
       this.publish({
@@ -177,6 +190,47 @@ class OrderInvoicePreviewImpl extends _BaseModule.BaseModule {
     this.pending = task;
     return task;
   }
+  getSelectionScope(input) {
+    return JSON.stringify([this.getScope(input), input.orderId]);
+  }
+  documentIdentity(key, language) {
+    return JSON.stringify([key, language]);
+  }
+
+  /** Switch only the ready receipt projection; no fetching or rebuilding data. */
+  selectLanguage(code) {
+    if (this.disposed) throw new Error('Invoice preview disposed');
+    const current = this.state.result;
+    if (this.state.status !== 'ready' || !current || !this.input) throw new Error('Invoice preview is not ready');
+    const currentShop = this.core.getPlugin('app')?.getData?.()?.('shop_id');
+    if (currentShop != null && String(currentShop) !== String(this.input.shopId)) throw new Error('Invoice shop changed');
+    const selected = current.languageOptions.find(option => option.code === code);
+    if (!selected) throw new Error('Invoice language is unavailable');
+    this.languageSelection = {
+      scope: this.getSelectionScope(this.input),
+      code: selected.code
+    };
+    if (selected.code === current.selectedLanguage) return current;
+    const {
+      secondaryLocale: _previousSecondary,
+      ...rest
+    } = current;
+    const result = {
+      ...rest,
+      identity: this.documentIdentity(this.activeKey, selected.code),
+      selectedLanguage: selected.code,
+      locale: selected.locales[0],
+      ...(selected.locales[1] ? {
+        secondaryLocale: selected.locales[1]
+      } : {})
+    };
+    this.publish({
+      status: 'ready',
+      result,
+      error: null
+    });
+    return result;
+  }
   retry() {
     if (!this.input) return Promise.reject(new Error('Invoice input is missing'));
     return this.prepare(this.input);

package/lib/solution/RegisterAndLogin/config.js

@@ -305,6 +305,30 @@ function withH5AuthPrefix(config) {
   return nextConfig;
 }
 const h5OnlineStoreConfig = withH5AuthPrefix(onlineStoreConfig);
+function withKioskSalesChannel(config) {
+  return {
+    ...config,
+    options: params => {
+      const options = (typeof config.options === 'function' ? config.options(params) : config.options) || {};
+      const headers = typeof options.headers === 'function' ? options.headers(params) : options.headers;
+      return {
+        ...options,
+        headers: {
+          ...headers,
+          'Sales-Channel': 'kiosk'
+        }
+      };
+    }
+  };
+}
+
+// Kiosk 复用网店顾客认证接口，通过注册（含验证码登录自动注册）请求头标识会员归属渠道。
+const kioskConfig = {
+  ...h5OnlineStoreConfig,
+  emailCodeRegister: withKioskSalesChannel(h5OnlineStoreConfig.emailCodeRegister),
+  phoneCodeRegister: withKioskSalesChannel(h5OnlineStoreConfig.phoneCodeRegister),
+  phoneCodeLogin: withKioskSalesChannel(h5OnlineStoreConfig.phoneCodeLogin)
+};
 
 /**
  * 默认配置（通用配置）
@@ -564,6 +588,16 @@ const defaultConfig = {
 /**
  * webpos 渠道配置
  */
+const webposPasswordResetOptions = {
+  prefix: false,
+  isDefaultSaasDomain: true,
+  cache: false,
+  noToast: true,
+  headers: {
+    Accept: 'application/json',
+    'Content-Type': 'application/json'
+  }
+};
 const webposConfig = {
   sendEmailVerificationCode: {
     url: '/auth/email/register-code',
@@ -686,13 +720,20 @@ const webposConfig = {
     })
   },
   checkEmailCode: {
-    url: '/auth/email/check-email-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/verify',
+    method: 'POST',
     transformParams: params => ({
       email: params.email,
-      code: params.code,
-      action: params.action
-    })
+      code: params.code
+    }),
+    // SaaS 成功时 data 为 null，统一为既有验证码校验返回结构。
+    transformResponse: response => response?.status === true ? {
+      ...response,
+      data: {
+        valid: true
+      }
+    } : response,
+    options: webposPasswordResetOptions
   },
   checkMobileCode: {
     url: '/auth/mobile/check-mobile-code',
@@ -714,11 +755,12 @@ const webposConfig = {
     })
   },
   sendPasswordResetEmail: {
-    url: '/auth/email/reset-password-code',
-    method: 'GET',
+    url: '/tenant/account/reset-password/email-code/send',
+    method: 'POST',
     transformParams: params => ({
       email: params.email
-    })
+    }),
+    options: webposPasswordResetOptions
   },
   sendPasswordResetSms: {
     url: '/auth/mobile/sms-forget',
@@ -751,13 +793,16 @@ const webposConfig = {
     })
   },
   resetPasswordByEmail: {
-    url: '/auth/email/reset-password',
+    url: '/tenant/account/reset-password/email-code',
     method: 'POST',
     transformParams: params => ({
       email: params.email,
       password: params.password,
-      code: params.code
-    })
+      code: params.code,
+      // 页面先校验两次输入完全一致，SDK 保持原有重置参数。
+      password_confirmation: params.password
+    }),
+    options: webposPasswordResetOptions
   },
   resetPasswordByPhone: {
     url: '/auth/mobile/reset-password',
@@ -1094,6 +1139,7 @@ const shopWebposConfig = {
 const channelConfigMap = exports.channelConfigMap = {
   'online-store': onlineStoreConfig,
   'online-store-h5': h5OnlineStoreConfig,
+  'kiosk': kioskConfig,
   'default': defaultConfig,
   'webpos': webposConfig,
   'shop.webpos': shopWebposConfig

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

@@ -4,6 +4,8 @@ import { RegisterParams, LoginParams, OAuthLoginParams, SendVerificationCodePara
 import { ApiCaller } from './config';
 export * from './types';
 export * from './config';
+export { validatePassword } from './utils';
+export type { PasswordValidationOptions } from './utils';
 /**
  * 注册登录解决方案实现
  */

package/lib/solution/RegisterAndLogin/index.js

@@ -4,9 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  RegisterAndLoginImpl: true
+  RegisterAndLoginImpl: true,
+  validatePassword: true
 };
 exports.RegisterAndLoginImpl = void 0;
+Object.defineProperty(exports, "validatePassword", {
+  enumerable: true,
+  get: function () {
+    return _utils.validatePassword;
+  }
+});
 var _BaseModule = require("../../modules/BaseModule");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
@@ -32,6 +39,7 @@ Object.keys(_config).forEach(function (key) {
     }
   });
 });
+var _utils = require("./utils");
 /**
  * 注册登录解决方案实现
  */

package/lib/solution/RegisterAndLogin/utils.d.ts

@@ -10,10 +10,18 @@ export declare function validateEmail(email: string): boolean;
  * 验证手机号格式（支持多种国际格式）
  */
 export declare function validatePhone(phone: string): boolean;
-/**
- * 验证密码强度
- */
-export declare function validatePassword(password: string): {
+export interface PasswordValidationOptions {
+    minLength?: number;
+    maxLength?: number;
+    requireLowercase?: boolean;
+    requireUppercase?: boolean;
+    requireNumber?: boolean;
+    requireSpecialCharacters?: boolean;
+    specialCharactersPattern?: RegExp;
+    messages?: Partial<Record<'minLength' | 'maxLength' | 'requireLowercase' | 'requireUppercase' | 'requireNumber' | 'requireSpecialCharacters', string>>;
+}
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+export declare function validatePassword(password: string, options?: PasswordValidationOptions): {
     isValid: boolean;
     errors: string[];
 };

package/lib/solution/RegisterAndLogin/utils.js

@@ -49,29 +49,36 @@ function validatePhone(phone) {
   const phoneRegex = /^(\+\d{1,3}[- ]?)?\d{10,14}$/;
   return phoneRegex.test(cleanPhone);
 }
-
-/**
- * 验证密码强度
- */
-function validatePassword(password) {
+/** 验证密码强度；不传 options 时保持原有规则与返回格式。 */
+function validatePassword(password, options = {}) {
   const errors = [];
-  if (password.length < 8) {
-    errors.push('密码长度至少为8位');
+  const {
+    minLength = 8,
+    maxLength = 128,
+    requireLowercase = true,
+    requireUppercase = true,
+    requireNumber = true,
+    requireSpecialCharacters = true,
+    specialCharactersPattern = /[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/,
+    messages = {}
+  } = options;
+  if (password.length < minLength) {
+    errors.push(messages.minLength ?? `密码长度至少为${minLength}位`);
   }
-  if (password.length > 128) {
-    errors.push('密码长度不能超过128位');
+  if (password.length > maxLength) {
+    errors.push(messages.maxLength ?? `密码长度不能超过${maxLength}位`);
   }
-  if (!/[a-z]/.test(password)) {
-    errors.push('密码必须包含至少一个小写字母');
+  if (requireLowercase && !/[a-z]/.test(password)) {
+    errors.push(messages.requireLowercase ?? '密码必须包含至少一个小写字母');
   }
-  if (!/[A-Z]/.test(password)) {
-    errors.push('密码必须包含至少一个大写字母');
+  if (requireUppercase && !/[A-Z]/.test(password)) {
+    errors.push(messages.requireUppercase ?? '密码必须包含至少一个大写字母');
   }
-  if (!/\d/.test(password)) {
-    errors.push('密码必须包含至少一个数字');
+  if (requireNumber && !/\d/.test(password)) {
+    errors.push(messages.requireNumber ?? '密码必须包含至少一个数字');
   }
-  if (!/[!@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/.test(password)) {
-    errors.push('密码必须包含至少一个特殊字符');
+  if (requireSpecialCharacters && !specialCharactersPattern.test(password)) {
+    errors.push(messages.requireSpecialCharacters ?? '密码必须包含至少一个特殊字符');
   }
   return {
     isValid: errors.length === 0,

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

@@ -105,6 +105,8 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private groupBookingsByResource;
     private isBookingMatchedResource;
     private sortMatchedBookings;
+    /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+    private sortCompletedBookings;
     /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
     private sortUnpaidBookings;
     /**

package/lib/solution/Sales/index.js

@@ -507,6 +507,15 @@ class SalesImpl extends _BaseModule.BaseModule {
     });
   }
 
+  /** 已完成：按订单创建时间降序，避免实时追加和重新加载导致显示顺序不同。 */
+  sortCompletedBookings(bookings) {
+    const createdAt = booking => {
+      const timestamp = (0, _dayjs.default)(booking.order?.created_at || '').valueOf();
+      return Number.isFinite(timestamp) ? timestamp : 0;
+    };
+    return [...bookings].sort((left, right) => createdAt(right) - createdAt(left));
+  }
+
   /** Unpaid：与 Current 重合的订单沿用 Current 顺序，其余欠款订单按开始时间降序追加。 */
   sortUnpaidBookings(bookings, currentBookings) {
     const currentOrderIndexes = new Map(currentBookings.map((booking, index) => [String(booking.order.order_id), index]));
@@ -881,7 +890,7 @@ class SalesImpl extends _BaseModule.BaseModule {
     const bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList), {
       includeAllFuture: true
     });
-    const completedBookings = completedBookingList.map(booking => {
+    const completedBookings = this.sortCompletedBookings(completedBookingList).map(booking => {
       return {
         ...booking,
         status: 'compelete',

package/lib/solution/ScanOrder/utils.js

@@ -34,6 +34,7 @@ exports.toNonNegativeInt = toNonNegativeInt;
 exports.toNonNegativeNumber = toNonNegativeNumber;
 exports.toPositiveString = toPositiveString;
 exports.toPriceString = toPriceString;
+var _weighedProduct = require("../../modules/Order/utils/weighedProduct");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _utils = require("../../modules/Order/utils");
@@ -612,7 +613,7 @@ function normalizeOrderProduct(product) {
   });
   const composedOriginalPrice = (0, _utils.composeLinePrice)({
     mainPrice: mainOriginalStr,
-    bundle: normalizedBundle,
+    bundle: Number(productSku.open_sold_weight) === 1 && (0, _manualProductDiscount.hasManualProductDiscountFlag)(metadata) ? (0, _weighedProduct.withOriginalBundleOptionPrices)(normalizedBundle) : normalizedBundle,
     useOriginalBundle: true
   });
   const finalOriginalPrice = (0, _utils.resolveManualOverrideLineOriginalPrice)({

package/lib/solution/UnifiedBookingSales/index.js

@@ -55,7 +55,7 @@ var _localClock = require("../../modules/ResourcePlanner/localClock");
 var _platform = require("../../utils/platform");
 var _itemRule = require("../../model/strategy/adapter/itemRule");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'basic', 'checkout', 'availability', 'documents'];
+const OPEN_DATA_SECTION_CODES = ['sale', 'reservation', 'fulfillment', 'menu', 'workflow', 'documents', 'basic', 'checkout', 'availability'];
 function normalizePositiveInteger(value) {
   const normalized = Number(value);
   if (!Number.isInteger(normalized) || normalized <= 0) return undefined;
@@ -283,10 +283,9 @@ function assertAvailabilityCatalogProductIds(productIds, context) {
     });
   }
 }
-function normalizeResourceType(_value) {
-  // 当前业务只支持每个资源组选择一个具体资源。
-  // 保留公共联合类型以兼容已有调用方，但暂不启用 multiple/capacity 分支。
-  return 'single';
+function normalizeResourceType(value) {
+  // 预约是否独占与每组选择几个资源是两个独立配置。
+  return value === 'multiple' || value === 'capacity' ? value : 'single';
 }
 function resolveProductKind(product) {
   if (product.duration || product.service_duration) return 'duration';
@@ -1655,7 +1654,7 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   shouldUseCheckoutSyncTask() {
     const configured = this.otherParams?.checkoutSyncTaskEnabled;
     if (configured === true) return true;
-    const platform = String(this.otherParams?.platform ?? '').trim().toLowerCase();
+    const platform = (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform);
     return !(0, _platform.isCustomerUserPlatform)(platform) && platform !== 'kiosk';
   }
 

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

@@ -41,6 +41,11 @@ export declare class VenueBookingImpl extends BaseSalesImpl implements Module {
     private customerLoginRefreshIdInFlight;
     private loadAllProductsInFlight;
     private productsLoaded;
+    private smartPricingCustomerId;
+    private smartPricingProductCatalog;
+    private slotPriceMapCache;
+    private slotPriceStrategyConfigs;
+    private slotPriceScheduleList;
     private loadOpenDataConfigInFlight;
     private static readonly OPEN_DATA_CACHE_TTL;
     private getLoggerContext;
@@ -69,7 +74,7 @@ export declare class VenueBookingImpl extends BaseSalesImpl implements Module {
     private clearLoginEffectListeners;
     private registerLoginEffect;
     private registerCustomerLoginListeners;
-    private refreshOrderMarketingAfterLogin;
+    private refreshOrderMarketingForCustomer;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -82,6 +87,11 @@ export declare class VenueBookingImpl extends BaseSalesImpl implements Module {
         passed: boolean | null;
         failures: QuantityCheckResult[];
     };
+    private resolveCustomerIdForSmartPricing;
+    private buildSmartPricingContext;
+    private buildSlotPriceMapForDate;
+    /** 规则或客户上下文更新后，同步商品展示、已选时段和订单汇总。 */
+    refreshSmartPricing(): Promise<void>;
     loadAllProducts(): Promise<{
         venueProducts: ProductData[];
         addonProducts: ProductData[];
@@ -167,7 +177,10 @@ export declare class VenueBookingImpl extends BaseSalesImpl implements Module {
     onCustomerLogin(params: {
         customerId: number;
     }): Promise<void>;
-    private recalculateOrderPricesFromQuotation;
+    /** 宿主退出登录或以匿名身份重新进入时，清理客户资产并恢复匿名价格。 */
+    onCustomerLogout(): Promise<void>;
+    private recalculateOrderPricesFromSmartPricing;
+    private resetProductPriceForSmartPricing;
     scanCode(code: string, customerId?: number): Promise<{
         isAvailable: boolean;
         isAccepted?: boolean | undefined;