@vendure/core 2.0.0-next.9 → 2.0.1

package/dist/config/promotion/actions/buy-x-get-y-free-action.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buyXGetYFreeAction = void 0;
 const generated_types_1 = require("@vendure/common/lib/generated-types");
-const utils_1 = require("../../../common/utils");
 const buy_x_get_y_free_condition_1 = require("../conditions/buy-x-get-y-free-condition");
 const promotion_action_1 = require("../promotion-action");
 exports.buyXGetYFreeAction = new promotion_action_1.PromotionItemAction({
@@ -10,21 +9,19 @@ exports.buyXGetYFreeAction = new promotion_action_1.PromotionItemAction({
     description: [
         {
             languageCode: generated_types_1.LanguageCode.en,
-            value: 'Buy { amountX } of { variantIdsX } products, get { amountY } of { variantIdsY } products free',
+            value: 'Buy X products, get Y products free',
         },
     ],
     args: {},
     conditions: [buy_x_get_y_free_condition_1.buyXGetYFreeCondition],
-    execute(ctx, orderItem, orderLine, args, state) {
-        const freeItemIds = state.buy_x_get_y_free.freeItemIds;
-        if (idsContainsItem(freeItemIds, orderItem)) {
+    execute(ctx, orderLine, args, state) {
+        const freeItemsPerLine = state.buy_x_get_y_free.freeItemsPerLine;
+        const freeQuantity = freeItemsPerLine[orderLine.id];
+        if (freeQuantity) {
             const unitPrice = ctx.channel.pricesIncludeTax ? orderLine.unitPriceWithTax : orderLine.unitPrice;
-            return -unitPrice;
+            return -unitPrice * (freeQuantity / orderLine.quantity);
         }
         return 0;
     },
 });
-function idsContainsItem(ids, item) {
-    return !!ids.find(id => (0, utils_1.idsAreEqual)(id, item.id));
-}
 //# sourceMappingURL=buy-x-get-y-free-action.js.map

package/dist/config/promotion/actions/buy-x-get-y-free-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"buy-x-get-y-free-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/buy-x-get-y-free-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAGnE,iDAAoD;AAEpD,yFAAiF;AACjF,0DAA0D;AAE7C,QAAA,kBAAkB,GAAG,IAAI,sCAAmB,CAAC;IACtD,IAAI,EAAE,kBAAkB;IACxB,WAAW,EAAE;QACT;YACI,YAAY,EAAE,8BAAY,CAAC,EAAE;YAC7B,KAAK,EACD,+FAA+F;SACtG;KACJ;IACD,IAAI,EAAE,EAAE;IACR,UAAU,EAAE,CAAC,kDAAqB,CAAC;IACnC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK;QAC1C,MAAM,WAAW,GAAG,KAAK,CAAC,gBAAgB,CAAC,WAAW,CAAC;QACvD,IAAI,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,EAAE;YACzC,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;YAClG,OAAO,CAAC,SAAS,CAAC;SACrB;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CACJ,CAAC,CAAC;AAEH,SAAS,eAAe,CAAC,GAAS,EAAE,IAAe;IAC/C,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"buy-x-get-y-free-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/buy-x-get-y-free-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAInE,yFAAiF;AACjF,0DAA0D;AAE7C,QAAA,kBAAkB,GAAG,IAAI,sCAAmB,CAAC;IACtD,IAAI,EAAE,kBAAkB;IACxB,WAAW,EAAE;QACT;YACI,YAAY,EAAE,8BAAY,CAAC,EAAE;YAC7B,KAAK,EAAE,qCAAqC;SAC/C;KACJ;IACD,IAAI,EAAE,EAAE;IACR,UAAU,EAAE,CAAC,kDAAqB,CAAC;IACnC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK;QAC/B,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC,gBAAgB,CAAC;QACjE,MAAM,YAAY,GAAG,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;QACpD,IAAI,YAAY,EAAE;YACd,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;YAClG,OAAO,CAAC,SAAS,GAAG,CAAC,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;SAC3D;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CACJ,CAAC,CAAC"}

package/dist/config/promotion/actions/facet-values-percentage-discount-action.d.ts

@@ -1,7 +1,7 @@
 import { PromotionItemAction } from '../promotion-action';
 export declare const discountOnItemWithFacets: PromotionItemAction<{
     discount: {
-        type: "int";
+        type: "float";
         ui: {
             component: string;
             suffix: string;

package/dist/config/promotion/actions/facet-values-percentage-discount-action.js

@@ -10,7 +10,7 @@ exports.discountOnItemWithFacets = new promotion_action_1.PromotionItemAction({
     code: 'facet_based_discount',
     args: {
         discount: {
-            type: 'int',
+            type: 'float',
             ui: {
                 component: 'number-form-input',
                 suffix: '%',
@@ -25,8 +25,8 @@ exports.discountOnItemWithFacets = new promotion_action_1.PromotionItemAction({
     init(injector) {
         facetValueChecker = new facet_value_checker_1.FacetValueChecker(injector.get(transactional_connection_1.TransactionalConnection));
     },
-    async execute(ctx, orderItem, orderLine, args) {
-        if (await facetValueChecker.hasFacetValues(orderLine, args.facets)) {
+    async execute(ctx, orderLine, args) {
+        if (await facetValueChecker.hasFacetValues(orderLine, args.facets, ctx)) {
             const unitPrice = ctx.channel.pricesIncludeTax ? orderLine.unitPriceWithTax : orderLine.unitPrice;
             return -unitPrice * (args.discount / 100);
         }

package/dist/config/promotion/actions/facet-values-percentage-discount-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"facet-values-percentage-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/facet-values-percentage-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,2FAAuF;AACvF,0DAA0D;AAC1D,sEAAiE;AAEjE,IAAI,iBAAoC,CAAC;AAE5B,QAAA,wBAAwB,GAAG,IAAI,sCAAmB,CAAC;IAC5D,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,KAAK;YACX,EAAE,EAAE;gBACA,SAAS,EAAE,mBAAmB;gBAC9B,MAAM,EAAE,GAAG;aACd;SACJ;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE;SAC9C;KACJ;IACD,IAAI,CAAC,QAAQ;QACT,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC,CAAC;IACrF,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI;QACzC,IAAI,MAAM,iBAAiB,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;YAChE,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;YAClG,OAAO,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;SAC7C;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IACD,WAAW,EAAE;QACT,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,sDAAsD,EAAE;KACnG;CACJ,CAAC,CAAC"}
+{"version":3,"file":"facet-values-percentage-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/facet-values-percentage-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,2FAAuF;AACvF,0DAA0D;AAC1D,sEAAiE;AAEjE,IAAI,iBAAoC,CAAC;AAE5B,QAAA,wBAAwB,GAAG,IAAI,sCAAmB,CAAC;IAC5D,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,OAAO;YACb,EAAE,EAAE;gBACA,SAAS,EAAE,mBAAmB;gBAC9B,MAAM,EAAE,GAAG;aACd;SACJ;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE;SAC9C;KACJ;IACD,IAAI,CAAC,QAAQ;QACT,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC,CAAC;IACrF,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI;QAC9B,IAAI,MAAM,iBAAiB,CAAC,cAAc,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;YACrE,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;YAClG,OAAO,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;SAC7C;QACD,OAAO,CAAC,CAAC;IACb,CAAC;IACD,WAAW,EAAE;QACT,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,sDAAsD,EAAE;KACnG;CACJ,CAAC,CAAC"}

package/dist/config/promotion/actions/order-fixed-discount-action.js

@@ -14,7 +14,8 @@ exports.orderFixedDiscount = new promotion_action_1.PromotionOrderAction({
         },
     },
     execute(ctx, order, args) {
-        return -args.discount;
+        const upperBound = ctx.channel.pricesIncludeTax ? order.subTotalWithTax : order.subTotal;
+        return -Math.min(args.discount, upperBound);
     },
     description: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Discount order by fixed amount' }],
 });

package/dist/config/promotion/actions/order-fixed-discount-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-fixed-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/order-fixed-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,0DAA2D;AAE9C,QAAA,kBAAkB,GAAG,IAAI,uCAAoB,CAAC;IACvD,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,KAAK;YACX,EAAE,EAAE;gBACA,SAAS,EAAE,qBAAqB;aACnC;SACJ;KACJ;IACD,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACpB,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC1B,CAAC;IACD,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAC;CAC5F,CAAC,CAAC"}
+{"version":3,"file":"order-fixed-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/order-fixed-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,0DAA2D;AAE9C,QAAA,kBAAkB,GAAG,IAAI,uCAAoB,CAAC;IACvD,IAAI,EAAE,sBAAsB;IAC5B,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,KAAK;YACX,EAAE,EAAE;gBACA,SAAS,EAAE,qBAAqB;aACnC;SACJ;KACJ;IACD,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACpB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACzF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAChD,CAAC;IACD,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,gCAAgC,EAAE,CAAC;CAC5F,CAAC,CAAC"}

package/dist/config/promotion/actions/order-percentage-discount-action.d.ts

@@ -1,7 +1,7 @@
 import { PromotionOrderAction } from '../promotion-action';
 export declare const orderPercentageDiscount: PromotionOrderAction<{
     discount: {
-        type: "int";
+        type: "float";
         ui: {
             component: string;
             suffix: string;

package/dist/config/promotion/actions/order-percentage-discount-action.js

@@ -7,7 +7,7 @@ exports.orderPercentageDiscount = new promotion_action_1.PromotionOrderAction({
     code: 'order_percentage_discount',
     args: {
         discount: {
-            type: 'int',
+            type: 'float',
             ui: {
                 component: 'number-form-input',
                 suffix: '%',

package/dist/config/promotion/actions/order-percentage-discount-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-percentage-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/order-percentage-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,0DAA2D;AAE9C,QAAA,uBAAuB,GAAG,IAAI,uCAAoB,CAAC;IAC5D,IAAI,EAAE,2BAA2B;IACjC,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,KAAK;YACX,EAAE,EAAE;gBACA,SAAS,EAAE,mBAAmB;gBAC9B,MAAM,EAAE,GAAG;aACd;SACJ;KACJ;IACD,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACpB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACzF,OAAO,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;IAC/C,CAAC;IACD,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,iCAAiC,EAAE,CAAC;CAC7F,CAAC,CAAC"}
+{"version":3,"file":"order-percentage-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/order-percentage-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,0DAA2D;AAE9C,QAAA,uBAAuB,GAAG,IAAI,uCAAoB,CAAC;IAC5D,IAAI,EAAE,2BAA2B;IACjC,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,OAAO;YACb,EAAE,EAAE;gBACA,SAAS,EAAE,mBAAmB;gBAC9B,MAAM,EAAE,GAAG;aACd;SACJ;KACJ;IACD,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACpB,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC;QACzF,OAAO,CAAC,UAAU,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;IAC/C,CAAC;IACD,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,iCAAiC,EAAE,CAAC;CAC7F,CAAC,CAAC"}

package/dist/config/promotion/actions/product-percentage-discount-action.d.ts

@@ -2,7 +2,7 @@ import { LanguageCode } from '@vendure/common/lib/generated-types';
 import { PromotionItemAction } from '../promotion-action';
 export declare const productsPercentageDiscount: PromotionItemAction<{
     discount: {
-        type: "int";
+        type: "float";
         ui: {
             component: string;
             suffix: string;

package/dist/config/promotion/actions/product-percentage-discount-action.js

@@ -9,7 +9,7 @@ exports.productsPercentageDiscount = new promotion_action_1.PromotionItemAction(
     description: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Discount specified products by { discount }%' }],
     args: {
         discount: {
-            type: 'int',
+            type: 'float',
             ui: {
                 component: 'number-form-input',
                 suffix: '%',
@@ -22,7 +22,7 @@ exports.productsPercentageDiscount = new promotion_action_1.PromotionItemAction(
             label: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Product variants' }],
         },
     },
-    execute(ctx, orderItem, orderLine, args) {
+    execute(ctx, orderLine, args) {
         if (lineContainsIds(args.productVariantIds, orderLine)) {
             const unitPrice = ctx.channel.pricesIncludeTax ? orderLine.unitPriceWithTax : orderLine.unitPrice;
             return -unitPrice * (args.discount / 100);

package/dist/config/promotion/actions/product-percentage-discount-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-percentage-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/product-percentage-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAGnE,iDAAoD;AAEpD,0DAA0D;AAE7C,QAAA,0BAA0B,GAAG,IAAI,sCAAmB,CAAC;IAC9D,IAAI,EAAE,8BAA8B;IACpC,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,8CAA8C,EAAE,CAAC;IACvG,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,KAAK;YACX,EAAE,EAAE;gBACA,SAAS,EAAE,mBAAmB;gBAC9B,MAAM,EAAE,GAAG;aACd;SACJ;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,EAAE,SAAS,EAAE,6BAA6B,EAAE;YAChD,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;SACxE;KACJ;IAED,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI;QACnC,IAAI,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAAE;YACpD,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;YAClG,OAAO,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;SAC7C;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CACJ,CAAC,CAAC;AAEH,SAAS,eAAe,CAAC,GAAS,EAAE,IAAe;IAC/C,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;AACrE,CAAC"}
+{"version":3,"file":"product-percentage-discount-action.js","sourceRoot":"","sources":["../../../../src/config/promotion/actions/product-percentage-discount-action.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAGnE,iDAAoD;AAEpD,0DAA0D;AAE7C,QAAA,0BAA0B,GAAG,IAAI,sCAAmB,CAAC;IAC9D,IAAI,EAAE,8BAA8B;IACpC,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,8CAA8C,EAAE,CAAC;IACvG,IAAI,EAAE;QACF,QAAQ,EAAE;YACN,IAAI,EAAE,OAAO;YACb,EAAE,EAAE;gBACA,SAAS,EAAE,mBAAmB;gBAC9B,MAAM,EAAE,GAAG;aACd;SACJ;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,EAAE,SAAS,EAAE,6BAA6B,EAAE;YAChD,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC;SACxE;KACJ;IAED,OAAO,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI;QACxB,IAAI,eAAe,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,CAAC,EAAE;YACpD,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;YAClG,OAAO,CAAC,SAAS,GAAG,CAAC,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC;SAC7C;QACD,OAAO,CAAC,CAAC;IACb,CAAC;CACJ,CAAC,CAAC;AAEH,SAAS,eAAe,CAAC,GAAS,EAAE,IAAe;IAC/C,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC;AACrE,CAAC"}

package/dist/config/promotion/conditions/buy-x-get-y-free-condition.d.ts

@@ -1,5 +1,4 @@
 import { LanguageCode } from '@vendure/common/lib/generated-types';
-import { ID } from '@vendure/common/lib/shared-types';
 import { PromotionCondition } from '../promotion-condition';
 export declare const buyXGetYFreeCondition: PromotionCondition<{
     amountX: {
@@ -33,5 +32,7 @@ export declare const buyXGetYFreeCondition: PromotionCondition<{
         }[];
     };
 }, "buy_x_get_y_free", false | {
-    freeItemIds: ID[];
+    freeItemsPerLine: {
+        [lineId: string]: number;
+    };
 }>;

package/dist/config/promotion/conditions/buy-x-get-y-free-condition.js

@@ -8,7 +8,7 @@ exports.buyXGetYFreeCondition = new promotion_condition_1.PromotionCondition({
     description: [
         {
             languageCode: generated_types_1.LanguageCode.en,
-            value: 'Buy { amountX } of { variantIdsX } products, get { amountY } of { variantIdsY } products free',
+            value: 'Buy X products, get Y products free',
         },
     ],
     args: {
@@ -20,7 +20,7 @@ exports.buyXGetYFreeCondition = new promotion_condition_1.PromotionCondition({
             type: 'ID',
             list: true,
             ui: { component: 'product-selector-form-input' },
-            label: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Product variants X' }],
+            label: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Buy amountX of these variants' }],
         },
         amountY: {
             type: 'int',
@@ -30,7 +30,7 @@ exports.buyXGetYFreeCondition = new promotion_condition_1.PromotionCondition({
             type: 'ID',
             list: true,
             ui: { component: 'product-selector-form-input' },
-            label: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Product variants Y' }],
+            label: [{ languageCode: generated_types_1.LanguageCode.en, value: 'Get amountY of these variants for free' }],
         },
     },
     async check(ctx, order, args) {
@@ -44,14 +44,13 @@ exports.buyXGetYFreeCondition = new promotion_condition_1.PromotionCondition({
                 matches += line.quantity;
             }
             if (variantId in yIds) {
-                freeItemCandidates.push(...line.items);
+                freeItemCandidates.push(line);
             }
         }
         const quantity = Math.floor(matches / args.amountX);
         if (!quantity || !freeItemCandidates.length)
             return false;
-        const freeItemIds = freeItemCandidates
-            .sort((a, b) => {
+        const freeLines = freeItemCandidates.sort((a, b) => {
             const unitPriceA = ctx.channel.pricesIncludeTax ? a.unitPriceWithTax : a.unitPrice;
             const unitPriceB = ctx.channel.pricesIncludeTax ? b.unitPriceWithTax : b.unitPrice;
             if (unitPriceA < unitPriceB)
@@ -59,10 +58,17 @@ exports.buyXGetYFreeCondition = new promotion_condition_1.PromotionCondition({
             if (unitPriceA > unitPriceB)
                 return 1;
             return 0;
-        })
-            .map(({ id }) => id)
-            .slice(0, quantity * args.amountY);
-        return { freeItemIds };
+        });
+        let placesToAllocate = args.amountY;
+        const freeItemsPerLine = {};
+        for (const freeLine of freeLines) {
+            if (placesToAllocate === 0)
+                break;
+            const freeQuantity = Math.min(freeLine.quantity, placesToAllocate);
+            freeItemsPerLine[freeLine.id] = freeQuantity;
+            placesToAllocate -= freeQuantity;
+        }
+        return { freeItemsPerLine };
     },
 });
 function createIdentityMap(ids) {

package/dist/config/promotion/conditions/buy-x-get-y-free-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"buy-x-get-y-free-condition.js","sourceRoot":"","sources":["../../../../src/config/promotion/conditions/buy-x-get-y-free-condition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"buy-x-get-y-free-condition.js","sourceRoot":"","sources":["../../../../src/config/promotion/conditions/buy-x-get-y-free-condition.ts"],"names":[],"mappings":"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"}

package/dist/config/promotion/conditions/customer-group-condition.js

@@ -1,30 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.customerGroup = void 0;
 const generated_types_1 = require("@vendure/common/lib/generated-types");
 const ttl_cache_1 = require("../../../common/ttl-cache");
 const utils_1 = require("../../../common/utils");
 const event_bus_1 = require("../../../event-bus/event-bus");
-const customer_group_event_1 = require("../../../event-bus/events/customer-group-event");
+const index_1 = require("../../../event-bus/index");
 const promotion_condition_1 = require("../promotion-condition");
 let customerService;
 let subscription;
@@ -42,11 +23,11 @@ exports.customerGroup = new promotion_condition_1.PromotionCondition({
     },
     async init(injector) {
         // Lazily-imported to avoid circular dependency issues.
-        const { CustomerService } = await Promise.resolve().then(() => __importStar(require('../../../service/services/customer.service')));
+        const { CustomerService } = await import('../../../service/services/customer.service.js');
         customerService = injector.get(CustomerService);
         subscription = injector
             .get(event_bus_1.EventBus)
-            .ofType(customer_group_event_1.CustomerGroupEvent)
+            .ofType(index_1.CustomerGroupChangeEvent)
             .subscribe(event => {
             // When a customer is added to or removed from a group, we need
             // to invalidate the cache for that customer id

package/dist/config/promotion/conditions/customer-group-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"customer-group-condition.js","sourceRoot":"","sources":["../../../../src/config/promotion/conditions/customer-group-condition.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,yEAAmE;AAInE,yDAAqD;AACrD,iDAAoD;AACpD,4DAAwD;AACxD,yFAAoF;AACpF,gEAA4D;AAE5D,IAAI,eAAqF,CAAC;AAC1F,IAAI,YAAsC,CAAC;AAE3C,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAClC,MAAM,KAAK,GAAG,IAAI,oBAAQ,CAAW,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;AAE9C,QAAA,aAAa,GAAG,IAAI,wCAAkB,CAAC;IAChD,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,6CAA6C,EAAE,CAAC;IACtG,IAAI,EAAE;QACF,eAAe,EAAE;YACb,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,EAAE,SAAS,EAAE,2BAA2B,EAAE;YAC9C,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;SACtE;KACJ;IACD,KAAK,CAAC,IAAI,CAAC,QAAQ;QACf,uDAAuD;QACvD,MAAM,EAAE,eAAe,EAAE,GAAG,wDAAa,4CAA4C,GAAC,CAAC;QACvF,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAChD,YAAY,GAAG,QAAQ;aAClB,GAAG,CAAC,oBAAQ,CAAC;aACb,MAAM,CAAC,yCAAkB,CAAC;aAC1B,SAAS,CAAC,KAAK,CAAC,EAAE;YACf,+DAA+D;YAC/D,+CAA+C;YAC/C,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE;gBACpC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aAC7B;QACL,CAAC,CAAC,CAAC;IACX,CAAC;IACD,OAAO;QACH,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,EAAE,CAAC;IAChC,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACxB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACjB,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,IAAI,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YACxE,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;SACnC;QACD,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAC,CAAC"}
+{"version":3,"file":"customer-group-condition.js","sourceRoot":"","sources":["../../../../src/config/promotion/conditions/customer-group-condition.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAInE,yDAAqD;AACrD,iDAAoD;AACpD,4DAAwD;AACxD,oDAAoE;AACpE,gEAA4D;AAE5D,IAAI,eAAqF,CAAC;AAC1F,IAAI,YAAsC,CAAC;AAE3C,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAClC,MAAM,KAAK,GAAG,IAAI,oBAAQ,CAAW,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;AAE9C,QAAA,aAAa,GAAG,IAAI,wCAAkB,CAAC;IAChD,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,6CAA6C,EAAE,CAAC;IACtG,IAAI,EAAE;QACF,eAAe,EAAE;YACb,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,EAAE,SAAS,EAAE,2BAA2B,EAAE;YAC9C,KAAK,EAAE,CAAC,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;SACtE;KACJ;IACD,KAAK,CAAC,IAAI,CAAC,QAAQ;QACf,uDAAuD;QACvD,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,+CAA+C,CAAC,CAAC;QAC1F,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;QAChD,YAAY,GAAG,QAAQ;aAClB,GAAG,CAAC,oBAAQ,CAAC;aACb,MAAM,CAAC,gCAAwB,CAAC;aAChC,SAAS,CAAC,KAAK,CAAC,EAAE;YACf,+DAA+D;YAC/D,+CAA+C;YAC/C,KAAK,MAAM,QAAQ,IAAI,KAAK,CAAC,SAAS,EAAE;gBACpC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aAC7B;QACL,CAAC,CAAC,CAAC;IACX,CAAC;IACD,OAAO;QACH,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,WAAW,EAAE,CAAC;IAChC,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACxB,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;YACjB,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,IAAI,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACrC,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YACxE,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjC,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;SACnC;QACD,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,EAAE,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IACxE,CAAC;CACJ,CAAC,CAAC"}

package/dist/config/promotion/conditions/has-facet-values-condition.js

@@ -18,11 +18,11 @@ exports.hasFacetValues = new promotion_condition_1.PromotionCondition({
     init(injector) {
         facetValueChecker = new facet_value_checker_1.FacetValueChecker(injector.get(transactional_connection_1.TransactionalConnection));
     },
-    // tslint:disable-next-line:no-shadowed-variable
+    // eslint-disable-next-line no-shadow,@typescript-eslint/no-shadow
     async check(ctx, order, args) {
         let matches = 0;
         for (const line of order.lines) {
-            if (await facetValueChecker.hasFacetValues(line, args.facets)) {
+            if (await facetValueChecker.hasFacetValues(line, args.facets, ctx)) {
                 matches += line.quantity;
             }
         }

package/dist/config/promotion/conditions/has-facet-values-condition.js.map

@@ -1 +1 @@
-{"version":3,"file":"has-facet-values-condition.js","sourceRoot":"","sources":["../../../../src/config/promotion/conditions/has-facet-values-condition.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,2FAAuF;AACvF,gEAA4D;AAC5D,sEAAiE;AAEjE,IAAI,iBAAoC,CAAC;AAE5B,QAAA,cAAc,GAAG,IAAI,wCAAkB,CAAC;IACjD,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE;QACT,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,yDAAyD,EAAE;KACtG;IACD,IAAI,EAAE;QACF,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE;QACzC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE,EAAE;KAClF;IACD,IAAI,CAAC,QAAQ;QACT,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC,CAAC;IACrF,CAAC;IACD,gDAAgD;IAChD,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACxB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;YAC5B,IAAI,MAAM,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;gBAC3D,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC;aAC5B;SACJ;QACD,OAAO,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC;IACnC,CAAC;CACJ,CAAC,CAAC"}
+{"version":3,"file":"has-facet-values-condition.js","sourceRoot":"","sources":["../../../../src/config/promotion/conditions/has-facet-values-condition.ts"],"names":[],"mappings":";;;AAAA,yEAAmE;AAEnE,2FAAuF;AACvF,gEAA4D;AAC5D,sEAAiE;AAEjE,IAAI,iBAAoC,CAAC;AAE5B,QAAA,cAAc,GAAG,IAAI,wCAAkB,CAAC;IACjD,IAAI,EAAE,wBAAwB;IAC9B,WAAW,EAAE;QACT,EAAE,YAAY,EAAE,8BAAY,CAAC,EAAE,EAAE,KAAK,EAAE,yDAAyD,EAAE;KACtG;IACD,IAAI,EAAE;QACF,OAAO,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,EAAE;QACzC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,wBAAwB,EAAE,EAAE;KAClF;IACD,IAAI,CAAC,QAAQ;QACT,iBAAiB,GAAG,IAAI,uCAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,kDAAuB,CAAC,CAAC,CAAC;IACrF,CAAC;IACD,kEAAkE;IAClE,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI;QACxB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE;YAC5B,IAAI,MAAM,iBAAiB,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;gBAChE,OAAO,IAAI,IAAI,CAAC,QAAQ,CAAC;aAC5B;SACJ;QACD,OAAO,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC;IACnC,CAAC;CACJ,CAAC,CAAC"}

package/dist/config/promotion/index.d.ts

@@ -44,10 +44,12 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
         }[];
     };
 }, "buy_x_get_y_free", false | {
-    freeItemIds: import("@vendure/common/lib/shared-types").ID[];
+    freeItemsPerLine: {
+        [lineId: string]: number;
+    };
 }>[]> | import("./promotion-action").PromotionItemAction<{
     discount: {
-        type: "int";
+        type: "float";
         ui: {
             component: string;
             suffix: string;
@@ -67,9 +69,17 @@ export declare const defaultPromotionActions: (import("./promotion-action").Prom
             component: string;
         };
     };
+}, []> | import("./promotion-action").PromotionOrderAction<{
+    discount: {
+        type: "float";
+        ui: {
+            component: string;
+            suffix: string;
+        };
+    };
 }, []> | import("./promotion-action").PromotionItemAction<{
     discount: {
-        type: "int";
+        type: "float";
         ui: {
             component: string;
             suffix: string;
@@ -119,7 +129,9 @@ export declare const defaultPromotionConditions: (import("./promotion-condition"
         }[];
     };
 }, "buy_x_get_y_free", false | {
-    freeItemIds: import("@vendure/common/lib/shared-types").ID[];
+    freeItemsPerLine: {
+        [lineId: string]: number;
+    };
 }> | import("./promotion-condition").PromotionCondition<{
     minimum: {
         type: "int";

package/dist/config/promotion/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/dist/config/promotion/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/promotion/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+EAAuE;AACvE,+GAA6F;AAC7F,yEAA8D;AAC9D,uFAA2E;AAC3E,iGAAqF;AACrF,qGAA0F;AAC1F,wFAAgF;AAChF,0FAA4E;AAC5E,oFAAsE;AACtE,wFAAyE;AACzE,wFAA6E;AAE7E,qDAAmC;AACnC,wDAAsC;AACtC,oFAAkE;AAClE,6EAA2D;AAC3D,+EAA6D;AAC7D,iEAA+C;AAC/C,oEAAkD;AAClD,wEAAsD;AACtD,0EAAwD;AACxD,0EAAwD;AACxD,2EAAyD;AACzD,wEAAsD;AACtD,0EAAwD;AACxD,8DAA4C;AAE/B,QAAA,uBAAuB,GAAG;IACnC,gDAAkB;IAClB,0DAAuB;IACvB,kEAAwB;IACxB,+DAA0B;IAC1B,mCAAY;IACZ,4CAAkB;CACrB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACtC,+CAAkB;IAClB,2CAAc;IACd,8CAAgB;IAChB,wCAAa;IACb,kDAAqB;CACxB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/config/promotion/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+EAAuE;AACvE,+GAA6F;AAC7F,yEAA8D;AAC9D,uFAA2E;AAC3E,iGAAqF;AACrF,qGAA0F;AAC1F,wFAAgF;AAChF,0FAA4E;AAC5E,oFAAsE;AACtE,wFAAyE;AACzE,wFAA6E;AAE7E,qDAAmC;AACnC,wDAAsC;AACtC,oFAAkE;AAClE,6EAA2D;AAC3D,+EAA6D;AAC7D,iEAA+C;AAC/C,oEAAkD;AAClD,wEAAsD;AACtD,0EAAwD;AACxD,0EAAwD;AACxD,2EAAyD;AACzD,wEAAsD;AACtD,0EAAwD;AACxD,8DAA4C;AAE/B,QAAA,uBAAuB,GAAG;IACnC,gDAAkB;IAClB,0DAAuB;IACvB,kEAAwB;IACxB,+DAA0B;IAC1B,mCAAY;IACZ,4CAAkB;CACrB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACtC,+CAAkB;IAClB,2CAAc;IACd,8CAAgB;IAChB,wCAAa;IACb,kDAAqB;CACxB,CAAC"}

package/dist/config/promotion/promotion-action.d.ts

@@ -1,55 +1,54 @@
 import { ConfigArg } from '@vendure/common/lib/generated-types';
 import { RequestContext } from '../../api/common/request-context';
 import { ConfigArgs, ConfigArgValues, ConfigurableOperationDef, ConfigurableOperationDefOptions } from '../../common/configurable-operation';
-import { PromotionState } from '../../entity';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
-import { OrderLine } from '../../entity/order-line/order-line.entity';
+import { Promotion, PromotionState } from '../../entity';
 import { Order } from '../../entity/order/order.entity';
+import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { ShippingLine } from '../../entity/shipping-line/shipping-line.entity';
 import { PromotionCondition } from './promotion-condition';
 /**
  * Unwrap a promise type
  */
-declare type Awaited<T> = T extends PromiseLike<infer U> ? Awaited<U> : T;
+type Awaited<T> = T extends PromiseLike<infer U> ? Awaited<U> : T;
 /**
  * Extract the (non-false) return value of the PromotionCondition "check" function.
  */
-declare type ConditionCheckReturnType<T extends PromotionCondition<any>> = Exclude<Awaited<ReturnType<T['check']>>, false>;
+type ConditionCheckReturnType<T extends PromotionCondition<any>> = Exclude<Awaited<ReturnType<T['check']>>, false>;
 /**
  * Converts an array of PromotionCondition types into a tuple, thus preserving the
  * distinct type of each condition in the array.
  */
-export declare type ConditionTuple<C extends Array<PromotionCondition<any>>> = [...C];
+export type ConditionTuple<C extends Array<PromotionCondition<any>>> = [...C];
 /**
  * Converts an array of PromotionConditions into a tuple of the type:
  * [<condition code>, <check function return value>]
  */
-declare type CodesStateTuple<T extends ConditionTuple<Array<PromotionCondition<any>>>> = {
+type CodesStateTuple<T extends ConditionTuple<Array<PromotionCondition<any>>>> = {
     [K in keyof T]: T[K] extends PromotionCondition<any> ? [T[K]['code'], ConditionCheckReturnType<T[K]>] : never;
 };
 /**
  * Convert a tuple into a union
  * [[string, number], [number, boolean]] => [string, number] | [number, boolean]
  */
-declare type TupleToUnion<T extends any[]> = T[number];
+type TupleToUnion<T extends any[]> = T[number];
 /**
  * Converts an array of PromotionConditions into an object of the type:
  * {
  *     [PromotionCondition.code]: ReturnType<PromotionCondition.check()>
  * }
  */
-export declare type ConditionState<U extends Array<PromotionCondition<any>>, T extends [string, any] = TupleToUnion<CodesStateTuple<ConditionTuple<U>>>> = {
+export type ConditionState<U extends Array<PromotionCondition<any>>, T extends [string, any] = TupleToUnion<CodesStateTuple<ConditionTuple<U>>>> = {
     [key in T[0]]: Extract<T, [key, any]>[1];
 };
 /**
  * @description
  * The function which is used by a PromotionItemAction to calculate the
- * discount on the OrderItem.
+ * discount on the OrderLine.
  *
  * @docsCategory promotions
  * @docsPage promotion-action
  */
-export declare type ExecutePromotionItemActionFn<T extends ConfigArgs, U extends Array<PromotionCondition<any>>> = (ctx: RequestContext, orderItem: OrderItem, orderLine: OrderLine, args: ConfigArgValues<T>, state: ConditionState<U>) => number | Promise<number>;
+export type ExecutePromotionItemActionFn<T extends ConfigArgs, U extends Array<PromotionCondition<any>>> = (ctx: RequestContext, orderLine: OrderLine, args: ConfigArgValues<T>, state: ConditionState<U>, promotion: Promotion) => number | Promise<number>;
 /**
  * @description
  * The function which is used by a PromotionOrderAction to calculate the
@@ -58,7 +57,7 @@ export declare type ExecutePromotionItemActionFn<T extends ConfigArgs, U extends
  * @docsCategory promotions
  * @docsPage promotion-action
  */
-export declare type ExecutePromotionOrderActionFn<T extends ConfigArgs, U extends Array<PromotionCondition<any>>> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T>, state: ConditionState<U>) => number | Promise<number>;
+export type ExecutePromotionOrderActionFn<T extends ConfigArgs, U extends Array<PromotionCondition<any>>> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T>, state: ConditionState<U>, promotion: Promotion) => number | Promise<number>;
 /**
  * @description
  * The function which is used by a PromotionOrderAction to calculate the
@@ -67,7 +66,17 @@ export declare type ExecutePromotionOrderActionFn<T extends ConfigArgs, U extend
  * @docsCategory promotions
  * @docsPage promotion-action
  */
-export declare type ExecutePromotionShippingActionFn<T extends ConfigArgs, U extends Array<PromotionCondition<any>>> = (ctx: RequestContext, shippingLine: ShippingLine, order: Order, args: ConfigArgValues<T>, state: ConditionState<U>) => number | Promise<number>;
+export type ExecutePromotionShippingActionFn<T extends ConfigArgs, U extends Array<PromotionCondition<any>>> = (ctx: RequestContext, shippingLine: ShippingLine, order: Order, args: ConfigArgValues<T>, state: ConditionState<U>, promotion: Promotion) => number | Promise<number>;
+/**
+ * @description
+ * The signature of a PromotionAction's side-effect functions `onActivate` and `onDeactivate`.
+ *
+ * @docsCategory promotions
+ * @docsPage promotion-action
+ * @since 1.8.0
+ * @experimental
+ */
+type PromotionActionSideEffectFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T>, promotion: Promotion) => void | Promise<void>;
 /**
  * @description
  * Configuration for all types of {@link PromotionAction}.
@@ -95,6 +104,27 @@ export interface PromotionActionConfig<T extends ConfigArgs, U extends Array<Pro
      * the return values of the PromotionConditions' `check()` function.
      */
     conditions?: U extends undefined ? undefined : ConditionTuple<Exclude<U, undefined>>;
+    /**
+     * @description
+     * An optional side effect function which is invoked when the promotion
+     * becomes active. It can be used for things like adding a free gift to the order
+     * or other side effects that are unrelated to price calculations.
+     *
+     * If used, make sure to use the corresponding `onDeactivate` function to clean up
+     * or reverse any side effects as needed.
+     *
+     * @since 1.8.0
+     * @experimental
+     */
+    onActivate?: PromotionActionSideEffectFn<T>;
+    /**
+     * @description
+     * Used to reverse or clean up any side effects executed as part of the `onActivate` function.
+     *
+     * @since 1.8.0
+     * @experimental
+     */
+    onDeactivate?: PromotionActionSideEffectFn<T>;
 }
 /**
  * @description
@@ -107,6 +137,8 @@ export interface PromotionItemActionConfig<T extends ConfigArgs, U extends Promo
     /**
      * @description
      * The function which contains the promotion calculation logic.
+     * Should resolve to a number which represents the amount by which to discount
+     * the OrderLine, i.e. the number should be negative.
      */
     execute: ExecutePromotionItemActionFn<T, U>;
 }
@@ -120,6 +152,8 @@ export interface PromotionOrderActionConfig<T extends ConfigArgs, U extends Prom
     /**
      * @description
      * The function which contains the promotion calculation logic.
+     * Should resolve to a number which represents the amount by which to discount
+     * the Order, i.e. the number should be negative.
      */
     execute: ExecutePromotionOrderActionFn<T, U>;
 }
@@ -133,6 +167,8 @@ export interface PromotionShippingActionConfig<T extends ConfigArgs, U extends P
     /**
      * @description
      * The function which contains the promotion calculation logic.
+     * Should resolve to a number which represents the amount by which to discount
+     * the Shipping, i.e. the number should be negative.
      */
     execute: ExecutePromotionShippingActionFn<T, U>;
 }
@@ -145,7 +181,7 @@ export interface PromotionShippingActionConfig<T extends ConfigArgs, U extends P
  * @docsPage promotion-action
  * @docsWeight 0
  */
-export declare abstract class PromotionAction<T extends ConfigArgs = {}, U extends PromotionCondition[] | undefined = any> extends ConfigurableOperationDef<T> {
+export declare abstract class PromotionAction<T extends ConfigArgs = ConfigArgs, U extends PromotionCondition[] | undefined = any> extends ConfigurableOperationDef<T> {
     /**
      * @description
      * Used to determine the order of application of multiple Promotions
@@ -155,16 +191,27 @@ export declare abstract class PromotionAction<T extends ConfigArgs = {}, U exten
      * @default 0
      */
     readonly priorityValue: number;
+    /** @internal */
     readonly conditions?: U;
+    /** @internal */
+    protected readonly onActivateFn?: PromotionActionSideEffectFn<T>;
+    /** @internal */
+    protected readonly onDeactivateFn?: PromotionActionSideEffectFn<T>;
     protected constructor(config: PromotionActionConfig<T, U>);
+    /** @internal */
+    abstract execute(...arg: any[]): number | Promise<number>;
+    /** @internal */
+    onActivate(ctx: RequestContext, order: Order, args: ConfigArg[], promotion: Promotion): void | Promise<void>;
+    /** @internal */
+    onDeactivate(ctx: RequestContext, order: Order, args: ConfigArg[], promotion: Promotion): void | Promise<void>;
 }
 /**
  * @description
- * Represents a PromotionAction which applies to individual {@link OrderItem}s.
+ * Represents a PromotionAction which applies to individual {@link OrderLine}s.
  *
  * @example
  * ```ts
- * // Applies a percentage discount to each OrderItem
+ * // Applies a percentage discount to each OrderLine
  * const itemPercentageDiscount = new PromotionItemAction({
  *     code: 'item_percentage_discount',
  *     args: { discount: 'percentage' },
@@ -183,7 +230,7 @@ export declare class PromotionItemAction<T extends ConfigArgs = ConfigArgs, U ex
     private readonly executeFn;
     constructor(config: PromotionItemActionConfig<T, U>);
     /** @internal */
-    execute(ctx: RequestContext, orderItem: OrderItem, orderLine: OrderLine, args: ConfigArg[], state: PromotionState): number | Promise<number>;
+    execute(ctx: RequestContext, orderLine: OrderLine, args: ConfigArg[], state: PromotionState, promotion: Promotion): number | Promise<number>;
 }
 /**
  * @description
@@ -210,7 +257,7 @@ export declare class PromotionOrderAction<T extends ConfigArgs = ConfigArgs, U e
     private readonly executeFn;
     constructor(config: PromotionOrderActionConfig<T, U>);
     /** @internal */
-    execute(ctx: RequestContext, order: Order, args: ConfigArg[], state: PromotionState): number | Promise<number>;
+    execute(ctx: RequestContext, order: Order, args: ConfigArg[], state: PromotionState, promotion: Promotion): number | Promise<number>;
 }
 /**
  * @description
@@ -224,6 +271,6 @@ export declare class PromotionShippingAction<T extends ConfigArgs = ConfigArgs,
     private readonly executeFn;
     constructor(config: PromotionShippingActionConfig<T, U>);
     /** @internal */
-    execute(ctx: RequestContext, shippingLine: ShippingLine, order: Order, args: ConfigArg[], state: PromotionState): number | Promise<number>;
+    execute(ctx: RequestContext, shippingLine: ShippingLine, order: Order, args: ConfigArg[], state: PromotionState, promotion: Promotion): number | Promise<number>;
 }
 export {};