@pisell/pisellos 2.2.273 → 2.2.274

package/dist/solution/BookingTicket/index.js

@@ -337,10 +337,11 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     key: "getOpenData",
     value: function () {
       var _getOpenData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this$store$openData;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              return _context3.abrupt("return", this.loadOpenDataConfig());
+              return _context3.abrupt("return", (_this$store$openData = this.store.openData) === null || _this$store$openData === void 0 ? void 0 : _this$store$openData.getOpenData());
             case 1:
             case "end":
               return _context3.stop();
@@ -351,15 +352,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _getOpenData.apply(this, arguments);
       }
       return getOpenData;
-    }() /** 清除店铺级 OpenData；下一次 getOpenData 时会重新拉取。 */
-  }, {
-    key: "clearOpenDataCache",
-    value: function clearOpenDataCache() {
-      var _this$store$openData;
-      this.loadOpenDataConfigInFlight = null;
-      this.otherParams.openData = null;
-      (_this$store$openData = this.store.openData) === null || _this$store$openData === void 0 || _this$store$openData.clearCache();
-    }
+    }()
   }, {
     key: "getShortNumberOrDeviceId",
     value: function () {
@@ -404,52 +397,49 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              // 业务码切换或配置失败时不能复用上一次初始化的短号。
-              this.setPaymentNumberDevicePrefix(null);
               openDataConfig = null;
-              _context5.prev = 2;
-              _context5.next = 5;
+              _context5.prev = 1;
+              _context5.next = 4;
               return this.loadOpenDataConfig();
-            case 5:
+            case 4:
               openDataConfig = _context5.sent;
-              _context5.next = 12;
+              _context5.next = 11;
               break;
-            case 8:
-              _context5.prev = 8;
-              _context5.t0 = _context5["catch"](2);
+            case 7:
+              _context5.prev = 7;
+              _context5.t0 = _context5["catch"](1);
               console.warn('[BookingTicket] OpenData 配置加载失败，跳过 idGenerator 配置', _context5.t0);
               return _context5.abrupt("return");
-            case 12:
+            case 11:
               // if (!openDataConfig) return;
               idGenerator = this.getIdGeneratorPlugin();
               if (idGenerator !== null && idGenerator !== void 0 && idGenerator.configure) {
-                _context5.next = 16;
+                _context5.next = 15;
                 break;
               }
               console.warn('[BookingTicket] idGenerator 插件不可用，跳过配置');
               return _context5.abrupt("return");
-            case 16:
+            case 15:
               receiptSequenceLength = this.normalizePositiveInteger((_openDataConfig = openDataConfig) === null || _openDataConfig === void 0 ? void 0 : _openDataConfig['sale.short_number_digits'], 5);
               receiptSequenceStart = this.normalizePositiveInteger((_openDataConfig2 = openDataConfig) === null || _openDataConfig2 === void 0 ? void 0 : _openDataConfig2['sale.short_number_start_number'], 1);
               prefix = this.normalizeIdPrefix((_openDataConfig3 = openDataConfig) === null || _openDataConfig3 === void 0 ? void 0 : _openDataConfig3['sale.short_number_prefix'], '');
               shopOrderPrefix = this.normalizeIdPrefix((_openDataConfig4 = openDataConfig) === null || _openDataConfig4 === void 0 ? void 0 : _openDataConfig4['sale.sale_number_prefix'], '');
               resetReceiptSequenceDaily = typeof ((_openDataConfig5 = openDataConfig) === null || _openDataConfig5 === void 0 ? void 0 : _openDataConfig5['sale.short_number_daily_reset']) === 'boolean' ? (_openDataConfig6 = openDataConfig) === null || _openDataConfig6 === void 0 ? void 0 : _openDataConfig6['sale.short_number_daily_reset'] : false;
               operatingDayBoundary = this.getAppData('operating_day_boundary');
-              _context5.next = 24;
+              _context5.next = 23;
               return this.getShortNumberOrDeviceId();
-            case 24:
+            case 23:
               deviceId = _context5.sent;
-              this.setPaymentNumberDevicePrefix(deviceId);
               businessCode = this.getBookingTicketBusinessCode();
               if (businessCode) {
-                _context5.next = 30;
+                _context5.next = 28;
                 break;
               }
               console.warn('[BookingTicket] businessCode 缺失，跳过 idGenerator 配置');
               return _context5.abrupt("return");
-            case 30:
-              _context5.prev = 30;
-              _context5.next = 33;
+            case 28:
+              _context5.prev = 28;
+              _context5.next = 31;
               return idGenerator.configure({
                 biz: businessCode,
                 config: {
@@ -464,18 +454,18 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
                   shopOrderPrefix: shopOrderPrefix
                 }
               });
-            case 33:
-              _context5.next = 38;
+            case 31:
+              _context5.next = 36;
               break;
-            case 35:
-              _context5.prev = 35;
-              _context5.t1 = _context5["catch"](30);
+            case 33:
+              _context5.prev = 33;
+              _context5.t1 = _context5["catch"](28);
               console.warn('[BookingTicket] idGenerator 配置失败', _context5.t1);
-            case 38:
+            case 36:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[2, 8], [30, 35]]);
+        }, _callee5, this, [[1, 7], [28, 33]]);
       }));
       function configureIdGeneratorFromOpenData() {
         return _configureIdGeneratorFromOpenData.apply(this, arguments);
@@ -1270,88 +1260,24 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
     }
 
     /**
-     * 通过 ids 获取商品列表；默认只读取内存，显式开启 loadMissing 时按当前订单上下文补查缺失商品。
-     * 补查直接写入 ProductList，不更新 BookingTicket.productCatalog，避免当前商品列表被查询子集覆盖。
+     * 通过 ids 获取商品列表（不加载到模块中）
+     * @returns 商品列表
      */
   }, {
     key: "getProductByIds",
     value: (function () {
-      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids, options) {
-        var _this$getOrderCustome, _this$getOrderCustome2, _this$getOrderCustome3;
-        var normalizedIds, localProducts, localProductIds, missingIds, rawBookingDate, bookingDate, customerId, loadedProducts, productById;
+      var _getProductByIds = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18(ids) {
         return _regeneratorRuntime().wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              normalizedIds = Array.from(new Set((ids || []).map(function (id) {
-                return Number(id);
-              }).filter(function (id) {
-                return Number.isFinite(id);
-              })));
-              _context18.next = 3;
-              return this.store.products.getProductByIds(normalizedIds);
-            case 3:
-              _context18.t0 = _context18.sent;
-              if (_context18.t0) {
-                _context18.next = 6;
-                break;
-              }
-              _context18.t0 = [];
-            case 6:
-              localProducts = _context18.t0;
-              if (options !== null && options !== void 0 && options.loadMissing) {
-                _context18.next = 9;
-                break;
-              }
-              return _context18.abrupt("return", localProducts);
-            case 9:
-              localProductIds = new Set(localProducts.map(function (product) {
-                return Number(product.id);
-              }));
-              missingIds = normalizedIds.filter(function (id) {
-                return !localProductIds.has(id);
-              });
-              if (missingIds.length) {
-                _context18.next = 13;
-                break;
-              }
-              return _context18.abrupt("return", localProducts);
-            case 13:
-              rawBookingDate = this.getBookingDate();
-              bookingDate = rawBookingDate && dayjs(rawBookingDate).isValid() ? dayjs(rawBookingDate) : null;
-              customerId = Number((_this$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_this$getOrderCustome3 = this.getOrderCustomer()) === null || _this$getOrderCustome3 === void 0 ? void 0 : _this$getOrderCustome3.customer_id);
-              _context18.next = 18;
-              return this.store.products.loadProducts(_objectSpread(_objectSpread({
-                product_ids: missingIds,
-                with_count: ['bundleGroup', 'optionGroup'],
-                with_schedule: 1,
-                cacheId: this.cacheId
-              }, bookingDate ? {
-                schedule_date: bookingDate.format('YYYY-MM-DD'),
-                schedule_datetime: bookingDate.format('YYYY-MM-DD HH:mm:ss')
-              } : {}), Number.isFinite(customerId) && customerId > 0 ? {
-                customer_id: customerId
-              } : {}));
-            case 18:
-              loadedProducts = _context18.sent;
-              productById = new Map();
-              [].concat(_toConsumableArray(localProducts), _toConsumableArray(loadedProducts || [])).forEach(function (product) {
-                var productId = Number(product.id);
-                if (Number.isFinite(productId)) {
-                  productById.set(productId, product);
-                }
-              });
-              return _context18.abrupt("return", normalizedIds.map(function (id) {
-                return productById.get(id);
-              }).filter(function (product) {
-                return Boolean(product);
-              }));
-            case 22:
+              return _context18.abrupt("return", this.store.products.getProductByIds(ids));
+            case 1:
             case "end":
               return _context18.stop();
           }
         }, _callee18, this);
       }));
