@pisell/pisellos 0.10.65 → 0.10.66

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/solution/BaseSales/index.d.ts

@@ -5,6 +5,7 @@ import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentS
 import { OrderModule } from '../../modules/Order';
 import { type PickupTimingBookingInput } from '../../modules/Order/pickupTiming';
 import type { PickupTimingAvailability, PickupTimingSelection, PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
+import { type ContactInfoConfig } from '../../modules/OpenData/contactInfo';
 import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount, VirtualCurrencyAsset } from '../../modules/Discount/types';
@@ -19,6 +20,7 @@ import { QuotationModule } from '../../modules/Quotation';
 import type { ISalesDetail, ISalesDetailHeader, ISalesBooking, ISalesPayment, ISalesSurcharge } from './utils/parseSalesResponse';
 import { AppPlugin } from '../../plugins/app';
 import { type TransformBaseProductToOrderProductParams } from './utils/transformBaseProductToOrderProduct';
+import type { OpenDataConfig } from '../../modules/OpenData/types';
 export interface BaseSalesState {
     order?: OrderModule;
     products?: ProductList;
@@ -283,6 +285,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     setPickupTimingBooking(input: PickupTimingBookingInput): import("../../modules/Order").PickupTimingBooking;
     clearPickupTimingBooking(): void;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    protected loadContactInfoOpenData(): Promise<OpenDataConfig | null>;
+    getContactInfoConfig(): Promise<ContactInfoConfig>;
+    validateContactInfo(): Promise<void>;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */
@@ -359,6 +364,8 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
      * payments 会交给 OrderModule 统一映射为 Sales 协议支付项。
      */
     submitSalesOrder<T = any>(params?: BaseSalesSubmitSalesOrderParams): Promise<T>;
+    /** Validate required contact fields before a new payment is initiated. */
+    ensureSalesOrderReadyForPayment(): Promise<void>;
     saveSalesOrderDraft<T = any>(params?: {
         platform?: string;
         businessCode?: string;

package/lib/solution/BaseSales/index.js

@@ -25,6 +25,7 @@ var _Order = require("../../modules/Order");
 var _pickupTiming = require("../../modules/Order/pickupTiming");
 var _pickupTiming2 = require("./pickupTiming");
 var _holderRelations = require("../../modules/Order/holderRelations");
+var _contactInfo = require("../../modules/OpenData/contactInfo");
 var _decimal = _interopRequireDefault(require("decimal.js"));
 var _lodashEs = require("lodash-es");
 var _types2 = require("../BookingByStep/types");
@@ -1906,6 +1907,27 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) throw new Error('order 模块未初始化');
     return this.store.order.updateTempOrderContactsInfo(contactsInfo);
   }
+  async loadContactInfoOpenData() {
+    return this.otherParams?.openData ?? null;
+  }
+  async getContactInfoConfig() {
+    const scope = this.getPickupTimingScope();
+    const data = await this.loadContactInfoOpenData();
+    if (scope !== this.getPickupTimingScope()) throw new Error('Store settings changed. Please try again.');
+    return (0, _contactInfo.resolveContactInfoConfig)(data);
+  }
+  async validateContactInfo() {
+    const order = this.getTempOrder();
+    const identity = order?._extend?.localId || order?.external_sale_number || order?.order_id || order;
+    const customerId = order?.customer_id;
+    const config = await this.getContactInfoConfig();
+    const current = this.getTempOrder();
+    if (identity !== (current?._extend?.localId || current?.external_sale_number || current?.order_id || current) || customerId !== current?.customer_id) {
+      throw new Error('The order changed. Please try again.');
+    }
+    const missing = (0, _contactInfo.getMissingContactInfoFields)(config, current?.contacts_info);
+    if (missing.length) throw new _contactInfo.ContactInfoRequiredError(missing);
+  }
 
   /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
   setEnableTempOrderPersist(enabled) {
@@ -2706,6 +2728,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
     }
+    await this.validateContactInfo();
     if (this.isPickupTimingEnabled()) await this.preparePickupTimingForCheckout({
       freeze: true
     });
@@ -2779,6 +2802,11 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     };
     return this.shouldUseCheckoutSyncTask() ? this.store.order.submitTempOrder(submitParams) : this.store.order.submitTempOrderAsync(submitParams);
   }
