@pisell/pisellos 2.3.37 → 2.3.39

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

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from '../../modules';
+import { ProductList, CartModule, ProductData, AccountModule, AccountListModule, DateModule, GuestListModule, OrderModule, PaymentModule, ResourceListModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from '../../modules';
 export interface BookingByStepState {
     cart: CartModule;
     summary: SummaryModule;
@@ -16,6 +16,7 @@ export interface BookingByStepState {
     schedule: ScheduleModule;
     salesSummary?: SalesSummaryModule;
     scanOrderLogger?: ScanOrderLoggerModule;
+    holder: HolderModule;
 }
 export declare function createModule<T extends keyof BookingByStepState>(moduleName: T, solutionName: string, name?: string, version?: string): BookingByStepState[T];
 export declare enum BookingByStepHooks {

package/dist/solution/BookingByStep/types.js

@@ -1,4 +1,4 @@
-import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule } from "../../modules";
+import { ProductList, CartModule, AccountListModule, DateModule, OrderModule, PaymentModule, StepModule, SummaryModule, SalesSummaryModule, ScheduleModule, ScanOrderLoggerModule, HolderModule } from "../../modules";
 export function createModule(moduleName, solutionName, name, version) {
   switch (moduleName) {
     case 'cart':
@@ -23,6 +23,8 @@ export function createModule(moduleName, solutionName, name, version) {
       return new ScheduleModule("".concat(solutionName, "_").concat(name || moduleName), version);
     case 'scanOrderLogger':
       return new ScanOrderLoggerModule("".concat(solutionName, "_").concat(name || moduleName), version);
+    case 'holder':
+      return new HolderModule("".concat(solutionName, "_").concat(name || moduleName), version);
     default:
       throw new Error("Unknown module type: ".concat(moduleName));
   }

package/dist/solution/BookingByStep/utils/capacity.js

@@ -23,11 +23,27 @@ export var formatDefaultCapacitys = function formatDefaultCapacitys(_ref) {
     product_bundle = _ref.product_bundle;
   if ((capacity === null || capacity === void 0 ? void 0 : capacity.type) === 'package') {
     return (product_bundle || []).map(function (d) {
+      var _window;
       var id = d.bundle_product_id;
       var variantId = d.bundle_variant_id;
       var item = ((capacity === null || capacity === void 0 ? void 0 : capacity.package) || []).find(function (item) {
-        return item.product_id === id || item.product_id === variantId;
+        return item.product_id == id || item.product_id == variantId;
       });
+      if (!item && (_window = window) !== null && _window !== void 0 && _window.sendWarningLog) {
+        window.sendWarningLog({
+          title: '未找到套餐 capacity 配置',
+          content: [{
+            key: 'product_id',
+            value: id
+          }, {
+            key: 'variant_id',
+            value: variantId
+          }, {
+            key: 'package',
+            value: JSON.stringify((capacity === null || capacity === void 0 ? void 0 : capacity.package) || [])
+          }]
+        });
+      }
       return {
         id: id,
         value: item ? d.num || 0 : 0,

package/dist/solution/BookingByStep/utils/timeslots.d.ts

@@ -19,10 +19,12 @@ export declare function calculateResourceAvailableTime({ resource, timeSlots, cu
  * @param countMap 已预约数量映射
  * @returns 最快可用的资源
  */
-export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, }: {
+export declare function findFastestAvailableResource({ resources, currentCapacity, countMap, targetDate, durationMinutes, }: {
     resources: ResourceItem[];
     currentCapacity?: number;
     countMap?: Record<number, number>;
+    targetDate?: string | Dayjs;
+    durationMinutes?: number;
 }): ResourceItem | null;
 /**
  * 给定一个时间列表，通过开始和结束时间过滤出符合条件的时间段

package/dist/solution/BookingByStep/utils/timeslots.js

@@ -91,8 +91,14 @@ export function findFastestAvailableResource(_ref2) {
     _ref2$currentCapacity = _ref2.currentCapacity,
     currentCapacity = _ref2$currentCapacity === void 0 ? 1 : _ref2$currentCapacity,
     _ref2$countMap = _ref2.countMap,
-    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap;
+    countMap = _ref2$countMap === void 0 ? {} : _ref2$countMap,
+    targetDate = _ref2.targetDate,
+    _ref2$durationMinutes = _ref2.durationMinutes,
+    durationMinutes = _ref2$durationMinutes === void 0 ? 30 : _ref2$durationMinutes;
   var currentTime = dayjs();
+  var resolvedDuration = durationMinutes > 0 ? durationMinutes : 30;
+  var targetDay = targetDate ? dayjs(targetDate) : currentTime;
+  var isTargetDayToday = targetDay.isSame(currentTime, 'day');
   var fastestTime = null;
   var fastestResources = [];
   console.log('[TimeslotUtils] 查找最快可用资源:', {
@@ -108,17 +114,18 @@ export function findFastestAvailableResource(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var _resource = _step2.value;
-      // 获取资源当天且还在工作时间内的时间段
-      var todayTimes = _resource.times.filter(function (time) {
-        var isToday = dayjs(time.start_at).isSame(currentTime, 'day');
-        var isStillWorking = dayjs(time.end_at).isAfter(currentTime);
-        return isToday && isStillWorking;
+      // 获取资源在目标日期且还在工作时间内的时间段
+      var targetDayTimes = _resource.times.filter(function (time) {
+        var isSameTargetDay = dayjs(time.start_at).isSame(targetDay, 'day');
+        if (!isSameTargetDay) return false;
+        if (!isTargetDayToday) return true;
+        return dayjs(time.end_at).isAfter(currentTime);
       });
-      if (todayTimes.length === 0) {
+      if (targetDayTimes.length === 0) {
         console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, ") \u4ECA\u65E5\u65E0\u53EF\u7528\u65F6\u95F4\u6BB5"));
         continue;
       }
-      var _iterator4 = _createForOfIteratorHelper(todayTimes),
+      var _iterator4 = _createForOfIteratorHelper(targetDayTimes),
         _step4;
       try {
         var _loop = function _loop() {
@@ -128,7 +135,7 @@ export function findFastestAvailableResource(_ref2) {
             var workEndTime = dayjs(time.end_at);
 
             // 确定检查的起始时间（当前时间 vs 工作开始时间）
-            var nextAvailableTime = currentTime.isBefore(workStartTime) ? workStartTime : currentTime;
+            var nextAvailableTime = isTargetDayToday && currentTime.isAfter(workStartTime) ? currentTime : workStartTime;
             console.log("[TimeslotUtils] \u68C0\u67E5\u8D44\u6E90 ".concat(_resource.id, "(").concat(_resource.main_field, "):"), {
               workTime: "".concat(workStartTime.format('HH:mm'), "-").concat(workEndTime.format('HH:mm')),
               checkStartTime: nextAvailableTime.format('HH:mm:ss'),
@@ -165,7 +172,7 @@ export function findFastestAvailableResource(_ref2) {
                 // 检查资源类型和容量
                 if (_resource.resourceType === 'single' || (_resource.capacity || 1) === 1) {
                   // 单人预约资源：检查时间冲突
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     // 有冲突，使用事件结束时间
                     finalAvailableTime = _eventEnd;
                     console.log("[TimeslotUtils] \u53D1\u73B0\u65F6\u95F4\u51B2\u7A81\uFF0C\u8C03\u6574\u5230: ".concat(finalAvailableTime.format('HH:mm:ss')));
@@ -177,7 +184,7 @@ export function findFastestAvailableResource(_ref2) {
                   var eventUsedCapacity = _event.pax || 1;
 
                   // 如果在事件时间范围内，检查容量是否足够
-                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(30, 'minute'))) {
+                  if (finalAvailableTime.isBefore(_eventEnd) && _eventStart.isBefore(finalAvailableTime.add(resolvedDuration, 'minute'))) {
                     var totalRequiredCapacity = currentUsedCapacity + currentCapacity + eventUsedCapacity;
                     if (totalRequiredCapacity > totalCapacity) {
                       // 容量不足，使用事件结束时间
@@ -194,7 +201,7 @@ export function findFastestAvailableResource(_ref2) {
             } finally {
               _iterator5.f();
             }
-            if (finalAvailableTime.isAfter(workEndTime)) {
+            if (finalAvailableTime.add(resolvedDuration, 'minute').isAfter(workEndTime)) {
               console.log("[TimeslotUtils] \u8D44\u6E90 ".concat(_resource.id, " \u53EF\u7528\u65F6\u95F4\u8D85\u51FA\u5DE5\u4F5C\u65F6\u95F4\uFF0C\u8DF3\u8FC7"));
               return 0; // continue
             }

package/dist/solution/BookingTicket/index.js

@@ -1993,8 +1993,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "getBookingConfig",
     value: function getBookingConfig() {
-      var _this$store$bookingCo;
-      return (_this$store$bookingCo = this.store.bookingContext) === null || _this$store$bookingCo === void 0 ? void 0 : _this$store$bookingCo.getBookingConfig();
+      return this.store.bookingContext.getBookingConfig();
     }
 
     /** 写入资源全集（来源：`/form/schedule`），同步派生 resourcesOriginMap。 */

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

@@ -83,7 +83,6 @@ export declare class SalesImpl extends BaseModule implements Module, SalesModule
     private getBookingAppointmentStatus;
     private isBookingIncludedInStats;
     private getBookingOrderPaymentStatus;
-    private isUnpaidBooking;
     private countBookingOrders;
     private countCompletedBookings;
     private groupBookingsByResource;

package/dist/solution/Sales/index.js

@@ -29,7 +29,6 @@ import dayjs from 'dayjs';
 import { BaseModule } from "../../modules/BaseModule";
 import { SalesHooks } from "./types";
 export * from "./types";
-var UNPAID_PAYMENT_STATUSES = new Set(['unpaid', 'partially_paid', 'payment_processing']);
 
 /**
  * Sales 解决方案基础骨架
@@ -416,11 +415,6 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
       var _booking$order$paymen, _booking$order;
       return String((_booking$order$paymen = (_booking$order = booking.order) === null || _booking$order === void 0 ? void 0 : _booking$order.payment_status) !== null && _booking$order$paymen !== void 0 ? _booking$order$paymen : '');
     }
-  }, {
-    key: "isUnpaidBooking",
-    value: function isUnpaidBooking(booking) {
-      return UNPAID_PAYMENT_STATUSES.has(this.getBookingOrderPaymentStatus(booking));
-    }
   }, {
     key: "countBookingOrders",
     value: function countBookingOrders(bookings) {
@@ -901,11 +895,9 @@ export var SalesImpl = /*#__PURE__*/function (_BaseModule) {
               });
               completedBookingList = matchedBookingList.filter(function (booking) {
                 return _this7.getBookingAppointmentStatus(booking) === 'completed';
-              }); // const unpaidBookingList = matchedBookingList.filter(
-              //   (booking) => this.getBookingOrderPaymentStatus(booking) === 'unpaid' || this.getBookingOrderPaymentStatus(booking) === 'payment_processing',
-              // );
+              });
               unpaidBookingList = matchedBookingList.filter(function (booking) {
-                return _this7.isUnpaidBooking(booking);
+                return _this7.getBookingOrderPaymentStatus(booking) === 'unpaid' || _this7.getBookingOrderPaymentStatus(booking) === 'payment_processing';
               });
               bookings = this.pickBookingsForCurrentPoint(current, this.normalizeResourceBookings(current, deviceCurrent, matchedBookingList));
               completedBookings = completedBookingList.map(function (booking) {

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

@@ -1,8 +1,9 @@
 import { Module, ModuleOptions, PisellCore } from '../../types';
-import { BaseModule } from '../../modules/BaseModule';
-import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderScanCodeResult } from './types';
+import { BaseSalesImpl } from '../BaseSales';
+import { ScanOrderAddLogParams, ScanOrderAvailabilityInfo, ScanOrderAllowAddItemsInfo, ScanOrderOrderProduct, ScanOrderOrderProductIdentity, ScanOrderReservationResourceSelectInfo, ScanOrderState, ScanOrderScanCodeResult, ScanOrderSyncAdditionalOrderResult } from './types';
 import type { UpdateOrderProductParams } from '../../modules/Order/types';
 import type { Discount } from '../../modules/Discount/types';
+import { RequestPlugin, WindowPlugin } from '../../plugins';
 import { type CartItemSummary, type PaxInfo, type QuantityCheckResult, type QuantityLimitResult } from '../../model/strategy/adapter/itemRule';
 import type { StrategyConfig } from '../../model/strategy/type';
 import type { ProductData } from '../../modules/Product/types';
@@ -15,16 +16,16 @@ interface ScanOrderItemRuleRuntimeConfig {
     submissionIndex?: number;
     custom?: Record<string, any>;
 }
-export declare class ScanOrderImpl extends BaseModule implements Module {
+export declare class ScanOrderImpl extends BaseSalesImpl implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
     isSolution: boolean;
-    private initializeOptions;
-    private store;
-    private otherParams;
-    private cacheId;
-    private window;
-    private request;
+    protected initializeOptions: ModuleOptions;
+    protected store: ScanOrderState;
+    protected otherParams: Record<string, any>;
+    protected cacheId: string | undefined;
+    window: WindowPlugin;
+    request: RequestPlugin;
     private itemRuleEvaluator;
     private itemRuleConfigs;
     private itemRuleConfigsPromise;
@@ -53,9 +54,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     private registerCustomerLoginListeners;
     private refreshOrderMarketingAfterLogin;
     constructor(name?: string, version?: string);
+    protected getRegisteredModuleNames(): readonly string[];
+    protected createSubModule(moduleName: string): Module | null;
     /** 与 `otherParams.cacheId` 一致，供宿主在 URL 变化时判断是否需要重新注册模块 */
     getCacheId(): string | undefined;
-    private destroyRegisteredChildModules;
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
     destroy(): Promise<void>;
     retryInit(): Promise<void>;
@@ -71,12 +73,14 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     };
     getTempOrder(): import("../../modules/Order/types").OrderTempOrder | null;
     updateTempOrderNote(note: string): string;
+    updateTempOrderNote(note: string, sync: true): Promise<string>;
+    updateTempOrderNote(note: string, sync: boolean): string | Promise<string>;
     setPickupReferenceMode(mode: 'counter_pickup' | 'table_service'): {
-        service_type: 'dine_in';
+        service_type: 'dine_in' | '';
         pickup_reference_mode: 'counter_pickup' | 'table_service';
     };
     setPickupRef(buzzer: string): string;
-    private ensureTempOrder;
+    private ensureScanOrderTempOrder;
     addNewOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     restoreOrder(): Promise<import("../../modules/Order/types").OrderTempOrder>;
     getOrderProducts(): import("../../modules/Order/types").OrderProduct[];
@@ -92,7 +96,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     }): Promise<void>;
     private findReservationRuleResource;
     private buildScanOrderResourceMetadata;
+    private prepareRetailAvailability;
     private buildSubmitPayloadEnhancer;
+    private isScanOrderMoreMode;
+    private submitScanOrderMore;
     submitScanOrder<T = any>(): Promise<T>;
     addProductToOrder(product: Partial<ScanOrderOrderProduct> & ScanOrderOrderProductIdentity): Promise<import("../../modules/Order/types").OrderProduct[]>;
     updateOrderProduct(params: UpdateOrderProductParams): Promise<import("../../modules/Order/types").OrderProduct[]>;
@@ -117,8 +124,10 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     setItemRuleRuntimeConfig(config?: ScanOrderItemRuleRuntimeConfig): Promise<void>;
     private normalizeResourceState;
     private resolveResourceSelectType;
-    private fetchResourceOccupyDetailByResourceId;
-    checkResourceAvailable(resourceId: string, hasOrderId: boolean): Promise<ScanOrderAvailabilityInfo>;
+    private fetchResourceOccupyDetailsByResourceId;
+    private resolveAdditionalOrderFromOccupyDetail;
+    checkResourceAvailable(resourceId?: string | null, hasOrderId?: boolean): Promise<ScanOrderAvailabilityInfo>;
+    restorePreviousOrderData(): Promise<void>;
     getAdditionalOrderInfo(): Promise<{
         orderId: string;
         orderStatus: 'pending' | 'processing' | 'completed' | 'cancelled';
@@ -141,6 +150,9 @@ export declare class ScanOrderImpl extends BaseModule implements Module {
     clearUIState(): void;
     setEntryPaxNumber(number: number): Promise<void>;
     getEntryPaxNumber(): number | null;
+    syncAdditionalOrderFromResource(resourceId?: string | null): Promise<ScanOrderSyncAdditionalOrderResult>;
+    getReservationResourceSelectType(): ScanOrderReservationResourceSelectInfo;
+    checkAllowAddItems(): ScanOrderAllowAddItemsInfo;
     getFulfillmentModes(): {
         enablePickup: boolean;
         enableTableService: boolean;