-      function getProductByIds(_x13, _x14) {
+      function getProductByIds(_x13) {
         return _getProductByIds.apply(this, arguments);
       }
       return getProductByIds;
@@ -1385,7 +1311,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee19, this);
       }));
-      function getScheduleTimePoints(_x15) {
+      function getScheduleTimePoints(_x14) {
         return _getScheduleTimePoints.apply(this, arguments);
       }
       return getScheduleTimePoints;
@@ -1775,7 +1701,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee23, this, [[0, 7]]);
       }));
-      function changeCustomerPage(_x16, _x17) {
+      function changeCustomerPage(_x15, _x16) {
         return _changeCustomerPage.apply(this, arguments);
       }
       return changeCustomerPage;
@@ -2067,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。 */
@@ -2229,10 +2154,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
   }, {
     key: "buildAddProductCtx",
     value: function buildAddProductCtx(extra) {
-      var _extra$date2, _ref12, _this$getOrderCustome4, _this$getOrderCustome5, _this$store$order$get4, _extra$presetStartTim2;
+      var _extra$date2, _ref12, _this$getOrderCustome, _this$getOrderCustome2, _this$store$order$get4, _extra$presetStartTim2;
       var bookingContextState = this.store.bookingContext.getState();
       var date = (_extra$date2 = extra === null || extra === void 0 ? void 0 : extra.date) !== null && _extra$date2 !== void 0 ? _extra$date2 : bookingContextState.date;
-      var orderCustomerId = (_ref12 = (_this$getOrderCustome4 = (_this$getOrderCustome5 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome5 === void 0 ? void 0 : _this$getOrderCustome5.id) !== null && _this$getOrderCustome4 !== void 0 ? _this$getOrderCustome4 : (_this$store$order$get4 = this.store.order.getTempOrder()) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
+      var orderCustomerId = (_ref12 = (_this$getOrderCustome = (_this$getOrderCustome2 = this.getOrderCustomerSnapshot()) === null || _this$getOrderCustome2 === void 0 ? void 0 : _this$getOrderCustome2.id) !== null && _this$getOrderCustome !== void 0 ? _this$getOrderCustome : (_this$store$order$get4 = this.store.order.getTempOrder()) === null || _this$store$order$get4 === void 0 ? void 0 : _this$store$order$get4.customer_id) !== null && _ref12 !== void 0 ? _ref12 : undefined;
       return _objectSpread({
         bookingConfig: bookingContextState.bookingConfig,
         resourcesOrigin: bookingContextState.resourcesOrigin,
@@ -2349,7 +2274,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee27, this);
       }));
-      function updateProductInOrder(_x18) {
+      function updateProductInOrder(_x17) {
         return _updateProductInOrder.apply(this, arguments);
       }
       return updateProductInOrder;
@@ -2458,7 +2383,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee28, this, [[4, 21]]);
       }));
