@pisell/pisellos 2.2.314 → 2.2.315

package/lib/modules/Order/pickupTiming.d.ts

@@ -0,0 +1,46 @@
+export type PickupTimingSelectionMode = 'asap' | 'scheduled';
+export type PickupTimingSource = 'asap' | 'schedule' | 'pos_manual';
+export interface PickupTimingBookingInput {
+    mode: PickupTimingSelectionMode;
+    source: PickupTimingSource;
+    /** Store-local calendar date and minute; the caller validates availability. */
+    date: string;
+    time: string;
+    /** Absolute timestamp disambiguates a repeated local minute at a DST change. */
+    instant?: string;
+    timezone?: string;
+    frozen?: boolean;
+}
+export interface PickupTimingBookingMetadata {
+    unique_identification_number: string;
+    is_fulfillment_timing: true;
+    fulfillment_timing: {
+        method: 'pick_up';
+        mode: PickupTimingSelectionMode;
+        source: PickupTimingSource;
+        instant?: string;
+        timezone?: string;
+        frozen?: boolean;
+    };
+    [key: string]: any;
+}
+export interface PickupTimingBooking {
+    schedule_id: number | string;
+    start_date: string;
+    end_date: string;
+    start_time: string;
+    end_time: string;
+    select_date: string;
+    duration: 0;
+    is_all: 0;
+    sub_type: 'minutes';
+    like_status: string;
+    resources: [];
+    metadata: PickupTimingBookingMetadata;
+    schedule_event_id?: number | string;
+    [key: string]: any;
+}
+/** The explicit marker is the only authority; unlinked ordinary bookings remain ordinary. */
+export declare function isFulfillmentTimingBooking(booking: unknown): boolean;
+/** Update an independent pickup appointment without changing its persisted row identity. */
+export declare function buildPickupTimingBooking(input: PickupTimingBookingInput, existing?: Record<string, any> | null): PickupTimingBooking;

package/lib/modules/Order/pickupTiming.js

@@ -0,0 +1,61 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.buildPickupTimingBooking = buildPickupTimingBooking;
+exports.isFulfillmentTimingBooking = isFulfillmentTimingBooking;
+var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
+/** The explicit marker is the only authority; unlinked ordinary bookings remain ordinary. */
+function isFulfillmentTimingBooking(booking) {
+  return booking?.metadata?.is_fulfillment_timing === true;
+}
+
+/** Update an independent pickup appointment without changing its persisted row identity. */
+function buildPickupTimingBooking(input, existing) {
+  const booking = {
+    ...(existing || {})
+  };
+  const metadata = {
+    ...(booking.metadata || {})
+  };
+  // A fulfillment appointment never becomes a product/resource/holder purchase line.
+  for (const key of ['product_uid', 'product', 'holder', 'holder_id', 'collect_pax', 'capacity']) {
+    delete booking[key];
+    delete metadata[key];
+  }
+  delete metadata.booking_uid;
+  return {
+    ...booking,
+    schedule_id: booking.schedule_id || 0,
+    start_date: input.date,
+    end_date: input.date,
+    start_time: input.time,
+    end_time: input.time,
+    select_date: input.date,
+    duration: 0,
+    is_all: 0,
+    sub_type: 'minutes',
+    like_status: booking.like_status || 'common',
+    resources: [],
+    metadata: {
+      ...metadata,
+      unique_identification_number: String(metadata.unique_identification_number || (0, _orderCollectionIdentity.createUuidV4)()),
+      is_fulfillment_timing: true,
+      fulfillment_timing: {
+        method: 'pick_up',
+        mode: input.mode,
+        source: input.source,
+        ...(input.instant !== undefined ? {
+          instant: input.instant
+        } : {}),
+        ...(input.timezone !== undefined ? {
+          timezone: input.timezone
+        } : {}),
+        ...(input.frozen !== undefined ? {
+          frozen: input.frozen
+        } : {})
+      }
+    }
+  };
+}

package/lib/modules/Order/types.d.ts

@@ -7,9 +7,10 @@ import type { SubmitPayloadEnhancer } from './utils';
 import type { PaymentItem } from '../Payment/types';
 import type { ICustomer } from '../AccountList/types';
 import type { OrderProductDiscountItem } from '../../server/modules/order/types';
+import type { PickupTimingBooking, PickupTimingBookingInput } from './pickupTiming';
 export type { OrderProductDiscountItem } from '../../server/modules/order/types';
 export type PickupReferenceMode = 'counter_pickup' | 'table_service';
