@vendure/core 1.4.6 → 1.5.1

package/cli/service/helpers/list-query-builder/parse-filter-params.d.ts

@@ -0,0 +1,13 @@
+import { Type } from '@vendure/common/lib/shared-types';
+import { Connection } from 'typeorm';
+import { FilterParameter, NullOptionals } from '../../../common/types/common-types';
+import { VendureEntity } from '../../../entity/base/base.entity';
+export interface WhereCondition {
+    clause: string;
+    parameters: {
+        [param: string]: string | number;
+    };
+}
+export declare function parseFilterParams<T extends VendureEntity>(connection: Connection, entity: Type<T>, filterParams?: NullOptionals<FilterParameter<T>> | null, customPropertyMap?: {
+    [name: string]: string;
+}): WhereCondition[];

package/cli/service/helpers/list-query-builder/parse-filter-params.js

@@ -0,0 +1,155 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFilterParams = void 0;
+const shared_utils_1 = require("@vendure/common/lib/shared-utils");
+const DateUtils_1 = require("typeorm/util/DateUtils");
+const errors_1 = require("../../../common/error/errors");
+const connection_utils_1 = require("./connection-utils");
+const get_calculated_columns_1 = require("./get-calculated-columns");
+function parseFilterParams(connection, entity, filterParams, customPropertyMap) {
+    if (!filterParams) {
+        return [];
+    }
+    const { columns, translationColumns, alias } = connection_utils_1.getColumnMetadata(connection, entity);
+    const calculatedColumns = get_calculated_columns_1.getCalculatedColumns(entity);
+    const output = [];
+    const dbType = connection.options.type;
+    let argIndex = 1;
+    for (const [key, operation] of Object.entries(filterParams)) {
+        if (operation) {
+            const calculatedColumnDef = calculatedColumns.find(c => c.name === key);
+            const instruction = calculatedColumnDef === null || calculatedColumnDef === void 0 ? void 0 : calculatedColumnDef.listQuery;
+            const calculatedColumnExpression = instruction === null || instruction === void 0 ? void 0 : instruction.expression;
+            for (const [operator, operand] of Object.entries(operation)) {
+                let fieldName;
+                if (columns.find(c => c.propertyName === key)) {
+                    fieldName = `${alias}.${key}`;
+                }
+                else if (translationColumns.find(c => c.propertyName === key)) {
+                    const translationsAlias = connection.namingStrategy.eagerJoinRelationAlias(alias, 'translations');
+                    fieldName = `${translationsAlias}.${key}`;
+                }
+                else if (calculatedColumnExpression) {
+                    fieldName = connection_utils_1.escapeCalculatedColumnExpression(connection, calculatedColumnExpression);
+                }
+                else if (customPropertyMap === null || customPropertyMap === void 0 ? void 0 : customPropertyMap[key]) {
+                    fieldName = customPropertyMap[key];
+                }
+                else {
+                    throw new errors_1.UserInputError('error.invalid-filter-field');
+                }
+                const condition = buildWhereCondition(fieldName, operator, operand, argIndex, dbType);
+                output.push(condition);
+                argIndex++;
+            }
+        }
+    }
+    return output;
+}
+exports.parseFilterParams = parseFilterParams;
+function buildWhereCondition(fieldName, operator, operand, argIndex, dbType) {
+    switch (operator) {
+        case 'eq':
+            return {
+                clause: `${fieldName} = :arg${argIndex}`,
+                parameters: { [`arg${argIndex}`]: convertDate(operand) },
+            };
+        case 'notEq':
+            return {
+                clause: `${fieldName} != :arg${argIndex}`,
+                parameters: { [`arg${argIndex}`]: convertDate(operand) },
+            };
+        case 'inList':
+        case 'contains': {
+            const LIKE = dbType === 'postgres' ? 'ILIKE' : 'LIKE';
+            return {
+                clause: `${fieldName} ${LIKE} :arg${argIndex}`,
+                parameters: {
+                    [`arg${argIndex}`]: `%${typeof operand === 'string' ? operand.trim() : operand}%`,
+                },
+            };
+        }
+        case 'notContains': {
+            const LIKE = dbType === 'postgres' ? 'ILIKE' : 'LIKE';
+            return {
+                clause: `${fieldName} NOT ${LIKE} :arg${argIndex}`,
+                parameters: { [`arg${argIndex}`]: `%${operand.trim()}%` },
+            };
+        }
+        case 'in':
+            return {
+                clause: `${fieldName} IN (:...arg${argIndex})`,
+                parameters: { [`arg${argIndex}`]: operand },
+            };
+        case 'notIn':
+            return {
+                clause: `${fieldName} NOT IN (:...arg${argIndex})`,
+                parameters: { [`arg${argIndex}`]: operand },
+            };
+        case 'regex':
+            return {
+                clause: getRegexpClause(fieldName, argIndex, dbType),
+                parameters: { [`arg${argIndex}`]: operand },
+            };
+        case 'lt':
+        case 'before':
+            return {
+                clause: `${fieldName} < :arg${argIndex}`,
+                parameters: { [`arg${argIndex}`]: convertDate(operand) },
+            };
+        case 'gt':
+        case 'after':
+            return {
+                clause: `${fieldName} > :arg${argIndex}`,
+                parameters: { [`arg${argIndex}`]: convertDate(operand) },
+            };
+        case 'lte':
+            return {
+                clause: `${fieldName} <= :arg${argIndex}`,
+                parameters: { [`arg${argIndex}`]: operand },
+            };
+        case 'gte':
+            return {
+                clause: `${fieldName} >= :arg${argIndex}`,
+                parameters: { [`arg${argIndex}`]: operand },
+            };
+        case 'between':
+            return {
+                clause: `${fieldName} BETWEEN :arg${argIndex}_a AND :arg${argIndex}_b`,
+                parameters: {
+                    [`arg${argIndex}_a`]: convertDate(operand.start),
+                    [`arg${argIndex}_b`]: convertDate(operand.end),
+                },
+            };
+        default:
+            shared_utils_1.assertNever(operator);
+    }
+    return {
+        clause: '1',
+        parameters: {},
+    };
+}
+function convertDate(input) {
+    if (input instanceof Date) {
+        return DateUtils_1.DateUtils.mixedDateToUtcDatetimeString(input);
+    }
+    return input;
+}
+function getRegexpClause(fieldName, argIndex, dbType) {
+    switch (dbType) {
+        case 'mariadb':
+        case 'mysql':
+        case 'sqljs':
+        case 'better-sqlite3':
+        case 'aurora-data-api':
+            return `${fieldName} REGEXP :arg${argIndex}`;
+        case 'postgres':
+        case 'aurora-data-api-pg':
+        case 'cockroachdb':
+            return `${fieldName} ~* :arg${argIndex}`;
+        case 'sqlite':
+        default:
+            throw new errors_1.InternalServerError(`The 'regex' filter is not available when using the '${dbType}' driver`);
+    }
+}
+//# sourceMappingURL=parse-filter-params.js.map

