@pisell/pisellos 2.2.194 → 2.2.195

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -83,6 +83,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   var bundle = mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : []);
   var originExtend = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 || (_product$metadata2 = _product$metadata2.origin) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2._extend;
   var productOptionString = buildProductOptionStringFromOrderLine(product);
+  var discountList = product.discount_list || [];
   var other = {
     product_id: resolvedId,
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
@@ -132,6 +133,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
   } : {}), {}, {
     note: product.note,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
+    discount_list: discountList,
     new: 0,
     autoClose: true,
     _extend: extend

package/dist/modules/Order/index.d.ts

@@ -265,7 +265,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/dist/modules/Order/index.js

@@ -56,6 +56,12 @@ function isSameDiscountList(left, right) {
   if (!Array.isArray(left) || !Array.isArray(right)) return false;
   return JSON.stringify(normalizeDiscountListSignature(left)) === JSON.stringify(normalizeDiscountListSignature(right));
 }
+function isManualProductDiscountProduct(product) {
+  var _product$metadata, _product$metadata2;
+  return (product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.is_manual_discount) === true || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.is_manual_discount) === 1 || ((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === 'product';
+  });
+}
 export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   _inherits(OrderModule, _BaseModule);
   var _super = _createSuper(OrderModule);
@@ -97,8 +103,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "applyProductDiscountPrices",
     value: function applyProductDiscountPrices(products) {
       return (products || []).map(function (product) {
-        var _product$metadata, _product$metadata$sou, _product$metadata2, _product$metadata3, _product$original_pri;
-        if ((_product$metadata = product.metadata) !== null && _product$metadata !== void 0 && _product$metadata.is_manual_discount) return product;
+        var _product$metadata$sou, _product$metadata3, _product$metadata4, _product$original_pri;
+        if (isManualProductDiscountProduct(product)) return product;
         var discountItems = Array.isArray(product.discount_list) ? product.discount_list : [];
         var hasOnlyPersistedDiscountSnapshots = product.order_detail_id !== undefined && product.order_detail_id !== null && discountItems.length > 0 && discountItems.every(function (discount) {
           return (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== undefined && (discount === null || discount === void 0 ? void 0 : discount.order_discount_id) !== null;
@@ -108,7 +114,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         }
         var totalPerUnitDiscount = resolveEffectivePerUnitDiscount(product);
         var optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
-        var sourcePrice = (_product$metadata$sou = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
+        var sourcePrice = (_product$metadata$sou = (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
         var newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         var newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -448,6 +454,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
           var _ref2;
           var uid = getOrderProductLineUid(product);
           var previous = (_ref2 = uid ? previousProductsByUid.get(uid) : undefined) !== null && _ref2 !== void 0 ? _ref2 : previousProductsByUid.get("__index__:".concat(index));
+          if (isManualProductDiscountProduct(previous)) {
+            return previous;
+          }
           var mergedProduct = previous ? mergeOrderProductDisplayFields(previous, product) : product;
           return _objectSpread(_objectSpread({}, mergedProduct), {}, {
             discount_list: normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(mergedProduct.discount_list, mergedProduct.num))
@@ -1481,11 +1490,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "removeLinkedBookingsForProduct",
     value: function removeLinkedBookingsForProduct(tempOrder, product) {
-      var _product$metadata4,
-        _product$metadata5,
+      var _product$metadata5,
+        _product$metadata6,
         _this7 = this;
-      var productUid = (product === null || product === void 0 || (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
-      var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.booking_uid);
+      var productUid = (product === null || product === void 0 || (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+      var bookingUid = (product === null || product === void 0 ? void 0 : product.booking_uid) || (product === null || product === void 0 || (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.booking_uid);
       if (!productUid && !bookingUid) return;
       tempOrder.bookings = (tempOrder.bookings || []).filter(function (booking) {
         var currentBookingUid = _this7.getBookingUniqueIdentificationNumber(booking);
@@ -2020,7 +2029,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _addProductToOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(product, booking) {
         var _this10 = this;
-        var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct;
+        var tempOrder, linked, productToAdd, incomingFingerprint, normalizedIncoming, hasIncomingGoodPass, shouldForceNewLine, matchedIndex, matchedProduct, existedFingerprint, shouldMerge, _targetProduct$metada, targetProduct, targetUid, normalizedProduct, nextNum, targetIsManualProductDiscount, nextDiscountList;
         return _regeneratorRuntime().wrap(function _callee13$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -2085,7 +2094,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   })
                 })));
                 normalizedProduct.discount_list = normalizeOrderProductDiscountList(normalizedProduct.discount_list);
-                tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
+                nextNum = getSafeProductNum(targetProduct.num + normalizedProduct.num);
+                targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
+                nextDiscountList = targetIsManualProductDiscount ? normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(targetProduct.discount_list, nextNum)) : normalizedProduct.discount_list;
+                tempOrder.products[matchedIndex] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, targetProduct), normalizedProduct), {}, {
+                  discount_list: nextDiscountList,
                   metadata: _objectSpread(_objectSpread(_objectSpread({}, targetProduct.metadata || {}), normalizedProduct.metadata || {}), {}, {
                     unique_identification_number: targetUid
                   }),
@@ -2095,10 +2108,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                     option: []
                   }), {}, {
                     option: getProductSkuOptions(normalizedProduct)
-                  }),
+                  })
+                }, targetIsManualProductDiscount ? {
+                  selling_price: targetProduct.selling_price,
+                  original_price: targetProduct.original_price,
+                  payment_price: targetProduct.payment_price,
+                  metadata: _objectSpread(_objectSpread(_objectSpread({}, normalizedProduct.metadata || {}), targetProduct.metadata || {}), {}, {
+                    unique_identification_number: targetUid
+                  })
+                } : {}), {}, {
                   note: targetProduct.note,
                   order_detail_id: targetProduct.order_detail_id,
-                  num: getSafeProductNum(targetProduct.num + normalizedProduct.num)
+                  num: nextNum
                 });
                 this.captureProductRuntime(tempOrder, productToAdd, tempOrder.products[matchedIndex], targetUid);
               }
@@ -3274,11 +3295,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _step9;
       try {
         for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var _product$metadata6, _ref24, _ref25, _existed$origin, _rawProduct$metadata;
+          var _product$metadata7, _ref24, _ref25, _existed$origin, _rawProduct$metadata;
           var _step9$value = _slicedToArray(_step9.value, 2),
             index = _step9$value[0],
             product = _step9$value[1];
-          var uid = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number;
+          var uid = (_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.unique_identification_number;
           if (!uid) continue;
           var existed = productsByUid[uid] && _typeof(productsByUid[uid]) === 'object' ? productsByUid[uid] : {};
           var rawProduct = rawProducts[index] && _typeof(rawProducts[index]) === 'object' ? rawProducts[index] : product;

package/dist/solution/BaseSales/index.js

@@ -37,6 +37,31 @@ export * from "./types";
 import { QuotationModule } from "../../modules/Quotation";
 import { transformBaseProductToOrderProduct as _transformBaseProductToOrderProduct } from "./utils/transformBaseProductToOrderProduct";
 import { calculateBaseSalesProductBookingPrice } from "./utils/quotationPrice";
+function isBaseSalesManualProductDiscountProduct(product) {
+  var _product$metadata, _product$metadata2;
+  return (product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.is_manual_discount) === true || (product === null || product === void 0 || (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.is_manual_discount) === 1 || ((product === null || product === void 0 ? void 0 : product.discount_list) || []).some(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.type) === 'product';
+  });
+}
+function getBaseSalesProductUid(product) {
+  var _product$metadata3;
+  var uid = (product === null || product === void 0 || (_product$metadata3 = product.metadata) === null || _product$metadata3 === void 0 ? void 0 : _product$metadata3.unique_identification_number) || (product === null || product === void 0 ? void 0 : product.unique_identification_number);
+  if (uid === undefined || uid === null || uid === '') return null;
+  return String(uid);
+}
+function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
+  var previousByUid = new Map();
+  (previousProducts || []).forEach(function (product, index) {
+    var uid = getBaseSalesProductUid(product);
+    if (uid) previousByUid.set(uid, product);
+    previousByUid.set("__index__:".concat(index), product);
+  });
+  return (nextProducts || []).map(function (product, index) {
+    var uid = getBaseSalesProductUid(product);
+    var previous = (uid ? previousByUid.get(uid) : undefined) || previousByUid.get("__index__:".concat(index));
+    return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
+  });
+}
 export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
   _inherits(BaseSalesImpl, _BaseModule);
   var _super = _createSuper(BaseSalesImpl);
@@ -342,7 +367,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
         _product$num,
         _ref8,
         _product$quantity,
-        _product$metadata;
+        _product$metadata4;
       if (!authoritativeProduct) return product;
       var selectedBundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
       var authoritativeBundles = this.getAuthoritativeBundleItems(authoritativeProduct);
@@ -373,7 +398,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           });
         }(),
         product_bundle: productBundle,
