@pisell/pisellos 2.1.132 → 2.1.134

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

@@ -19,7 +19,7 @@ interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
     package_scope?: {
-        type: 'all_packages' | 'specific_packages';
+        type: 'all_packages' | 'specific_packages' | 'product_all' | 'products';
         exclude_bundle_product_ids: number[];
         include_bundle_product_ids: number[];
         filter: 0 | 1;

package/dist/modules/Order/utils.js

@@ -202,7 +202,7 @@ export function createDefaultOrderRulesHooks() {
         num: (_values$quantity2 = values.quantity) !== null && _values$quantity2 !== void 0 ? _values$quantity2 : product.num,
         product_bundle: nextBundle,
         metadata: _objectSpread(_objectSpread({}, metadataAny), {}, {
-          source_product_price: nextSourceSellingPrice,
+          source_product_price: nextSourceOriginalPrice,
           main_product_selling_price: nextMainSellingPrice,
           main_product_original_price: nextMainOriginalPrice,
           price_schema_version: 2

package/dist/modules/Rules/index.js

@@ -1882,8 +1882,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
             // 套餐适用范围校验
             var isScopeValid = false;
 
-            // 排除套餐判断
-            if (scopeType === 'all_packages') {
+            // 排除套餐判断, product_all值兼容旧数据
+            if (scopeType === 'all_packages' || scopeType === 'product_all') {
               // 所有套餐可用
               if (!filter) {
                 isScopeValid = true;
@@ -1892,8 +1892,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               }
             }
 
-            // 包含套餐判断
-            if (scopeType === 'specific_packages') {
+            // 包含套餐判断, products值兼容旧数据
+            if (scopeType === 'specific_packages' || scopeType === 'products') {
               isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
             }
 

package/dist/solution/VenueBooking/index.js

@@ -2455,7 +2455,7 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
     key: "removeProductFromOrder",
     value: function () {
       var _removeProductFromOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(identity) {
-        var products;
+        var _this$store$order$get3, _this$store$order6, _this$store$order$ens, _this$store$order7, _tempOrder$bookings, tempOrder, products, _tempOrder$bookings2, _tempOrder$bookings3, venueProductUids, venueBookingUids, _iterator15, _step15, _product$metadata6, _product$metadata7, product, beforeBookingCount, _this$store$order$per, _this$store$order8;
         return _regeneratorRuntime().wrap(function _callee27$(_context27) {
           while (1) switch (_context27.prev = _context27.next) {
             case 0:
@@ -2470,30 +2470,86 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               }
               throw new Error('order 模块未初始化');
             case 4:
-              _context27.next = 6;
+              tempOrder = ((_this$store$order$get3 = (_this$store$order6 = this.store.order).getTempOrder) === null || _this$store$order$get3 === void 0 ? void 0 : _this$store$order$get3.call(_this$store$order6)) || ((_this$store$order$ens = (_this$store$order7 = this.store.order).ensureTempOrder) === null || _this$store$order$ens === void 0 ? void 0 : _this$store$order$ens.call(_this$store$order7));
+              _context27.next = 7;
               return this.store.order.removeProductFromOrder(identity);
-            case 6:
+            case 7:
               products = _context27.sent;
-              _context27.next = 9;
+              if (!(tempOrder !== null && tempOrder !== void 0 && (_tempOrder$bookings = tempOrder.bookings) !== null && _tempOrder$bookings !== void 0 && _tempOrder$bookings.length)) {
+                _context27.next = 33;
+                break;
+              }
+              venueProductUids = new Set();
+              venueBookingUids = new Set();
+              _iterator15 = _createForOfIteratorHelper(tempOrder.products || []);
+              _context27.prev = 12;
+              _iterator15.s();
+            case 14:
+              if ((_step15 = _iterator15.n()).done) {
+                _context27.next = 22;
+                break;
+              }
+              product = _step15.value;
+              if (product !== null && product !== void 0 && (_product$metadata6 = product.metadata) !== null && _product$metadata6 !== void 0 && _product$metadata6.venue_booking) {
+                _context27.next = 18;
+                break;
+              }
+              return _context27.abrupt("continue", 20);
+            case 18:
+              if (product.identity_key) venueProductUids.add(String(product.identity_key));
+              if ((_product$metadata7 = product.metadata) !== null && _product$metadata7 !== void 0 && _product$metadata7.booking_uid) {
+                venueBookingUids.add(String(product.metadata.booking_uid));
+              }
+            case 20:
+              _context27.next = 14;
+              break;
+            case 22:
+              _context27.next = 27;
+              break;
+            case 24:
+              _context27.prev = 24;
+              _context27.t0 = _context27["catch"](12);
+              _iterator15.e(_context27.t0);
+            case 27:
+              _context27.prev = 27;
+              _iterator15.f();
+              return _context27.finish(27);
+            case 30:
+              beforeBookingCount = ((_tempOrder$bookings2 = tempOrder.bookings) === null || _tempOrder$bookings2 === void 0 ? void 0 : _tempOrder$bookings2.length) || 0;
+              tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
+                var _booking$metadata, _booking$metadata2;
+                if (!(booking !== null && booking !== void 0 && (_booking$metadata = booking.metadata) !== null && _booking$metadata !== void 0 && _booking$metadata.venue_booking)) return true;
+                if (booking.product_uid) {
+                  return venueProductUids.has(String(booking.product_uid));
+                }
+                var bookingUid = (_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.unique_identification_number;
+                if (bookingUid) return venueBookingUids.has(String(bookingUid));
+                return true;
+              });
+              if ((((_tempOrder$bookings3 = tempOrder.bookings) === null || _tempOrder$bookings3 === void 0 ? void 0 : _tempOrder$bookings3.length) || 0) !== beforeBookingCount) {
+                (_this$store$order$per = (_this$store$order8 = this.store.order).persistTempOrder) === null || _this$store$order$per === void 0 || _this$store$order$per.call(_this$store$order8);
+              }
+            case 33:
+              _context27.next = 35;
               return this.refreshItemRuleQuantityLimits();
-            case 9:
-              _context27.next = 11;
+            case 35:
+              _context27.next = 37;
               return this.refreshCartValidationPassed();
-            case 11:
+            case 37:
               this.logMethodSuccess('removeProductFromOrder', {
                 productCount: products.length
               });
               return _context27.abrupt("return", products);
-            case 15:
-              _context27.prev = 15;
-              _context27.t0 = _context27["catch"](1);
-              this.logMethodError('removeProductFromOrder', _context27.t0);
-              throw _context27.t0;
-            case 19:
+            case 41:
+              _context27.prev = 41;
+              _context27.t1 = _context27["catch"](1);
+              this.logMethodError('removeProductFromOrder', _context27.t1);
+              throw _context27.t1;
+            case 45:
             case "end":
               return _context27.stop();
           }
-        }, _callee27, this, [[1, 15]]);
+        }, _callee27, this, [[1, 41], [12, 24, 27, 30]]);
       }));
       function removeProductFromOrder(_x18) {
         return _removeProductFromOrder.apply(this, arguments);
@@ -2697,17 +2753,17 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
                 if (visited.has(value)) return;
                 visited.add(value);
                 if (Array.isArray(value)) {
-                  var _iterator15 = _createForOfIteratorHelper(value),
-                    _step15;
+                  var _iterator16 = _createForOfIteratorHelper(value),
+                    _step16;
                   try {
-                    for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
-                      var item = _step15.value;
+                    for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
+                      var item = _step16.value;
                       collectFromValue(item);
                     }
                   } catch (err) {
-                    _iterator15.e(err);
+                    _iterator16.e(err);
                   } finally {
-                    _iterator15.f();
+                    _iterator16.f();
                   }
                   return;
                 }
@@ -2862,7 +2918,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, _iterator16, _step16, _prefillItem$product_, _targetProduct$_origi, prefillItem, productId, productVariantId, targetQuantity, sourceItem, productIndex, _sourceItem$price, sellingPrice, targetProduct, existedQuantity, delta, nextProduct;
+        var strategyConfigs, businessData, prefillItems, productSourceMap, tempOrder, hasChanges, _iterator17, _step17, _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:
@@ -2907,15 +2963,15 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
               productSourceMap = _context36.sent;
               tempOrder = this.ensureTempOrder();
               hasChanges = false;
-              _iterator16 = _createForOfIteratorHelper(prefillItems);
+              _iterator17 = _createForOfIteratorHelper(prefillItems);
               _context36.prev = 20;
-              _iterator16.s();
+              _iterator17.s();
             case 22:
-              if ((_step16 = _iterator16.n()).done) {
+              if ((_step17 = _iterator17.n()).done) {
                 _context36.next = 45;
                 break;
               }
-              prefillItem = _step16.value;
+              prefillItem = _step17.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);
@@ -2984,10 +3040,10 @@ export var VenueBookingImpl = /*#__PURE__*/function (_BaseModule) {
             case 47:
               _context36.prev = 47;
               _context36.t0 = _context36["catch"](20);
-              _iterator16.e(_context36.t0);
+              _iterator17.e(_context36.t0);
             case 50:
               _context36.prev = 50;
-              _iterator16.f();
+              _iterator17.f();
               return _context36.finish(50);
             case 53:
               if (!hasChanges) {

package/lib/model/strategy/adapter/promotion/index.js

@@ -1,49 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/model/strategy/adapter/promotion/index.ts
-var promotion_exports = {};
-__export(promotion_exports, {
-  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter: () => import_adapter.PromotionAdapter,
-  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
-  default: () => import_adapter2.default
-});
-module.exports = __toCommonJS(promotion_exports);
-var import_evaluator = require("./evaluator");
-var import_adapter = require("./adapter");
-var import_adapter2 = __toESM(require("./adapter"));
-var import_examples = require("./examples");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  BUY_X_GET_Y_FREE_STRATEGY,
-  PromotionAdapter,
-  PromotionEvaluator,
-  X_ITEMS_FOR_Y_PRICE_STRATEGY
-});

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

@@ -19,7 +19,7 @@ interface PackageSubItemUsageRules {
     type: 'universal_discount' | 'package_exclusive' | 'single_item_promo' | 'custom_usage_rules';
     rules: ("original_price" | "markup_price")[];
     package_scope?: {
-        type: 'all_packages' | 'specific_packages';
+        type: 'all_packages' | 'specific_packages' | 'product_all' | 'products';
         exclude_bundle_product_ids: number[];
         include_bundle_product_ids: number[];
         filter: 0 | 1;

package/lib/modules/Order/utils.js

@@ -166,7 +166,7 @@ function createDefaultOrderRulesHooks() {
         product_bundle: nextBundle,
         metadata: {
           ...metadataAny,
-          source_product_price: nextSourceSellingPrice,
+          source_product_price: nextSourceOriginalPrice,
           main_product_selling_price: nextMainSellingPrice,
           main_product_original_price: nextMainOriginalPrice,
           price_schema_version: 2

package/lib/modules/Rules/index.js

@@ -1421,14 +1421,14 @@ var RulesModule = class extends import_BaseModule.BaseModule {
           const _isMarkupPrice = isMarkupPrice && rules.includes("markup_price");
           const isPriceValid = _isOriginalPrice || _isMarkupPrice;
           let isScopeValid = false;
-          if (scopeType === "all_packages") {
+          if (scopeType === "all_packages" || scopeType === "product_all") {
             if (!filter) {
               isScopeValid = true;
             } else {
               isScopeValid = !exclude_bundle_product_ids.includes(Number(mainProductId));
             }
           }
-          if (scopeType === "specific_packages") {
+          if (scopeType === "specific_packages" || scopeType === "products") {
             isScopeValid = include_bundle_product_ids.includes(Number(mainProductId));
           }
           if (isPriceValid && isScopeValid) {

package/lib/solution/VenueBooking/index.js

@@ -1455,6 +1455,7 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     }
   }
   async removeProductFromOrder(identity) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     this.logMethodStart("removeProductFromOrder", {
       product_id: identity.product_id,
       product_variant_id: identity.product_variant_id
@@ -1462,7 +1463,37 @@ var _VenueBookingImpl = class extends import_BaseModule.BaseModule {
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
+      const tempOrder = ((_b = (_a = this.store.order).getTempOrder) == null ? void 0 : _b.call(_a)) || ((_d = (_c = this.store.order).ensureTempOrder) == null ? void 0 : _d.call(_c));
       const products = await this.store.order.removeProductFromOrder(identity);
+      if ((_e = tempOrder == null ? void 0 : tempOrder.bookings) == null ? void 0 : _e.length) {
+        const venueProductUids = /* @__PURE__ */ new Set();
+        const venueBookingUids = /* @__PURE__ */ new Set();
+        for (const product of tempOrder.products || []) {
+          if (!((_f = product == null ? void 0 : product.metadata) == null ? void 0 : _f.venue_booking))
+            continue;
+          if (product.identity_key)
+            venueProductUids.add(String(product.identity_key));
+          if ((_g = product.metadata) == null ? void 0 : _g.booking_uid) {
+            venueBookingUids.add(String(product.metadata.booking_uid));
+          }
+        }
+        const beforeBookingCount = ((_h = tempOrder.bookings) == null ? void 0 : _h.length) || 0;
+        tempOrder.bookings = (tempOrder.bookings || []).filter((booking) => {
+          var _a2, _b2;
+          if (!((_a2 = booking == null ? void 0 : booking.metadata) == null ? void 0 : _a2.venue_booking))
+            return true;
+          if (booking.product_uid) {
+            return venueProductUids.has(String(booking.product_uid));
+          }
+          const bookingUid = (_b2 = booking.metadata) == null ? void 0 : _b2.unique_identification_number;
+          if (bookingUid)
+            return venueBookingUids.has(String(bookingUid));
+          return true;
+        });
+        if ((((_i = tempOrder.bookings) == null ? void 0 : _i.length) || 0) !== beforeBookingCount) {
+          (_k = (_j = this.store.order).persistTempOrder) == null ? void 0 : _k.call(_j);
+        }
+      }
       await this.refreshItemRuleQuantityLimits();
       await this.refreshCartValidationPassed();
       this.logMethodSuccess("removeProductFromOrder", {

package/package.json

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