@pisell/pisellos 0.0.501 → 0.0.502

package/dist/modules/Order/index.d.ts

@@ -2,6 +2,7 @@ import { Module, PisellCore, ModuleOptions } from '../../types';
 import { BaseModule } from '../BaseModule';
 import { OrderModuleAPI, CommitOrderParams, SubmitScanOrderParams, ScanOrderMoreParams, CheckoutOrderParams } from './types';
 import { CartItem } from '../Cart/types';
+import { type SubmitPayloadEnhancer } from './utils';
 import type { ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderSummary, ScanOrderTempOrder } from '../../solution/ScanOrder/types';
 import type { Discount } from '../Discount/types';
 import { UnavailableReason } from '../Rules/types';
@@ -57,6 +58,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     persistTempOrder(): void;
     private createDefaultTempOrderInstance;
     ensureTempOrder(): ScanOrderTempOrder;
+    restoreOrder(): ScanOrderTempOrder;
     getTempOrder(): ScanOrderTempOrder | null;
     addNewOrder(): Promise<ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
@@ -66,6 +68,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     }): Promise<ScanOrderSummary | null>;
     getScanOrderSummary(): Promise<ScanOrderSummary>;
     updateTempOrderNote(note: string): string;
+    updateTempOrderBuzzer(buzzer: string): string;
     updateTempOrderContactsInfo(contactsInfo: any[]): any[];
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder(params: {
@@ -80,6 +83,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         businessCode?: string;
         channel?: string;
         type?: string;
+        enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     createOrder(params: CommitOrderParams['query']): {
         type: "virtual" | "appointment_booking";

package/dist/modules/Order/index.js

@@ -325,9 +325,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "applyDiscount",
     value: function applyDiscount() {
-      var _tempOrder$products, _this$store$discount6, _tempOrder$holder3, _tempOrder$holder4, _tempOrder$summary2;
+      var _this$store$discount6, _tempOrder$holder3, _tempOrder$holder4, _tempOrder$summary2;
       var tempOrder = this.store.tempOrder;
-      if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return;
+      // 任意 products CRUD 后都应当重算 discount 状态；即使 products 为空，
+      // 也需要让 Rules.calcDiscount 把 DiscountModule 的 isSelected / isAvailable /
+      // appliedProductDetails / savedAmount 以及 tempOrder.discount_list 复位。
+      if (!tempOrder) return;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
       var discountList = ((_this$store$discount6 = this.store.discount) === null || _this$store$discount6 === void 0 ? void 0 : _this$store$discount6.getDiscountList()) || [];
@@ -417,6 +420,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       return newOrder;
     }
+  }, {
+    key: "restoreOrder",
+    value: function restoreOrder() {
+      var freshTempOrder = this.createDefaultTempOrderInstance();
+      this.store.tempOrder = freshTempOrder;
+      this.persistTempOrder();
+      return freshTempOrder;
+    }
   }, {
     key: "getTempOrder",
     value: function getTempOrder() {
@@ -558,6 +569,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       this.persistTempOrder();
       return tempOrder.note;
     }
+  }, {
+    key: "updateTempOrderBuzzer",
+    value: function updateTempOrderBuzzer(buzzer) {
+      var tempOrder = this.ensureTempOrder();
+      tempOrder.buzzer = String(buzzer || '');
+      this.persistTempOrder();
+      return tempOrder.buzzer;
+    }
   }, {
     key: "updateTempOrderContactsInfo",
     value: function updateTempOrderContactsInfo(contactsInfo) {
@@ -711,7 +730,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 platform: params === null || params === void 0 ? void 0 : params.platform,
                 businessCode: params === null || params === void 0 ? void 0 : params.businessCode,
                 channel: params === null || params === void 0 ? void 0 : params.channel,
-                type: params === null || params === void 0 ? void 0 : params.type
+                type: params === null || params === void 0 ? void 0 : params.type,
+                enhance: params === null || params === void 0 ? void 0 : params.enhancePayload
               });
               if (!tempOrder.order_id) {
                 _context10.next = 12;

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

@@ -3,6 +3,7 @@ import type { ScanOrderTempOrder, ScanOrderOrderProduct, ScanOrderOrderProductId
 import type { DiscountModule } from '../Discount';
 import type { RulesModule } from '../Rules';
 import type { Discount } from '../Discount/types';
+import type { SubmitPayloadEnhancer } from './utils';
 export declare enum OrderHooks {
     OnOrderCreate = "order:onOrderCreate",
     OnOrderUpdate = "order:onOrderUpdate",
@@ -68,10 +69,12 @@ export interface SubmitScanOrderBooking {
     start_time?: string;
     end_time?: string;
     metadata?: Record<string, any>;
+    resources?: Array<Record<string, any>>;
+    product_uid?: string;
 }
 export interface SubmitScanOrderFormRecord {
     form_id: number | string;
-    form_record_ids: Array<number | string>;
+    form_record_id: number | string;
 }
 export interface SubmitScanOrderParams {
     url?: string;
@@ -107,6 +110,8 @@ export interface SubmitScanOrderParams {
         shop_discount: string;
         surcharge_fee: string;
         note: string;
+        delivery_type?: string;
+        table_number?: Record<string, any>;
         schedule_date: string;
         created_at?: string;
         products: SubmitScanOrderProduct[];
@@ -195,12 +200,14 @@ export interface OrderModuleAPI {
     getTempOrder: () => ScanOrderTempOrder | null;
     ensureTempOrder: () => ScanOrderTempOrder;
     addNewOrder: () => Promise<ScanOrderTempOrder>;
+    restoreOrder: () => ScanOrderTempOrder;
     getOrderProducts: () => ScanOrderOrderProduct[];
     getScanOrderSummary: () => Promise<ScanOrderSummary>;
     recalculateSummary: (options?: {
         createIfMissing?: boolean;
     }) => Promise<ScanOrderSummary | null>;
     updateTempOrderNote: (note: string) => string;
+    updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: any[]) => any[];
     addProductToOrder: (product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity) => Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder: (params: {
@@ -216,6 +223,7 @@ export interface OrderModuleAPI {
         businessCode?: string;
         channel?: string;
         type?: string;
+        enhancePayload?: SubmitPayloadEnhancer;
     }) => Promise<T>;
     loadDiscountConfig: (params: {
         customerId: number;

package/dist/modules/Order/utils.d.ts

@@ -56,6 +56,12 @@ export declare function createDefaultTempOrder(params: {
     now: string;
     summary?: ScanOrderSummary;
 }): ScanOrderTempOrder;
+export interface SubmitPayloadEnhancerContext {
+    tempOrder: ScanOrderTempOrder;
+    bookingUuid: string;
+    now: Date;
+}
+export type SubmitPayloadEnhancer = (payload: ScanOrderSubmitPayload, ctx: SubmitPayloadEnhancerContext) => ScanOrderSubmitPayload;
 export declare function buildSubmitPayload(params: {
     tempOrder: ScanOrderTempOrder;
     cacheId?: string;
@@ -64,6 +70,7 @@ export declare function buildSubmitPayload(params: {
     businessCode?: string;
     channel?: string;
     type?: string;
+    enhance?: SubmitPayloadEnhancer;
 }): ScanOrderSubmitPayload;
 export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     bundle: any[];
@@ -71,7 +78,7 @@ export declare function formatV1Product(products: ScanOrderSubmitProduct[]): {
     option: any[];
     product_id: number | null;
     product_variant_id: number;
-    quantity: number;
+    num: number;
     rowKey: number | null;
     session: null;
     unique: string;

package/dist/modules/Order/utils.js

@@ -1,5 +1,6 @@
 var _excluded = ["_origin", "identity_key"],
-  _excluded2 = ["created_at", "summary", "surcharges"];
+  _excluded2 = ["created_at", "summary", "surcharges"],
+  _excluded3 = ["collect_pax", "table_occupancy_duration"];
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -187,6 +188,9 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.price_breakdown) {
     cleanMetadata.price_breakdown = rawMetadata.price_breakdown;
   }
+  if (rawMetadata.is_rule !== undefined) {
+    cleanMetadata.is_rule = rawMetadata.is_rule;
+  }
   return _objectSpread(_objectSpread(_objectSpread({}, submitProduct), bookingUid ? {
     booking_uid: bookingUid
   } : {}), {}, {
@@ -303,7 +307,8 @@ export function buildSubmitPayload(params) {
     platform = params.platform,
     businessCode = params.businessCode,
     channel = params.channel,
-    type = params.type;
+    type = params.type,
+    enhance = params.enhance;
   var scheduleDate = tempOrder.schedule_date || tempOrder.created_at || formatDateTime(now);
   var summary = tempOrder.summary || createEmptySummary();
   var relationId = tempOrder.relation_id;
@@ -313,8 +318,8 @@ export function buildSubmitPayload(params) {
   var bookingDuration = resolveTableOccupancyDuration(tempOrder);
   var bookingEnd = bookingStart.add(bookingDuration, 'minute');
   var bookings = relationId && tableFormId ? [{
-    relation_id: relationId,
-    form_id: tableFormId,
+    relation_id: 0,
+    form_id: 0,
     start_time: bookingStart.format('HH:mm'),
     start_date: bookingStart.format('YYYY-MM-DD'),
     end_time: bookingEnd.format('HH:mm'),
@@ -326,20 +331,20 @@ export function buildSubmitPayload(params) {
     },
     select_date: bookingStart.format('YYYY-MM-DD'),
     is_all: false,
-    "like_status": "common",
-    "schedule_id": 0,
-    "relation_type": "form",
-    "number": 1
+    like_status: 'common',
+    schedule_id: 0,
+    relation_type: '',
+    number: 1
   }] : tempOrder.bookings || [];
   var formRecordIds = relationId && tableFormId ? [{
     form_id: tableFormId,
-    form_record_ids: [relationId]
+    form_record_id: relationId
   }] : undefined;
   var _createdAt = tempOrder.created_at,
     _summary = tempOrder.summary,
     _surcharges = tempOrder.surcharges,
     tempOrderRest = _objectWithoutProperties(tempOrder, _excluded2);
-  return _objectSpread(_objectSpread({}, tempOrderRest), {}, {
+  var payload = _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     platform: normalizeSubmitPlatform(platform !== null && platform !== void 0 ? platform : tempOrder.platform),
     request_unique_idempotency_token: cacheId,
     type: (_ref2 = type !== null && type !== void 0 ? type : tempOrder.type) !== null && _ref2 !== void 0 ? _ref2 : 'table-order',
@@ -368,11 +373,22 @@ export function buildSubmitPayload(params) {
     contacts_info: tempOrder.contacts_info || [],
     // holder: tempOrder.holder || null,
     // summary,
-    metadata: _objectSpread({}, tempOrder.metadata),
+    metadata: function () {
+      var _ref5 = tempOrder.metadata || {},
+        _collectPax = _ref5.collect_pax,
+        _tableOccupancyDuration = _ref5.table_occupancy_duration,
+        rest = _objectWithoutProperties(_ref5, _excluded3);
+      return _objectSpread({}, rest);
+    }(),
     products: (tempOrder.products || []).map(function (product) {
       return normalizeSubmitProduct(product);
     })
   });
+  return enhance ? enhance(payload, {
+    tempOrder: tempOrder,
+    bookingUuid: bookingUuid,
+    now: now
+  }) : payload;
 }
 export function formatV1Product(products) {
   return products.map(function (product) {
@@ -382,7 +398,7 @@ export function formatV1Product(products) {
       option: product.product_option_item,
       product_id: product.product_id,
       product_variant_id: product.product_variant_id,
-      quantity: product.num,
+      num: product.num,
       rowKey: product.product_id,
       session: null,
       unique: createUuidV4()

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "sold_out" | "lots_of_space" | "filling_up_fast";
+        status: "lots_of_space" | "filling_up_fast" | "sold_out";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/dist/solution/ScanOrder/index.d.ts

@@ -52,10 +52,17 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     getTempOrder(): import("./types").ScanOrderTempOrder | null;
     updateTempOrderNote(note: string): string;
+    setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
+        service_type: 'dine_in';
+        pickup_reference_mode: 'counter_pickup' | 'table_service';
+    };
+    setPickupRef(buzzer: string): string;
     private ensureTempOrder;
     addNewOrder(): Promise<import("./types").ScanOrderTempOrder>;
+    restoreOrder(): Promise<import("./types").ScanOrderTempOrder>;
     getOrderProducts(): ScanOrderOrderProduct[];
     getSummary(): Promise<import("./types").ScanOrderSummary>;
+    private buildReservationRuleEnhancer;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<ScanOrderOrderProduct[]>;
     updateProductInOrder(params: {
@@ -94,4 +101,12 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }): Promise<void>;
     setEntryPaxNumber(number: number): Promise<void>;
     getEntryPaxNumber(): number | null;
+    getFulfillmentModes(): {
+        enablePickup: boolean;
+        enableTableService: boolean;
+    };
+    checkManualPickupRef(): {
+        enabled: boolean;
+        manualInputType?: string;
+    };
 }