@pisell/pisellos 2.1.125 → 2.1.127

package/dist/solution/VenueBooking/index.js

@@ -35,6 +35,7 @@ import { createModule } from "../BookingByStep/types";
 import { ProductList } from "../../modules/ProductList";
 import { DateModule } from "../../modules/Date";
 import { ScheduleModule } from "../../modules/Schedule";
+import { calcMinTimeMaxTimeBySchedules } from "../../modules/Schedule/utils";
 import { QuotationModule } from "../../modules/Quotation";
 import { OpenDataModule } from "../../modules/OpenData";
 import { AccountHooks } from "../../modules/Account/types";
@@ -87,6 +88,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     _defineProperty(_assertThisInitialized(_this), "cacheId", void 0);
     _defineProperty(_assertThisInitialized(_this), "window", void 0);
     _defineProperty(_assertThisInitialized(_this), "request", void 0);
+    _defineProperty(_assertThisInitialized(_this), "baseSlotConfig", _objectSpread({}, DEFAULT_SLOT_CONFIG));
     _defineProperty(_assertThisInitialized(_this), "itemRuleEvaluator", new ItemRuleEvaluator());
     _defineProperty(_assertThisInitialized(_this), "itemRuleConfigs", []);
     _defineProperty(_assertThisInitialized(_this), "itemRuleConfigsPromise", null);
@@ -460,7 +462,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               this.store.status = 'initializing';
               this.store.error = null;
               this.store.rawResourceData = [];
-              this.store.slotConfig = _objectSpread(_objectSpread({}, DEFAULT_SLOT_CONFIG), ((_options$otherParams2 = options.otherParams) === null || _options$otherParams2 === void 0 ? void 0 : _options$otherParams2.slotConfig) || {});
+              this.baseSlotConfig = _objectSpread(_objectSpread({}, DEFAULT_SLOT_CONFIG), ((_options$otherParams2 = options.otherParams) === null || _options$otherParams2 === void 0 ? void 0 : _options$otherParams2.slotConfig) || {});
+              this.store.slotConfig = _objectSpread({}, this.baseSlotConfig);
               this.otherParams = options.otherParams || {};
               this.cacheId = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.cacheId;
               this.itemRuleRuntimeConfig = ((_this$otherParams2 = this.otherParams) === null || _this$otherParams2 === void 0 ? void 0 : _this$otherParams2.venueBookingItemRule) || ((_this$otherParams3 = this.otherParams) === null || _this$otherParams3 === void 0 ? void 0 : _this$otherParams3.itemRule) || {};
@@ -475,19 +478,19 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               this.window = core.getPlugin('window');
               this.request = core.getPlugin('request');
               if (this.window) {
-                _context6.next = 23;
+                _context6.next = 24;
                 break;
               }
               this.logMethodError('initialize', 'window plugin missing');
               throw new Error('venueBooking解决方案需要 window 插件支持');
-            case 23:
+            case 24:
               if (this.request) {
-                _context6.next = 26;
+                _context6.next = 27;
                 break;
               }
               this.logMethodError('initialize', 'request plugin missing');
               throw new Error('venueBooking解决方案需要 request 插件支持');
