@pisell/pisellos 2.3.164 → 2.3.166

package/dist/modules/Order/index.js

@@ -34,8 +34,9 @@ import { loadSalesOrderSnapshot } from "../../shared/sales/loadSalesOrderSnapsho
 import { PAYMENT_REFRESH_MESSAGE, requiresLocalPaymentRefresh, stripLocalEftposState } from "./localEftposState";
 import { BaseModule } from "../BaseModule";
 import { OrderHooks } from "./types";
-import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, collectPointCardSnapshotCodeCandidates, mergePointCardSnapshotCodes as _mergePointCardSnapshotCodes, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
+import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, hasAssignedHolderId, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, collectPointCardSnapshotCodeCandidates, mergePointCardSnapshotCodes as _mergePointCardSnapshotCodes, buildVirtualCurrencySnapshotFromList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
 import { isNormalProduct } from "../Product/utils";
+import { ensureHolderRelationUuids, getProductHolderRelations, hasProductBooking, removeProductHolderRelations, replaceProductHolderRelations, restoreLegacyHolderRelations } from "./holderRelations";
 import { getWeighedProductPriceFingerprint, resolveWeighedSourcePrice, withOriginalBundleOptionPrices } from "./utils/weighedProduct";
 import { buildPickupTimingBooking, isFulfillmentTimingBooking } from "./pickupTiming";
 import dayjs from 'dayjs';
@@ -648,6 +649,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       return createDefaultOrderRulesHooks(function () {
         var _this3$store$tempOrde;
         return ((_this3$store$tempOrde = _this3.store.tempOrder) === null || _this3$store$tempOrde === void 0 ? void 0 : _this3$store$tempOrde.bookings) || [];
+      }, function () {
+        var _this3$store$tempOrde2;
+        return (_this3$store$tempOrde2 = _this3.store.tempOrder) === null || _this3$store$tempOrde2 === void 0 ? void 0 : _this3$store$tempOrde2.holder_relations;
       });
     }
 
@@ -1168,7 +1172,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             discount_list: normalizeOrderProductDiscountList(syncManualProductDiscountProductNum(mergedProduct.discount_list, mergedProduct.num))
           });
         }));
