@vendure/core 3.7.4-master-202610040244 → 3.7.4

package/dist/entity/order-line/order-line.entity.js

@@ -22,8 +22,8 @@ const channel_entity_1 = require("../channel/channel.entity");
 const custom_entity_fields_1 = require("../custom-entity-fields");
 const entity_id_decorator_1 = require("../entity-id.decorator");
 const money_decorator_1 = require("../money.decorator");
-const order_line_reference_entity_1 = require("../order-line-reference/order-line-reference.entity");
 const order_entity_1 = require("../order/order.entity");
+const order_line_reference_entity_1 = require("../order-line-reference/order-line-reference.entity");
 const product_variant_entity_1 = require("../product-variant/product-variant.entity");
 const shipping_line_entity_1 = require("../shipping-line/shipping-line.entity");
 const allocation_entity_1 = require("../stock-movement/allocation.entity");
@@ -155,21 +155,18 @@ let OrderLine = class OrderLine extends base_entity_1.VendureEntity {
         // Group discounts together, so that it does not list a new
         // discount row for each item in the line
         const groupedDiscounts = new Map();
-        // See `getUnitAdjustmentsTotal()` for the quantity basis used per adjustment type. A
-        // quantity of 0 (e.g. a fully-cancelled line added by an OrderModification, which keeps
-        // `orderPlacedQuantity` at 0 too, per #5097) has no units left to hold a discount,
-        // regardless of what the stored adjustment amount is.
+        // A line added by an OrderModification keeps an orderPlacedQuantity of 0, so once it is
+        // cancelled there are no units left to prorate the adjustment over.
+        const proratedOverQuantity = Math.max(this.orderPlacedQuantity, this.quantity);
         for (const adjustment of this.adjustments) {
             const discountGroup = groupedDiscounts.get(adjustment.adjustmentSource);
-            const lineAdjustmentAmount = this.quantity === 0
-                ? 0
-                : (adjustment.amount / this.quantityBasisFor(adjustment)) * this.quantity;
+            const unitAdjustmentAmount = proratedOverQuantity === 0 ? 0 : (adjustment.amount / proratedOverQuantity) * this.quantity;
             const amount = priceIncludesTax
-                ? (0, tax_utils_1.netPriceOf)(lineAdjustmentAmount, this.taxRate)
-                : lineAdjustmentAmount;
+                ? (0, tax_utils_1.netPriceOf)(unitAdjustmentAmount, this.taxRate)
+                : unitAdjustmentAmount;
             const amountWithTax = priceIncludesTax
-                ? lineAdjustmentAmount
-                : (0, tax_utils_1.grossPriceOf)(lineAdjustmentAmount, this.taxRate);
+                ? unitAdjustmentAmount
+                : (0, tax_utils_1.grossPriceOf)(unitAdjustmentAmount, this.taxRate);
             if (discountGroup) {
                 discountGroup.amount += amount;
                 discountGroup.amountWithTax += amountWithTax;
@@ -217,26 +214,6 @@ let OrderLine = class OrderLine extends base_entity_1.VendureEntity {
             this.adjustments = this.adjustments.concat(limitedAdjustment);
         }
     }
-    /**
-     * @description
-     * Sets this line's quantity to `newQuantity`, rescaling its `PROMOTION`-type adjustments to
-     * match. Used where a quantity reduction bypasses `OrderCalculator` recalculation (see
-     * `OrderModifier.cancelOrderByOrderLines()`), to preserve the invariant that `PROMOTION`
-     * amounts are stored scaled to the current quantity.
-     *
-     * A `newQuantity` of 0 sets the quantity but leaves the adjustments untouched: the getters
-     * short-circuit on an empty line either way, so scaling them to zero would only erase the
-     * record of the discount that had applied, which plugins and accounting exports read back.
-     */
-    setQuantityRescalingAdjustments(newQuantity) {
-        var _a;
-        if (0 < newQuantity) {
-            const scaleFactor = newQuantity / this.quantity;
-            this.adjustments = ((_a = this.adjustments) !== null && _a !== void 0 ? _a : []).map(adjustment => adjustment.type === generated_types_1.AdjustmentType.PROMOTION
-                ? Object.assign(Object.assign({}, adjustment), { amount: (0, round_money_1.roundMoney)(adjustment.amount * scaleFactor) }) : adjustment);
-        }
-        this.quantity = newQuantity;
-    }
     /**
      * Clears Adjustments from all OrderItems of the given type. If no type
      * is specified, then all adjustments are removed.
@@ -285,9 +262,7 @@ let OrderLine = class OrderLine extends base_entity_1.VendureEntity {
     }
     /**
      * @description
-     * The total of all price adjustments, expressed per unit. Will typically be a negative
-     * number due to discounts. See `quantityBasisFor()` for the quantity basis used per
-     * adjustment, which differs by `AdjustmentType`.
+     * The total of all price adjustments. Will typically be a negative number due to discounts.
      */
     getUnitAdjustmentsTotal(type) {
         if (!this.adjustments || this.quantity === 0) {
@@ -295,13 +270,12 @@ let OrderLine = class OrderLine extends base_entity_1.VendureEntity {
         }
         return this.adjustments
             .filter(adjustment => (type ? adjustment.type === type : true))
-            .map(adjustment => adjustment.amount / this.quantityBasisFor(adjustment))
+            .map(adjustment => adjustment.amount / Math.max(this.orderPlacedQuantity, this.quantity))
             .reduce((total, a) => total + a, 0);
     }
     /**
      * @description
-     * The total of all price adjustments for the whole line. Will typically be a negative number
-     * due to discounts. See `quantityBasisFor()` for the quantity basis used per adjustment.
+     * The total of all price adjustments. Will typically be a negative number due to discounts.
      */
     getLineAdjustmentsTotal(withTax, type) {
         if (!this.adjustments || this.quantity === 0) {
@@ -309,40 +283,20 @@ let OrderLine = class OrderLine extends base_entity_1.VendureEntity {
         }
         const sum = this.adjustments
             .filter(adjustment => (type ? adjustment.type === type : true))
-            .map(adjustment => (adjustment.amount / this.quantityBasisFor(adjustment)) * this.quantity)
+            .map(adjustment => adjustment.amount)
             .reduce((total, a) => total + a, 0);
+        const adjustedForQuantityChanges = sum * (this.quantity / Math.max(this.orderPlacedQuantity, this.quantity));
         if (withTax) {
-            return this.listPriceIncludesTax ? sum : (0, tax_utils_1.grossPriceOf)(sum, this.taxRate);
+            return this.listPriceIncludesTax
+                ? adjustedForQuantityChanges
+                : (0, tax_utils_1.grossPriceOf)(adjustedForQuantityChanges, this.taxRate);
         }
         else {
-            return this.listPriceIncludesTax ? (0, tax_utils_1.netPriceOf)(sum, this.taxRate) : sum;
+            return this.listPriceIncludesTax
+                ? (0, tax_utils_1.netPriceOf)(adjustedForQuantityChanges, this.taxRate)
+                : adjustedForQuantityChanges;
         }
     }
-    /**
-     * @description
-     * The quantity that `adjustment.amount` (a line total) should be divided by to get a correct
-     * per-unit share. `PROMOTION` adjustments are always freshly recomputed against the current
-     * `this.quantity`, so that is their basis. Other types (`DISTRIBUTED_ORDER_PROMOTION`, `OTHER`)
-     * are a per-line share of an order-level amount that is redistributed by weight on every
-     * recalculation, so their basis is pinned to `orderPlacedQuantity` - otherwise a partially
-     * cancelled/refunded line's surviving units could absorb a bigger share than they're due. See
-     * #5127 for the full reasoning.
-     */
-    quantityBasisFor(adjustment) {
-        const basis = (() => {
-            switch (adjustment.type) {
-                case generated_types_1.AdjustmentType.PROMOTION:
-                    return this.quantity;
-                case generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION:
-                case generated_types_1.AdjustmentType.OTHER:
-                default:
-                    return Math.max(this.orderPlacedQuantity, this.quantity);
-            }
-        })();
-        // An empty line has no units to divide across; every caller discards the result in that
-        // case, and 1 keeps a future caller that forgets from producing NaN (cf. #5101).
-        return basis === 0 ? 1 : basis;
-    }
 };
 exports.OrderLine = OrderLine;
 __decorate([

package/dist/entity/order-line/order-line.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-line.entity.js","sourceRoot":"","sources":["../../../src/entity/order-line/order-line.entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-line.entity.js","sourceRoot":"","sources":["../../../src/entity/order-line/order-line.entity.ts"],"names":[],"mappings":"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"}

package/dist/event-bus/events/stock-shortfall-event.d.ts

@@ -0,0 +1,40 @@
+import { ID } from '@vendure/common/lib/shared-types';
+import { RequestContext } from '../../api/common/request-context';
+import { Order } from '../../entity/order/order.entity';
+import { VendureEvent } from '../vendure-event';
+/**
+ * @description
+ * Describes a single order line whose requested quantity could not be fully allocated
+ * from available stock.
+ *
+ * @since 3.7.4
+ * @docsCategory events
+ * @docsPage Event Types
+ */
+export interface StockShortfall {
+    productVariantId: ID;
+    orderLineId: ID;
+    requested: number;
+    allocated: number;
+}
+/**
+ * @description
+ * This event is fired when stock allocation for an Order cannot fully satisfy the requested
+ * quantities — i.e. the available stock was depleted (e.g. by concurrent orders) between the time
+ * the cart passed the checkout stock check and the time stock was actually allocated. Because the
+ * payment may already have been captured, allocation is capped to the available quantity rather than
+ * failing, and this event is published so that plugins can react (refund, backorder, notify).
+ *
+ * The `order` carries only its own columns: no relations (lines, customer, payments) are loaded.
+ * Fetch them via the {@link OrderService} if needed.
+ *
+ * @since 3.7.4
+ * @docsCategory events
+ * @docsPage Event Types
+ */
+export declare class StockShortfallEvent extends VendureEvent {
+    ctx: RequestContext;
+    order: Order;
+    shortfalls: StockShortfall[];
+    constructor(ctx: RequestContext, order: Order, shortfalls: StockShortfall[]);
+}

package/dist/event-bus/events/stock-shortfall-event.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StockShortfallEvent = void 0;
+const vendure_event_1 = require("../vendure-event");
+/**
+ * @description
+ * This event is fired when stock allocation for an Order cannot fully satisfy the requested
+ * quantities — i.e. the available stock was depleted (e.g. by concurrent orders) between the time
+ * the cart passed the checkout stock check and the time stock was actually allocated. Because the
+ * payment may already have been captured, allocation is capped to the available quantity rather than
+ * failing, and this event is published so that plugins can react (refund, backorder, notify).
+ *
+ * The `order` carries only its own columns: no relations (lines, customer, payments) are loaded.
+ * Fetch them via the {@link OrderService} if needed.
+ *
+ * @since 3.7.4
+ * @docsCategory events
+ * @docsPage Event Types
+ */
+class StockShortfallEvent extends vendure_event_1.VendureEvent {
+    constructor(ctx, order, shortfalls) {
+        super();
+        this.ctx = ctx;
+        this.order = order;
+        this.shortfalls = shortfalls;
+    }
+}
+exports.StockShortfallEvent = StockShortfallEvent;
+//# sourceMappingURL=stock-shortfall-event.js.map

package/dist/event-bus/events/stock-shortfall-event.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stock-shortfall-event.js","sourceRoot":"","sources":["../../../src/event-bus/events/stock-shortfall-event.ts"],"names":[],"mappings":";;;AAIA,oDAAgD;AAkBhD;;;;;;;;;;;;;;GAcG;AACH,MAAa,mBAAoB,SAAQ,4BAAY;IACjD,YACW,GAAmB,EACnB,KAAY,EACZ,UAA4B;QAEnC,KAAK,EAAE,CAAC;QAJD,QAAG,GAAH,GAAG,CAAgB;QACnB,UAAK,GAAL,KAAK,CAAO;QACZ,eAAU,GAAV,UAAU,CAAkB;IAGvC,CAAC;CACJ;AARD,kDAQC"}

package/dist/event-bus/index.d.ts

@@ -58,6 +58,7 @@ export * from './events/seller-event';
 export * from './events/shipping-method-event';
 export * from './events/stock-location-event';
 export * from './events/stock-movement-event';
+export * from './events/stock-shortfall-event';
 export * from './events/tax-category-event';
 export * from './events/tax-rate-event';
 export * from './events/tax-rate-modification-event';

package/dist/event-bus/index.js

@@ -74,6 +74,7 @@ __exportStar(require("./events/seller-event"), exports);
 __exportStar(require("./events/shipping-method-event"), exports);
 __exportStar(require("./events/stock-location-event"), exports);
 __exportStar(require("./events/stock-movement-event"), exports);
+__exportStar(require("./events/stock-shortfall-event"), exports);
 __exportStar(require("./events/tax-category-event"), exports);
 __exportStar(require("./events/tax-rate-event"), exports);
 __exportStar(require("./events/tax-rate-modification-event"), exports);

package/dist/event-bus/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/event-bus/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,qDAAmC;AACnC,yDAAuC;AACvC,kDAAgC;AAEhC,sEAAoD;AACpD,kEAAgD;AAChD,+DAA6C;AAC7C,yDAAuC;AACvC,+DAA6C;AAC7C,uDAAqC;AACrC,iEAA+C;AAC/C,8DAA4C;AAC5C,gEAA8C;AAC9C,yDAAuC;AACvC,4DAA0C;AAC1C,yEAAuD;AACvD,yDAAuC;AACvC,6DAA2C;AAC3C,kEAAgD;AAChD,0DAAwC;AACxC,uEAAqD;AACrD,gEAA8C;AAC9C,uDAAqC;AACrC,6DAA2C;AAC3C,6DAA2C;AAC3C,8EAA4D;AAC5D,iEAA+C;AAC/C,+DAA6C;AAC7C,mEAAiD;AACjD,2EAAyD;AACzD,6DAA2C;AAC3C,uDAAqC;AACrC,wDAAsC;AACtC,uDAAqC;AACrC,4DAA0C;AAC1C,8DAA4C;AAC5C,wEAAsD;AACtD,gEAA8C;AAC9C,yEAAuD;AACvD,gEAA8C;AAC9C,0EAAwD;AACxD,iEAA+C;AAC/C,yDAAuC;AACvC,gEAA8C;AAC9C,6EAA2D;AAC3D,sEAAoD;AACpD,yEAAuD;AACvD,iEAA+C;AAC/C,uEAAqD;AACrD,2DAAyC;AACzC,0DAAwC;AACxC,wDAAsC;AACtC,yEAAuD;AACvD,6DAA2C;AAC3C,sDAAoC;AACpC,wDAAsC;AACtC,wDAAsC;AACtC,iEAA+C;AAC/C,gEAA8C;AAC9C,gEAA8C;AAC9C,8DAA4C;AAC5C,0DAAwC;AACxC,uEAAqD;AACrD,sDAAoC;AACpC,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/event-bus/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8CAA4B;AAC5B,qDAAmC;AACnC,yDAAuC;AACvC,kDAAgC;AAEhC,sEAAoD;AACpD,kEAAgD;AAChD,+DAA6C;AAC7C,yDAAuC;AACvC,+DAA6C;AAC7C,uDAAqC;AACrC,iEAA+C;AAC/C,8DAA4C;AAC5C,gEAA8C;AAC9C,yDAAuC;AACvC,4DAA0C;AAC1C,yEAAuD;AACvD,yDAAuC;AACvC,6DAA2C;AAC3C,kEAAgD;AAChD,0DAAwC;AACxC,uEAAqD;AACrD,gEAA8C;AAC9C,uDAAqC;AACrC,6DAA2C;AAC3C,6DAA2C;AAC3C,8EAA4D;AAC5D,iEAA+C;AAC/C,+DAA6C;AAC7C,mEAAiD;AACjD,2EAAyD;AACzD,6DAA2C;AAC3C,uDAAqC;AACrC,wDAAsC;AACtC,uDAAqC;AACrC,4DAA0C;AAC1C,8DAA4C;AAC5C,wEAAsD;AACtD,gEAA8C;AAC9C,yEAAuD;AACvD,gEAA8C;AAC9C,0EAAwD;AACxD,iEAA+C;AAC/C,yDAAuC;AACvC,gEAA8C;AAC9C,6EAA2D;AAC3D,sEAAoD;AACpD,yEAAuD;AACvD,iEAA+C;AAC/C,uEAAqD;AACrD,2DAAyC;AACzC,0DAAwC;AACxC,wDAAsC;AACtC,yEAAuD;AACvD,6DAA2C;AAC3C,sDAAoC;AACpC,wDAAsC;AACtC,wDAAsC;AACtC,iEAA+C;AAC/C,gEAA8C;AAC9C,gEAA8C;AAC9C,iEAA+C;AAC/C,8DAA4C;AAC5C,0DAAwC;AACxC,uEAAqD;AACrD,sDAAoC;AACpC,8DAA4C"}

package/dist/migration-utils/index.d.ts

@@ -1,3 +1,2 @@
 export { migrateAssetTranslationData } from './v3_6_asset_translations';
 export { migrateProductOptionGroupData } from './v3_6_shared_option_groups';
-export { RescaleOrderLinePromotionAdjustmentsOptions, rescaleOrderLinePromotionAdjustments, } from './v3_8_orderline_promotion_rescale';

package/dist/migration-utils/index.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rescaleOrderLinePromotionAdjustments = exports.migrateProductOptionGroupData = exports.migrateAssetTranslationData = void 0;
+exports.migrateProductOptionGroupData = exports.migrateAssetTranslationData = void 0;
 var v3_6_asset_translations_1 = require("./v3_6_asset_translations");
 Object.defineProperty(exports, "migrateAssetTranslationData", { enumerable: true, get: function () { return v3_6_asset_translations_1.migrateAssetTranslationData; } });
 var v3_6_shared_option_groups_1 = require("./v3_6_shared_option_groups");
 Object.defineProperty(exports, "migrateProductOptionGroupData", { enumerable: true, get: function () { return v3_6_shared_option_groups_1.migrateProductOptionGroupData; } });
-var v3_8_orderline_promotion_rescale_1 = require("./v3_8_orderline_promotion_rescale");
-Object.defineProperty(exports, "rescaleOrderLinePromotionAdjustments", { enumerable: true, get: function () { return v3_8_orderline_promotion_rescale_1.rescaleOrderLinePromotionAdjustments; } });
 //# sourceMappingURL=index.js.map

package/dist/migration-utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/migration-utils/index.ts"],"names":[],"mappings":";;;AAAA,qEAAwE;AAA/D,sIAAA,2BAA2B,OAAA;AACpC,yEAA4E;AAAnE,0IAAA,6BAA6B,OAAA;AACtC,uFAG4C;AADxC,wJAAA,oCAAoC,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/migration-utils/index.ts"],"names":[],"mappings":";;;AAAA,qEAAwE;AAA/D,sIAAA,2BAA2B,OAAA;AACpC,yEAA4E;AAAnE,0IAAA,6BAA6B,OAAA"}

package/dist/service/helpers/order-modifier/order-modifier.d.ts

@@ -16,6 +16,7 @@ import { HistoryService } from '../../services/history.service';
 import { PaymentService } from '../../services/payment.service';
 import { ProductVariantService } from '../../services/product-variant.service';
 import { PromotionService } from '../../services/promotion.service';
+import { StockLevelReadOptions, StockLevelService } from '../../services/stock-level.service';
 import { StockMovementService } from '../../services/stock-movement.service';
 import { CustomFieldRelationService } from '../custom-field-relation/custom-field-relation.service';
 import { OrderCalculator } from '../order-calculator/order-calculator';
@@ -48,7 +49,8 @@ export declare class OrderModifier {
     private shippingCalculator;
     private historyService;
     private translator;
-    constructor(connection: TransactionalConnection, configService: ConfigService, orderCalculator: OrderCalculator, paymentService: PaymentService, countryService: CountryService, stockMovementService: StockMovementService, productVariantService: ProductVariantService, customFieldRelationService: CustomFieldRelationService, promotionService: PromotionService, eventBus: EventBus, shippingCalculator: ShippingCalculator, historyService: HistoryService, translator: TranslatorService);
+    private stockLevelService;
+    constructor(connection: TransactionalConnection, configService: ConfigService, orderCalculator: OrderCalculator, paymentService: PaymentService, countryService: CountryService, stockMovementService: StockMovementService, productVariantService: ProductVariantService, customFieldRelationService: CustomFieldRelationService, promotionService: PromotionService, eventBus: EventBus, shippingCalculator: ShippingCalculator, historyService: HistoryService, translator: TranslatorService, stockLevelService: StockLevelService);
     /**
      * @description
      * Ensure that the ProductVariant has sufficient saleable stock to add the given
@@ -61,8 +63,13 @@ export declare class OrderModifier {
      * have differing values for one or more custom fields. In this case, we need to take _all_ of these
      * OrderLines into account when constraining the quantity. See https://github.com/vendurehq/vendure/issues/2702
      * for more on this.
+     * - `options.lockStockLevels` must be `true` when the caller allocates stock in the same
+     * transaction based on the result, so that the check and the allocation cannot be interleaved
+     * with another transaction for the same ProductVariant. See {@link StockLevelService.getAvailableStock}.
+     *
+     * @since 3.7.4 - Added the `options` parameter
      */
-    constrainQuantityToSaleable(ctx: RequestContext, variant: ProductVariant, quantity: number, existingOrderLineQuantity?: number, quantityInOtherOrderLines?: number): Promise<number>;
+    constrainQuantityToSaleable(ctx: RequestContext, variant: ProductVariant, quantity: number, existingOrderLineQuantity?: number, quantityInOtherOrderLines?: number, options?: StockLevelReadOptions): Promise<number>;
     /**
      * @description
      * Given a ProductVariant ID and optional custom fields, this method will return an existing OrderLine that
@@ -112,4 +119,10 @@ export declare class OrderModifier {
      */
     private coerceValue;
     private getProductVariantOrThrow;
+    /**
+     * modifyOrder allocates, releases and cancels stock in one transaction, visiting the lines in
+     * the caller's order. Locking every affected variant up front, in the shared order, means it
+     * cannot deadlock with a concurrent modification or settlement.
+     */
+    private lockStockLevelsForModification;
 }

package/dist/service/helpers/order-modifier/order-modifier.js

@@ -43,6 +43,7 @@ const history_service_1 = require("../../services/history.service");
 const payment_service_1 = require("../../services/payment.service");
 const product_variant_service_1 = require("../../services/product-variant.service");
 const promotion_service_1 = require("../../services/promotion.service");
+const stock_level_service_1 = require("../../services/stock-level.service");
 const stock_movement_service_1 = require("../../services/stock-movement.service");
 const custom_field_relation_service_1 = require("../custom-field-relation/custom-field-relation.service");
 const order_calculator_1 = require("../order-calculator/order-calculator");
@@ -65,7 +66,7 @@ const patch_entity_1 = require("../utils/patch-entity");
  * @docsCategory service-helpers
  */
 let OrderModifier = class OrderModifier {
-    constructor(connection, configService, orderCalculator, paymentService, countryService, stockMovementService, productVariantService, customFieldRelationService, promotionService, eventBus, shippingCalculator, historyService, translator) {
+    constructor(connection, configService, orderCalculator, paymentService, countryService, stockMovementService, productVariantService, customFieldRelationService, promotionService, eventBus, shippingCalculator, historyService, translator, stockLevelService) {
         this.connection = connection;
         this.configService = configService;
         this.orderCalculator = orderCalculator;
@@ -79,6 +80,7 @@ let OrderModifier = class OrderModifier {
         this.shippingCalculator = shippingCalculator;
         this.historyService = historyService;
         this.translator = translator;
+        this.stockLevelService = stockLevelService;
     }
     /**
      * @description
@@ -92,10 +94,15 @@ let OrderModifier = class OrderModifier {
      * have differing values for one or more custom fields. In this case, we need to take _all_ of these
      * OrderLines into account when constraining the quantity. See https://github.com/vendurehq/vendure/issues/2702
      * for more on this.
+     * - `options.lockStockLevels` must be `true` when the caller allocates stock in the same
+     * transaction based on the result, so that the check and the allocation cannot be interleaved
+     * with another transaction for the same ProductVariant. See {@link StockLevelService.getAvailableStock}.
+     *
+     * @since 3.7.4 - Added the `options` parameter
      */
-    async constrainQuantityToSaleable(ctx, variant, quantity, existingOrderLineQuantity = 0, quantityInOtherOrderLines = 0) {
+    async constrainQuantityToSaleable(ctx, variant, quantity, existingOrderLineQuantity = 0, quantityInOtherOrderLines = 0, options) {
         let correctedQuantity = quantity + existingOrderLineQuantity;
-        const saleableStockLevel = await this.productVariantService.getSaleableStockLevel(ctx, variant);
+        const saleableStockLevel = await this.productVariantService.getSaleableStockLevel(ctx, variant, options);
         if (saleableStockLevel < correctedQuantity + quantityInOtherOrderLines) {
             correctedQuantity = Math.max(saleableStockLevel - existingOrderLineQuantity - quantityInOtherOrderLines, 0);
         }
@@ -270,18 +277,18 @@ let OrderModifier = class OrderModifier {
                 });
             }
         }
+        // Cancellations and releases touch different sets of variants, so lock their union once,
+        // in the shared order, rather than letting each call lock its own set.
+        await this.stockLevelService.lockStockLevelsForVariants(ctx, [...fulfilledLines, ...allocatedLines]
+            .map(line => { var _a; return (_a = fullOrder.lines.find(l => (0, utils_1.idsAreEqual)(l.id, line.orderLineId))) === null || _a === void 0 ? void 0 : _a.productVariantId; })
+            .filter((id) => id != null));
         await this.stockMovementService.createCancellationsForOrderLines(ctx, fulfilledLines);
         await this.stockMovementService.createReleasesForOrderLines(ctx, allocatedLines);
         for (const line of lineInputs) {
             const orderLine = fullOrder.lines.find(l => (0, utils_1.idsAreEqual)(l.id, line.orderLineId));
             if (orderLine) {
-                // A partial cancellation bypasses `OrderCalculator` recalculation entirely, so the
-                // `PROMOTION` adjustments are rescaled here to preserve the invariant that they are
-                // stored scaled to the current quantity.
-                orderLine.setQuantityRescalingAdjustments(orderLine.quantity - line.quantity);
                 await this.connection.getRepository(ctx, order_line_entity_1.OrderLine).update(line.orderLineId, {
-                    quantity: orderLine.quantity,
-                    adjustments: orderLine.adjustments,
+                    quantity: orderLine.quantity - line.quantity,
                 });
                 await this.eventBus.publish(new order_line_event_1.OrderLineEvent(ctx, order, orderLine, 'cancelled'));
             }
@@ -351,6 +358,7 @@ let OrderModifier = class OrderModifier {
             amount: refund.amount,
             reason: refund.reason || input.note,
         }));
+        await this.lockStockLevelsForModification(ctx, order, input);
         for (const row of (_a = input.addItems) !== null && _a !== void 0 ? _a : []) {
             const { productVariantId, quantity } = row;
             if (quantity < 0) {
@@ -358,7 +366,9 @@ let OrderModifier = class OrderModifier {
             }
             const customFields = row.customFields || {};
             const orderLine = await this.getOrCreateOrderLine(ctx, order, productVariantId, customFields);
-            const correctedQuantity = await this.constrainQuantityToSaleable(ctx, orderLine.productVariant, quantity);
+            // The allocation in updateOrderLineQuantity runs in this transaction, so the check
+            // re-reads the rows locked by lockStockLevelsForModification() above.
+            const correctedQuantity = await this.constrainQuantityToSaleable(ctx, orderLine.productVariant, quantity, 0, 0, { lockStockLevels: true });
             if (orderItemsLimit < currentItemsCount + correctedQuantity) {
                 return new generated_graphql_shop_errors_1.OrderLimitError({ maxItems: orderItemsLimit });
             }
@@ -388,7 +398,8 @@ let OrderModifier = class OrderModifier {
             const initialLineQuantity = orderLine.quantity;
             let correctedQuantity = quantity;
             if (initialLineQuantity < quantity) {
-                const additionalQuantity = await this.constrainQuantityToSaleable(ctx, orderLine.productVariant, quantity - initialLineQuantity);
+                // See the comment on the addItems loop above.
+                const additionalQuantity = await this.constrainQuantityToSaleable(ctx, orderLine.productVariant, quantity - initialLineQuantity, 0, 0, { lockStockLevels: true });
                 correctedQuantity = initialLineQuantity + additionalQuantity;
             }
             const resultingOrderTotalQuantity = currentItemsCount + correctedQuantity - orderLine.quantity;
@@ -776,6 +787,19 @@ let OrderModifier = class OrderModifier {
             throw new errors_1.EntityNotFoundError('ProductVariant', productVariantId);
         }
     }
+    /**
+     * modifyOrder allocates, releases and cancels stock in one transaction, visiting the lines in
+     * the caller's order. Locking every affected variant up front, in the shared order, means it
+     * cannot deadlock with a concurrent modification or settlement.
+     */
+    async lockStockLevelsForModification(ctx, order, input) {
+        var _a, _b;
+        const variantIds = [
+            ...((_a = input.addItems) !== null && _a !== void 0 ? _a : []).map(row => row.productVariantId),
+            ...((_b = input.adjustOrderLines) !== null && _b !== void 0 ? _b : []).map(row => { var _a; return (_a = order.lines.find(line => (0, utils_1.idsAreEqual)(line.id, row.orderLineId))) === null || _a === void 0 ? void 0 : _a.productVariantId; }),
+        ].filter((id) => id != null);
+        await this.stockLevelService.lockStockLevelsForVariants(ctx, variantIds);
+    }
 };
 exports.OrderModifier = OrderModifier;
 exports.OrderModifier = OrderModifier = __decorate([
@@ -793,6 +817,7 @@ exports.OrderModifier = OrderModifier = __decorate([
         event_bus_2.EventBus,
         shipping_calculator_1.ShippingCalculator,
         history_service_1.HistoryService,
-        translator_service_1.TranslatorService])
+        translator_service_1.TranslatorService,
+        stock_level_service_1.StockLevelService])
 ], OrderModifier);
 //# sourceMappingURL=order-modifier.js.map