package/cli/service/helpers/list-query-builder/parse-filter-params.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-filter-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-filter-params.ts"],"names":[],"mappings":"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"}

package/cli/service/helpers/list-query-builder/parse-sort-params.d.ts

@@ -0,0 +1,7 @@
+import { Type } from '@vendure/common/lib/shared-types';
+import { Connection, OrderByCondition } from 'typeorm';
+import { NullOptionals, SortParameter } from '../../../common/types/common-types';
+import { VendureEntity } from '../../../entity/base/base.entity';
+export declare function parseSortParams<T extends VendureEntity>(connection: Connection, entity: Type<T>, sortParams?: NullOptionals<SortParameter<T>> | null, customPropertyMap?: {
+    [name: string]: string;
+}): OrderByCondition;

package/cli/service/helpers/list-query-builder/parse-sort-params.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSortParams = void 0;
+const unique_1 = require("@vendure/common/lib/unique");
+const errors_1 = require("../../../common/error/errors");
+const connection_utils_1 = require("./connection-utils");
+const get_calculated_columns_1 = require("./get-calculated-columns");
+function parseSortParams(connection, entity, sortParams, customPropertyMap) {
+    if (!sortParams || Object.keys(sortParams).length === 0) {
+        return {};
+    }
+    const { columns, translationColumns, alias } = connection_utils_1.getColumnMetadata(connection, entity);
+    const calculatedColumns = get_calculated_columns_1.getCalculatedColumns(entity);
+    const output = {};
+    for (const [key, order] of Object.entries(sortParams)) {
+        const calculatedColumnDef = calculatedColumns.find(c => c.name === key);
+        const matchingColumn = columns.find(c => c.propertyName === key);
+        if (matchingColumn) {
+            output[`${alias}.${matchingColumn.propertyPath}`] = order;
+        }
+        else if (translationColumns.find(c => c.propertyName === key)) {
+            const translationsAlias = connection.namingStrategy.eagerJoinRelationAlias(alias, 'translations');
+            output[`${translationsAlias}.${key}`] = order;
+        }
+        else if (calculatedColumnDef) {
+            const instruction = calculatedColumnDef.listQuery;
+            if (instruction) {
+                output[connection_utils_1.escapeCalculatedColumnExpression(connection, instruction.expression)] = order;
+            }
+        }
+        else if (customPropertyMap === null || customPropertyMap === void 0 ? void 0 : customPropertyMap[key]) {
+            output[customPropertyMap[key]] = order;
+        }
+        else {
+            throw new errors_1.UserInputError('error.invalid-sort-field', {
+                fieldName: key,
+                validFields: [
+                    ...getValidSortFields([...columns, ...translationColumns]),
+                    ...calculatedColumns.map(c => c.name.toString()),
+                ].join(', '),
+            });
+        }
+    }
+    return output;
+}
+exports.parseSortParams = parseSortParams;
+function getValidSortFields(columns) {
+    return unique_1.unique(columns.map(c => c.propertyName));
+}
+//# sourceMappingURL=parse-sort-params.js.map