-      function handleGlobalScanCode(_x19, _x20) {
+      function handleGlobalScanCode(_x18, _x19) {
         return _handleGlobalScanCode.apply(this, arguments);
       }
       return handleGlobalScanCode;
@@ -2556,7 +2481,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee29, this);
       }));
-      function addAddTimeProductToBooking(_x21) {
+      function addAddTimeProductToBooking(_x20) {
         return _addAddTimeProductToBooking.apply(this, arguments);
       }
       return addAddTimeProductToBooking;
@@ -2659,7 +2584,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee30, this, [[13, 31, 34, 37]]);
       }));
-      function addAddTimeProductsToBooking(_x22) {
+      function addAddTimeProductsToBooking(_x21) {
         return _addAddTimeProductsToBooking.apply(this, arguments);
       }
       return addAddTimeProductsToBooking;
@@ -2676,24 +2601,22 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           while (1) switch (_context31.prev = _context31.next) {
             case 0:
               _ref19 = _args31.length > 1 && _args31[1] !== undefined ? _args31[1] : {}, _ref19$cover = _ref19.cover, cover = _ref19$cover === void 0 ? false : _ref19$cover;
-              _context31.next = 3;
-              return _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
+              _get(_getPrototypeOf(BookingTicketImpl.prototype), "setOtherParams", this).call(this, params, {
                 cover: cover
               });
-            case 3:
-              if (!((params === null || params === void 0 ? void 0 : params.businessCode) !== undefined || (params === null || params === void 0 ? void 0 : params.business_code) !== undefined)) {
-                _context31.next = 6;
+              if (!(params !== null && params !== void 0 && params.businessCode)) {
+                _context31.next = 5;
                 break;
               }
-              _context31.next = 6;
+              _context31.next = 5;
               return this.configureIdGeneratorFromOpenData();
-            case 6:
+            case 5:
             case "end":
               return _context31.stop();
           }
         }, _callee31, this);
       }));