-        metadata: (_product$metadata = product.metadata) !== null && _product$metadata !== void 0 ? _product$metadata : authoritativeProduct.metadata
+        metadata: (_product$metadata4 = product.metadata) !== null && _product$metadata4 !== void 0 ? _product$metadata4 : authoritativeProduct.metadata
       });
     }
   }, {
@@ -1180,7 +1205,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     value: function () {
       var _loadDiscountConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(params) {
         var _this$getOrderIdentit, _tempOrder$customer, _tempOrder$_extend, _tempOrder$_extend2, _discountModule$getDi, _discountModule$getOr, _discountModule$getDi2;
-        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata2, _tempOrder$_extend3, _product$metadata3, _product$metadata$sou, _product$metadata4, _product$metadata5, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
+        var tempOrder, orderStore, discountModule, rulesModule, orderId, customerId, currentDiscountList, originalDiscountList, hasManualDiscountSelection, discountAction, discountConfigCacheKey, preparedDiscountList, _discountModule$setOr, nextDiscountList, shouldSkipAutoApplyFetchedDiscounts, _summary, _tempOrder$holder, _tempOrder$holder2, _orderStore$summary, holders, result, _iterator, _step, _product$metadata5, _tempOrder$_extend3, _product$metadata$sou, _product$metadata6, _product$metadata7, _product$original_pri, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice, summary;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
@@ -1291,7 +1316,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 discountList: nextDiscountList
               };
               if (result.productList) {
-                tempOrder.products = result.productList;
+                tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               _iterator = _createForOfIteratorHelper(tempOrder.products || []);
               _context12.prev = 45;
@@ -1302,9 +1327,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               product = _step.value;
-              productUid = (_product$metadata2 = product.metadata) === null || _product$metadata2 === void 0 ? void 0 : _product$metadata2.unique_identification_number;
+              productUid = (_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend3 = tempOrder._extend) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3.productsByUid) === null || _tempOrder$_extend3 === void 0 || (_tempOrder$_extend3 = _tempOrder$_extend3[productUid]) === null || _tempOrder$_extend3 === void 0 ? void 0 : _tempOrder$_extend3.origin : undefined;
-              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata3 = product.metadata) !== null && _product$metadata3 !== void 0 && _product$metadata3.is_manual_discount)) {
+              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
                 _context12.next = 53;
                 break;
               }