package/cli/service/helpers/list-query-builder/parse-sort-params.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-sort-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-sort-params.ts"],"names":[],"mappings":";;;AACA,uDAAoD;AAIpD,yDAA8D;AAI9D,yDAAyF;AACzF,qEAAgE;AAShE,SAAgB,eAAe,CAC3B,UAAsB,EACtB,MAAe,EACf,UAAmD,EACnD,iBAA8C;IAE9C,IAAI,CAAC,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;QACrD,OAAO,EAAE,CAAC;KACb;IACD,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,oCAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IACrF,MAAM,iBAAiB,GAAG,6CAAoB,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACnD,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;QACxE,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,CAAC;QACjE,IAAI,cAAc,EAAE;YAChB,MAAM,CAAC,GAAG,KAAK,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC,GAAG,KAAY,CAAC;SACpE;aAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,GAAG,CAAC,EAAE;YAC7D,MAAM,iBAAiB,GAAG,UAAU,CAAC,cAAc,CAAC,sBAAsB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAClG,MAAM,CAAC,GAAG,iBAAiB,IAAI,GAAG,EAAE,CAAC,GAAG,KAAY,CAAC;SACxD;aAAM,IAAI,mBAAmB,EAAE;YAC5B,MAAM,WAAW,GAAG,mBAAmB,CAAC,SAAS,CAAC;YAClD,IAAI,WAAW,EAAE;gBACb,MAAM,CAAC,mDAAgC,CAAC,UAAU,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC,GAAG,KAAY,CAAC;aAC/F;SACJ;aAAM,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,GAAG,CAAC,EAAE;YACjC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,KAAY,CAAC;SACjD;aAAM;YACH,MAAM,IAAI,uBAAc,CAAC,0BAA0B,EAAE;gBACjD,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE;oBACT,GAAG,kBAAkB,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,kBAAkB,CAAC,CAAC;oBAC1D,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;iBACnD,CAAC,IAAI,CAAC,IAAI,CAAC;aACf,CAAC,CAAC;SACN;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAtCD,0CAsCC;AAED,SAAS,kBAAkB,CAAC,OAAyB;IACjD,OAAO,eAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AACpD,CAAC"}

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