-      function setOtherParams(_x23) {
+      function setOtherParams(_x22) {
         return _setOtherParams.apply(this, arguments);
       }
       return setOtherParams;
@@ -2764,7 +2687,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee32, this);
       }));
-      function handlePrintWristband(_x24) {
+      function handlePrintWristband(_x23) {
         return _handlePrintWristband.apply(this, arguments);
       }
       return handlePrintWristband;
@@ -2839,7 +2762,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
           }
         }, _callee33, this);
       }));
-      function handleRedeem(_x25) {
+      function handleRedeem(_x24) {
         return _handleRedeem.apply(this, arguments);
       }
       return handleRedeem;

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

@@ -118,12 +118,15 @@ export interface BookingTicketCartBookingView extends ISalesBooking {
         canAddTime: boolean;
     };
 }
+export type BookingTicketCartLineView = BookingTicketCartBookingView | BookingTicketCartItemView;
 /**
  * BookingTicket 面向 UI 的购物车视图。
  */
 export interface BookingTicketCartView {
     bookings: BookingTicketCartBookingView[];
     items: BookingTicketCartItemView[];
+    /** 以 tempOrder.products 为唯一顺序真源的统一购物车行（旧到新）。 */
+    lines: BookingTicketCartLineView[];
 }
 /**
  * BookingTicket 面向 UI 的客户展示视图。

package/dist/solution/BookingTicket/utils/cartView.js

@@ -108,33 +108,28 @@ export function buildCartView(lines, bookings) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var productLines = Array.isArray(lines) ? lines : [];
   var bookingList = Array.isArray(bookings) ? bookings : [];
+  var childBookings = bookingList.filter(function (booking) {
+    return booking.parent_id !== 0;
+  });
+  var bookingsByProductUid = indexBookingsByProductUid(childBookings);
   var linesByUid = indexProductsByUid(productLines);
   var addTimeLinesByBookingUid = indexAddTimeProductsByBookingUid(productLines);
-  var claimedUids = new Set();
   var claimedAddTimeLines = new Set();
-  var cartBookings = bookingList.filter(function (booking) {
-    return booking.parent_id !== 0;
-  }).reduce(function (acc, booking) {
-    var uid = booking === null || booking === void 0 ? void 0 : booking.product_uid;
+  childBookings.forEach(function (booking) {
     var bookingUid = getBookingUid(booking);
-    var product = null;
-    if (uid !== undefined && uid !== null && uid !== '') {
-      var key = String(uid);
-      if (!claimedUids.has(key)) {
-        var line = linesByUid[key];
-        // 赠品预约只作为提交数据保留，不在购物车顶部预约卡片区展示。
-        if (isGiftProductLine(line)) return acc;
-        if (line) {
-          claimedUids.add(key);
-          product = line;
-        }
-      }
-    }
-    var addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
-    addTimeProduct.forEach(function (line) {
-      return claimedAddTimeLines.add(line);
+    if (!bookingUid) return;
+    (addTimeLinesByBookingUid[bookingUid] || []).forEach(function (line) {
+      claimedAddTimeLines.add(line);
     });
-    acc.push(_objectSpread(_objectSpread({}, booking), {}, {
+  });
+  var claimedBookings = new Set();
+  var cartBookings = [];
+  var items = [];
+  var orderedLines = [];
+  var buildBookingView = function buildBookingView(booking, product) {
+    var bookingUid = getBookingUid(booking);
+    var addTimeProduct = bookingUid ? addTimeLinesByBookingUid[bookingUid] || [] : [];
+    return _objectSpread(_objectSpread({}, booking), {}, {
       _extend: {
         product: product,
         addTimeProduct: addTimeProduct,
@@ -147,21 +142,38 @@ export function buildCartView(lines, bookings) {
           shopOpeningHours: options.shopOpeningHours
         })
       }
-    }));
-    return acc;
-  }, []);
-  var items = productLines.filter(function (line) {
+    });
+  };
+  productLines.forEach(function (line) {
     var _line$metadata6;
-    // 促销赠品行仅通过主商品 Gift 行展示，不在 items 单独占一行（对齐 legacy `isGift: !!_giftInfo`）
-    if (isGiftProductLine(line)) return false;
-    if (claimedAddTimeLines.has(line)) return false;
+    // 赠品由主商品 Gift 行展示；加时商品挂在 booking._extend.addTimeProduct。
+    if (isGiftProductLine(line) || claimedAddTimeLines.has(line)) return;
     var uid = (_line$metadata6 = line.metadata) === null || _line$metadata6 === void 0 ? void 0 : _line$metadata6.unique_identification_number;
-    if (uid === undefined || uid === null || uid === '') return true;
-    return !claimedUids.has(String(uid));
+    var matchedBooking = uid === undefined || uid === null || uid === '' ? undefined : (bookingsByProductUid[String(uid)] || []).find(function (booking) {
+      return !claimedBookings.has(booking);
+    });
+    if (matchedBooking) {
+      claimedBookings.add(matchedBooking);
+      var bookingView = buildBookingView(matchedBooking, line);
+      cartBookings.push(bookingView);
+      orderedLines.push(bookingView);
+      return;
+    }
+    items.push(line);
+    orderedLines.push(line);
+  });
+  childBookings.forEach(function (booking) {
+    if (claimedBookings.has(booking)) return;
+    var uid = booking === null || booking === void 0 ? void 0 : booking.product_uid;
+    var linkedProduct = uid === undefined || uid === null || uid === '' ? null : linesByUid[String(uid)] || null;
+    // 赠品预约只作为提交数据保留，不在购物车预约卡片区展示。
+    if (isGiftProductLine(linkedProduct)) return;
+    cartBookings.push(buildBookingView(booking, null));
   });
   return {
     bookings: cartBookings,
-    items: items
+    items: items,
+    lines: orderedLines
   };
 }
 export function isWalkInCustomer(customer) {

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.js

@@ -41,10 +41,6 @@ import { composeLinePrice, createUuidV4, getProductSkuOptions, normalizeSubmitCo
 import dayjs from 'dayjs';
 import { ItemRuleEvaluator } from "../../model/strategy/adapter/itemRule";
 export * from "./types";
-function isItemRewardProductDiscount(discount) {
-  var _discount$metadata, _discount$metadata2;
-  return (discount === null || discount === void 0 ? void 0 : discount.type) === 'product' && (discount === null || discount === void 0 || (_discount$metadata = discount.metadata) === null || _discount$metadata === void 0 ? void 0 : _discount$metadata.source) === 'promotion' && (discount === null || discount === void 0 || (_discount$metadata2 = discount.metadata) === null || _discount$metadata2 === void 0 ? void 0 : _discount$metadata2.actionType) === 'ITEM_REWARD';
-}
 export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(ScanOrderImpl, _BaseModule);
   var _super = _createSuper(ScanOrderImpl);
@@ -1181,7 +1177,7 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
               _iterator3.s();
             case 19:
               if ((_step3 = _iterator3.n()).done) {
-                _context15.next = 36;
+                _context15.next = 33;
                 break;
               }
               product = _step3.value;
@@ -1189,15 +1185,8 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 _context15.next = 23;
                 break;
               }
-              return _context15.abrupt("continue", 34);
+              return _context15.abrupt("continue", 31);
             case 23:
-              if (!(product.discount_list || []).some(isItemRewardProductDiscount)) {
-                _context15.next = 26;
-                break;
-              }
-              product.discount_list = (product.discount_list || []).filter(isItemRewardProductDiscount);
-              return _context15.abrupt("continue", 34);
-            case 26:
               product.discount_list = (product.discount_list || []).filter(function (pd) {
                 var _pd$discount$resource, _pd$discount;
                 var rid = (_pd$discount$resource = (_pd$discount = pd.discount) === null || _pd$discount === void 0 ? void 0 : _pd$discount.resource_id) !== null && _pd$discount$resource !== void 0 ? _pd$discount$resource : pd.id;
@@ -1221,47 +1210,47 @@ export var ScanOrderImpl = /*#__PURE__*/function (_BaseModule) {
                 mainPrice: newMainSellingPrice,
                 bundle: product.product_bundle
               });
