@pisell/pisellos 2.3.104 → 2.3.105

package/dist/modules/Payment/walletpass.js

@@ -851,7 +851,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
     key: "getUserIdentificationCodeListAsync",
     value: function () {
       var _getUserIdentificationCodeListAsync = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(params) {
-        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, platform, response, sortedData;
+        var _newParams$products, _newParams$prepare_pa, _this$walletParams4, newParams, response, sortedData;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -864,20 +864,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
               return _context6.abrupt("return", []);
             case 5:
-              platform = this.paymentModule.getPlatform();
-              if (!(platform === 'pc' || platform === 'h5')) {
-                _context6.next = 11;
-                break;
-              }
-              this.userIdentificationCodes = [];
-              this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
-                userIdentificationCodes: []
-              });
-              this.paymentModule.logInfo('[WalletPass] 用户端平台跳过获取用户识别码列表', {
-                platform: platform
-              });
-              return _context6.abrupt("return", []);
-            case 11:
+              // const platform = this.paymentModule.getPlatform();
+              // if (platform === 'pc' || platform === 'h5') {
+              //   this.userIdentificationCodes = [];
+              //   this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
+              //     userIdentificationCodes: [],
+              //   } as OnUserIdentificationCodesUpdatedEventData);
+              //   this.paymentModule.logInfo(
+              //     '[WalletPass] 用户端平台跳过获取用户识别码列表',
+              //     { platform },
+              //   );
+              //   return [];
+              // }
+
               if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
                 newParams.payment_order_id = undefined;
               }
@@ -888,9 +887,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
                 payment_order_id: (_this$walletParams4 = this.walletParams) === null || _this$walletParams4 === void 0 ? void 0 : _this$walletParams4.payment_order_id
               });
-              _context6.next = 15;
+              _context6.next = 9;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 15:
+            case 9:
               response = _context6.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -911,19 +910,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context6.abrupt("return", this.userIdentificationCodes);
-            case 23:
-              _context6.prev = 23;
+            case 17:
+              _context6.prev = 17;
               _context6.t0 = _context6["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context6.t0, {
                 customer_id: params.customer_id,
                 available: params.available
               });
               return _context6.abrupt("return", []);