-            case 26:
+            case 27:
               // 注册基础模块（order, salesSummary, products, logger）
               baseModules = ['scanOrderLogger', 'products', 'order', 'salesSummary'];
               baseModules.forEach(function (step) {
@@ -581,46 +584,46 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               this.registerCustomerLoginListeners();
               console.log('[VenueBooking] 初始化开始');
-              _context6.prev = 49;
-              _context6.next = 52;
+              _context6.prev = 50;
+              _context6.next = 53;
               return (_this$store$order = this.store.order) === null || _this$store$order === void 0 ? void 0 : _this$store$order.recalculateSummary({
                 createIfMissing: false
               });
-            case 52:
+            case 53:
               (_this$store$order2 = this.store.order) === null || _this$store$order2 === void 0 || _this$store$order2.persistTempOrder();
-              _context6.next = 55;
+              _context6.next = 56;
               return this.loadRuntimeConfigs();
-            case 55:
+            case 56:
               if (!this.store.schedule) {
-                _context6.next = 60;
+                _context6.next = 61;
                 break;
               }
-              _context6.next = 58;
+              _context6.next = 59;
               return this.store.schedule.loadAllSchedule();
-            case 58:
+            case 59:
               this.injectScheduleResolverToQuotation();
               (_this$store$quotation = this.store.quotation) === null || _this$store$quotation === void 0 || _this$store$quotation.loadQuotations({
                 channel: (_this$otherParams6 = this.otherParams) === null || _this$otherParams6 === void 0 ? void 0 : _this$otherParams6.channel
               });
-            case 60:
-              _context6.next = 62;
+            case 61:
+              _context6.next = 63;
               return this.refreshItemRuleQuantityLimits();
-            case 62:
+            case 63:
               this.store.status = 'ready';
               console.log('[VenueBooking] 初始化完成');
-              _context6.next = 66;
+              _context6.next = 67;
               return this.core.effects.emit(VenueBookingHooks.onInited, {
                 status: this.store.status
               });
-            case 66:
+            case 67:
               this.logMethodSuccess('initialize', {
                 status: this.store.status
               });
-              _context6.next = 76;
+              _context6.next = 77;
               break;
-            case 69:
-              _context6.prev = 69;
-              _context6.t0 = _context6["catch"](49);
+            case 70:
+              _context6.prev = 70;
+              _context6.t0 = _context6["catch"](50);
               this.store.status = 'error';
               this.store.error = _context6.t0 instanceof Error ? _context6.t0.message : '初始化失败';
               console.error('[VenueBooking] 初始化失败', _context6.t0);
@@ -628,11 +631,11 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 status: this.store.status
               });
               throw _context6.t0;
-            case 76:
+            case 77:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[49, 69]]);
+        }, _callee6, this, [[50, 70]]);
       }));
       function initialize(_x5) {
         return _initialize.apply(this, arguments);
@@ -1094,27 +1097,105 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return fetchResourceAvailability;
     }() // ─── 日期概览 & 时间槽矩阵（纯计算，不发请求） ───