-        ensureUniqueProductLineUids(tempOrder);
+        ensureUniqueProductLineUids(tempOrder, discountList);
         consolidateDiscountFreeProductLines(tempOrder);
       }
       if (result !== null && result !== void 0 && result.discountList) {
@@ -1710,7 +1714,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "persistTempOrder",
     value: function persistTempOrder() {
-      if (!this.sessionStoragePersistEnabled || !this.store.tempOrder) return;
+      if (!this.store.tempOrder) return;
+      ensureHolderRelationUuids(this.store.tempOrder);
+      if (!this.sessionStoragePersistEnabled) return;
       this.checkSaveCache({
         cacheId: this.cacheId,
         fatherModule: this.fatherModule,
@@ -2630,12 +2636,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         selling_price: this.normalizeFingerprintMoney(product === null || product === void 0 ? void 0 : product.selling_price),
         original_price: this.normalizeFingerprintMoney(product === null || product === void 0 ? void 0 : product.original_price),
         payment_price: this.normalizeFingerprintMoney((_product$payment_pric = product === null || product === void 0 ? void 0 : product.payment_price) !== null && _product$payment_pric !== void 0 ? _product$payment_pric : product === null || product === void 0 ? void 0 : product.selling_price),
-        metadata: {
+        metadata: _objectSpread({
           source_product_price: this.normalizeFingerprintMoney(metadata.source_product_price),
           main_product_selling_price: this.normalizeFingerprintMoney(metadata.main_product_selling_price),
           main_product_original_price: this.normalizeFingerprintMoney(metadata.main_product_original_price),
           product_discount_difference: this.normalizeFingerprintMoney(metadata.product_discount_difference)
-        },
+        }, !hasProductBooking(product) ? {
+          holder_relations: this.normalizeFingerprintValue(getProductHolderRelations(this.store.tempOrder || {}, product))
+        } : {}),
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code = sku.code) !== null && _sku$code !== void 0 ? _sku$code : '',
           barcode: (_sku$barcode = sku.barcode) !== null && _sku$barcode !== void 0 ? _sku$barcode : '',
@@ -2702,6 +2710,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _ref36,
         _sku$variant_id2,
         _this17 = this;
+      var order = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.store.tempOrder || {};
       var sku = (product === null || product === void 0 ? void 0 : product.product_sku) || {};
       var metadata = (product === null || product === void 0 ? void 0 : product.metadata) || {};
       var discountTypes = ((product === null || product === void 0 ? void 0 : product.discount_list) || []).map(function (discount) {
@@ -2717,12 +2726,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         product_variant_id: (_product$product_vari2 = product === null || product === void 0 ? void 0 : product.product_variant_id) !== null && _product$product_vari2 !== void 0 ? _product$product_vari2 : null,
         extension_type: extensionType,
         num: getSafeProductNum((_product$num2 = product === null || product === void 0 ? void 0 : product.num) !== null && _product$num2 !== void 0 ? _product$num2 : product === null || product === void 0 ? void 0 : product.product_quantity),
-        metadata: {
+        metadata: _objectSpread({
           unique_identification_number: (_ref35 = (_metadata$unique_iden = metadata.unique_identification_number) !== null && _metadata$unique_iden !== void 0 ? _metadata$unique_iden : product === null || product === void 0 ? void 0 : product.unique_identification_number) !== null && _ref35 !== void 0 ? _ref35 : '',
           price_override: (_metadata$price_overr = metadata.price_override) !== null && _metadata$price_overr !== void 0 ? _metadata$price_overr : '',
           is_manual_discount: (_metadata$is_manual_d = metadata.is_manual_discount) !== null && _metadata$is_manual_d !== void 0 ? _metadata$is_manual_d : '',
           product_discount_reason: (_metadata$product_dis = metadata.product_discount_reason) !== null && _metadata$product_dis !== void 0 ? _metadata$product_dis : ''
-        },
+        }, !hasProductBooking(product) ? {
+          holder_relations: this.normalizeFingerprintValue(getProductHolderRelations(order, product))
+        } : {}),
         product_sku: this.normalizeFingerprintValue({
           code: (_sku$code2 = sku.code) !== null && _sku$code2 !== void 0 ? _sku$code2 : '',
           barcode: (_sku$barcode2 = sku.barcode) !== null && _sku$barcode2 !== void 0 ? _sku$barcode2 : '',
@@ -2775,8 +2786,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "buildOrderProductsStructuralFingerprint",
     value: function buildOrderProductsStructuralFingerprint(products) {
       var _this18 = this;
+      var order = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.store.tempOrder || {};
       var items = (products || []).map(function (product) {
-        return _this18.buildProductStructuralFingerprintItem(product);
+        return _this18.buildProductStructuralFingerprintItem(product, order);
       });
       items.sort(function (left, right) {
         return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2862,7 +2874,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       if (currentFingerprint !== snapshot.productFingerprint) {
         var currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
-        var snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : []);
+        var snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : [], snapshot);
         if (currentStructuralFingerprint !== snapshotStructuralFingerprint) return null;
       }
       var summary = _objectSpread(_objectSpread({}, createEmptySummary()), cloneDeep(snapshot.summary || {}));
@@ -3220,8 +3232,17 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "sanitizeOrderProductForTempOrder",
     value: function sanitizeOrderProductForTempOrder(product) {
+      var _product$_extend;
+      var deferHolderCleanup = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       if (product.metadata && _typeof(product.metadata) === 'object') {
         delete product.metadata.origin;
+        if (!deferHolderCleanup && !hasProductBooking(product)) {
+          delete product.metadata.holder;
+          delete product.metadata.holder_id;
+        }
+      }
+      if (((_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.holder_relations) !== undefined) {
+        delete product._extend.holder_relations;
       }
       return product;
     }
@@ -4322,6 +4343,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var nextCustomerId = (_tempOrder$customer_i4 = tempOrder.customer_id) !== null && _tempOrder$customer_i4 !== void 0 ? _tempOrder$customer_i4 : null;
       if (String(previousCustomerId !== null && previousCustomerId !== void 0 ? previousCustomerId : '') !== String(nextCustomerId !== null && nextCustomerId !== void 0 ? nextCustomerId : '')) {
         this.clearCustomerWalletState(tempOrder);
+        removeProductHolderRelations(tempOrder, tempOrder.products.filter(function (product) {
+          return !hasProductBooking(product);
+        }));
       }
       this.persistTempOrder();
       return {
@@ -5092,6 +5116,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         _normalizedIncoming$p2,
         _booking_uid,
         _metadata,
+        _productToAdd$_extend,
         _productToAdd$metadat,
         _origin,
         _this33 = this;
@@ -5126,10 +5151,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var hasIncomingProductNote = this.hasOrderProductLineNote(normalizedIncoming);
       var hasIncomingManualProductDiscount = isManualProductDiscountProduct(normalizedIncoming);
       var hasIncomingBookingUid = this.hasLinkedBookingUid(productToAdd) || this.hasLinkedBookingUid(normalizedIncoming);
+      var holderRelationsPatch = !hasIncomingBookingUid ? (_productToAdd$_extend = productToAdd._extend) === null || _productToAdd$_extend === void 0 ? void 0 : _productToAdd$_extend.holder_relations : undefined;
+      var hasIncomingHolder = Array.isArray(holderRelationsPatch) && holderRelationsPatch.length > 0;
       var isIncomingCustomItem = ((_productToAdd$metadat = productToAdd.metadata) === null || _productToAdd$metadat === void 0 || (_productToAdd$metadat = _productToAdd$metadat.origin) === null || _productToAdd$metadat === void 0 ? void 0 : _productToAdd$metadat.isCustomItem) === true || ((_origin = productToAdd._origin) === null || _origin === void 0 ? void 0 : _origin.isCustomItem) === true;
-      var shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || isIncomingCustomItem || isWeighingProduct;
+      var shouldForceNewLine = disableMerge || !!booking || hasIncomingGoodPass || isIncomingPersistedEntitlementPass || hasIncomingBookingUid || hasIncomingHolder || isIncomingCustomItem || isWeighingProduct;
       var matchedIndex = shouldForceNewLine ? -1 : tempOrder.products.findIndex(function (item) {
+        var _item$metadata4;
         if (_this33.hasGoodPassDiscount(item)) return false;
+        if (getProductHolderRelations(tempOrder, item).length > 0 || hasAssignedHolderId((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.holder_id)) return false;
         var isRuntimeEntitlementPass = _this33.isRuntimeEntitlementAppend(item, tempOrder);
         if (isIncomingEntitlementAppend !== isRuntimeEntitlementPass) {
           return false;
@@ -5213,6 +5242,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (linked) {
           tempOrder.bookings = [].concat(_toConsumableArray(tempOrder.bookings || []), [linked.booking]);
         }
+        replaceProductHolderRelations(tempOrder, committedProduct, holderRelationsPatch);
         return committedProduct;
       };
       if (!matchedProduct) {
@@ -5342,6 +5372,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
               mutationSnapshot = salesNoteDrafts.length > 0 ? {
                 products: cloneDeep(tempOrder.products || []),
+                holder_relations: cloneDeep(tempOrder.holder_relations),
                 bookings: cloneDeep(tempOrder.bookings || []),
                 notes: cloneDeep(tempOrder.notes || []),
                 extend: cloneDeep(tempOrder._extend || {})
@@ -5367,6 +5398,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               rollbackProductAndNotesMutation = function rollbackProductAndNotesMutation() {
                 if (!mutationSnapshot) return;
                 tempOrder.products = mutationSnapshot.products;
+                if (mutationSnapshot.holder_relations === undefined) delete tempOrder.holder_relations;else tempOrder.holder_relations = mutationSnapshot.holder_relations;
                 tempOrder.bookings = mutationSnapshot.bookings;
                 tempOrder.notes = mutationSnapshot.notes;
                 tempOrder._extend = mutationSnapshot.extend;
@@ -5653,12 +5685,12 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "getFullCoveragePassDiscounts",
     value: function getFullCoveragePassDiscounts(product) {
-      var _product$_extend;
+      var _product$_extend2;
       var discountList = _toConsumableArray(product.discount_list || []);
       (product.product_bundle || []).forEach(function (item) {
         discountList.push.apply(discountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
       });
-      ((product === null || product === void 0 || (_product$_extend = product._extend) === null || _product$_extend === void 0 || (_product$_extend = _product$_extend.other) === null || _product$_extend === void 0 ? void 0 : _product$_extend.bundle) || []).forEach(function (item) {
+      ((product === null || product === void 0 || (_product$_extend2 = product._extend) === null || _product$_extend2 === void 0 || (_product$_extend2 = _product$_extend2.other) === null || _product$_extend2 === void 0 ? void 0 : _product$_extend2.bundle) || []).forEach(function (item) {
         discountList.push.apply(discountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
       });
       return discountList.filter(function (item) {
@@ -5770,15 +5802,15 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (((_params$updates = params.updates) === null || _params$updates === void 0 ? void 0 : _params$updates.num) === undefined) return false;
       var uid = params.unique_identification_number;
       var product = uid !== undefined ? tempOrder.products.find(function (item) {
-        var _item$metadata4;
-        return String(((_item$metadata4 = item.metadata) === null || _item$metadata4 === void 0 ? void 0 : _item$metadata4.unique_identification_number) || item.unique_identification_number || '') === String(uid);
+        var _item$metadata5;
+        return String(((_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.unique_identification_number) || item.unique_identification_number || '') === String(uid);
       }) : tempOrder.products[getProductIdentityIndex(tempOrder.products, params)];
       return !product || getSafeProductNum(params.updates.num) > product.num;
     }
   }, {
     key: "applyOrderProductUpdateToTempOrder",
     value: function applyOrderProductUpdateToTempOrder(tempOrder, params, reapplyWeighedDiscountProductUids) {
-      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata2, _targetProduct$metada20, _tempOrder$products$p, _tempOrder$products$p2;
+      var _targetProduct$metada2, _product_sku, _metadata2, _metadata3, _metadata4, _metadata5, _metadata6, _metadata7, _metadata8, _metadata9, _metadata10, _nextProduct$metadata2, _targetProduct$metada20, _updates$_extend, _tempOrder$products$p, _tempOrder$products$p2;
       var product_id = params.product_id,
         product_variant_id = params.product_variant_id,
         updates = params.updates,
@@ -5806,8 +5838,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (unique_identification_number !== undefined) {
         var targetUid = String(unique_identification_number);
         productIndex = tempOrder.products.findIndex(function (item) {
-          var _item$metadata5;
-          return String(((_item$metadata5 = item.metadata) === null || _item$metadata5 === void 0 ? void 0 : _item$metadata5.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+          var _item$metadata6;
+          return String(((_item$metadata6 = item.metadata) === null || _item$metadata6 === void 0 ? void 0 : _item$metadata6.unique_identification_number) || item.unique_identification_number || '') === targetUid;
         });
       }
       if (productIndex === -1) {
@@ -6007,6 +6039,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         if (uid) reapplyWeighedDiscountProductUids === null || reapplyWeighedDiscountProductUids === void 0 || reapplyWeighedDiscountProductUids.push(String(uid));
       }
       tempOrder.products[productIndex] = normalizedProduct;
+      replaceProductHolderRelations(tempOrder, normalizedProduct, (_updates$_extend = updates._extend) === null || _updates$_extend === void 0 ? void 0 : _updates$_extend.holder_relations);
       this.syncTempOrderHolderFromBookings(tempOrder);
       this.captureProductRuntime(tempOrder, updates, tempOrder.products[productIndex], (_tempOrder$products$p = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p === void 0 ? void 0 : _tempOrder$products$p.unique_identification_number);
       return (_tempOrder$products$p2 = tempOrder.products[productIndex].metadata) === null || _tempOrder$products$p2 === void 0 ? void 0 : _tempOrder$products$p2.unique_identification_number;
@@ -6143,8 +6176,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               if (unique_identification_number !== undefined) {
                 targetUid = String(unique_identification_number);
                 productIndex = tempOrder.products.findIndex(function (item) {
-                  var _item$metadata6;
-                  return String(((_item$metadata6 = item.metadata) === null || _item$metadata6 === void 0 ? void 0 : _item$metadata6.unique_identification_number) || item.unique_identification_number || '') === targetUid;
+                  var _item$metadata7;
+                  return String(((_item$metadata7 = item.metadata) === null || _item$metadata7 === void 0 ? void 0 : _item$metadata7.unique_identification_number) || item.unique_identification_number || '') === targetUid;
                 });
               }
               if (productIndex === -1) {
@@ -6365,8 +6398,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               bookingsBeforeRemove = tempOrder.bookings || [];
               preserveDisplayPosition = options === null || options === void 0 ? void 0 : options.preserveDisplayPosition;
               anchorIndex = preserveDisplayPosition ? productsBeforeRemove.findIndex(function (item) {
-                var _item$metadata7;
-                var uid = ((_item$metadata7 = item.metadata) === null || _item$metadata7 === void 0 ? void 0 : _item$metadata7.unique_identification_number) || item.unique_identification_number;
+                var _item$metadata8;
+                var uid = ((_item$metadata8 = item.metadata) === null || _item$metadata8 === void 0 ? void 0 : _item$metadata8.unique_identification_number) || item.unique_identification_number;
                 return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.anchorProductUid);
               }) : -1;
               productsAfterAnchor = anchorIndex >= 0 ? productsBeforeRemove.slice(anchorIndex + 1) : [];
@@ -6462,8 +6495,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               }
               if (preserveDisplayPosition && anchorIndex >= 0) {
                 remainingProductIndex = tempOrder.products.findIndex(function (item) {
-                  var _item$metadata8;
-                  var uid = ((_item$metadata8 = item.metadata) === null || _item$metadata8 === void 0 ? void 0 : _item$metadata8.unique_identification_number) || item.unique_identification_number;
+                  var _item$metadata9;
+                  var uid = ((_item$metadata9 = item.metadata) === null || _item$metadata9 === void 0 ? void 0 : _item$metadata9.unique_identification_number) || item.unique_identification_number;
                   return uid !== undefined && uid !== null && String(uid) === String(preserveDisplayPosition.remainingProductUid);
                 });
                 if (remainingProductIndex >= 0) {
@@ -6476,28 +6509,31 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   tempOrder.products = nextProductIndex >= 0 ? [].concat(_toConsumableArray(productsWithoutRemaining.slice(0, nextProductIndex)), [remainingProduct], _toConsumableArray(productsWithoutRemaining.slice(nextProductIndex))) : [].concat(_toConsumableArray(productsWithoutRemaining), [remainingProduct]);
                 }
               }
+              removeProductHolderRelations(tempOrder, productsBeforeRemove.filter(function (product) {
+                return !tempOrder.products.includes(product);
+              }));
               this.removeSalesNotesForMissingProductLines(tempOrder);
               if (!isCurrentOrder) {
-                _context32.next = 44;
+                _context32.next = 45;
                 break;
               }
-              _context32.next = 42;
+              _context32.next = 43;
               return this.finalizeProductOrderMutation(tempOrder, {
                 skipEditDiscountConfigRefresh: true,
                 isCurrentOrder: isCurrentOrder
               });
-            case 42:
-              _context32.next = 46;
+            case 43:
+              _context32.next = 47;
               break;
-            case 44:
-              _context32.next = 46;
+            case 45:
+              _context32.next = 47;
               return this.finalizeAfterProductsMutation(tempOrder);
-            case 46:
+            case 47:
               this.logInfo('removeProductsFromOrder success', {
                 identities: identities
               });
               return _context32.abrupt("return", tempOrder.products);
-            case 48:
+            case 49:
             case "end":
               return _context32.stop();
           }
@@ -6541,6 +6577,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureSalesNotesLoadedForMutation(tempOrder);
+              removeProductHolderRelations(tempOrder, tempOrder.products);
               tempOrder.products = [];
               tempOrder.bookings = [];
               releaseTempOrderSettlementState(tempOrder);
@@ -6551,22 +6588,22 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context34.next = 10;
+              _context34.next = 11;
               return this.evaluatePromotion();
-            case 10:
+            case 11:
               promotionPayload = _context34.sent;
               this.applyDiscount();
               this.sanitizeTempOrderProducts(tempOrder);
-              _context34.next = 15;
+              _context34.next = 16;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 15:
+            case 16:
               this.persistTempOrder();
               this.emitPromotionApplied(promotionPayload);
               this.logInfo('clearOrderCartLines success', {});
               return _context34.abrupt("return", tempOrder);
-            case 19:
+            case 20:
             case "end":
               return _context34.stop();
           }
@@ -6592,6 +6629,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 0:
               tempOrder = this.ensureTempOrder();
               this.ensureSalesNotesLoadedForMutation(tempOrder);
+              removeProductHolderRelations(tempOrder, tempOrder.products);
               tempOrder.products = [];
               tempOrder.bookings = [];
               this.removeSalesNotesForMissingProductLines(tempOrder);
@@ -6607,24 +6645,24 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                   productsByUid: {}
                 });
               }
-              _context35.next = 15;
+              _context35.next = 16;
               return (_this$store$discount22 = this.store.discount) === null || _this$store$discount22 === void 0 ? void 0 : _this$store$discount22.setDiscountList([]);
-            case 15:
-              _context35.next = 17;
+            case 16:
+              _context35.next = 18;
               return (_this$store$discount23 = this.store.discount) === null || _this$store$discount23 === void 0 ? void 0 : _this$store$discount23.setOriginalDiscountList([]);
-            case 17:
+            case 18:
               this.hasActiveCustomerBoundDiscount = false;
               this.lastUnfulfilledPromotions = [];
               this.lastGiftActions = null;
-              _context35.next = 22;
+              _context35.next = 23;
               return this.recalculateSummary({
                 createIfMissing: true
               });
-            case 22:
+            case 23:
               this.persistTempOrder();
               this.logInfo('clearOrderForSettlementSwitch success', {});
               return _context35.abrupt("return", tempOrder);
-            case 25:
+            case 26:
             case "end":
               return _context35.stop();
           }
@@ -7758,6 +7796,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 originalSalesSnapshot: _objectSpread(_objectSpread({
                   summary: cloneDeep(this.store.summary),
                   products: cloneDeep(nextTempOrder.products || []),
+                  holder_relations: cloneDeep(nextTempOrder.holder_relations),
                   bookings: cloneDeep(nextTempOrder.bookings || []),
                   payments: cloneDeep(nextTempOrder.payments || []),
                   surcharges: cloneDeep(nextTempOrder.surcharges || []),
@@ -7952,6 +7991,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       delete nextTempOrder.total_refund_amount;
       delete nextTempOrder.holder_id;
       nextTempOrder.metadata = raw.metadata && _typeof(raw.metadata) === 'object' ? _objectSpread({}, raw.metadata) : {};
+      var holderRelations = restoreLegacyHolderRelations(raw);
+      if (holderRelations === undefined) delete nextTempOrder.holder_relations;else nextTempOrder.holder_relations = cloneDeep(holderRelations);
+      ensureHolderRelationUuids(nextTempOrder);
       nextTempOrder.holder = raw.holder && _typeof(raw.holder) === 'object' ? _objectSpread({}, raw.holder) : null;
       var rawProducts = Array.isArray(raw.products) ? raw.products : [];
       nextTempOrder.products = rawProducts.length > 0 ? rawProducts.map(function (p) {
@@ -8040,6 +8082,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       tempOrderExtend.productsByUid = productsByUid;
       this.hydrateLinkedBookingIdentity(nextTempOrder);
+      nextTempOrder.products.forEach(function (product) {
+        return _this42.sanitizeOrderProductForTempOrder(product);
+      });
       if ((options === null || options === void 0 ? void 0 : options.ensureIdentity) !== false) {
         this.ensureExternalSaleNumber(nextTempOrder);
       }
@@ -8224,7 +8269,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       });
       if (result.metadata) delete result.metadata.price_schema_version;
       var restored = restoreHydratedBundleDiscounts(result, normalizeOrderProductDiscountList);
-      return this.sanitizeOrderProductForTempOrder(this.normalizeVirtualSettlementProductIfEnabled(restored));
+      return this.sanitizeOrderProductForTempOrder(this.normalizeVirtualSettlementProductIfEnabled(restored), true);
     }
   }, {
     key: "getLastOrderInfo",

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

@@ -243,6 +243,11 @@ export interface OrderProduct extends OrderProductIdentity {
     product_cover?: string;
     metadata: Record<string, any>;
     note?: string;
+    /** 仅作按行更新输入；正式数据保存于订单顶层。 */
+    _extend?: {
+        holder_relations?: OrderHolderRelation[];
+        [key: string]: any;
+    };
 }
 export interface OrderSummary {
     product_quantity: number;
@@ -340,6 +345,17 @@ export interface SalesNotesMutationSnapshot {
 }
 export type SalesNoteProtocolRelation = SalesNoteRelation;
 export type SalesNoteProtocol = SalesNote;
+/** 后端关系及 metadata 均为开放对象，未知字段必须往返保留。 */
+export interface OrderHolderRelation {
+    /** 关系自身的 UUID；新选择/旧草稿可缺省，入单与提交时由 OS 补齐。 */
+    uuid?: string;
+    relation_model: string;
+    relation_uuid: string;
+    holder_type: 'form' | 'customer';
+    holder_id: number;
+    metadata?: Record<string, any>;
+    [key: string]: any;
+}
 export interface OrderTempOrder {
     order_id: number | null;
     external_sale_number: string;
@@ -379,6 +395,7 @@ export interface OrderTempOrder {
     created_at: string | undefined;
     request_unique_idempotency_token?: string;
     products: OrderProduct[];
+    holder_relations?: OrderHolderRelation[];
     notes: SalesNote[];
     bookings: any[];
     payments: any[];
@@ -398,7 +415,7 @@ export interface OrderTempOrder {
         [key: string]: any;
     };
 }
-export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num'> {
+export interface OrderSubmitProduct extends Omit<OrderProduct, 'unique_identification_number' | 'num' | '_extend'> {
     product_quantity: number;
     payment_price: string;
     product_sku: OrderProductSku;
@@ -607,6 +624,7 @@ export interface SubmitSalesOrderParams {
         schedule_date: string;
         created_at?: string | undefined;
         products: OrderSubmitProduct[];
+        holder_relations?: OrderHolderRelation[];
         bookings: OrderSubmitBooking[];
         payments: any[];
         vouchers: any[];

package/dist/modules/Order/types.js

@@ -69,6 +69,8 @@ export var OrderHooks = /*#__PURE__*/function (OrderHooks) {
  * 该对象应视为 opaque token，只用于原样传回 restoreSalesNotesMutationSnapshot。
  */
 
+/** 后端关系及 metadata 均为开放对象，未知字段必须往返保留。 */
+
 /**
  * 添加商品行时的顺序控制。
  * 默认追加到 products 尾部；预约数量同步可插入到既有预约组的最新行之后，

package/dist/modules/Order/utils/discountProductLineIdentity.d.ts

@@ -31,7 +31,7 @@ export declare const DISCOUNT_SPLIT_ORIGIN_UID_KEY = "discountSplitOriginUid";
  * 没有 UID 的裸商品不会被补写 UID。这是为了兼容 Rules/mock 的历史协议形状；
  * 正常 Order 写路径会在 normalize 阶段提前创建 UID。
  */
-export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder): void;
+export declare function ensureUniqueProductLineUids(tempOrder: OrderTempOrder, discounts?: Array<Record<string, any>>): void;
 /**
  * 把券移除后已经恢复原价的同源折扣拆分行重新合并。
  *