-            case 27:
+            case 21:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[0, 23]]);
+        }, _callee6, this, [[0, 17]]);
       }));
       function getUserIdentificationCodeListAsync(_x7) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);

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,12 +1037,23 @@ 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) {

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

@@ -243,6 +243,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/server/utils/small-ticket.js

@@ -30,6 +30,8 @@ var LABELS = {
     pickUpTime: 'Pick-up time',
     asap: 'ASAP',
     cash: 'Cash',
+    cashReceived: 'Cash received',
+    changeDue: 'Change due',
     eftpos: 'Eftpos',
     wallet: 'Wallet',
     giftCard: 'Gift card',
@@ -57,6 +59,8 @@ var LABELS = {
     pickUpTime: '取餐时间',
     asap: '尽快',
     cash: '现金支付',
+    cashReceived: '收取现金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '钱包支付',
     giftCard: '礼品卡',
@@ -84,6 +88,8 @@ var LABELS = {
     pickUpTime: '取餐時間',
     asap: '盡快',
     cash: '現金支付',
+    cashReceived: '收取現金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '錢包支付',
     giftCard: '禮品卡',
@@ -98,6 +104,14 @@ var LABELS = {
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
+  },
+  ja: {
+    cashReceived: 'お預かり',
+    changeDue: 'お釣り'
+  },
+  pt: {
+    cashReceived: 'Dinheiro recebido',
+    changeDue: 'Troco'
   }
 };
 export function buildSmallTicketData(params) {
@@ -174,7 +188,7 @@ function buildBaseData(params) {
     order_number: orderNumber,
     shop_tax_number: stringify(shopInfo.tax_number || order.shop_tax_number),
     shop_phone: stringify(shopInfo.phone || order.shop_phone),
-    shop_address: stringify(shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
+    shop_address: stringify(shopInfo.receipt_address || shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
     original_payment_status: stringify(order.payment_status),
     is_repeat: 0,
     buzzer: stringify(order.buzzer || order.pickup_number || ((_order$metadata = order.metadata) === null || _order$metadata === void 0 ? void 0 : _order$metadata.buzzer)),
@@ -839,6 +853,11 @@ function buildPaymentItems(params) {
     item: paymentMethodName(payment, locale),
     value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
   }];
+  items.push.apply(items, _toConsumableArray(buildCashChangePaymentItems({
+    payment: payment,
+    locale: locale,
+    currencySymbol: currencySymbol
+  })));
   if (serviceFee.gt(0)) {
     items.push({
       item: label(locale, 'surchargeIncluded'),
@@ -882,6 +901,35 @@ function resolveReceiptPaymentAmount(payment, serviceFee) {
   var originAmount = new Decimal(toMoneyNumber(payment.origin_amount));
   return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
 }
+function buildCashChangePaymentItems(params) {
+  var payment = params.payment,
+    locale = params.locale,
+    currencySymbol = params.currencySymbol;
+  if (!shouldDisplayCashChange(payment)) return [];
+  return [{
+    item: label(locale, 'cashReceived'),
+    value: formatMoney(payment.metadata.actual_paid_amount, currencySymbol)
+  }, {
+    item: label(locale, 'changeDue'),
+    value: formatMoney(payment.metadata.change_given_amount, currencySymbol)
+  }];
+}
+function shouldDisplayCashChange(payment) {
+  var _payment$code, _payment$metadata2, _payment$metadata3;
+  if (stringify(payment.status).toLowerCase() !== 'paid') return false;
+  var paymentMethod = stringify((_payment$code = payment.code) !== null && _payment$code !== void 0 ? _payment$code : payment.payment_method).toUpperCase();
+  if (paymentMethod !== 'CASHMANUAL') return false;
+  var actualPaidAmount = (_payment$metadata2 = payment.metadata) === null || _payment$metadata2 === void 0 ? void 0 : _payment$metadata2.actual_paid_amount;
+  var changeGivenAmount = (_payment$metadata3 = payment.metadata) === null || _payment$metadata3 === void 0 ? void 0 : _payment$metadata3.change_given_amount;
+  if (!isNumericAmount(actualPaidAmount) || !isNumericAmount(changeGivenAmount)) return false;
+  return new Decimal(changeGivenAmount).toDecimalPlaces(2).gt(0);
+}
+function isNumericAmount(value) {
+  if (typeof value === 'number') return Number.isFinite(value);
+  if (typeof value !== 'string') return false;
+  var normalized = value.trim();
+  return normalized !== '' && /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(normalized);
+}
 function buildFundRecordPaymentItems(params) {
   var payment = params.payment,
     fundRecord = params.fundRecord,

package/dist/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 | 3 | 1 | 5 | 6 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -130,8 +130,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/dist/solution/UnifiedBookingSales/index.js

@@ -43,7 +43,7 @@ import { UnifiedBookingSalesHooks } from "./types";
 import { AvailabilityRemoteOccupancyCache } from "./remoteOccupancyCache";
 import { BookingTicket } from "../BookingTicket";
 import { addLocalCalendarDays, captureRuntimeOffsetMinutes, formatLocalDate, formatLocalDateTime, formatLocalTime, localDateTimeToScalar, localDateToScalar, localDateToScalarStart, parseLocalDate, parseLocalDateTime } from "../../modules/ResourcePlanner/localClock";
-import { isCustomerUserPlatform } from "../../utils/platform";
+import { isCustomerUserPlatform, normalizeRuntimePlatform } from "../../utils/platform";
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
 export { AvailabilityError } from "../../modules/ResourcePlanner";
@@ -1053,7 +1053,7 @@ function buildBookingFromAvailabilitySelection(params) {
   var timeSlotId = (_candidate$primarySch3 = (_candidate$primarySch4 = candidate.primaryScheduleRef) === null || _candidate$primarySch4 === void 0 ? void 0 : _candidate$primarySch4.timeSlotId) !== null && _candidate$primarySch3 !== void 0 ? _candidate$primarySch3 : (_assignments$find2 = assignments.find(function (assignment) {
     return assignment.timeSlotId != null;
   })) === null || _assignments$find2 === void 0 ? void 0 : _assignments$find2.timeSlotId;
-  if (product.kind === 'session' && scheduleId == null) {
+  if (product.kind === 'session' && candidate.source === 'session_schedule' && scheduleId == null) {
     throw new AvailabilityError('REVALIDATION_FAILED', 'session 候选缺少真实 schedule identity', {
       productId: product.id,
       candidateKey: candidate.key,
@@ -1062,15 +1062,16 @@ function buildBookingFromAvailabilitySelection(params) {
   }
   var normalizedHolder = holder && _typeof(holder) === 'object' ? cloneDeep(holder) : undefined;
   var normalizedHolderIds = Array.isArray(holderIds) ? cloneDeep(holderIds) : holderIds;
-  return _objectSpread(_objectSpread({
+  return _objectSpread(_objectSpread(_objectSpread({
     start_date: bookingStartAt.slice(0, 10),
     start_time: bookingStartAt.slice(11, 16),
     end_date: bookingEndAt.slice(0, 10),
     end_time: bookingEndAt.slice(11, 16),
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1000))),
-    like_status: 'common',
+    like_status: 'common'
+  }, product.kind === 'session' && candidate.source === 'duration_window' ? {} : {
     schedule_id: scheduleId !== null && scheduleId !== void 0 ? scheduleId : 0
-  }, normalizedHolder ? {
+  }), normalizedHolder ? {
     holder: normalizedHolder
   } : {}), {}, {
     resources: assignments.map(function (assignment) {
@@ -1867,15 +1868,17 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     }
 
     /**
-     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
      */
   }, {
     key: "shouldUseCheckoutSyncTask",
     value: function shouldUseCheckoutSyncTask() {
-      var _this$otherParams15;
+      var _this$otherParams15, _this$otherParams16;
       var configured = (_this$otherParams15 = this.otherParams) === null || _this$otherParams15 === void 0 ? void 0 : _this$otherParams15.checkoutSyncTaskEnabled;
-      return typeof configured === 'boolean' ? configured : false;
+      if (configured === true) return true;
+      var platform = normalizeRuntimePlatform((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.platform);
+      return platform !== 'h5' && platform !== 'kiosk';
     }
 
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
@@ -2029,8 +2032,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
   }, {
     key: "isAuthenticatedCustomerUserPlatform",
     value: function isAuthenticatedCustomerUserPlatform() {
-      var _this$otherParams16;
-      return isCustomerUserPlatform((_this$otherParams16 = this.otherParams) === null || _this$otherParams16 === void 0 ? void 0 : _this$otherParams16.platform);
+      var _this$otherParams17;
+      return isCustomerUserPlatform((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.platform);
     }
   }, {
     key: "resolveDiscountOrderIdentity",
@@ -2208,13 +2211,13 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "getOpenData",
     value: function () {
       var _getOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        var _this$otherParams17, _this$otherParams18, _this$store$openData;
+        var _this$otherParams18, _this$otherParams19, _this$store$openData;
         var businessCode, channel, target, cachedData;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              businessCode = String(((_this$otherParams17 = this.otherParams) === null || _this$otherParams17 === void 0 ? void 0 : _this$otherParams17.businessCode) || '').trim();
-              channel = String(((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.channel) || '').trim();
+              businessCode = String(((_this$otherParams18 = this.otherParams) === null || _this$otherParams18 === void 0 ? void 0 : _this$otherParams18.businessCode) || '').trim();
+              channel = String(((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.channel) || '').trim();
               if (!(!businessCode || !channel)) {
                 _context12.next = 4;
                 break;
@@ -2381,7 +2384,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "resolveProductAllergyRequirement",
     value: (function () {
       var _resolveProductAllergyRequirement = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16(params) {
-        var _this$otherParams19, _this$getOrderProduct, _runtimePax$total, _runtimePax$adult, _runtimePax$child, _ref35, _runtimeConfig$servic, _this$otherParams20, _ref36, _ref37, _params$channel, _this$otherParams21, _this$otherParams22, _runtimeConfig$submis;
+        var _this$otherParams20, _this$getOrderProduct, _runtimePax$total, _runtimePax$adult, _runtimePax$child, _ref35, _runtimeConfig$servic, _this$otherParams21, _ref36, _ref37, _params$channel, _this$otherParams22, _this$otherParams23, _runtimeConfig$submis;
         var productId, strategyConfigs, productVariantId, runtimeConfig, runtimePax, cartItems;
         return _regeneratorRuntime().wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
@@ -2404,7 +2407,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               return _context16.abrupt("return", null);
             case 8:
               productVariantId = normalizePositiveInteger(params.productVariantId);
-              runtimeConfig = ((_this$otherParams19 = this.otherParams) === null || _this$otherParams19 === void 0 ? void 0 : _this$otherParams19.itemRule) || {};
+              runtimeConfig = ((_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.itemRule) || {};
               runtimePax = runtimeConfig.pax || {};
               cartItems = (((_this$getOrderProduct = this.getOrderProducts) === null || _this$getOrderProduct === void 0 ? void 0 : _this$getOrderProduct.call(this)) || []).map(function (item) {
                 var _item$product_id, _item$product_variant, _ref34, _item$num;
@@ -2423,8 +2426,8 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                   child: Number((_runtimePax$child = runtimePax.child) !== null && _runtimePax$child !== void 0 ? _runtimePax$child : 0) || 0
                 },
                 cartItems: cartItems,
-                serviceType: String((_ref35 = (_runtimeConfig$servic = runtimeConfig.serviceType) !== null && _runtimeConfig$servic !== void 0 ? _runtimeConfig$servic : (_this$otherParams20 = this.otherParams) === null || _this$otherParams20 === void 0 ? void 0 : _this$otherParams20.serviceType) !== null && _ref35 !== void 0 ? _ref35 : ''),
-                channel: String((_ref36 = (_ref37 = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.channel) !== null && _ref37 !== void 0 ? _ref37 : (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.platform) !== null && _ref36 !== void 0 ? _ref36 : ''),
+                serviceType: String((_ref35 = (_runtimeConfig$servic = runtimeConfig.serviceType) !== null && _runtimeConfig$servic !== void 0 ? _runtimeConfig$servic : (_this$otherParams21 = this.otherParams) === null || _this$otherParams21 === void 0 ? void 0 : _this$otherParams21.serviceType) !== null && _ref35 !== void 0 ? _ref35 : ''),
+                channel: String((_ref36 = (_ref37 = (_params$channel = params.channel) !== null && _params$channel !== void 0 ? _params$channel : (_this$otherParams22 = this.otherParams) === null || _this$otherParams22 === void 0 ? void 0 : _this$otherParams22.channel) !== null && _ref37 !== void 0 ? _ref37 : (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.platform) !== null && _ref36 !== void 0 ? _ref36 : ''),
                 currentProduct: _objectSpread({
                   product_id: productId
                 }, productVariantId ? {
@@ -4466,13 +4469,14 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     value: (function () {
       var _getProductTimeRanges = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(contextId) {
         var _this$otherParams$pla,
-          _this$otherParams23,
+          _this$otherParams24,
           _this10 = this;
         var request,
           _yield$this$ensureAva,
           context,
           projectionEntry,
           contextVersion,
+          isPosAvailabilityRequest,
           allowOutsideOperatingHoursForRequestedStartTimes,
           _args40 = arguments;
         return _regeneratorRuntime().wrap(function _callee40$(_context40) {
@@ -4486,13 +4490,15 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               context = _yield$this$ensureAva.context;
               projectionEntry = _yield$this$ensureAva.projectionEntry;
               contextVersion = context.activeVersion;
-              allowOutsideOperatingHoursForRequestedStartTimes = String((_this$otherParams$pla = (_this$otherParams23 = this.otherParams) === null || _this$otherParams23 === void 0 ? void 0 : _this$otherParams23.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos' && Object.values(request.durationStartTimesByProductId || {}).some(function (startTimes) {
+              isPosAvailabilityRequest = String((_this$otherParams$pla = (_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.platform) !== null && _this$otherParams$pla !== void 0 ? _this$otherParams$pla : '').trim().toLowerCase() === 'pos';
+              allowOutsideOperatingHoursForRequestedStartTimes = isPosAvailabilityRequest && Object.values(request.durationStartTimesByProductId || {}).some(function (startTimes) {
                 return Array.isArray(startTimes) && startTimes.length > 0;
               });
               return _context40.abrupt("return", getProjectionProductTimeRanges(projectionEntry.projection, _objectSpread(_objectSpread({}, request), allowOutsideOperatingHoursForRequestedStartTimes ? {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
               } : {}), {
-                evaluatedAt: this.getAvailabilityRuntimeDateTime()
+                evaluatedAt: this.getAvailabilityRuntimeDateTime(),
+                allowSessionCustomRanges: isPosAvailabilityRequest
               }).map(function (group) {
                 return _objectSpread(_objectSpread({}, group), {}, {
                   ranges: group.ranges.map(function (candidate) {
@@ -4500,7 +4506,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                   })
                 });
               }));
-            case 9:
+            case 10:
             case "end":
               return _context40.stop();
           }
@@ -4636,7 +4642,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
     key: "commitAvailabilitySelection",
     value: (function () {
       var _commitAvailabilitySelection = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee42(contextId, params) {
-        var normalizedContextId, _params$bookingCount, _ref51, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla2, _this$otherParams24, _ref52, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref53, _ref54, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref55, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _params$salesNotes, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
+        var normalizedContextId, _params$bookingCount, _ref51, _params$orderProduct$, _params$orderProduct, _params$orderProduct2, _params$orderProduct3, _params$orderProduct$2, _params$orderProduct4, _params$orderProduct5, _editingLine$product_, _baseProjection$meta$, _refreshedProjection$, _baseProjection$meta$2, _this$otherParams$pla2, _this$otherParams25, _ref52, _params$orderProduct$3, _params$orderProduct6, _existingBooking$meta, _ref53, _ref54, _params$orderProduct$4, _params$orderProduct7, _params$orderProduct8, _existingBooking$meta2, _existingBooking$hold, bookingCount, orderProductQuantity, partySize, _yield$this$ensureAva3, context, projectionEntry, refreshed, boundEditingUids, orderProductId, editingLine, _editingLine$product_2, baseProjection, commitWriteGuard, prepareParams, fallbackResources, commitSnapshot, refreshedProjection, _baseProjection$meta$3, latestContext, candidateDurationMinutes, candidateStartTime, allowPosAvailabilityOverride, refreshedRanges, refreshedCandidateBase, product, validation, forced, capacityConflict, revalidationEntry, revalidatedContext, refreshedCandidate, existingBooking, existingBookingUid, booking, transformed, productLineUid, bookingUid, productLineUids, bookingUids, _transformed$product_, _transformed$product_2, _transformed$product_3, _ref55, _transformed$product_4, _this$getTempOrder4, _this$getTempOrder5, _params$salesNotes, _this$getTempOrder6, beforeProductLineUids, beforeBookingUids, products, addedLines, addedBookings, nextContext, result;
         return _regeneratorRuntime().wrap(function _callee42$(_context42) {
           while (1) switch (_context42.prev = _context42.next) {
             case 0:
@@ -4866,7 +4872,7 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
               this.assertAvailabilityCommitWriteCAS(commitWriteGuard);
               candidateDurationMinutes = getCandidateDurationMinutes(params.candidate);
               candidateStartTime = getCandidateStartTime(params.candidate);
-              allowPosAvailabilityOverride = String((_this$otherParams$pla2 = (_this$otherParams24 = this.otherParams) === null || _this$otherParams24 === void 0 ? void 0 : _this$otherParams24.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
+              allowPosAvailabilityOverride = String((_this$otherParams$pla2 = (_this$otherParams25 = this.otherParams) === null || _this$otherParams25 === void 0 ? void 0 : _this$otherParams25.platform) !== null && _this$otherParams$pla2 !== void 0 ? _this$otherParams$pla2 : '').trim().toLowerCase() === 'pos';
               refreshedRanges = getProjectionProductTimeRanges(refreshedProjection, _objectSpread({
                 productIds: [params.candidate.productId],
                 dateRange: {
@@ -4879,7 +4885,9 @@ export var UnifiedBookingSalesImpl = /*#__PURE__*/function (_BookingTicket) {
                 durationStartTimesByProductId: _defineProperty({}, String(params.candidate.productId), [candidateStartTime])
               }, allowPosAvailabilityOverride ? {
                 allowOutsideOperatingHoursForRequestedStartTimes: true
-              } : {}) : {}) : {})).flatMap(function (group) {
+              } : {}) : {}) : {}), {
+                allowSessionCustomRanges: allowPosAvailabilityOverride
+              }).flatMap(function (group) {
                 return group.ranges;
               });
               refreshedCandidateBase = refreshedRanges.find(function (candidate) {

package/lib/modules/Payment/walletpass.js

@@ -650,17 +650,20 @@ class WalletPassPaymentImpl {
         this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
         return [];
       }
-      const platform = this.paymentModule.getPlatform();
-      if (platform === 'pc' || platform === 'h5') {
-        this.userIdentificationCodes = [];
-        this.emitEvent(_types.WalletPassHooks.OnUserIdentificationCodesUpdated, {
-          userIdentificationCodes: []
-        });
-        this.paymentModule.logInfo('[WalletPass] 用户端平台跳过获取用户识别码列表', {
-          platform
-        });
-        return [];
-      }
+
+      // const platform = this.paymentModule.getPlatform();
+      // if (platform === 'pc' || platform === 'h5') {
+      //   this.userIdentificationCodes = [];
+      //   this.emitEvent(WalletPassHooks.OnUserIdentificationCodesUpdated, {
+      //     userIdentificationCodes: [],
+      //   } as OnUserIdentificationCodesUpdatedEventData);
+      //   this.paymentModule.logInfo(
+      //     '[WalletPass] 用户端平台跳过获取用户识别码列表',
+      //     { platform },
+      //   );
+      //   return [];
+      // }
+
       if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
         newParams.payment_order_id = undefined;
       }

package/lib/modules/ResourcePlanner/planner.js

@@ -55,12 +55,18 @@ function resolveRequestedDurationMinutes(product, request) {
   const normalized = Number(override);
   return Number.isInteger(normalized) && normalized > 0 ? normalized : configured;
 }
-function resolveRequestedDurationStartTimes(product, request) {
-  if (product.kind !== 'duration') return [];
+function resolveRequestedDurationStartTimes(product, request, allowSessionCustomRanges = false) {
+  if (product.kind !== 'duration' && !(product.kind === 'session' && allowSessionCustomRanges)) return [];
   const values = request.durationStartTimesByProductId?.[String(product.id)];
   if (!Array.isArray(values)) return [];
   return Array.from(new Set(values.filter(value => typeof value === 'string' && /^([01]\d|2[0-3]):[0-5]\d$/.test(value))));
 }
+function resolveRequestedSessionDurationMinutes(product, request, allowSessionCustomRanges) {
+  if (product.kind !== 'session' || !allowSessionCustomRanges) return undefined;
+  const override = request.durationMinutesByProductId?.[String(product.id)];
+  const normalized = Number(override);
+  return Number.isInteger(normalized) && normalized > 0 ? normalized : undefined;
+}
 function toDateTime(value, _timezoneName) {
   try {
     return (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(value));
@@ -207,7 +213,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.
+    const hasNotReachedStart = product.isFlexibleDuration ? floorToMinute(now) <= candidateRange.start : now < candidateRange.start;
+    if (hasNotReachedStart) return null;
     return {
       status: 'unavailable',
       reasonCodes: ['booking_cutoff_before_start'],
@@ -919,12 +929,23 @@ function getProductTimeRanges(projection, request = {}, runtimeOptions = {}) {
       };
     }
     if (product.kind === 'session' || product.kind === 'venue_slot') {
+      const fixedRanges = getSessionRangesForProduct(projection, product, dateRange);
+      const customRanges = [];
+      const customDurationMinutes = resolveRequestedSessionDurationMinutes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      const requestedStartTimes = resolveRequestedDurationStartTimes(product, request, runtimeOptions.allowSessionCustomRanges === true);
+      if (product.kind === 'session' && customDurationMinutes && dateRange.startDate === dateRange.endDate) {
+        requestedStartTimes.forEach(startTime => {
+          const 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,
-        ranges: getSessionRangesForProduct(projection, product, dateRange)
+        ranges: dedupeProductRanges([...fixedRanges, ...customRanges])
       };
     }
     const requiredGroups = (product.requirementGroups || []).filter(group => group.required !== false);

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

@@ -243,6 +243,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/lib/server/utils/small-ticket.js

@@ -22,6 +22,8 @@ const LABELS = {
     pickUpTime: 'Pick-up time',
     asap: 'ASAP',
     cash: 'Cash',
+    cashReceived: 'Cash received',
+    changeDue: 'Change due',
     eftpos: 'Eftpos',
     wallet: 'Wallet',
     giftCard: 'Gift card',
@@ -49,6 +51,8 @@ const LABELS = {
     pickUpTime: '取餐时间',
     asap: '尽快',
     cash: '现金支付',
+    cashReceived: '收取现金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '钱包支付',
     giftCard: '礼品卡',
@@ -76,6 +80,8 @@ const LABELS = {
     pickUpTime: '取餐時間',
     asap: '盡快',
     cash: '現金支付',
+    cashReceived: '收取現金',
+    changeDue: '找零',
     eftpos: '刷卡支付',
     wallet: '錢包支付',
     giftCard: '禮品卡',
@@ -90,6 +96,14 @@ const LABELS = {
     rounding: '抹零',
     gross: '重量',
     tare: '去皮'
+  },
+  ja: {
+    cashReceived: 'お預かり',
+    changeDue: 'お釣り'
+  },
+  pt: {
+    cashReceived: 'Dinheiro recebido',
+    changeDue: 'Troco'
   }
 };
 function buildSmallTicketData(params) {
@@ -169,7 +183,7 @@ function buildBaseData(params) {
     order_number: orderNumber,
     shop_tax_number: stringify(shopInfo.tax_number || order.shop_tax_number),
     shop_phone: stringify(shopInfo.phone || order.shop_phone),
-    shop_address: stringify(shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
+    shop_address: stringify(shopInfo.receipt_address || shopInfo.address || buildShopAddress(shopInfo) || order.shop_address),
     original_payment_status: stringify(order.payment_status),
     is_repeat: 0,
     buzzer: stringify(order.buzzer || order.pickup_number || order.metadata?.buzzer),
@@ -807,6 +821,11 @@ function buildPaymentItems(params) {
     item: paymentMethodName(payment, locale),
     value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
   }];
+  items.push(...buildCashChangePaymentItems({
+    payment,
+    locale,
+    currencySymbol
+  }));
   if (serviceFee.gt(0)) {
     items.push({
       item: label(locale, 'surchargeIncluded'),
@@ -848,6 +867,36 @@ function resolveReceiptPaymentAmount(payment, serviceFee) {
   const originAmount = new _decimal.default(toMoneyNumber(payment.origin_amount));
   return amount.eq(originAmount) ? amount.plus(serviceFee) : amount;
 }
+function buildCashChangePaymentItems(params) {
+  const {
+    payment,
+    locale,
+    currencySymbol
+  } = params;
+  if (!shouldDisplayCashChange(payment)) return [];
+  return [{
+    item: label(locale, 'cashReceived'),
+    value: formatMoney(payment.metadata.actual_paid_amount, currencySymbol)
+  }, {
+    item: label(locale, 'changeDue'),
+    value: formatMoney(payment.metadata.change_given_amount, currencySymbol)
+  }];
+}
+function shouldDisplayCashChange(payment) {
+  if (stringify(payment.status).toLowerCase() !== 'paid') return false;
+  const paymentMethod = stringify(payment.code ?? payment.payment_method).toUpperCase();
+  if (paymentMethod !== 'CASHMANUAL') return false;
+  const actualPaidAmount = payment.metadata?.actual_paid_amount;
+  const changeGivenAmount = payment.metadata?.change_given_amount;
+  if (!isNumericAmount(actualPaidAmount) || !isNumericAmount(changeGivenAmount)) return false;
+  return new _decimal.default(changeGivenAmount).toDecimalPlaces(2).gt(0);
+}
+function isNumericAmount(value) {
+  if (typeof value === 'number') return Number.isFinite(value);
+  if (typeof value !== 'string') return false;
+  const normalized = value.trim();
+  return normalized !== '' && /^[+-]?(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(normalized);
+}
 function buildFundRecordPaymentItems(params) {
   const {
     payment,

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

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

@@ -130,8 +130,8 @@ export declare class UnifiedBookingSalesImpl extends BookingTicket {
      */
     clearSessionStorageOrderSnapshot(): void;
     /**
-     * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-     * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+     * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+     * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
      */
     protected shouldUseCheckoutSyncTask(): boolean;
     /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */

package/lib/solution/UnifiedBookingSales/index.js

@@ -962,7 +962,7 @@ function buildBookingFromAvailabilitySelection(params) {
   const endScalar = (0, _localClock.localDateTimeToScalar)((0, _localClock.parseLocalDateTime)(bookingEndAt));
   const scheduleId = candidate.primaryScheduleRef?.scheduleId ?? assignments.find(assignment => assignment.scheduleId != null)?.scheduleId;
   const timeSlotId = candidate.primaryScheduleRef?.timeSlotId ?? assignments.find(assignment => assignment.timeSlotId != null)?.timeSlotId;
-  if (product.kind === 'session' && scheduleId == null) {
+  if (product.kind === 'session' && candidate.source === 'session_schedule' && scheduleId == null) {
     throw new _ResourcePlanner.AvailabilityError('REVALIDATION_FAILED', 'session 候选缺少真实 schedule identity', {
       productId: product.id,
       candidateKey: candidate.key,
@@ -978,7 +978,9 @@ function buildBookingFromAvailabilitySelection(params) {
     end_time: bookingEndAt.slice(11, 16),
     duration: Math.max(1, Math.trunc((endScalar - startScalar) / (60 * 1000))),
     like_status: 'common',
-    schedule_id: scheduleId ?? 0,
+    ...(product.kind === 'session' && candidate.source === 'duration_window' ? {} : {
+      schedule_id: scheduleId ?? 0
+    }),
     ...(normalizedHolder ? {
       holder: normalizedHolder
     } : {}),
@@ -1548,12 +1550,14 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
   }
 
   /**
-   * Kiosk 不能把已收款订单留在本地等待重试：默认直接等待云端 checkout。
-   * 兼容仍需要 WebPOS 待同步模式的入口可显式传 checkoutSyncTaskEnabled: true。
+   * H5/Kiosk 不能把已收款订单留在本地等待重试，必须直接等待云端 checkout。
+   * 其它平台保持 WebPOS/POS 的本地待同步任务；显式 true 仍可强制使用本地任务。
    */
   shouldUseCheckoutSyncTask() {
     const configured = this.otherParams?.checkoutSyncTaskEnabled;
-    return typeof configured === 'boolean' ? configured : false;
+    if (configured === true) return true;
+    const platform = (0, _platform.normalizeRuntimePlatform)(this.otherParams?.platform);
+    return platform !== 'h5' && platform !== 'kiosk';
   }
 
   /** UnifiedBookingSales 的真实结账默认请求收据数据，供云端确认后再本地打印。 */
@@ -2929,14 +2933,16 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
       projectionEntry
     } = await this.ensureAvailabilityContextProjection(contextId, 'get_product_time_ranges');
     const contextVersion = context.activeVersion;
-    const allowOutsideOperatingHoursForRequestedStartTimes = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos' && Object.values(request.durationStartTimesByProductId || {}).some(startTimes => Array.isArray(startTimes) && startTimes.length > 0);
+    const isPosAvailabilityRequest = String(this.otherParams?.platform ?? '').trim().toLowerCase() === 'pos';
+    const allowOutsideOperatingHoursForRequestedStartTimes = isPosAvailabilityRequest && Object.values(request.durationStartTimesByProductId || {}).some(startTimes => Array.isArray(startTimes) && startTimes.length > 0);
     return (0, _ResourcePlanner.getProductTimeRanges)(projectionEntry.projection, {
       ...request,
       ...(allowOutsideOperatingHoursForRequestedStartTimes ? {
         allowOutsideOperatingHoursForRequestedStartTimes: true
       } : {})
     }, {
-      evaluatedAt: this.getAvailabilityRuntimeDateTime()
+      evaluatedAt: this.getAvailabilityRuntimeDateTime(),
+      allowSessionCustomRanges: isPosAvailabilityRequest
     }).map(group => ({
       ...group,
       ranges: group.ranges.map(candidate => this.decorateAvailabilityCandidate(context.contextId, contextVersion, candidate))
@@ -3207,6 +3213,8 @@ class UnifiedBookingSalesImpl extends _BookingTicket.BookingTicket {
             } : {})
           } : {})
         } : {})
+      }, {
+        allowSessionCustomRanges: allowPosAvailabilityOverride
       }).flatMap(group => group.ranges);
       const refreshedCandidateBase = refreshedRanges.find(candidate => candidate.startAt === params.candidate.startAt && candidate.endAt === params.candidate.endAt && candidate.bookingStartAt === params.candidate.bookingStartAt && candidate.bookingEndAt === params.candidate.bookingEndAt);
       if (!refreshedCandidateBase) {

package/package.json

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