@pisell/pisellos 0.10.27 → 0.10.29

package/dist/modules/Quotation/index.js

@@ -40,6 +40,8 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
       list: []
     });
     _defineProperty(_assertThisInitialized(_this), "scheduleResolver", void 0);
+    _defineProperty(_assertThisInitialized(_this), "app", void 0);
+    _defineProperty(_assertThisInitialized(_this), "quotationListUpdatedListener", void 0);
     _defineProperty(_assertThisInitialized(_this), "quotationCache", new Map());
     _defineProperty(_assertThisInitialized(_this), "quotationLoadPromises", new Map());
     _defineProperty(_assertThisInitialized(_this), "quotationCacheVersions", new Map());
@@ -51,6 +53,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "initialize",
     value: function () {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(core, options) {
+        var _core$getPlugin, _core$getPlugin$getAp;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -62,6 +65,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('QuotationModule 需要 request 插件支持');
             case 4:
+              this.app = (_core$getPlugin = core.getPlugin('app')) === null || _core$getPlugin === void 0 || (_core$getPlugin$getAp = _core$getPlugin.getApp) === null || _core$getPlugin$getAp === void 0 ? void 0 : _core$getPlugin$getAp.call(_core$getPlugin);
               this.store = {
                 list: []
               };
@@ -70,7 +74,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
               this.quotationCacheVersions.clear();
               this.activeChannelKey = '';
               this.lifecycleGeneration += 1;
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }
@@ -254,32 +258,34 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "fetchQuotations",
     value: function () {
       var _fetchQuotations = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
-        var _data;
-        var query, res, list;
+        var _this3 = this;
+        var query, initialResultApplied, applyRemoteUpdate, res;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               query = {};
               if (params.channelKey) query.channel = params.channelKey;
-              _context4.next = 4;
+              initialResultApplied = false;
+              applyRemoteUpdate = function applyRemoteUpdate(response) {
+                var applied = _this3.applyQuotationResponse(response, params);
+                if (applied && initialResultApplied && _this3.activeChannelKey === params.channelKey) {
+                  _this3.notifyQuotationListUpdated();
+                }
+              };
+              _context4.next = 6;
               return this.request.get('/quotation/available', query, {
-                useCache: false,
-                osServer: true
+                cache: {
+                  type: 'indexDB',
+                  updateCache: true,
+                  cacheKeyData: this.getQuotationCacheKeyData(query)
+                },
+                cacheUpdateChange: applyRemoteUpdate
               });
-            case 4:
+            case 6:
               res = _context4.sent;
-              list = _toConsumableArray((res === null || res === void 0 || (_data = res.data) === null || _data === void 0 ? void 0 : _data.list) || (res === null || res === void 0 ? void 0 : res.list) || []).sort(function (a, b) {
-                return b.sort - a.sort;
-              });
-              if (!(this.lifecycleGeneration !== params.lifecycleGeneration || this.getQuotationCacheVersion(params.channelKey) !== params.cacheVersion)) {
-                _context4.next = 8;
-                break;
-              }
-              return _context4.abrupt("return");
-            case 8:
-              this.quotationCache.set(params.channelKey, list);
-              if (this.activeChannelKey === params.channelKey) this.store.list = list;
-            case 10:
+              this.applyQuotationResponse(res, params);
+              initialResultApplied = true;
+            case 9:
             case "end":
               return _context4.stop();
           }
@@ -295,10 +301,15 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function getQuotationList() {
       return this.store.list;
     }
+  }, {
+    key: "setQuotationListUpdatedListener",
+    value: function setQuotationListUpdatedListener(listener) {
+      this.quotationListUpdatedListener = listener;
+    }
   }, {
     key: "getQuotationCustomerScopeInfo",
     value: function getQuotationCustomerScopeInfo() {
-      var _this3 = this;
+      var _this4 = this;
       var customerById = new Map();
       var quotationScopes = this.store.list.filter(function (quotation) {
         return Array.isArray(quotation.customer) && quotation.customer.length > 0;
@@ -308,7 +319,7 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
         var localSeen = new Set();
         var quotationCustomers = quotation.customer || [];
         quotationCustomers.forEach(function (customer) {
-          var customerId = _this3.normalizeCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
+          var customerId = _this4.normalizeCustomerId(customer === null || customer === void 0 ? void 0 : customer.id);
           if (!customerId || localSeen.has(customerId)) return;
           localSeen.add(customerId);
           customerIds.push(customerId);
@@ -436,6 +447,47 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     value: function setScheduleResolver(resolver) {
       this.scheduleResolver = resolver;
     }
+  }, {
+    key: "applyQuotationResponse",
+    value: function applyQuotationResponse(response, params) {
+      var _data;
+      var source = (response === null || response === void 0 || (_data = response.data) === null || _data === void 0 ? void 0 : _data.list) || (response === null || response === void 0 ? void 0 : response.list) || [];
+      var list = _toConsumableArray(source).sort(function (a, b) {
+        return Number(b.sort || 0) - Number(a.sort || 0);
+      });
+      if (this.lifecycleGeneration !== params.lifecycleGeneration || this.getQuotationCacheVersion(params.channelKey) !== params.cacheVersion) {
+        return false;
+      }
+      this.quotationCache.set(params.channelKey, list);
+      if (this.activeChannelKey === params.channelKey) this.store.list = list;
+      return true;
+    }
+  }, {
+    key: "notifyQuotationListUpdated",
+    value: function notifyQuotationListUpdated() {
+      try {
+        var _this$quotationListUp;
+        (_this$quotationListUp = this.quotationListUpdatedListener) === null || _this$quotationListUp === void 0 || _this$quotationListUp.call(this);
+      } catch (error) {
+        console.warn('[QuotationModule] 报价单后台更新回调失败', error);
+      }
+    }
+  }, {
+    key: "getQuotationCacheKeyData",
+    value: function getQuotationCacheKeyData(query) {
+      var shopId = '';
+      try {
+        var _this$app, _this$app$getStorage;
+        var storedCore = (_this$app = this.app) === null || _this$app === void 0 || (_this$app = _this$app.storage) === null || _this$app === void 0 || (_this$app$getStorage = _this$app.getStorage) === null || _this$app$getStorage === void 0 ? void 0 : _this$app$getStorage.call(_this$app, 'core');
+        var coreInfo = typeof storedCore === 'string' ? JSON.parse(storedCore || '{}') : storedCore || {};
+        shopId = String((coreInfo === null || coreInfo === void 0 ? void 0 : coreInfo.id) || '');
+      } catch (_unused) {
+        // 缓存隔离信息读取失败时仍按请求参数缓存。
+      }
+      return _objectSpread(_objectSpread({}, query), {}, {
+        shop_id: shopId
+      });
+    }
   }, {
     key: "normalizeChannel",
     value: function normalizeChannel(channel) {
@@ -486,17 +538,17 @@ export var QuotationModule = /*#__PURE__*/function (_BaseModule) {
     key: "isQuotationActiveAt",
     value: function isQuotationActiveAt(quotation, datetime) {
       var _quotation$schedule,
-        _this4 = this;
+        _this5 = this;
       if (!((_quotation$schedule = quotation.schedule) !== null && _quotation$schedule !== void 0 && _quotation$schedule.length)) return false;
       var scheduleItems = [];
       quotation.schedule.forEach(function (s) {
-        var _this4$scheduleResolv;
-        var full = (_this4$scheduleResolv = _this4.scheduleResolver) === null || _this4$scheduleResolv === void 0 ? void 0 : _this4$scheduleResolv.call(_this4, s.id);
+        var _this5$scheduleResolv;
+        var full = (_this5$scheduleResolv = _this5.scheduleResolver) === null || _this5$scheduleResolv === void 0 ? void 0 : _this5$scheduleResolv.call(_this5, s.id);
         if (full) {
           scheduleItems.push(full);
           return;
         }
-        if (_this4.scheduleResolver) {
+        if (_this5.scheduleResolver) {
           return;
         }
         var fallbackSchedule = _objectSpread(_objectSpread({}, s), {}, {

package/dist/modules/ResourcePlanner/planner.js

@@ -62,13 +62,21 @@ function resolveRequestedDurationMinutes(product, request) {
 }
 function resolveRequestedDurationStartTimes(product, request) {
   var _request$durationStar;
-  if (product.kind !== 'duration') return [];
+  var allowSessionCustomRanges = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  if (product.kind !== 'duration' && !(product.kind === 'session' && allowSessionCustomRanges)) return [];
   var values = (_request$durationStar = request.durationStartTimesByProductId) === null || _request$durationStar === void 0 ? void 0 : _request$durationStar[String(product.id)];
   if (!Array.isArray(values)) return [];
   return Array.from(new Set(values.filter(function (value) {
     return typeof value === 'string' && /^([01]\d|2[0-3]):[0-5]\d$/.test(value);
   })));
 }
+function resolveRequestedSessionDurationMinutes(product, request, allowSessionCustomRanges) {
+  var _request$durationMinu2;
+  if (product.kind !== 'session' || !allowSessionCustomRanges) return undefined;
+  var override = (_request$durationMinu2 = request.durationMinutesByProductId) === null || _request$durationMinu2 === void 0 ? void 0 : _request$durationMinu2[String(product.id)];
+  var normalized = Number(override);
+  return Number.isInteger(normalized) && normalized > 0 ? normalized : undefined;
+}
 function toDateTime(value, _timezoneName) {
   try {
     return localDateTimeToScalar(parseLocalDateTime(value));
@@ -212,7 +220,11 @@ function evaluateCandidateTimeGate(params) {
     };
   }
   if (policy.type === 'before_start') {
-    if (now < candidateRange.start) return null;
+    // Flexible-duration candidates start at minute precision. Keep the current
+    // minute selectable instead of treating the freshly generated candidate as
+    // already started because the query clock still contains seconds.
+    var hasNotReachedStart = product.isFlexibleDuration ? floorToMinute(now) <= candidateRange.start : now < candidateRange.start;
+    if (hasNotReachedStart) return null;
     return {
       status: 'unavailable',
       reasonCodes: ['booking_cutoff_before_start'],
@@ -1025,18 +1037,32 @@ export function getProductTimeRanges(projection) {
       };
     }
     if (product.kind === 'session' || product.kind === 'venue_slot') {
+      var fixedRanges = getSessionRangesForProduct(projection, product, dateRange);
+      var customRanges = [];
+      var customDurationMinutes = resolveRequestedSessionDurationMinutes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      var _requestedStartTimes = resolveRequestedDurationStartTimes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      if (product.kind === 'session' && customDurationMinutes && dateRange.startDate === dateRange.endDate) {
+        _requestedStartTimes.forEach(function (startTime) {
+          var start = toDateTimeInDate(dateRange.startDate, startTime, projection.meta.timezone);
+          if (!Number.isFinite(start)) return;
+          customRanges.push(createDurationTimeRange(product, start, customDurationMinutes, projection, fixedOffsetMinutes));
+        });
+      }
       return {
         productId: product.id,
         title: product.title,
         kind: product.kind,
         slotStepMinutes: slotStepMinutes,
-        ranges: getSessionRangesForProduct(projection, product, dateRange)
+        ranges: dedupeProductRanges([].concat(_toConsumableArray(fixedRanges), customRanges))
       };
     }
     var requiredGroups = (product.requirementGroups || []).filter(function (group) {
       return group.required !== false;
     });
     var operatingRanges = buildOperatingRanges(projection, dateRange);
+    var operatingEndAt = dateRange.startDate === dateRange.endDate && operatingRanges.length > 0 ? formatDateTime(Math.max.apply(Math, _toConsumableArray(operatingRanges.map(function (range) {
+      return range.end;
+    }))), projection.meta.timezone, fixedOffsetMinutes) : undefined;
     var resourceRanges = requiredGroups.length ? requiredGroups.map(function (group) {
       return buildGroupWorkingRanges({
         projection: projection,
@@ -1104,13 +1130,16 @@ export function getProductTimeRanges(projection) {
         ranges.push(createDurationTimeRange(product, start, durationMinutes, projection, fixedOffsetMinutes));
       });
     }
-    return {
+    return _objectSpread(_objectSpread({
       productId: product.id,
       title: product.title,
       kind: product.kind,
-      slotStepMinutes: slotStepMinutes,
+      slotStepMinutes: slotStepMinutes
+    }, operatingEndAt ? {
+      operatingEndAt: operatingEndAt
+    } : {}), {}, {
       ranges: dedupeProductRanges(ranges)
-    };
+    });
   });
 }
 function aggregateMatchedCells(productId, requirementGroupId, resourceId, candidateRange, indexedCells) {

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

@@ -213,6 +213,8 @@ export interface ProductTimeRangeGroup {
     title?: string;
     kind: AvailabilityProductKind;
     slotStepMinutes?: number;
+    /** 单日查询对应营业窗口的最终结束时刻，不受资源排班是否为空影响。 */
+    operatingEndAt?: string;
     ranges: ProductTimeRange[];
 }
 export interface AvailabilityAssignment extends AvailabilityAbsoluteRange {
@@ -243,6 +245,13 @@ export interface GetProductTimeRangesRequest {
 }
 export interface GetProductTimeRangesRuntimeOptions {
     evaluatedAt?: string;
+    /**
+     * Internal POS capability: allow explicit duration/start overrides to append
+     * a custom duration candidate for Session products. Fixed Session ranges are
+     * still returned unchanged. Callers outside the POS facade must leave this
+     * disabled.
+     */
+    allowSessionCustomRanges?: boolean;
 }
 export interface QueryAvailabilityBaseRequest {
     productIds?: AvailabilityId[];

package/dist/modules/Rules/index.js

@@ -1388,7 +1388,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // bundle子商品：保存到扁平化Map
             processedFlatItemsMap.set(flatItem._id, [_objectSpread(_objectSpread({}, flatItem), {}, {
               discount_list: isManualDiscount ? _this4.resolveDiscountListForManualOverride(((_flatItem$bundleItem8 = flatItem.bundleItem) === null || _flatItem$bundleItem8 === void 0 ? void 0 : _flatItem$bundleItem8.discount_list) || []) : _this4.filterDiscountListByType(((_flatItem$bundleItem9 = flatItem.bundleItem) === null || _flatItem$bundleItem9 === void 0 ? void 0 : _flatItem$bundleItem9.discount_list) || [], 'promotion'),
-              price: isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
+              price: flatItem.bundleItem.price,
               bundle_selling_price: (_flatItem$bundleItem$ = flatItem.bundleItem.bundle_selling_price) !== null && _flatItem$bundleItem$ !== void 0 ? _flatItem$bundleItem$ : isManualDiscount ? flatItem.bundleItem.price : flatItem.bundleItem.original_price,
               processed: true
             })]);

package/dist/plugins/request.d.ts

@@ -68,6 +68,7 @@ export interface RequestOptions {
     useCache?: boolean;
     customToast?: () => void;
     cache?: CacheProps;
+    cacheUpdateChange?: (data: any) => void;
     osServer?: boolean;
     isNocobase?: boolean;
     prefix?: boolean;

package/dist/server/index.d.ts

@@ -51,6 +51,8 @@ declare class Server {
     private productQueryScheduleTimers;
     /** 餐牌筛选为空时才触发的菜单/日程缓存自愈，避免每次商品查询都请求远端。 */
     private menuScheduleRefreshInFlight;
+    /** 启动阶段模块预加载任务；预渲染商品查询复用该任务，避免缓存尚未 ready 时误触发远端自愈。 */
+    private startupModulePreloadInFlight;
     private lastMenuScheduleRefreshAt;
     private readonly MENU_SCHEDULE_REFRESH_COOLDOWN_MS;
     private orderQuerySubscribers;
@@ -126,6 +128,9 @@ declare class Server {
     private runCheckoutSync;
     private omitCheckoutSyncMode;
     private buildRemoteCheckoutData;
+    private buildCheckoutDeviceHeaders;
+    private applyKioskCheckoutOperator;
+    private resolveKioskCheckoutOperatorId;
     private mergeCheckoutSyncPayments;
     private persistSyncedCheckoutOrder;
     /**
@@ -157,13 +162,17 @@ declare class Server {
      * 重新拉取全量 SSE 接口，更新本地数据后触发 onProductsSyncCompleted
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
-    refreshProductsInBackground(): Promise<void>;
+    refreshProductsInBackground(options?: {
+        trigger?: string;
+    }): Promise<void>;
     /**
      * 后台静默刷新订单数据
      * 重新拉取全量 SSE 接口，更新本地数据后触发 onOrdersSyncCompleted
      * 不影响当前界面展示，适用于切回前台、定时刷新等场景
      */
-    refreshOrdersInBackground(): Promise<void>;
+    refreshOrdersInBackground(options?: {
+        trigger?: string;
+    }): Promise<void>;
     /**
      * 编辑正式订单时强制查询 Server 最新快照并覆盖本地缓存。
      * 商品成员增删由 OrderModule 在 SQLite/Store 更新完成后广播，
@@ -524,6 +533,8 @@ declare class Server {
     private getLocalPrintOrderLookup;
     private mergeLocalPrintOrderInput;
     private handleLocalPrintOrder;
+    private normalizeRequestedReceiptLocales;
+    private handleLocalOrderReceiptSnapshot;
     private handleMachinecodeBatchMeta;
     private resolveMachinecodeBatchMetadataLookup;
     private syncMachinecodeRedeemStatusToLocalOrder;