+  }, {
+    key: "getOperatingHoursScheduleIds",
+    value: function getOperatingHoursScheduleIds() {
+      var _this$store$openData, _this$store$openData$;
+      var openData = this.otherParams.openData || ((_this$store$openData = this.store.openData) === null || _this$store$openData === void 0 || (_this$store$openData$ = _this$store$openData.getOpenData) === null || _this$store$openData$ === void 0 ? void 0 : _this$store$openData$.call(_this$store$openData)) || null;
+      var rawIds = openData === null || openData === void 0 ? void 0 : openData['availability.operating_hours'];
+      if (!Array.isArray(rawIds)) return [];
+      return _toConsumableArray(new Set(rawIds.map(function (id) {
+        return Number(id);
+      }).filter(function (id) {
+        return Number.isFinite(id) && id > 0;
+      }).map(function (id) {
+        return Math.floor(id);
+      })));
+    }
+  }, {
+    key: "resolveSlotConfigForDate",
+    value: function resolveSlotConfigForDate(date) {
+      var nextSlotConfig = _objectSpread({}, this.baseSlotConfig);
+      if (!date || !this.store.schedule) return nextSlotConfig;
+      var operatingHoursScheduleIds = this.getOperatingHoursScheduleIds();
+      if (!operatingHoursScheduleIds.length) return nextSlotConfig;
+      var scheduleList = this.store.schedule.getScheduleListByIds(operatingHoursScheduleIds);
+      if (!scheduleList.length) return nextSlotConfig;
+      var timeRangeMap = calcMinTimeMaxTimeBySchedules(scheduleList, undefined, date);
+      var earliestStart = null;
+      var latestEnd = null;
+      var _iterator3 = _createForOfIteratorHelper(scheduleList),
+        _step3;
+      try {
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _timeRangeMap$schedul;
+          var schedule = _step3.value;
+          var dateRangeList = (timeRangeMap === null || timeRangeMap === void 0 || (_timeRangeMap$schedul = timeRangeMap[schedule.id]) === null || _timeRangeMap$schedul === void 0 ? void 0 : _timeRangeMap$schedul.dateRangeFormat) || [];
+          var _iterator4 = _createForOfIteratorHelper(dateRangeList),
+            _step4;
+          try {
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var range = _step4.value;
+              var start = dayjs(range === null || range === void 0 ? void 0 : range.start);
+              var end = dayjs(range === null || range === void 0 ? void 0 : range.end);
+              if (!start.isValid() || !end.isValid()) continue;
+              if (!earliestStart || start.isBefore(earliestStart)) {
+                earliestStart = start;
+              }
+              if (!latestEnd || end.isAfter(latestEnd)) {
+                latestEnd = end;
+              }
+            }
+          } catch (err) {
+            _iterator4.e(err);
+          } finally {
+            _iterator4.f();
+          }
+        }
+      } catch (err) {
+        _iterator3.e(err);
+      } finally {
+        _iterator3.f();
+      }
+      if (!earliestStart || !latestEnd) return nextSlotConfig;
+      return _objectSpread(_objectSpread({}, nextSlotConfig), {}, {
+        businessStartTime: earliestStart.format('HH:mm'),
+        businessEndTime: latestEnd.format('HH:mm')
+      });
+    }
+  }, {
+    key: "syncOperatingHoursToSlotConfig",
+    value: function syncOperatingHoursToSlotConfig(date) {
+      var resolvedSlotConfig = this.resolveSlotConfigForDate(date);
+      this.store.slotConfig = resolvedSlotConfig;
+      return resolvedSlotConfig;
+    }
   }, {
     key: "getDateRangeSummary",
     value: function getDateRangeSummary(params) {
+      var _this6 = this;
       return buildDateRangeSummary({
         startDate: params.startDate,
         endDate: params.endDate,
-        config: this.store.slotConfig,
+        config: this.baseSlotConfig,
         rawResources: this.store.rawResourceData,
         resourceProductMap: this.resourceProductMap,
-        quotationModule: this.store.quotation
+        quotationModule: this.store.quotation,
+        resolveConfig: function resolveConfig(date) {
+          return _this6.resolveSlotConfigForDate(date);
+        }
       });
     }
   }, {
     key: "getTimeSlotGrid",
     value: function getTimeSlotGrid(date) {
+      var resolvedSlotConfig = this.syncOperatingHoursToSlotConfig(date);
       var quotationPriceMap;
       if (this.store.quotation) {
         var productIds = _toConsumableArray(new Set(_toConsumableArray(this.resourceProductMap.values()).map(function (m) {
           return m.productId;
         })));
-        var timeLabels = generateTimeLabels(this.store.slotConfig);
+        var timeLabels = generateTimeLabels(resolvedSlotConfig);
         var timePoints = timeLabels.map(function (label) {
           return "".concat(date, " ").concat(label);
         });
@@ -1125,7 +1206,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
       }
       return buildTimeSlotGrid({
         date: date,
-        config: this.store.slotConfig,
+        config: resolvedSlotConfig,
         rawResources: this.store.rawResourceData,
         resourceProductMap: this.resourceProductMap,
         quotationPriceMap: quotationPriceMap
@@ -1222,17 +1303,17 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
       });
       var slotDuration = this.store.slotConfig.slotDurationMinutes;
       var slots = [];
-      var _iterator3 = _createForOfIteratorHelper(venueProducts),
-        _step3;
+      var _iterator5 = _createForOfIteratorHelper(venueProducts),
+        _step5;
       try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var product = _step3.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var product = _step5.value;
           slots.push.apply(slots, _toConsumableArray(expandMergedSlotToIndividual(product, slotDuration)));
         }
       } catch (err) {
-        _iterator3.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator3.f();
+        _iterator5.f();
       }
       return slots.sort(function (a, b) {
         return a.startTime.localeCompare(b.startTime);
@@ -1265,12 +1346,12 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
         return (_p$metadata3 = p.metadata) === null || _p$metadata3 === void 0 ? void 0 : _p$metadata3.venue_booking;
       });
       var slotDuration = this.store.slotConfig.slotDurationMinutes;