-export type ShopServiceType = 'dine_in' | 'takeaway';
+export type ShopServiceType = 'dine_in' | 'takeaway' | 'pick_up' | 'delivery';
 export interface ShopServiceData {
     pickup_reference_mode?: PickupReferenceMode;
     service_type?: ShopServiceType | '';
@@ -212,6 +213,7 @@ export interface VirtualCurrencySnapshotItem {
     id: number | string;
     tag: 'virtual_currency';
     product_id?: number | string;
+    code?: string;
     product_name: string;
     par_value: string;
     used_par_value: string;
@@ -439,16 +441,29 @@ export type AddProductBookingInput = Record<string, any>;
  */
 export interface AddProductToOrderOptions {
     insertAfterProductUid?: string;
+    /** 新增商品行插入 products 首位，优先于 insertAfterProductUid。 */
+    insertAtStart?: boolean;
     /** 跳过同商品/规格匹配，始终新增购物车行。 */
     disableMerge?: boolean;
     /** 商品行 UID 落定后，由 OrderModule 原子绑定到该行的 Sales Notes 草稿。 */
     salesNotes?: SalesNoteDraftInput[];
+    /**
+     * 自动预约加购的同步提交门禁；抛错时不发布本次新增。
+     * 带门禁时先在私有草稿中准备全部商品/booking，异步等待后及原子发布前重新调用。
+     * 门禁须校验当前订单身份/版本和真实时间；发布前不会因本次拆行改变订单版本。
+     * 不传时保留原有人工加购行为。
+     */
+    availabilityCommitGuard?: () => void;
+    /** 发布后的订单/业务归属检查；只用于阻止旧异步收尾写入新单，不再校验截止或 revision。 */
+    availabilityCommitTargetGuard?: () => boolean;
 }
 /**
  * 删除商品后的可选位置保持策略。
  * 预约合并行减量时仍删除最新真实行，再把剩余代表行移动到被删除代表行原位置。
  */
 export interface RemoveProductsFromOrderOptions {
+    /** 自动购物车写入的订单归属检查；失效时不再变更或发布异步收尾结果。 */
+    isCurrentOrder?: () => boolean;
     preserveDisplayPosition?: {
         remainingProductUid: string;
         anchorProductUid: string;
@@ -516,7 +531,15 @@ export type OrderProductMergeDecisionResult = boolean | {
     reason?: string;
     [key: string]: any;
 };
+export interface OrderCartIntentCommitContext {
+    action: 'add_product' | 'update_product' | 'increase_quantity' | 'scan_promotion';
+    tempOrder: OrderTempOrder | null;
+}
 export interface OrderHooksConfig {
+    /** Optional customer-order guard; called synchronously before the first cart write. */
+    beforeCartIntentCommit?: (context: OrderCartIntentCommitContext) => void;
+    /** Captures tenant/business runtime identity for asynchronous cart intents. */
+    getCartIntentScope?: () => unknown;
     onBeforeMergeProductToOrder?: (context: OrderProductMergeDecisionContext) => OrderProductMergeDecisionResult | Promise<OrderProductMergeDecisionResult>;
 }
 /**
@@ -863,6 +886,9 @@ export interface OrderModuleAPI {
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderPickupReferenceMode: (mode: PickupReferenceMode) => ShopServiceData;
     updateTempOrderServiceType: (serviceType: ShopServiceType) => ShopServiceData;
+    getPickupTimingBooking: () => PickupTimingBooking | null;
+    setPickupTimingBooking: (input: PickupTimingBookingInput) => PickupTimingBooking;
+    clearPickupTimingBooking: () => void;
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;
     addProductToOrder: (product: Partial<OrderProduct> & OrderProductIdentity, booking?: AddProductBookingInput, options?: AddProductToOrderOptions) => Promise<OrderProduct[]>;
@@ -875,7 +901,9 @@ export interface OrderModuleAPI {
     updateOrderProduct: (params: UpdateOrderProductParams) => Promise<OrderProduct[]>;
     /** 批量更新购物车行，末尾仅触发一次促销重算与 summary 刷新 */
     updateOrderProducts: (paramsList: UpdateOrderProductParams[]) => Promise<OrderProduct[]>;
-    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams) => Promise<OrderProduct[]>;
+    updateOrderProductQuantity: (params: UpdateOrderProductQuantityParams, options?: {
+        isCurrentOrder?: () => boolean;
+    }) => Promise<OrderProduct[]>;
     updateOrderBooking: (params: UpdateOrderBookingParams) => any[];
     removeProductFromOrder: (identity: OrderProductIdentity, options?: RemoveProductsFromOrderOptions) => Promise<OrderProduct[]>;
     /** 批量删除购物车行，末尾仅触发一次促销重算与 summary 刷新 */

package/lib/modules/Order/utils.js

@@ -137,6 +137,7 @@ var _utils = require("../Holder/utils");
 var _utils2 = require("../../solution/ScanOrder/utils");
 var _orderCollectionIdentity = require("./utils/orderCollectionIdentity");
 var _salesNotes = require("./salesNotes");
+var _pickupTiming = require("./pickupTiming");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _dayjs.default.extend(_customParseFormat.default);
 const POINT_CARD_SNAPSHOT_TAG = 'point_card';
@@ -283,6 +284,10 @@ function normalizeVirtualCurrencySnapshotItem(value) {
   if (productId !== undefined) {
     snapshot.product_id = productId;
   }
+  const code = normalizeSnapshotScalar(value.code);
+  if (code !== undefined) {
+    snapshot.code = String(code).trim();
+  }
   return snapshot;
 }
 function normalizeVirtualCurrencySnapshotList(value) {
@@ -313,6 +318,10 @@ function buildVirtualCurrencySnapshotFromList(value) {
     if (productId !== undefined) {
       snapshot.product_id = productId;
     }
+    const code = normalizeSnapshotScalar(item.code);
+    if (code !== undefined) {
+      snapshot.code = String(code).trim();
+    }
     result.push(snapshot);
     return result;
   }, []);
@@ -1318,7 +1327,7 @@ function normalizeSubmitProduct(product, formatOptions = {}) {
     payment_price: formatOptions.virtualSettlementMode ? virtualPrice : submitProduct.payment_price ?? submitProduct.selling_price
   };
 }
-const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder'];
+const SUBMIT_BOOKING_METADATA_WHITELIST = ['unique_identification_number', 'collect_pax', 'capacity', 'holder_id', 'resource_select_type', 'holder', 'is_fulfillment_timing', 'fulfillment_timing'];
 function normalizeBookingIsAll(booking) {
   return booking.is_all === true || booking.is_all === 1 || booking.is_all === '1' || booking.is_all === 'true' ? 1 : 0;
 }
@@ -1337,7 +1346,9 @@ function normalizeSubmitBooking(booking) {
       cleanMetadata[key] = rawMetadata[key];
     }
   }
-  if (cleanMetadata.holder_id === undefined) cleanMetadata.holder_id = null;
+  if (cleanMetadata.holder_id === undefined && !(0, _pickupTiming.isFulfillmentTimingBooking)(booking)) {
+    cleanMetadata.holder_id = null;
+  }
   const bookingRecord = booking;
   const startDate = bookingRecord.start_date;
   const shouldRestoreSelectDate = bookingRecord.select_date === undefined || bookingRecord.select_date === null || bookingRecord.select_date === '';
@@ -1349,6 +1360,10 @@ function normalizeSubmitBooking(booking) {
     } : {}),
     is_all: normalizeBookingIsAll(bookingRecord),
     sub_type: normalizeBookingSubType(bookingRecord),