@@ -0,0 +1,32 @@
+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 { 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';
+export declare class OrderCalculator {
+    private configService;
+    private zoneService;
+    private taxRateService;
+    private shippingMethodService;
+    private shippingCalculator;
+    private requestContextCache;
+    constructor(configService: ConfigService, zoneService: ZoneService, taxRateService: TaxRateService, shippingMethodService: ShippingMethodService, shippingCalculator: ShippingCalculator, requestContextCache: RequestContextCacheService);
+    applyPriceAdjustments(ctx: RequestContext, order: Order, promotions: Promotion[], updatedOrderLines?: OrderLine[], options?: {
+        recalculateShipping?: boolean;
+    }): Promise<OrderItem[]>;
+    private applyTaxes;
+    private applyTaxesToOrderLine;
+    private createTaxRateGetter;
+    private applyPromotions;
+    private applyOrderItemPromotions;
+    private orderLineHasInapplicablePromotions;
+    private applyOrderPromotions;
+    private applyShippingPromotions;
+    private applyShipping;
+    calculateOrderTotals(order: Order): void;
+}

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

@@ -0,0 +1,311 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrderCalculator = void 0;
+const common_1 = require("@nestjs/common");
+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");
+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");
+let OrderCalculator = class OrderCalculator {
+    constructor(configService, zoneService, taxRateService, shippingMethodService, shippingCalculator, requestContextCache) {
+        this.configService = configService;
+        this.zoneService = zoneService;
+        this.taxRateService = taxRateService;
+        this.shippingMethodService = shippingMethodService;
+        this.shippingCalculator = shippingCalculator;
+        this.requestContextCache = requestContextCache;
+    }
+    async applyPriceAdjustments(ctx, order, promotions, updatedOrderLines = [], options) {
+        const { taxZoneStrategy } = this.configService.taxOptions;
+        const zones = await this.zoneService.findAll(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`);
+        }
+        if (!order.taxZoneId || !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) {
+            if (taxZoneChanged) {
+                await this.applyTaxes(ctx, order, activeTaxZone);
+            }
+            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.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);
+            }
+        }
+        this.calculateOrderTotals(order);
+        return taxZoneChanged ? order.getOrderItems() : Array.from(updatedOrderItems);
+    }
+    async applyTaxes(ctx, order, activeZone) {
+        const getTaxRate = this.createTaxRateGetter(ctx, activeZone);
+        for (const line of order.lines) {
+            await this.applyTaxesToOrderLine(ctx, order, line, activeZone, getTaxRate);
+        }
+        this.calculateOrderTotals(order);
+    }
+    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,
+            });
+        }
+    }
+    createTaxRateGetter(ctx, activeZone) {
+        const taxRateCache = new Map();
+        return async (taxCategory) => {
+            const cached = taxRateCache.get(taxCategory);
+            if (cached) {
+                return cached;
+            }
+            const rate = await this.taxRateService.getApplicableTaxRate(ctx, activeZone, taxCategory);
+            taxRateCache.set(taxCategory, rate);
+            return rate;
+        };
+    }
+    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;
+        }
+    }
+    async applyOrderItemPromotions(ctx, order, promotions) {
+        var _a, _b, _c, _d;
+        const updatedOrderItems = new Set();
+        for (const line of order.lines) {
+            const applicablePromotions = await 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) {
+                line.items.forEach(i => updatedOrderItems.add(i));
+            }
+            for (const promotion of applicablePromotions) {
+                let priceAdjusted = false;
+                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);
+                        }
+                    }
+                    if (priceAdjusted) {
+                        this.calculateOrderTotals(order);
+                        priceAdjusted = false;
+                    }
+                }
+            }
+            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) {
+                this.calculateOrderTotals(order);
+            }
+        }
+        return Array.from(updatedOrderItems.values());
+    }
+    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;
+    }
+    async applyOrderPromotions(ctx, order, promotions) {
+        const updatedItems = new Set();
+        const orderHasDistributedPromotions = !!order.discounts.find(adjustment => adjustment.type === generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION);
+        if (orderHasDistributedPromotions) {
+            order.lines.forEach(line => {
+                line.clearAdjustments(generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION);
+                line.items.forEach(item => updatedItems.add(item));
+            });
+        }
+        this.calculateOrderTotals(order);
+        const applicableOrderPromotions = await filter_async_1.filterAsync(promotions, p => p.test(ctx, order).then(Boolean));
+        if (applicableOrderPromotions.length) {
+            for (const promotion of applicableOrderPromotions) {
+                const applicableOrState = await promotion.test(ctx, order);
+                if (applicableOrState) {
+                    const state = typeof applicableOrState === 'object' ? applicableOrState : undefined;
+                    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 distribution = prorate_1.prorate(weights, amount);
+                        order.lines.forEach((line, i) => {
+                            const shareOfAmount = distribution[i];
+                            const itemWeights = line.items.map(item => item.unitPrice);
+                            const itemDistribution = prorate_1.prorate(itemWeights, shareOfAmount);
+                            line.items.forEach((item, j) => {
+                                const discount = itemDistribution[j];
+                                const adjustedDiscount = item.listPriceIncludesTax
+                                    ? tax_utils_1.netPriceOf(amount, item.taxRate)
+                                    : amount;
+                                updatedItems.add(item);
+                                item.addAdjustment({
+                                    amount: discount,
+                                    adjustmentSource: adjustment.adjustmentSource,
+                                    description: adjustment.description,
+                                    type: generated_types_1.AdjustmentType.DISTRIBUTED_ORDER_PROMOTION,
+                                });
+                            });
+                        });
+                        this.calculateOrderTotals(order);
+                    }
+                }
+            }
+            this.calculateOrderTotals(order);
+        }
+        return Array.from(updatedItems.values());
+    }
+    async applyShippingPromotions(ctx, order, promotions) {
+        const applicableOrderPromotions = await filter_async_1.filterAsync(promotions, p => p.test(ctx, order).then(Boolean));
+        if (applicableOrderPromotions.length) {
+            order.shippingLines.forEach(line => line.clearAdjustments());
+            for (const promotion of applicableOrderPromotions) {
+                const applicableOrState = await promotion.test(ctx, order);
+                if (applicableOrState) {
+                    const state = typeof applicableOrState === 'object' ? applicableOrState : undefined;
+                    for (const shippingLine of order.shippingLines) {
+                        const adjustment = await promotion.apply(ctx, { shippingLine, order }, state);
+                        if (adjustment && adjustment.amount !== 0) {
+                            shippingLine.addAdjustment(adjustment);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            for (const shippingLine of order.shippingLines) {
+                shippingLine.clearAdjustments();
+            }
+        }
+    }
+    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;
+                shippingLine.taxLines = [
+                    {
+                        description: 'shipping tax',
+                        taxRate: 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 = [];
+        }
+    }
+    calculateOrderTotals(order) {
+        let totalPrice = 0;
+        let totalPriceWithTax = 0;
+        for (const line of order.lines) {
+            totalPrice += line.proratedLinePrice;
+            totalPriceWithTax += line.proratedLinePriceWithTax;
+        }
+        for (const surcharge of order.surcharges) {
+            totalPrice += surcharge.price;
+            totalPriceWithTax += surcharge.priceWithTax;
+        }
+        order.subTotal = totalPrice;
+        order.subTotalWithTax = totalPriceWithTax;
+        let shippingPrice = 0;
+        let shippingPriceWithTax = 0;
+        for (const shippingLine of order.shippingLines) {
+            shippingPrice += shippingLine.discountedPrice;
+            shippingPriceWithTax += shippingLine.discountedPriceWithTax;
+        }
+        order.shipping = shippingPrice;
+        order.shippingWithTax = shippingPriceWithTax;
+    }
+};
+OrderCalculator = __decorate([
+    common_1.Injectable(),
+    __metadata("design:paramtypes", [config_service_1.ConfigService,
+        zone_service_1.ZoneService,
+        tax_rate_service_1.TaxRateService,
+        shipping_method_service_1.ShippingMethodService,
+        shipping_calculator_1.ShippingCalculator,
+        request_context_cache_service_1.RequestContextCacheService])
+], OrderCalculator);
+exports.OrderCalculator = OrderCalculator;
+//# sourceMappingURL=order-calculator.js.map

package/cli/service/helpers/order-calculator/order-calculator.js.map

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

package/cli/service/helpers/order-calculator/prorate.d.ts

@@ -0,0 +1 @@
+export declare function prorate(weights: number[], amount: number): number[];

package/cli/service/helpers/order-calculator/prorate.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prorate = void 0;
+function prorate(weights, amount) {
+    const totalWeight = weights.reduce((total, val) => total + val, 0);
+    const length = weights.length;
+    const actual = [];
+    const error = [];
+    const rounded = [];
+    let added = 0;
+    let i = 0;
+    for (const w of weights) {
+        actual[i] = amount * (w / totalWeight);
+        rounded[i] = Math.floor(actual[i]);
+        error[i] = actual[i] - rounded[i];
+        added += rounded[i];
+        i += 1;
+    }
+    while (added < amount) {
+        let maxError = 0.0;
+        let maxErrorIndex = -1;
+        for (let e = 0; e < length; ++e) {
+            if (error[e] > maxError) {
+                maxError = error[e];
+                maxErrorIndex = e;
+            }
+        }
+        rounded[maxErrorIndex] += 1;
+        error[maxErrorIndex] -= 1;
+        added += 1;
+    }
+    return rounded;
+}
+exports.prorate = prorate;
+//# sourceMappingURL=prorate.js.map