-      var _iterator4 = _createForOfIteratorHelper(venueProducts),
-        _step4;
+      var _iterator6 = _createForOfIteratorHelper(venueProducts),
+        _step6;
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
           var _product$metadata;
-          var product = _step4.value;
+          var product = _step6.value;
           var resourceId = (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.resource_id;
           if (resourceId == null) continue;
           var existing = result.get(resourceId) || [];
@@ -1278,25 +1359,25 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
           result.set(resourceId, existing);
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator4.f();
+        _iterator6.f();
       }
-      var _iterator5 = _createForOfIteratorHelper(result),
-        _step5;
+      var _iterator7 = _createForOfIteratorHelper(result),
+        _step7;
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var _step5$value = _slicedToArray(_step5.value, 2),
-            key = _step5$value[0],
-            slots = _step5$value[1];
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var _step7$value = _slicedToArray(_step7.value, 2),
+            key = _step7$value[0],
+            slots = _step7$value[1];
           result.set(key, slots.sort(function (a, b) {
             return a.startTime.localeCompare(b.startTime);
           }));
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator5.f();
+        _iterator7.f();
       }
       return result;
     }
@@ -1365,7 +1446,6 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                   num: 1,
                   selling_price: group.totalPrice,
                   original_price: group.totalPrice,
-                  payment_price: group.totalPrice,
                   is_charge_tax: (_venueProduct$is_char = venueProduct === null || venueProduct === void 0 ? void 0 : venueProduct.is_charge_tax) !== null && _venueProduct$is_char !== void 0 ? _venueProduct$is_char : 0,
                   metadata: {
                     venue_booking: true,
@@ -1459,7 +1539,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "setSlotConfig",
     value: function setSlotConfig(config) {
-      this.store.slotConfig = _objectSpread(_objectSpread({}, this.store.slotConfig), config);
+      this.baseSlotConfig = _objectSpread(_objectSpread({}, this.baseSlotConfig), config);
+      this.store.slotConfig = _objectSpread({}, this.baseSlotConfig);
     }
   }, {
     key: "getSlotConfig",
@@ -1509,10 +1590,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "injectScheduleResolverToQuotation",
     value: function injectScheduleResolverToQuotation() {
-      var _this6 = this;
+      var _this7 = this;
       if (this.store.quotation && this.store.schedule) {
         this.store.quotation.setScheduleResolver(function (id) {
-          return _this6.store.schedule.getScheduleListByIds([id])[0];
+          return _this7.store.schedule.getScheduleListByIds([id])[0];
         });
       }
     }
@@ -1590,25 +1671,25 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "recalculateOrderPricesFromQuotation",
     value: function recalculateOrderPricesFromQuotation() {
       var _tempOrder$products,
-        _this7 = this;
+        _this8 = this;
       if (!this.store.order || !this.store.quotation) return;
       var tempOrder = this.store.order.getTempOrder();
       if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$products = tempOrder.products) !== null && _tempOrder$products !== void 0 && _tempOrder$products.length)) return;
       var now = dayjs().format('YYYY-MM-DD HH:mm:ss');