@@ -1314,7 +1339,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return sum + Number(pd.amount || 0);
               }, 0);
               optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
-              sourcePrice = (_product$metadata$sou = (_product$metadata4 = product.metadata) === null || _product$metadata4 === void 0 ? void 0 : _product$metadata4.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata5 = product.metadata) === null || _product$metadata5 === void 0 ? void 0 : _product$metadata5.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
+              sourcePrice = (_product$metadata$sou = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.source_product_price) !== null && _product$metadata$sou !== void 0 ? _product$metadata$sou : ((_product$metadata7 = product.metadata) === null || _product$metadata7 === void 0 ? void 0 : _product$metadata7.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri = product.original_price) !== null && _product$original_pri !== void 0 ? _product$original_pri : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
               if (product.metadata) {
@@ -1427,7 +1452,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 orderTotalAmount: Number(((_orderStore$summary2 = orderStore.summary) === null || _orderStore$summary2 === void 0 ? void 0 : _orderStore$summary2.total_amount) || 0)
               }) || result;
               if (result.productList) {
-                tempOrder.products = result.productList;
+                tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
                 _context13.next = 23;
@@ -1525,7 +1550,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
     key: "setDiscountSelected",
     value: function () {
       var _setDiscountSelected = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15(params) {
-        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata6, _tempOrder$_extend4, _product$metadata7, _product$metadata$sou2, _product$metadata8, _product$metadata9, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
+        var _tempOrder$holder5, list, updated, tempOrder, orderStore, discountModule, rulesModule, holders, nextDiscountList, _tempOrder$holder6, result, beforeSelectedIds, _iterator2, _step2, d, selectedResourceIds, _iterator3, _step3, _product$metadata8, _tempOrder$_extend4, _product$metadata$sou2, _product$metadata9, _product$metadata10, _product$original_pri2, product, productUid, runtimeOrigin, totalPerUnitDiscount, optionSum, sourcePrice, newSourceSellingPrice, newMainSellingPrice;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1569,7 +1594,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                   discountList: updated
                 };
                 if (result !== null && result !== void 0 && result.productList) {
-                  tempOrder.products = result.productList;
+                  tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
                 }
                 if (result !== null && result !== void 0 && result.discountList) {
                   nextDiscountList = result.discountList;
@@ -1610,9 +1635,9 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 break;
               }
               product = _step3.value;
-              productUid = (_product$metadata6 = product.metadata) === null || _product$metadata6 === void 0 ? void 0 : _product$metadata6.unique_identification_number;
+              productUid = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.unique_identification_number;
               runtimeOrigin = productUid ? (_tempOrder$_extend4 = tempOrder._extend) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4.productsByUid) === null || _tempOrder$_extend4 === void 0 || (_tempOrder$_extend4 = _tempOrder$_extend4[productUid]) === null || _tempOrder$_extend4 === void 0 ? void 0 : _tempOrder$_extend4.origin : undefined;
-              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || (_product$metadata7 = product.metadata) !== null && _product$metadata7 !== void 0 && _product$metadata7.is_manual_discount)) {
+              if (!(runtimeOrigin !== null && runtimeOrigin !== void 0 && runtimeOrigin.isManualDiscount || isBaseSalesManualProductDiscountProduct(product))) {
                 _context15.next = 25;
                 break;
               }
@@ -1630,7 +1655,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
                 return sum + (pd.amount || 0);
               }, 0); // TODO 这块逻辑需要拿掉
               optionSum = sumOptionUnitPrice(getProductSkuOptions(product));