-            case 34:
+            case 31:
               _context15.next = 19;
               break;
-            case 36:
-              _context15.next = 41;
+            case 33:
+              _context15.next = 38;
               break;
-            case 38:
-              _context15.prev = 38;
+            case 35:
+              _context15.prev = 35;
               _context15.t0 = _context15["catch"](17);
               _iterator3.e(_context15.t0);
-            case 41:
-              _context15.prev = 41;
+            case 38:
+              _context15.prev = 38;
               _iterator3.f();
-              return _context15.finish(41);
-            case 44:
+              return _context15.finish(38);
+            case 41:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
-              _context15.next = 47;
+              _context15.next = 44;
               return discountModule === null || discountModule === void 0 ? void 0 : discountModule.setDiscountList(nextDiscountList);
-            case 47:
+            case 44:
               tempOrder.discount_list = (nextDiscountList || []).filter(function (d) {
                 return d.isSelected;
               });
-              _context15.next = 50;
+              _context15.next = 47;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 50:
+            case 47:
               this.store.order.persistTempOrder();
               this.logMethodSuccess('setDiscountSelected', params);
-              _context15.next = 58;
+              _context15.next = 55;
               break;
-            case 54:
-              _context15.prev = 54;
+            case 51:
+              _context15.prev = 51;
               _context15.t1 = _context15["catch"](1);
               this.logMethodError('setDiscountSelected', _context15.t1);
               throw _context15.t1;
-            case 58:
+            case 55:
             case "end":
               return _context15.stop();
           }
-        }, _callee15, this, [[1, 54], [17, 38, 41, 44]]);
+        }, _callee15, this, [[1, 51], [17, 35, 38, 41]]);
       }));
       function setDiscountSelected(_x8) {
         return _setDiscountSelected.apply(this, arguments);