-      var _iterator6 = _createForOfIteratorHelper(tempOrder.products),
-        _step6;
+      var _iterator8 = _createForOfIteratorHelper(tempOrder.products),
+        _step8;
       try {
         var _loop = function _loop() {
           var _product$metadata2;
-          var product = _step6.value;
+          var product = _step8.value;
           if ((_product$metadata2 = product.metadata) !== null && _product$metadata2 !== void 0 && _product$metadata2.venue_booking) {
-            var mapping = _this7.resourceProductMap.get(product.metadata.resource_id);
+            var mapping = _this8.resourceProductMap.get(product.metadata.resource_id);
             if (!mapping) return 1; // continue
-            var slots = expandMergedSlotToIndividual(product, _this7.store.slotConfig.slotDurationMinutes);
+            var slots = expandMergedSlotToIndividual(product, _this8.store.slotConfig.slotDurationMinutes);
             var updatedSlots = slots.map(function (slot) {
               var _getPriceForProduct;
               return _objectSpread(_objectSpread({}, slot), {}, {
-                price: (_getPriceForProduct = _this7.store.quotation.getPriceForProduct({
+                price: (_getPriceForProduct = _this8.store.quotation.getPriceForProduct({
                   productId: mapping.productId,
                   datetime: slot.startTime
                 })) !== null && _getPriceForProduct !== void 0 ? _getPriceForProduct : mapping.price
@@ -1617,33 +1698,33 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
             var merged = mergeConsecutiveSlots(updatedSlots);
             if (merged.length === 1) {
               product.selling_price = merged[0].totalPrice;
-              product.payment_price = merged[0].totalPrice;
+              product.original_price = merged[0].totalPrice;
               product.metadata.price_breakdown = buildPriceBreakdown({
                 group: merged[0],
                 productId: mapping.productId,
-                quotation: _this7.store.quotation
+                quotation: _this8.store.quotation
               });
             }
           } else if (product.product_id != null) {
             var _product$product_vari;
-            var quotationPrice = _this7.store.quotation.getPriceForProduct({
+            var quotationPrice = _this8.store.quotation.getPriceForProduct({
               productId: product.product_id,
               variantId: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : undefined,
               datetime: now
             });
             if (quotationPrice !== null) {
               product.selling_price = quotationPrice;
-              product.payment_price = quotationPrice;
+              product.original_price = quotationPrice;
             }
           }
         };
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
           if (_loop()) continue;
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator6.f();
+        _iterator8.f();
       }
     }
   }, {
@@ -1711,7 +1792,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: (function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21(params) {
-        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator7, _step7, d, selectedResourceIds, _iterator8, _step8, _product$discount_lis, product, before, totalDiscountAmount, newPaymentPrice, paymentStr, afterApplyTarget, finalSummary, finalProduct, finalTarget;
+        var _tempOrder$holder, _this$store$order$get, _this$store$order$get2, list, beforeTarget, updated, updatedTarget, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder2, result, beforeSelectedIds, _iterator9, _step9, d, selectedResourceIds, _iterator10, _step10, _product$discount_lis, product, before, totalPerUnitDiscount, newSellingPrice, afterApplyTarget, finalSummary, finalProduct, finalTarget;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
             case 0:
@@ -1771,18 +1852,18 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                     }).map(function (d) {
                       return d.id;
                     }));
-                    _iterator7 = _createForOfIteratorHelper(nextDiscountList);
+                    _iterator9 = _createForOfIteratorHelper(nextDiscountList);
                     try {
-                      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                        d = _step7.value;
+                      for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+                        d = _step9.value;
                         if (d.isSelected && !beforeSelectedIds.has(d.id)) {
                           d.isSelected = false;
                         }
                       }
                     } catch (err) {
-                      _iterator7.e(err);
+                      _iterator9.e(err);
                     } finally {
-                      _iterator7.f();
+                      _iterator9.f();
                     }
                   }
                 }
@@ -1792,15 +1873,15 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }).map(function (d) {
                 return d.id;
               }));
-              _iterator8 = _createForOfIteratorHelper(tempOrder.products);
+              _iterator10 = _createForOfIteratorHelper(tempOrder.products);
               _context21.prev = 19;
-              _iterator8.s();
+              _iterator10.s();
             case 21:
-              if ((_step8 = _iterator8.n()).done) {
+              if ((_step10 = _iterator10.n()).done) {
                 _context21.next = 30;
                 break;
               }
-              product = _step8.value;
+              product = _step10.value;
               if ((_product$discount_lis = product.discount_list) !== null && _product$discount_lis !== void 0 && _product$discount_lis.length) {
                 _context21.next = 25;
                 break;
@@ -1814,14 +1895,15 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return rid != null && selectedResourceIds.has(rid);
               });
               if (product.discount_list.length < before) {
-                totalDiscountAmount = product.discount_list.reduce(function (sum, pd) {
+                // 基于剩余的 discount_list 重算 selling_price。
+                // 约定：pd.amount 为 per-unit 折扣额，remaining 加总即单品券后总折扣。
+                totalPerUnitDiscount = product.discount_list.reduce(function (sum, pd) {
                   return sum + (pd.amount || 0);
                 }, 0);
-                newPaymentPrice = new Decimal(product.selling_price || 0).minus(totalDiscountAmount).toNumber();
-                paymentStr = toPriceString(newPaymentPrice);
-                product.payment_price = paymentStr;
+                newSellingPrice = new Decimal(product.original_price || product.selling_price || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
+                product.selling_price = newSellingPrice;
                 if (product.metadata) {
-                  product.metadata.main_product_selling_price = paymentStr;
+                  product.metadata.main_product_selling_price = newSellingPrice;
                 }
               }
             case 28:
@@ -1833,10 +1915,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
             case 32:
               _context21.prev = 32;
               _context21.t0 = _context21["catch"](19);
-              _iterator8.e(_context21.t0);
+              _iterator10.e(_context21.t0);
             case 35:
               _context21.prev = 35;
-              _iterator8.f();
+              _iterator10.f();
               return _context21.finish(35);
             case 38:
               OrderModule.populateSavedAmounts(tempOrder.products, nextDiscountList);
@@ -2041,10 +2123,9 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 });
                 if (quotationPrice !== null) {
                   product.selling_price = quotationPrice;
-                  if (product.original_price == null) {
-                    product.original_price = quotationPrice;
-                  }
-                  product.payment_price = quotationPrice;
+                  product.original_price = quotationPrice;
+                } else if (product.selling_price != null) {
+                  product.original_price = product.selling_price;
                 }
               }
               _context25.next = 7;
@@ -2209,7 +2290,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "loadOpenDataConfig",
     value: function () {
       var _loadOpenDataConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29() {
-        var _this8 = this;
+        var _this9 = this;
         var lastFetchedAt, cachedData;
         return _regeneratorRuntime().wrap(function _callee29$(_context29) {
           while (1) switch (_context29.prev = _context29.next) {
@@ -2240,10 +2321,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 target: 'venue_booking+online_store',
                 section_code: [].concat(OPEN_DATA_SECTION_CODES)
               }).then(function (openDataConfig) {
-                _this8.otherParams.openData = openDataConfig;
+                _this9.otherParams.openData = openDataConfig;
                 return openDataConfig;
               }).finally(function () {
-                _this8.loadOpenDataConfigInFlight = null;
+                _this9.loadOpenDataConfigInFlight = null;
               });
               return _context29.abrupt("return", this.loadOpenDataConfigInFlight);
             case 11:
@@ -2372,17 +2453,17 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 if (visited.has(value)) return;
                 visited.add(value);
                 if (Array.isArray(value)) {
-                  var _iterator9 = _createForOfIteratorHelper(value),
-                    _step9;
+                  var _iterator11 = _createForOfIteratorHelper(value),
+                    _step11;
                   try {
-                    for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                      var item = _step9.value;
+                    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+                      var item = _step11.value;
                       collectFromValue(item);
                     }
                   } catch (err) {
-                    _iterator9.e(err);
+                    _iterator11.e(err);
                   } finally {
-                    _iterator9.f();
+                    _iterator11.f();
                   }
                   return;
                 }
@@ -2430,7 +2511,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "ensureItemRuleConfigsLoaded",
     value: function () {
       var _ensureItemRuleConfigsLoaded = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee34() {
-        var _this9 = this;
+        var _this10 = this;
         return _regeneratorRuntime().wrap(function _callee34$(_context34) {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
@@ -2451,19 +2532,19 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 return _regeneratorRuntime().wrap(function _callee33$(_context33) {
                   while (1) switch (_context33.prev = _context33.next) {
                     case 0:
-                      runtimeConfig = _this9.getItemRuleRuntimeConfig();
+                      runtimeConfig = _this10.getItemRuleRuntimeConfig();
                       staticConfigs = normalizeItemRuleStrategies(runtimeConfig.strategyConfigs);
                       if (!(staticConfigs.length > 0)) {
                         _context33.next = 6;
                         break;
                       }
-                      _this9.itemRuleConfigs = staticConfigs;
-                      _this9.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
-                      return _context33.abrupt("return", _this9.itemRuleConfigs);
+                      _this10.itemRuleConfigs = staticConfigs;
+                      _this10.itemRuleEvaluator.setStrategyConfigs(staticConfigs);
+                      return _context33.abrupt("return", _this10.itemRuleConfigs);
                     case 6:
-                      _this9.itemRuleConfigs = [];
-                      _this9.itemRuleEvaluator.setStrategyConfigs([]);
-                      return _context33.abrupt("return", _this9.itemRuleConfigs);
+                      _this10.itemRuleConfigs = [];
+                      _this10.itemRuleEvaluator.setStrategyConfigs([]);
+                      return _context33.abrupt("return", _this10.itemRuleConfigs);
                     case 9:
                     case "end":
                       return _context33.stop();
@@ -2537,7 +2618,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "applyPrefillByItemRule",
     value: function () {
       var _applyPrefillByItemRule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee36() {
-        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator10, _step10, _prefillItem$product_, _targetProduct$_origi, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, _ref5, _sourceItem$original_, _ref6, _sourceItem$payment_p, sellingPrice, originalPrice, paymentPrice, targetProduct, existedQuantity, delta, nextProduct;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator12, _step12, _prefillItem$product_, _targetProduct$_origi, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct;
         return _regeneratorRuntime().wrap(function _callee36$(_context36) {
           while (1) switch (_context36.prev = _context36.next) {
             case 0:
@@ -2582,15 +2663,15 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               productSourceMap = _context36.sent;
               tempOrder = this.ensureTempOrder();
               hasChanges = false;
-              _iterator10 = _createForOfIteratorHelper(prefillItems);
+              _iterator12 = _createForOfIteratorHelper(prefillItems);
               _context36.prev = 20;
-              _iterator10.s();
+              _iterator12.s();
             case 22:
-              if ((_step10 = _iterator10.n()).done) {
-                _context36.next = 47;
+              if ((_step12 = _iterator12.n()).done) {
+                _context36.next = 45;
                 break;
               }
-              prefillItem = _step10.value;
+              prefillItem = _step12.value;
               productId = Number(prefillItem.product_id);
               productVariantId = Number((_prefillItem$product_ = prefillItem.product_variant_id) !== null && _prefillItem$product_ !== void 0 ? _prefillItem$product_ : 0);
               targetQuantity = toNonNegativeInt(prefillItem.quantity);
@@ -2598,13 +2679,13 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 _context36.next = 29;
                 break;
               }
-              return _context36.abrupt("continue", 45);
+              return _context36.abrupt("continue", 43);
             case 29:
               if (!Number.isNaN(productVariantId)) {
                 _context36.next = 31;
                 break;
               }
-              return _context36.abrupt("continue", 45);
+              return _context36.abrupt("continue", 43);
             case 31:
               sourceItem = productSourceMap.get(buildProductKey(productId, productVariantId)) || productSourceMap.get(buildProductKey(productId, 0)) || null;
               productIndex = getProductIdentityIndex(tempOrder.products, {
@@ -2612,19 +2693,16 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 product_variant_id: productVariantId
               });
               if (!(productIndex === -1)) {
-                _context36.next = 40;
+                _context36.next = 38;
                 break;
               }
               sellingPrice = toPriceString((_sourceItem$price = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _sourceItem$price !== void 0 ? _sourceItem$price : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.selling_price, '0.00');
-              originalPrice = toPriceString((_ref5 = (_sourceItem$original_ = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.original_price) !== null && _sourceItem$original_ !== void 0 ? _sourceItem$original_ : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _ref5 !== void 0 ? _ref5 : sellingPrice, sellingPrice);
-              paymentPrice = toPriceString((_ref6 = (_sourceItem$payment_p = sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.payment_price) !== null && _sourceItem$payment_p !== void 0 ? _sourceItem$payment_p : sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price) !== null && _ref6 !== void 0 ? _ref6 : sellingPrice, sellingPrice);
               tempOrder.products.push(normalizeOrderProduct({
                 product_id: productId,
                 product_variant_id: productVariantId,
                 num: targetQuantity,
                 selling_price: sellingPrice,
-                original_price: originalPrice,
-                payment_price: paymentPrice,
+                original_price: sellingPrice,
                 metadata: {
                   item_rule_prefill: true,
                   item_rule_id: prefillItem.ruleId
@@ -2635,8 +2713,8 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 })
               }));
               hasChanges = true;
-              return _context36.abrupt("continue", 45);
-            case 40:
+              return _context36.abrupt("continue", 43);
+            case 38:
               targetProduct = tempOrder.products[productIndex];
               existedQuantity = toNonNegativeInt(targetProduct.num);
               delta = targetQuantity - existedQuantity;
@@ -2653,45 +2731,45 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 tempOrder.products[productIndex] = nextProduct;
                 hasChanges = true;
               }
-            case 45:
+            case 43:
               _context36.next = 22;
               break;
-            case 47:
-              _context36.next = 52;
+            case 45:
+              _context36.next = 50;
               break;
-            case 49:
-              _context36.prev = 49;
+            case 47:
+              _context36.prev = 47;
               _context36.t0 = _context36["catch"](20);
-              _iterator10.e(_context36.t0);
-            case 52:
-              _context36.prev = 52;
-              _iterator10.f();
-              return _context36.finish(52);
-            case 55:
+              _iterator12.e(_context36.t0);
+            case 50:
+              _context36.prev = 50;
+              _iterator12.f();
+              return _context36.finish(50);
+            case 53:
               if (!hasChanges) {
-                _context36.next = 59;
+                _context36.next = 57;
                 break;
               }
-              _context36.next = 58;
+              _context36.next = 56;
               return this.store.order.recalculateSummary({
                 createIfMissing: true
               });
-            case 58:
+            case 56:
               this.store.order.persistTempOrder();
-            case 59:
-              _context36.next = 61;
+            case 57:
+              _context36.next = 59;
               return this.refreshItemRuleQuantityLimits();
-            case 61:
+            case 59:
               this.itemRulePrefillApplied = true;
               this.logMethodSuccess('applyPrefillByItemRule', {
                 prefillCount: prefillItems.length,
                 hasChanges: hasChanges
               });
-            case 63:
+            case 61:
             case "end":
               return _context36.stop();
           }
-        }, _callee36, this, [[20, 49, 52, 55]]);
+        }, _callee36, this, [[20, 47, 50, 53]]);
       }));
       function applyPrefillByItemRule() {
         return _applyPrefillByItemRule.apply(this, arguments);
@@ -2996,14 +3074,14 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setOtherParams",
     value: function () {
       var _setOtherParams = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee43(params) {
-        var _ref7,
-          _ref7$cover,
+        var _ref5,
+          _ref5$cover,
           cover,
           _args43 = arguments;
         return _regeneratorRuntime().wrap(function _callee43$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
-              _ref7 = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {}, _ref7$cover = _ref7.cover, cover = _ref7$cover === void 0 ? false : _ref7$cover;
+              _ref5 = _args43.length > 1 && _args43[1] !== undefined ? _args43[1] : {}, _ref5$cover = _ref5.cover, cover = _ref5$cover === void 0 ? false : _ref5$cover;
               if (cover) {
                 this.otherParams = params;
               } else {