+    ...((0, _pickupTiming.isFulfillmentTimingBooking)(booking) ? {
+      like_status: bookingRecord.like_status || 'common',
+      schedule_id: bookingRecord.schedule_id || 0
+    } : {}),
     metadata: cleanMetadata
   };
 }
@@ -1434,6 +1449,7 @@ function hasBoundBookingResource(bookings) {
   if (!Array.isArray(bookings)) return false;
   return bookings.some(booking => {
     if (!booking || typeof booking !== 'object') return false;
+    if ((0, _pickupTiming.isFulfillmentTimingBooking)(booking)) return false;
     if (Number(booking.parent_id) === 0) return false;
     const resources = booking.resources;
     if (!Array.isArray(resources)) return false;
@@ -1469,7 +1485,7 @@ function resolveSubmitOrderType(params) {
     return 'table-order';
   }
   if (currentType) return currentType;
-  if (Array.isArray(bookings) && bookings.length > 0) {
+  if (Array.isArray(bookings) && bookings.some(booking => !(0, _pickupTiming.isFulfillmentTimingBooking)(booking))) {
     return businessCode === 'dine_in' ? 'table-order' : 'appointment_booking';
   }
   return 'virtual';
@@ -1551,10 +1567,10 @@ function buildSubmitPayload(params) {
     shop_discount: tempOrder.shop_discount || '0.00',
     surcharge_fee: tempOrder.surcharge_fee || '0.00',
     note: tempOrder.note || '',
-    delivery_type: tempOrder.delivery_type || 'nil',
+    delivery_type: tempOrder.delivery_type || 'shop_service',
     schedule_date: scheduleDate,
     // created_at: tempOrder.created_at || formatDateTime(now), 和后端协定这个字段先不提交到接口
-    bookings: (tempOrder.bookings || []).filter(booking => Number(booking.parent_id) !== 0).map(booking => normalizeSubmitBooking(booking)),
+    bookings: (tempOrder.bookings || []).filter(booking => (0, _pickupTiming.isFulfillmentTimingBooking)(booking) || Number(booking.parent_id) !== 0).map(booking => normalizeSubmitBooking(booking)),
     payments: tempOrder.payments || [],
     relation_forms: tempOrder.relation_forms || [],
     // contacts: tempOrder.contacts || [],

package/lib/modules/Payment/index.js

@@ -9,6 +9,7 @@ var _exportNames = {
 };
 exports.PaymentModule = void 0;
 exports.generateRequestUniqueId = generateRequestUniqueId;
+var _loadPaymentMethods = require("../../shared/payment/loadPaymentMethods");
 var _BaseModule = require("../BaseModule");
 var _types = require("./types");
 Object.keys(_types).forEach(function (key) {
@@ -282,12 +283,10 @@ class PaymentModule extends _BaseModule.BaseModule {
   async getPayMethodListAsync() {
     this.logInfo('Starting getPayMethodListAsync');
     try {
-      const response = await this.request.get('/pay/custom-payment/all', {
+      const payMethods = await (0, _loadPaymentMethods.loadPaymentMethods)(this.request, {
+        transport: 'os-server',
         filterPaymentMethods: true
-      }, {
-        osServer: true
       });
-      const payMethods = response?.data || response || [];
       this.logInfo('getPayMethodListAsync completed successfully', {
         payMethods
       });

package/lib/modules/Product/types.d.ts

@@ -218,6 +218,17 @@ export interface ProductData {
     bundle?: any[];
     /** 商品选项组成 */
     options?: any[];
+    /** 单规格组；用于由已选 option 反查规格项名称、价格等商品快照字段。 */
+    option_group?: Array<{
+        id: number | string;
+        option_item?: Array<{
+            id: number | string;
+            name?: string | Record<string, any>;
+            title?: string | Record<string, any>;
+            [key: string]: any;
+        }>;
+        [key: string]: any;
+    }>;
     /** 商品原信息 */
     origin?: any;
     /** 容量 */

package/lib/modules/ProductList/index.js

@@ -125,7 +125,7 @@ class ProductList extends _BaseModule.BaseModule {
       online_store: 'online-store',
       scan_to_order: 'online-store',
       'scan-to-order': 'online-store',
-      scan_to_order_2: 'mobile_order',
+      scan_to_order_2: 'online-store',
       scan_to_order_3: 'scantoorder3'
     };
     const rawApplicationCode = this.otherParams?.channel;

package/lib/modules/ResourcePlanner/planner.d.ts

@@ -1,5 +1,7 @@
 import type { AvailabilityProjection, AvailabilityProjectionInput, AvailabilityQuery, AvailabilityQueryResult, AvailabilitySelectionValidationParams, AvailabilitySelectionValidationResult, GetProductTimeRangesRequest, GetProductTimeRangesRuntimeOptions, ProductTimeRangeGroup } from './types';
 export declare function createAvailabilityProjection(input: AvailabilityProjectionInput): AvailabilityProjection;
+/** Resolve the label without changing the real calendar timestamp. */
+export declare function getDurationBusinessDate(projection: AvailabilityProjection, startAt: string): string;
 export declare function getProductTimeRanges(projection: AvailabilityProjection, request?: GetProductTimeRangesRequest, runtimeOptions?: GetProductTimeRangesRuntimeOptions): ProductTimeRangeGroup[];
 export declare function queryAvailabilityProjection(projection: AvailabilityProjection, request: AvailabilityQuery, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilityQueryResult;
 export declare function validateAvailabilitySelection(projection: AvailabilityProjection, params: AvailabilitySelectionValidationParams, runtimeOptions?: GetProductTimeRangesRuntimeOptions): AvailabilitySelectionValidationResult;