-              sourcePrice = (_product$metadata$sou2 = (_product$metadata8 = product.metadata) === null || _product$metadata8 === void 0 ? void 0 : _product$metadata8.source_product_price) !== null && _product$metadata$sou2 !== void 0 ? _product$metadata$sou2 : ((_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : '0';
+              sourcePrice = (_product$metadata$sou2 = (_product$metadata9 = product.metadata) === null || _product$metadata9 === void 0 ? void 0 : _product$metadata9.source_product_price) !== null && _product$metadata$sou2 !== void 0 ? _product$metadata$sou2 : ((_product$metadata10 = product.metadata) === null || _product$metadata10 === void 0 ? void 0 : _product$metadata10.main_product_original_price) != null ? new Decimal(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : '0';
               newSourceSellingPrice = new Decimal(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
               newMainSellingPrice = new Decimal(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
               if (product.metadata) {
@@ -1717,7 +1742,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
               orderStore = this.store.order.store || {};
               discountModule = orderStore.discount;
               if (result.productList) {
-                tempOrder.products = result.productList;
+                tempOrder.products = preserveManualProductDiscountProducts(tempOrder.products, result.productList);
               }
               if (!result.discountList) {
                 _context16.next = 14;

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -0,0 +1,49 @@
+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/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -88,6 +88,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
   );
   const originExtend = (_c = (_b = product.metadata) == null ? void 0 : _b.origin) == null ? void 0 : _c._extend;
   const productOptionString = (0, import_orderLineDisplay.buildProductOptionStringFromOrderLine)(product);
+  const discountList = product.discount_list || [];
   const other = {
     product_id: resolvedId,
     product_variant_id: product.product_variant_id ?? 0,
@@ -135,6 +136,7 @@ function buildNormalProductCacheItemFromOrderLine(input) {
     ...productOptionString ? { product_option_string: productOptionString } : {},
     note: product.note,
     order_detail_id: product.order_detail_id ?? null,
+    discount_list: discountList,
     new: 0,
     autoClose: true,
     _extend: extend

package/lib/modules/Order/index.d.ts

@@ -265,7 +265,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     private logSubmitBackendRejected;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;

package/lib/modules/Order/index.js

@@ -60,6 +60,10 @@ function isSameDiscountList(left, right) {
     normalizeDiscountListSignature(right)
   );
 }
+function isManualProductDiscountProduct(product) {
+  var _a, _b;
+  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
+}
 var OrderModule = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name || "order", version);
@@ -119,8 +123,8 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   applyProductDiscountPrices(products) {
     return (products || []).map((product) => {
-      var _a, _b, _c;
-      if ((_a = product.metadata) == null ? void 0 : _a.is_manual_discount)
+      var _a, _b;
+      if (isManualProductDiscountProduct(product))
         return product;
       const discountItems = Array.isArray(product.discount_list) ? product.discount_list : [];
       const hasOnlyPersistedDiscountSnapshots = product.order_detail_id !== void 0 && product.order_detail_id !== null && discountItems.length > 0 && discountItems.every((discount) => (discount == null ? void 0 : discount.order_discount_id) !== void 0 && (discount == null ? void 0 : discount.order_discount_id) !== null);
@@ -129,7 +133,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       }
       const totalPerUnitDiscount = (0, import_utils.resolveEffectivePerUnitDiscount)(product);
       const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-      const sourcePrice = ((_b = product.metadata) == null ? void 0 : _b.source_product_price) ?? (((_c = product.metadata) == null ? void 0 : _c.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+      const sourcePrice = ((_a = product.metadata) == null ? void 0 : _a.source_product_price) ?? (((_b = product.metadata) == null ? void 0 : _b.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
       const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
       const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
       if (product.metadata) {
@@ -346,6 +350,9 @@ var OrderModule = class extends import_BaseModule.BaseModule {
         (result.productList || []).map((product, index) => {
           const uid = (0, import_utils.getOrderProductLineUid)(product);
           const previous = (uid ? previousProductsByUid.get(uid) : void 0) ?? previousProductsByUid.get(`__index__:${index}`);
+          if (isManualProductDiscountProduct(previous)) {
+            return previous;
+          }
           const mergedProduct = previous ? (0, import_utils.mergeOrderProductDisplayFields)(previous, product) : product;
           return {
             ...mergedProduct,
@@ -1511,9 +1518,18 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
         normalizedProduct.discount_list
       );
+      const nextNum = (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num);
+      const targetIsManualProductDiscount = isManualProductDiscountProduct(targetProduct);
+      const nextDiscountList = targetIsManualProductDiscount ? (0, import_utils.normalizeOrderProductDiscountList)(
+        (0, import_manualProductDiscount.syncManualProductDiscountProductNum)(
+          targetProduct.discount_list,
+          nextNum
+        )
+      ) : normalizedProduct.discount_list;
       tempOrder.products[matchedIndex] = {
         ...targetProduct,
         ...normalizedProduct,
+        discount_list: nextDiscountList,
         metadata: {
           ...targetProduct.metadata || {},
           ...normalizedProduct.metadata || {},
@@ -1524,9 +1540,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
           ...normalizedProduct.product_sku || { option: [] },
           option: (0, import_utils.getProductSkuOptions)(normalizedProduct)
         },
+        ...targetIsManualProductDiscount ? {
+          selling_price: targetProduct.selling_price,
+          original_price: targetProduct.original_price,
+          payment_price: targetProduct.payment_price,
+          metadata: {
+            ...normalizedProduct.metadata || {},
+            ...targetProduct.metadata || {},
+            unique_identification_number: targetUid
+          }
+        } : {},
         note: targetProduct.note,
         order_detail_id: targetProduct.order_detail_id,
-        num: (0, import_utils3.getSafeProductNum)(targetProduct.num + normalizedProduct.num)
+        num: nextNum
       };
       this.captureProductRuntime(
         tempOrder,

package/lib/solution/BaseSales/index.js

@@ -44,6 +44,31 @@ __reExport(BaseSales_exports, require("./types"), module.exports);
 var import_Quotation = require("../../modules/Quotation");
 var import_transformBaseProductToOrderProduct = require("./utils/transformBaseProductToOrderProduct");
 var import_quotationPrice = require("./utils/quotationPrice");
+function isBaseSalesManualProductDiscountProduct(product) {
+  var _a, _b;
+  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.is_manual_discount) === true || ((_b = product == null ? void 0 : product.metadata) == null ? void 0 : _b.is_manual_discount) === 1 || ((product == null ? void 0 : product.discount_list) || []).some((item) => (item == null ? void 0 : item.type) === "product");
+}
+function getBaseSalesProductUid(product) {
+  var _a;
+  const uid = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.unique_identification_number) || (product == null ? void 0 : product.unique_identification_number);
+  if (uid === void 0 || uid === null || uid === "")
+    return null;
+  return String(uid);
+}
+function preserveManualProductDiscountProducts(previousProducts, nextProducts) {
+  const previousByUid = /* @__PURE__ */ new Map();
+  (previousProducts || []).forEach((product, index) => {
+    const uid = getBaseSalesProductUid(product);
+    if (uid)
+      previousByUid.set(uid, product);
+    previousByUid.set(`__index__:${index}`, product);
+  });
+  return (nextProducts || []).map((product, index) => {
+    const uid = getBaseSalesProductUid(product);
+    const previous = (uid ? previousByUid.get(uid) : void 0) || previousByUid.get(`__index__:${index}`);
+    return previous && isBaseSalesManualProductDiscountProduct(previous) ? previous : product;
+  });
+}
 var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   constructor(name, version) {
     super(name, version);
@@ -772,7 +797,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
     });
   }
   async loadDiscountConfig(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t;
     if (!this.store.order)
       throw new Error("order 模块未初始化");
     const tempOrder = this.store.order.ensureTempOrder();
@@ -852,19 +877,22 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         orderTotalAmount: Number(((_n = orderStore.summary) == null ? void 0 : _n.total_amount) || 0)
       }) || { productList: tempOrder.products, discountList: nextDiscountList };
       if (result.productList) {
-        tempOrder.products = result.productList;
+        tempOrder.products = preserveManualProductDiscountProducts(
+          tempOrder.products,
+          result.productList
+        );
       }
       for (const product of tempOrder.products || []) {
         const productUid = (_o = product.metadata) == null ? void 0 : _o.unique_identification_number;
         const runtimeOrigin = productUid ? (_r = (_q = (_p = tempOrder._extend) == null ? void 0 : _p.productsByUid) == null ? void 0 : _q[productUid]) == null ? void 0 : _r.origin : void 0;
-        if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || ((_s = product.metadata) == null ? void 0 : _s.is_manual_discount))
+        if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         const totalPerUnitDiscount = (product.discount_list || []).reduce(
           (sum, pd) => sum + Number(pd.amount || 0),
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        const sourcePrice = ((_t = product.metadata) == null ? void 0 : _t.source_product_price) ?? (((_u = product.metadata) == null ? void 0 : _u.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const sourcePrice = ((_s = product.metadata) == null ? void 0 : _s.source_product_price) ?? (((_t = product.metadata) == null ? void 0 : _t.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -928,7 +956,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
         orderTotalAmount: Number(((_e = orderStore.summary) == null ? void 0 : _e.total_amount) || 0)
       }) || result;
       if (result.productList) {
-        tempOrder.products = result.productList;
+        tempOrder.products = preserveManualProductDiscountProducts(
+          tempOrder.products,
+          result.productList
+        );
       }
       if (result.discountList) {
         nextDiscountList = this.mergeHistoricalDiscountList(
@@ -974,7 +1005,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
   }
   // TODO 需要优化，这段逻辑太长了，里面应该有些历史遗留问题
   async setDiscountSelected(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     try {
       if (!this.store.order)
         throw new Error("order 模块未初始化");
@@ -1008,7 +1039,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           }
         ) || { productList: tempOrder.products, discountList: updated };
         if (result == null ? void 0 : result.productList) {
-          tempOrder.products = result.productList;
+          tempOrder.products = preserveManualProductDiscountProducts(
+            tempOrder.products,
+            result.productList
+          );
         }
         if (result == null ? void 0 : result.discountList) {
           nextDiscountList = result.discountList;
@@ -1031,7 +1065,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       for (const product of tempOrder.products) {
         const productUid = (_c = product.metadata) == null ? void 0 : _c.unique_identification_number;
         const runtimeOrigin = productUid ? (_f = (_e = (_d = tempOrder._extend) == null ? void 0 : _d.productsByUid) == null ? void 0 : _e[productUid]) == null ? void 0 : _f.origin : void 0;
-        if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || ((_g = product.metadata) == null ? void 0 : _g.is_manual_discount))
+        if ((runtimeOrigin == null ? void 0 : runtimeOrigin.isManualDiscount) || isBaseSalesManualProductDiscountProduct(product))
           continue;
         product.discount_list = (product.discount_list || []).filter((pd) => {
           var _a2;
@@ -1043,7 +1077,7 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
           0
         );
         const optionSum = (0, import_utils.sumOptionUnitPrice)((0, import_utils.getProductSkuOptions)(product));
-        const sourcePrice = ((_h = product.metadata) == null ? void 0 : _h.source_product_price) ?? (((_i = product.metadata) == null ? void 0 : _i.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
+        const sourcePrice = ((_g = product.metadata) == null ? void 0 : _g.source_product_price) ?? (((_h = product.metadata) == null ? void 0 : _h.main_product_original_price) != null ? new import_decimal.default(Number(product.metadata.main_product_original_price) || 0).minus(optionSum).toFixed(2) : product.original_price ?? "0");
         const newSourceSellingPrice = new import_decimal.default(Number(sourcePrice) || 0).minus(totalPerUnitDiscount).toDecimalPlaces(2).toString();
         const newMainSellingPrice = new import_decimal.default(Number(newSourceSellingPrice) || 0).plus(optionSum).toDecimalPlaces(2).toFixed(2);
         if (product.metadata) {
@@ -1080,7 +1114,10 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
       const orderStore = this.store.order.store || {};
       const discountModule = orderStore.discount;
       if (result.productList) {
-        tempOrder.products = result.productList;
+        tempOrder.products = preserveManualProductDiscountProducts(
+          tempOrder.products,
+          result.productList
+        );
       }
       if (result.discountList) {
         import_Order.OrderModule.populateSavedAmounts(

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

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 5 | 3 | 4 | 6;
+        weekNum: 0 | 2 | 1 | 6 | 3 | 5 | 4;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/package.json

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