+
+  /** Validate required contact fields before a new payment is initiated. */
+  async ensureSalesOrderReadyForPayment() {
+    await this.validateContactInfo();
+  }
   async saveSalesOrderDraft(params) {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
@@ -2801,6 +2829,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
     if (!this.store.order) {
       throw new Error('BaseSales 解决方案需要 order 模块支持');
     }
+    await this.validateContactInfo();
     if (this.isPickupTimingEnabled()) {
       await this.preparePickupTimingForCheckout({
         freeze: true
@@ -3637,6 +3666,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
    */
   async confirmWalletPayment() {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.validateContactInfo();
     const beforePayments = (0, _lodashEs.cloneDeep)(this.store.order.getOrderPayments());
     const pendingWalletAmount = this.getPendingWalletPaymentAmount(beforePayments);
     const amountSnapshot = this.store.order.getOrderAmountSnapshot?.();
@@ -3708,6 +3738,7 @@ class BaseSalesImpl extends _BaseModule.BaseModule {
    */
   async payCash(params) {
     if (!this.store.order) throw new Error('order 模块未初始化');
+    await this.validateContactInfo();
     const amount = Number(params.amount || 0);
     if (!Number.isFinite(amount) || amount <= 0) {
       throw new Error('现金支付金额必须大于 0');

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 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 4 | 5 | 3;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -58,6 +58,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     private getIdGeneratorPlugin;
     protected loadOpenDataConfig(): Promise<OpenDataConfig | null>;
     getOpenData(): Promise<OpenDataConfig | null>;
+    protected loadContactInfoOpenData(): Promise<OpenDataConfig | null>;
     getInvoiceLayoutConfig(): Promise<InvoiceLayoutConfig>;
     getInvoiceTemplateSettings(): Promise<InvoiceTemplateSettings>;
     protected isInvoiceOpenDataCacheCurrent(): boolean;
@@ -286,7 +287,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     /**
      * 清空下单客户（协议字段 + snapshot）。
      */
-    clearOrderCustomer(): void;
+    clearOrderCustomer(options?: {
+        preserveContactInfo?: boolean;
+    }): void;
     /**
      * 重置 tempOrder，并同步清空下单客户运行态。
      *
@@ -465,19 +468,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 加车两阶段主决策（规格弹窗 / 资源编辑 / 直接加车）。
      * 与 ticketBooking `handleSelectProduct` + `handleBooking4Service` 等价。
      */
-    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): {
-        action: "reloadCatalog";
-    } | {
-        action: "add";
-        cacheItem: any;
-    } | {
-        action: "requiresDetail";
-        payload: AddProductRequiresDetailPayload;
-    } | {
-        action: "requiresBookingEdit";
-        cacheItem: any;
-        payload: import("./utils/addProductDecision").AddProductRequiresBookingEditPayload;
-    };
+    decideAddProduct(item: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /** 规格弹窗 callback 后的第二段决策。 */
     decideAfterDetail(cacheItem: any, options?: Partial<AddProductDecideContext>): import("./utils/addProductDecision").AddProductDecision;
     /**

package/lib/solution/BookingTicket/index.js

@@ -39,6 +39,8 @@ var _orderLineDisplay = require("../../modules/BookingContext/utils/orderLineDis
 var _bookingStatus = require("./utils/bookingStatus");
 var _resolveBestAddTimePlan = require("./utils/resolveBestAddTimePlan");
 var _utils = require("../../modules/Order/utils");
+var _contactInfo = require("../../modules/OpenData/contactInfo");
+var _lodashEs = require("lodash-es");
 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;
@@ -289,6 +291,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   async getOpenData() {
     return this.loadOpenDataConfig();
   }
+  async loadContactInfoOpenData() {
+    return this.store.openData ? this.getOpenData() : super.loadContactInfoOpenData();
+  }
   async getInvoiceLayoutConfig() {
     const openData = await this.loadOpenDataConfig();
     if (!openData) return (0, _OpenData.getDefaultInvoiceLayoutConfig)();
@@ -1009,7 +1014,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
    */
   setOrderCustomer(customer, options) {
     if (!customer) {
-      this.clearOrderCustomer();
+      this.clearOrderCustomer({
+        preserveContactInfo: options?.source === 'detailHydrate'
+      });
       return;
     }
     const previousCustomerId = this.store.order.getOrderCustomer()?.customer_id;
@@ -1020,6 +1027,9 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
       this.discountConfigCacheKey = null;
       this.hasManualDiscountSelection = false;
     }
+    if (!customerUnchanged && options?.source !== 'detailHydrate') {
+      this.store.order.updateTempOrderContactsInfo((0, _lodashEs.cloneDeep)((0, _contactInfo.extractCustomerContactInfo)(customer)));
+    }
     this.store.order.setOrderCustomer(patch, customer);
     const snapshotAfterOrderSet = this.store.order.getOrderCustomerSnapshot();
     if (customerUnchanged) {
@@ -1071,7 +1081,8 @@ class BookingTicketImpl extends _BaseSales.BaseSalesImpl {
   /**
    * 清空下单客户（协议字段 + snapshot）。
    */
-  clearOrderCustomer() {
+  clearOrderCustomer(options) {
+    if (!options?.preserveContactInfo) this.store.order.updateTempOrderContactsInfo(null);
     this.store.order.clearOrderCustomer();
     this.discountConfigCacheKey = null;
     this.hasManualDiscountSelection = false;

package/package.json

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