@vendure/core 2.0.0-next.9 → 2.0.0

package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.d.ts

@@ -1,8 +1,10 @@
+import { LanguageCode } from '@vendure/common/lib/generated-types';
 import { RequestContext } from '../../../api/common/request-context';
 import { RequestContextCacheService } from '../../../cache/request-context-cache.service';
 import { Translatable, TranslatableKeys } from '../../../common/types/locale-types';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { VendureEntity } from '../../../entity/base/base.entity';
+import { TranslatorService } from '../translator/translator.service';
 /**
  * This helper class is to be used in GraphQL entity resolvers, to resolve fields which depend on being
  * translated (i.e. the corresponding entity field is of type `LocaleString`).
@@ -10,8 +12,11 @@ import { VendureEntity } from '../../../entity/base/base.entity';
 export declare class LocaleStringHydrator {
     private connection;
     private requestCache;
-    constructor(connection: TransactionalConnection, requestCache: RequestContextCacheService);
-    hydrateLocaleStringField<T extends VendureEntity & Translatable>(ctx: RequestContext, entity: T, fieldName: TranslatableKeys<T>): Promise<string>;
+    private translator;
+    constructor(connection: TransactionalConnection, requestCache: RequestContextCacheService, translator: TranslatorService);
+    hydrateLocaleStringField<T extends VendureEntity & Translatable & {
+        languageCode?: LanguageCode;
+    }>(ctx: RequestContext, entity: T, fieldName: TranslatableKeys<T> | 'languageCode'): Promise<string>;
     /**
      * Takes a translatable entity and populates all the LocaleString fields
      * by fetching the translations from the database (they will be eagerly loaded).

package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js

@@ -13,15 +13,16 @@ exports.LocaleStringHydrator = void 0;
 const common_1 = require("@nestjs/common");
 const request_context_cache_service_1 = require("../../../cache/request-context-cache.service");
 const transactional_connection_1 = require("../../../connection/transactional-connection");
-const translate_entity_1 = require("../utils/translate-entity");
+const translator_service_1 = require("../translator/translator.service");
 /**
  * This helper class is to be used in GraphQL entity resolvers, to resolve fields which depend on being
  * translated (i.e. the corresponding entity field is of type `LocaleString`).
  */
 let LocaleStringHydrator = class LocaleStringHydrator {
-    constructor(connection, requestCache) {
+    constructor(connection, requestCache, translator) {
         this.connection = connection;
         this.requestCache = requestCache;
+        this.translator = translator;
     }
     async hydrateLocaleStringField(ctx, entity, fieldName) {
         if (entity[fieldName]) {
@@ -45,18 +46,23 @@ let LocaleStringHydrator = class LocaleStringHydrator {
             const cacheKey = `hydrate-${entityType}-${entity.id}`;
             let dbCallPromise = this.requestCache.get(ctx, cacheKey);
             if (!dbCallPromise) {
-                dbCallPromise = this.connection.getRepository(ctx, entityType).findOne(entity.id);
+                dbCallPromise = this.connection
+                    .getRepository(ctx, entityType)
+                    .findOne({ where: { id: entity.id } });
                 this.requestCache.set(ctx, cacheKey, dbCallPromise);
             }
             await dbCallPromise.then(withTranslations => {
-                // tslint:disable-next-line:no-non-null-assertion
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 entity.translations = withTranslations.translations;
             });
         }
         if (entity.translations.length) {
-            const translated = (0, translate_entity_1.translateDeep)(entity, ctx.languageCode);
+            const translated = this.translator.translate(entity, ctx);
             for (const localeStringProp of Object.keys(entity.translations[0])) {
-                if (localeStringProp === 'base' || localeStringProp === 'languageCode') {
+                if (localeStringProp === 'base' ||
+                    localeStringProp === 'id' ||
+                    localeStringProp === 'createdAt' ||
+                    localeStringProp === 'updatedAt') {
                     continue;
                 }
                 if (localeStringProp === 'customFields') {
@@ -73,7 +79,8 @@ let LocaleStringHydrator = class LocaleStringHydrator {
 LocaleStringHydrator = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
-        request_context_cache_service_1.RequestContextCacheService])
+        request_context_cache_service_1.RequestContextCacheService,
+        translator_service_1.TranslatorService])
 ], LocaleStringHydrator);
 exports.LocaleStringHydrator = LocaleStringHydrator;
 //# sourceMappingURL=locale-string-hydrator.js.map

package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js.map

@@ -1 +1 @@
-{"version":3,"file":"locale-string-hydrator.js","sourceRoot":"","sources":["../../../../src/service/helpers/locale-string-hydrator/locale-string-hydrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,gGAA0F;AAE1F,2FAAuF;AAGvF,gEAA0D;AAE1D;;;GAGG;AAEH,IAAa,oBAAoB,GAAjC,MAAa,oBAAoB;IAC7B,YACY,UAAmC,EACnC,YAAwC;QADxC,eAAU,GAAV,UAAU,CAAyB;QACnC,iBAAY,GAAZ,YAAY,CAA4B;IACjD,CAAC;IAEJ,KAAK,CAAC,wBAAwB,CAC1B,GAAmB,EACnB,MAAS,EACT,SAA8B;QAE9B,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;YACnB,wCAAwC;YACxC,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;SACnC;QACD,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;IACpC,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,oBAAoB,CAC9B,GAAmB,EACnB,MAAS;;QAET,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;QAC3C,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,YAAY,0CAAE,MAAM,CAAA,EAAE;YAC9B,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACtD,IAAI,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAyB,GAAG,EAAE,QAAQ,CAAC,CAAC;YAEjF,IAAI,CAAC,aAAa,EAAE;gBAChB,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAI,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACrF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;aACvD;YAED,MAAM,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBACxC,iDAAiD;gBACjD,MAAM,CAAC,YAAY,GAAG,gBAAiB,CAAC,YAAY,CAAC;YACzD,CAAC,CAAC,CAAC;SACN;QACD,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;YAC5B,MAAM,UAAU,GAAG,IAAA,gCAAa,EAAC,MAAM,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;YAC3D,KAAK,MAAM,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;gBAChE,IAAI,gBAAgB,KAAK,MAAM,IAAI,gBAAgB,KAAK,cAAc,EAAE;oBACpE,SAAS;iBACZ;gBACD,IAAI,gBAAgB,KAAK,cAAc,EAAE;oBACpC,MAAc,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,MAAM,CAC5C,MAAc,CAAC,gBAAgB,CAAC,EAChC,UAAkB,CAAC,gBAAgB,CAAC,CACxC,CAAC;iBACL;qBAAM;oBACF,MAAc,CAAC,gBAAgB,CAAC,GAAI,UAAkB,CAAC,gBAAgB,CAAC,CAAC;iBAC7E;aACJ;SACJ;QACD,OAAO,MAAuB,CAAC;IACnC,CAAC;CACJ,CAAA;AA/DY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACrB,0DAA0B;GAH3C,oBAAoB,CA+DhC;AA/DY,oDAAoB"}
+{"version":3,"file":"locale-string-hydrator.js","sourceRoot":"","sources":["../../../../src/service/helpers/locale-string-hydrator/locale-string-hydrator.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAK5C,gGAA0F;AAE1F,2FAAuF;AAEvF,yEAAqE;AAErE;;;GAGG;AAEI,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAC7B,YACY,UAAmC,EACnC,YAAwC,EACxC,UAA6B;QAF7B,eAAU,GAAV,UAAU,CAAyB;QACnC,iBAAY,GAAZ,YAAY,CAA4B;QACxC,eAAU,GAAV,UAAU,CAAmB;IACtC,CAAC;IAEJ,KAAK,CAAC,wBAAwB,CAC1B,GAAmB,EACnB,MAAS,EACT,SAA+C;QAE/C,IAAI,MAAM,CAAC,SAAS,CAAC,EAAE;YACnB,wCAAwC;YACxC,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;SACnC;QACD,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO,MAAM,CAAC,SAAS,CAAQ,CAAC;IACpC,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,oBAAoB,CAC9B,GAAmB,EACnB,MAAS;;QAET,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;QAC3C,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,YAAY,0CAAE,MAAM,CAAA,EAAE;YAC9B,MAAM,QAAQ,GAAG,WAAW,UAAU,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;YACtD,IAAI,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAoB,GAAG,EAAE,QAAQ,CAAC,CAAC;YAE5E,IAAI,CAAC,aAAa,EAAE;gBAChB,aAAa,GAAG,IAAI,CAAC,UAAU;qBAC1B,aAAa,CAAI,GAAG,EAAE,UAAU,CAAC;qBACjC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,EAAuB,CAAC,CAAC;gBAChE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;aACvD;YAED,MAAM,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;gBACxC,oEAAoE;gBACpE,MAAM,CAAC,YAAY,GAAG,gBAAiB,CAAC,YAAY,CAAC;YACzD,CAAC,CAAC,CAAC;SACN;QACD,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE;YAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YAC1D,KAAK,MAAM,gBAAgB,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE;gBAChE,IACI,gBAAgB,KAAK,MAAM;oBAC3B,gBAAgB,KAAK,IAAI;oBACzB,gBAAgB,KAAK,WAAW;oBAChC,gBAAgB,KAAK,WAAW,EAClC;oBACE,SAAS;iBACZ;gBACD,IAAI,gBAAgB,KAAK,cAAc,EAAE;oBACpC,MAAc,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,MAAM,CAC5C,MAAc,CAAC,gBAAgB,CAAC,EAChC,UAAkB,CAAC,gBAAgB,CAAC,CACxC,CAAC;iBACL;qBAAM;oBACF,MAAc,CAAC,gBAAgB,CAAC,GAAI,UAAkB,CAAC,gBAAgB,CAAC,CAAC;iBAC7E;aACJ;SACJ;QACD,OAAO,MAAuB,CAAC;IACnC,CAAC;CACJ,CAAA;AAvEY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACrB,0DAA0B;QAC5B,sCAAiB;GAJhC,oBAAoB,CAuEhC;AAvEY,oDAAoB"}

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

@@ -1,13 +1,24 @@
 import { RequestContext } from '../../../api/common/request-context';
 import { RequestContextCacheService } from '../../../cache/request-context-cache.service';
 import { ConfigService } from '../../../config/config.service';
-import { OrderItem, OrderLine } from '../../../entity';
+import { OrderLine } from '../../../entity';
 import { Order } from '../../../entity/order/order.entity';
 import { Promotion } from '../../../entity/promotion/promotion.entity';
 import { ShippingMethodService } from '../../services/shipping-method.service';
 import { TaxRateService } from '../../services/tax-rate.service';
 import { ZoneService } from '../../services/zone.service';
 import { ShippingCalculator } from '../shipping-calculator/shipping-calculator';
+/**
+ * @description
+ * This helper is used when making changes to an Order, to apply all applicable price adjustments to that Order,
+ * including:
+ *
+ * - Promotions
+ * - Taxes
+ * - Shipping
+ *
+ * @docsCategory service-helpers
+ */
 export declare class OrderCalculator {
     private configService;
     private zoneService;
@@ -17,47 +28,42 @@ export declare class OrderCalculator {
     private requestContextCache;
     constructor(configService: ConfigService, zoneService: ZoneService, taxRateService: TaxRateService, shippingMethodService: ShippingMethodService, shippingCalculator: ShippingCalculator, requestContextCache: RequestContextCacheService);
     /**
+     * @description
      * Applies taxes and promotions to an Order. Mutates the order object.
      * Returns an array of any OrderItems which had new adjustments
      * applied, either tax or promotions.
      */
     applyPriceAdjustments(ctx: RequestContext, order: Order, promotions: Promotion[], updatedOrderLines?: OrderLine[], options?: {
         recalculateShipping?: boolean;
-    }): Promise<OrderItem[]>;
+    }): Promise<Order>;
     /**
-     * Applies the correct TaxRate to each OrderItem in the order.
+     * @description
+     * Applies the correct TaxRate to each OrderLine in the order.
      */
     private applyTaxes;
     /**
+     * @description
      * Applies the correct TaxRate to an OrderLine
      */
     private applyTaxesToOrderLine;
     /**
+     * @description
      * Returns a memoized function for performing an efficient
      * lookup of the correct TaxRate for a given TaxCategory.
      */
     private createTaxRateGetter;
     /**
-     * Applies any eligible promotions to each OrderItem in the order. Returns an array of
-     * any OrderItems which had their Adjustments modified.
+     * @description
+     * Applies any eligible promotions to each OrderLine in the order.
      */
     private applyPromotions;
     /**
+     * @description
      * Applies promotions to OrderItems. This is a quite complex function, due to the inherent complexity
      * of applying the promotions, and also due to added complexity in the name of performance
-     * optimization. Therefore it is heavily annotated so that the purpose of each step is clear.
+     * optimization. Therefore, it is heavily annotated so that the purpose of each step is clear.
      */
     private applyOrderItemPromotions;
-    /**
-     * An OrderLine may have promotion adjustments from Promotions which are no longer applicable.
-     * For example, a coupon code might have caused a discount to be applied, and now that code has
-     * been removed from the order. The adjustment will still be there on each OrderItem it was applied
-     * to, even though that Promotion is no longer found in the `applicablePromotions` array.
-     *
-     * We need to know about this because it means that all OrderItems in the OrderLine must be
-     * updated.
-     */
-    private orderLineHasInapplicablePromotions;
     private applyOrderPromotions;
     private applyShippingPromotions;
     private applyShipping;
@@ -72,4 +78,5 @@ export declare class OrderCalculator {
      * totals.
      */
     calculateOrderTotals(order: Order): void;
+    private addPromotion;
 }

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

@@ -15,7 +15,6 @@ const filter_async_1 = require("@vendure/common/lib/filter-async");
 const generated_types_1 = require("@vendure/common/lib/generated-types");
 const request_context_cache_service_1 = require("../../../cache/request-context-cache.service");
 const errors_1 = require("../../../common/error/errors");
-const tax_utils_1 = require("../../../common/tax-utils");
 const utils_1 = require("../../../common/utils");
 const config_service_1 = require("../../../config/config.service");
 const shipping_method_service_1 = require("../../services/shipping-method.service");
@@ -23,6 +22,17 @@ const tax_rate_service_1 = require("../../services/tax-rate.service");
 const zone_service_1 = require("../../services/zone.service");
 const shipping_calculator_1 = require("../shipping-calculator/shipping-calculator");
 const prorate_1 = require("./prorate");
+/**
+ * @description
+ * This helper is used when making changes to an Order, to apply all applicable price adjustments to that Order,
+ * including:
+ *
+ * - Promotions
+ * - Taxes
+ * - Shipping
+ *
+ * @docsCategory service-helpers
+ */
 let OrderCalculator = class OrderCalculator {
     constructor(configService, zoneService, taxRateService, shippingMethodService, shippingCalculator, requestContextCache) {
         this.configService = configService;
@@ -33,26 +43,28 @@ let OrderCalculator = class OrderCalculator {
         this.requestContextCache = requestContextCache;
     }
     /**
+     * @description
      * Applies taxes and promotions to an Order. Mutates the order object.
      * Returns an array of any OrderItems which had new adjustments
      * applied, either tax or promotions.
      */
     async applyPriceAdjustments(ctx, order, promotions, updatedOrderLines = [], options) {
         const { taxZoneStrategy } = this.configService.taxOptions;
-        const zones = await this.zoneService.findAll(ctx);
+        // We reset the promotions array as all promotions
+        // must be revalidated on any changes to an Order.
+        order.promotions = [];
+        const zones = await this.zoneService.getAllWithMembers(ctx);
         const activeTaxZone = await this.requestContextCache.get(ctx, 'activeTaxZone', () => taxZoneStrategy.determineTaxZone(ctx, zones, ctx.channel, order));
         let taxZoneChanged = false;
         if (!activeTaxZone) {
-            throw new errors_1.InternalServerError(`error.no-active-tax-zone`);
+            throw new errors_1.InternalServerError('error.no-active-tax-zone');
         }
         if (!order.taxZoneId || !(0, utils_1.idsAreEqual)(order.taxZoneId, activeTaxZone.id)) {
             order.taxZoneId = activeTaxZone.id;
             taxZoneChanged = true;
         }
-        const updatedOrderItems = new Set();
         for (const updatedOrderLine of updatedOrderLines) {
             await this.applyTaxesToOrderLine(ctx, order, updatedOrderLine, activeTaxZone, this.createTaxRateGetter(ctx, activeTaxZone));
-            updatedOrderLine.activeItems.forEach(item => updatedOrderItems.add(item));
         }
         this.calculateOrderTotals(order);
         if (order.lines.length) {
@@ -62,23 +74,24 @@ let OrderCalculator = class OrderCalculator {
             }
             // Then test and apply promotions
             const totalBeforePromotions = order.subTotal;
-            const itemsModifiedByPromotions = await this.applyPromotions(ctx, order, promotions);
-            itemsModifiedByPromotions.forEach(item => updatedOrderItems.add(item));
-            if (order.subTotal !== totalBeforePromotions || itemsModifiedByPromotions.length) {
+            await this.applyPromotions(ctx, order, promotions);
+            // itemsModifiedByPromotions.forEach(item => updatedOrderItems.add(item));
+            if (order.subTotal !== totalBeforePromotions) {
                 // Finally, re-calculate taxes because the promotions may have
                 // altered the unit prices, which in turn will alter the tax payable.
                 await this.applyTaxes(ctx, order, activeTaxZone);
             }
-            if ((options === null || options === void 0 ? void 0 : options.recalculateShipping) !== false) {
-                await this.applyShipping(ctx, order);
-                await this.applyShippingPromotions(ctx, order, promotions);
-            }
+        }
+        if ((options === null || options === void 0 ? void 0 : options.recalculateShipping) !== false) {
+            await this.applyShipping(ctx, order);
+            await this.applyShippingPromotions(ctx, order, promotions);
         }
         this.calculateOrderTotals(order);
-        return taxZoneChanged ? order.getOrderItems() : Array.from(updatedOrderItems);
+        return order;
     }
     /**
-     * Applies the correct TaxRate to each OrderItem in the order.
+     * @description
+     * Applies the correct TaxRate to each OrderLine in the order.
      */
     async applyTaxes(ctx, order, activeZone) {
         const getTaxRate = this.createTaxRateGetter(ctx, activeZone);
@@ -88,22 +101,21 @@ let OrderCalculator = class OrderCalculator {
         this.calculateOrderTotals(order);
     }
     /**
+     * @description
      * Applies the correct TaxRate to an OrderLine
      */
     async applyTaxesToOrderLine(ctx, order, line, activeZone, getTaxRate) {
         const applicableTaxRate = await getTaxRate(line.taxCategory);
         const { taxLineCalculationStrategy } = this.configService.taxOptions;
-        for (const item of line.activeItems) {
-            item.taxLines = await taxLineCalculationStrategy.calculate({
-                ctx,
-                applicableTaxRate,
-                order,
-                orderItem: item,
-                orderLine: line,
-            });
-        }
+        line.taxLines = await taxLineCalculationStrategy.calculate({
+            ctx,
+            applicableTaxRate,
+            order,
+            orderLine: line,
+        });
     }
     /**
+     * @description
      * Returns a memoized function for performing an efficient
      * lookup of the correct TaxRate for a given TaxCategory.
      */
@@ -120,48 +132,26 @@ let OrderCalculator = class OrderCalculator {
         };
     }
     /**
-     * Applies any eligible promotions to each OrderItem in the order. Returns an array of
-     * any OrderItems which had their Adjustments modified.
+     * @description
+     * Applies any eligible promotions to each OrderLine in the order.
      */
     async applyPromotions(ctx, order, promotions) {
-        const updatedItems = await this.applyOrderItemPromotions(ctx, order, promotions);
-        const orderUpdatedItems = await this.applyOrderPromotions(ctx, order, promotions);
-        if (orderUpdatedItems.length) {
-            return orderUpdatedItems;
-        }
-        else {
-            return updatedItems;
-        }
+        await this.applyOrderItemPromotions(ctx, order, promotions);
+        await this.applyOrderPromotions(ctx, order, promotions);
+        return;
     }
     /**
+     * @description
      * Applies promotions to OrderItems. This is a quite complex function, due to the inherent complexity
      * of applying the promotions, and also due to added complexity in the name of performance
-     * optimization. Therefore it is heavily annotated so that the purpose of each step is clear.
+     * optimization. Therefore, it is heavily annotated so that the purpose of each step is clear.
      */
     async applyOrderItemPromotions(ctx, order, promotions) {
-        var _a, _b, _c, _d;
-        // The naive implementation updates *every* OrderItem after this function is run.
-        // However, on a very large order with hundreds or thousands of OrderItems, this results in
-        // very poor performance. E.g. updating a single quantity of an OrderLine results in saving
-        // all 1000 (for example) OrderItems to the DB.
-        // The solution is to try to be smart about tracking exactly which OrderItems have changed,
-        // so that we only update those.
-        const updatedOrderItems = new Set();
         for (const line of order.lines) {
             // Must be re-calculated for each line, since the previous lines may have triggered promotions
             // which affected the order price.
             const applicablePromotions = await (0, filter_async_1.filterAsync)(promotions, p => p.test(ctx, order).then(Boolean));
-            const lineHasExistingPromotions = !!((_b = (_a = line.firstItem) === null || _a === void 0 ? void 0 : _a.adjustments) === null || _b === void 0 ? void 0 : _b.find(a => a.type === generated_types_1.AdjustmentType.PROMOTION));
-            const forceUpdateItems = this.orderLineHasInapplicablePromotions(applicablePromotions, line);
-            if (forceUpdateItems || lineHasExistingPromotions) {
-                line.clearAdjustments();
-            }
-            if (forceUpdateItems) {
-                // This OrderLine contains Promotion adjustments for Promotions that are no longer
-                // applicable. So we know for sure we will need to update these OrderItems in the
-                // DB. Therefore add them to the `updatedOrderItems` set.
-                line.items.forEach(i => updatedOrderItems.add(i));
-            }
+            line.clearAdjustments();
             for (const promotion of applicablePromotions) {
                 let priceAdjusted = false;
                 // We need to test the promotion *again*, even though we've tested them for the line.
@@ -170,56 +160,26 @@ let OrderCalculator = class OrderCalculator {
                 const applicableOrState = await promotion.test(ctx, order);
                 if (applicableOrState) {
                     const state = typeof applicableOrState === 'object' ? applicableOrState : undefined;
-                    for (const item of line.items) {
-                        const adjustment = await promotion.apply(ctx, {
-                            orderItem: item,
-                            orderLine: line,
-                        }, state);
-                        if (adjustment) {
-                            item.addAdjustment(adjustment);
-                            priceAdjusted = true;
-                            updatedOrderItems.add(item);
-                        }
+                    // for (const item of line.items) {
+                    const adjustment = await promotion.apply(ctx, { orderLine: line }, state);
+                    if (adjustment) {
+                        adjustment.amount = adjustment.amount * line.quantity;
+                        line.addAdjustment(adjustment);
+                        priceAdjusted = true;
                     }
                     if (priceAdjusted) {
                         this.calculateOrderTotals(order);
                         priceAdjusted = false;
                     }
+                    this.addPromotion(order, promotion);
                 }
             }
-            const lineNoLongerHasPromotions = !((_d = (_c = line.firstItem) === null || _c === void 0 ? void 0 : _c.adjustments) === null || _d === void 0 ? void 0 : _d.find(a => a.type === generated_types_1.AdjustmentType.PROMOTION));
-            if (lineHasExistingPromotions && lineNoLongerHasPromotions) {
-                line.items.forEach(i => updatedOrderItems.add(i));
-            }
-            if (forceUpdateItems) {
-                // If we are forcing an update, we need to ensure that totals get
-                // re-calculated *even if* there are no applicable promotions (i.e.
-                // the other call to `this.calculateOrderTotals()` inside the `for...of`
-                // loop was never invoked).
-                this.calculateOrderTotals(order);
-            }
+            this.calculateOrderTotals(order);
         }
-        return Array.from(updatedOrderItems.values());
-    }
-    /**
-     * An OrderLine may have promotion adjustments from Promotions which are no longer applicable.
-     * For example, a coupon code might have caused a discount to be applied, and now that code has
-     * been removed from the order. The adjustment will still be there on each OrderItem it was applied
-     * to, even though that Promotion is no longer found in the `applicablePromotions` array.
-     *
-     * We need to know about this because it means that all OrderItems in the OrderLine must be
-     * updated.
-     */
-    orderLineHasInapplicablePromotions(applicablePromotions, line) {
-        const applicablePromotionIds = applicablePromotions.map(p => p.getSourceId());
-        const linePromotionIds = line.adjustments
-            .filter(a => a.type === generated_types_1.AdjustmentType.PROMOTION)
-            .map(a => a.adjustmentSource);
-        const hasPromotionsThatAreNoLongerApplicable = !linePromotionIds.every(id => applicablePromotionIds.includes(id));
-        return hasPromotionsThatAreNoLongerApplicable;
+        return;
     }
     async applyOrderPromotions(ctx, order, promotions) {
-        const updatedItems = new Set();
+        // const updatedItems = new Set<OrderItem>();
         const orderHasDistributedPromotions = !!order.discounts.find(adjustment => adjustment.type === generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION);
         if (orderHasDistributedPromotions) {
             // If the Order currently has any Order-level discounts applied, we need to
@@ -228,7 +188,6 @@ let OrderCalculator = class OrderCalculator {
             // to be saved.
             order.lines.forEach(line => {
                 line.clearAdjustments(generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION);
-                line.items.forEach(item => updatedItems.add(item));
             });
         }
         this.calculateOrderTotals(order);
@@ -243,41 +202,32 @@ let OrderCalculator = class OrderCalculator {
                     const adjustment = await promotion.apply(ctx, { order }, state);
                     if (adjustment && adjustment.amount !== 0) {
                         const amount = adjustment.amount;
-                        const weights = order.lines.map(l => l.proratedLinePriceWithTax);
+                        const weights = order.lines
+                            .filter(l => l.quantity !== 0)
+                            .map(l => l.proratedLinePriceWithTax);
                         const distribution = (0, prorate_1.prorate)(weights, amount);
                         order.lines.forEach((line, i) => {
                             const shareOfAmount = distribution[i];
-                            const itemWeights = line.items.map(item => item.unitPrice);
+                            const itemWeights = Array.from({
+                                length: line.quantity,
+                            }).map(() => line.unitPrice);
                             const itemDistribution = (0, prorate_1.prorate)(itemWeights, shareOfAmount);
-                            line.items.forEach((item, j) => {
-                                const discount = itemDistribution[j];
-                                const adjustedDiscount = item.listPriceIncludesTax
-                                    ? (0, tax_utils_1.netPriceOf)(amount, item.taxRate)
-                                    : amount;
-                                // Note: At this point, any time we have an Order-level discount being applied,
-                                // we are effectively nuking all the performance optimizations we have for updating
-                                // as few OrderItems as possible (see notes in the `applyOrderItemPromotions()` method).
-                                // This is because we are prorating any Order-level discounts over _all_ OrderItems.
-                                // (see https://github.com/vendure-ecommerce/vendure/issues/573 for a detailed discussion
-                                // as to why). The are ways to optimize this, but for now I am leaving the implementation
-                                // as-is, and we can deal with performance issues later. Correctness is more important
-                                // when is comes to price & tax calculations.
-                                updatedItems.add(item);
-                                item.addAdjustment({
-                                    amount: discount,
-                                    adjustmentSource: adjustment.adjustmentSource,
-                                    description: adjustment.description,
-                                    type: generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION,
-                                });
+                            line.addAdjustment({
+                                amount: shareOfAmount,
+                                adjustmentSource: adjustment.adjustmentSource,
+                                description: adjustment.description,
+                                type: generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION,
+                                data: { itemDistribution },
                             });
                         });
                         this.calculateOrderTotals(order);
                     }
+                    this.addPromotion(order, promotion);
                 }
             }
             this.calculateOrderTotals(order);
         }
-        return Array.from(updatedItems.values());
+        return;
     }
     async applyShippingPromotions(ctx, order, promotions) {
         const applicableOrderPromotions = await (0, filter_async_1.filterAsync)(promotions, p => p.test(ctx, order).then(Boolean));
@@ -295,6 +245,7 @@ let OrderCalculator = class OrderCalculator {
                             shippingLine.addAdjustment(adjustment);
                         }
                     }
+                    this.addPromotion(order, promotion);
                 }
             }
         }
@@ -307,45 +258,46 @@ let OrderCalculator = class OrderCalculator {
         }
     }
     async applyShipping(ctx, order) {
-        const shippingLine = order.shippingLines[0];
-        const currentShippingMethod = (shippingLine === null || shippingLine === void 0 ? void 0 : shippingLine.shippingMethodId) &&
-            (await this.shippingMethodService.findOne(ctx, shippingLine.shippingMethodId));
-        if (!currentShippingMethod) {
-            return;
-        }
-        const currentMethodStillEligible = await currentShippingMethod.test(ctx, order);
-        if (currentMethodStillEligible) {
-            const result = await currentShippingMethod.apply(ctx, order);
-            if (result) {
-                shippingLine.listPrice = result.price;
-                shippingLine.listPriceIncludesTax = result.priceIncludesTax;
+        for (const shippingLine of order.shippingLines) {
+            const currentShippingMethod = (shippingLine === null || shippingLine === void 0 ? void 0 : shippingLine.shippingMethodId) &&
+                (await this.shippingMethodService.findOne(ctx, shippingLine.shippingMethodId));
+            if (!currentShippingMethod) {
+                return;
+            }
+            const currentMethodStillEligible = await currentShippingMethod.test(ctx, order);
+            if (currentMethodStillEligible) {
+                const result = await currentShippingMethod.apply(ctx, order);
+                if (result) {
+                    shippingLine.listPrice = result.price;
+                    shippingLine.listPriceIncludesTax = result.priceIncludesTax;
+                    shippingLine.taxLines = [
+                        {
+                            description: 'shipping tax',
+                            taxRate: result.taxRate,
+                        },
+                    ];
+                }
+                continue;
+            }
+            const results = await this.shippingCalculator.getEligibleShippingMethods(ctx, order, [
+                currentShippingMethod.id,
+            ]);
+            if (results && results.length) {
+                const cheapest = results[0];
+                shippingLine.listPrice = cheapest.result.price;
+                shippingLine.listPriceIncludesTax = cheapest.result.priceIncludesTax;
+                shippingLine.shippingMethod = cheapest.method;
+                shippingLine.shippingMethodId = cheapest.method.id;
                 shippingLine.taxLines = [
                     {
                         description: 'shipping tax',
-                        taxRate: result.taxRate,
+                        taxRate: cheapest.result.taxRate,
                     },
                 ];
             }
-            return;
-        }
-        const results = await this.shippingCalculator.getEligibleShippingMethods(ctx, order, [
-            currentShippingMethod.id,
-        ]);
-        if (results && results.length) {
-            const cheapest = results[0];
-            shippingLine.listPrice = cheapest.result.price;
-            shippingLine.listPriceIncludesTax = cheapest.result.priceIncludesTax;
-            shippingLine.shippingMethod = cheapest.method;
-            shippingLine.shippingMethodId = cheapest.method.id;
-            shippingLine.taxLines = [
-                {
-                    description: 'shipping tax',
-                    taxRate: cheapest.result.taxRate,
-                },
-            ];
-        }
-        else {
-            order.shippingLines = [];
+            else {
+                order.shippingLines = order.shippingLines.filter(sl => sl !== shippingLine);
+            }
         }
     }
     /**
@@ -380,6 +332,11 @@ let OrderCalculator = class OrderCalculator {
         order.shipping = shippingPrice;
         order.shippingWithTax = shippingPriceWithTax;
     }
+    addPromotion(order, promotion) {
+        if (order.promotions && !order.promotions.find(p => (0, utils_1.idsAreEqual)(p.id, promotion.id))) {
+            order.promotions.push(promotion);
+        }
+    }
 };
 OrderCalculator = __decorate([
     (0, common_1.Injectable)(),