@medusajs/medusa 1.2.2-dev.56 → 1.3.1-alpha.72

package/dist/services/product-type.js

@@ -53,6 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var medusa_core_utils_1 = require("medusa-core-utils");
 var medusa_interfaces_1 = require("medusa-interfaces");
+var typeorm_1 = require("typeorm");
 /**
  * Provides layer to manipulate products.
  * @extends BaseService
@@ -138,12 +139,24 @@ var ProductTypeService = /** @class */ (function (_super) {
         if (selector === void 0) { selector = {}; }
         if (config === void 0) { config = { skip: 0, take: 20 }; }
         return __awaiter(this, void 0, void 0, function () {
-            var typeRepo, query;
+            var typeRepo, q, query, where_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         typeRepo = this.manager_.getCustomRepository(this.typeRepository_);
+                        q = undefined;
+                        if ("q" in selector) {
+                            q = selector.q;
+                            delete selector.q;
+                        }
                         query = this.buildQuery_(selector, config);
+                        if (q) {
+                            where_1 = query.where;
+                            delete where_1.value;
+                            query.where = function (qb) {
+                                qb.where(where_1).andWhere([{ value: (0, typeorm_1.ILike)("%".concat(q, "%")) }]);
+                            };
+                        }
                         return [4 /*yield*/, typeRepo.findAndCount(query)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }

package/dist/services/product-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-type.js","sourceRoot":"","sources":["../../src/services/product-type.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAA+C;AAC/C,uDAA+C;AAO/C;;;GAGG;AACH;IAAiC,sCAAW;IAG1C,4BAAY,EAAkC;YAAhC,OAAO,aAAA,EAAE,qBAAqB,2BAAA;QAA5C,YACE,iBAAO,SAIR;QAFC,KAAI,CAAC,QAAQ,GAAG,OAAO,CAAA;QACvB,KAAI,CAAC,eAAe,GAAG,qBAAqB,CAAA;;IAC9C,CAAC;IAED,4CAAe,GAAf,UAAgB,kBAAiC;QAC/C,IAAI,CAAC,kBAAkB,EAAE;YACvB,OAAO,IAAI,CAAA;SACZ;QAED,IAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC;YACpC,OAAO,EAAE,kBAAkB;YAC3B,qBAAqB,EAAE,IAAI,CAAC,eAAe;SAC5C,CAAC,CAAA;QAEF,MAAM,CAAC,mBAAmB,GAAG,kBAAkB,CAAA;QAC/C,MAAM,CAAC,QAAQ,GAAG,kBAAkB,CAAA;QAEpC,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;;;;;OAOG;IACG,qCAAQ,GAAd,UACE,EAAU,EACV,MAAoC;QAApC,uBAAA,EAAA,WAAoC;;;;;;wBAE9B,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;wBAElE,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,IAAA,EAAE,EAAE,MAAM,CAAC,CAAA;wBACjC,qBAAM,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAA;;wBAApC,IAAI,GAAG,SAA6B;wBAE1C,IAAI,CAAC,IAAI,EAAE;4BACT,MAAM,IAAI,+BAAW,CACnB,+BAAW,CAAC,KAAK,CAAC,SAAS,EAC3B,2BAAoB,EAAE,mBAAgB,CACvC,CAAA;yBACF;wBAED,sBAAO,IAAI,EAAA;;;;KACZ;IAED;;;;;OAKG;IACG,iCAAI,GAAV,UACE,QAAyC,EACzC,MAAuD;QADvD,yBAAA,EAAA,aAAyC;QACzC,uBAAA,EAAA,WAAoC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;;;;;;wBAEjD,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;wBAElE,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;wBACzC,qBAAM,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAA;4BAAjC,sBAAO,SAA0B,EAAA;;;;KAClC;IAED;;;;;OAKG;IACG,yCAAY,GAAlB,UACE,QAAyC,EACzC,MAAuD;QADvD,yBAAA,EAAA,aAAyC;QACzC,uBAAA,EAAA,WAAoC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;;;;;;wBAEjD,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;wBAElE,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;wBACzC,qBAAM,QAAQ,CAAC,YAAY,CAAC,KAAK,CAAC,EAAA;4BAAzC,sBAAO,SAAkC,EAAA;;;;KAC1C;IACH,yBAAC;AAAD,CAAC,AApFD,CAAiC,+BAAW,GAoF3C;AAED,kBAAe,kBAAkB,CAAA"}
+{"version":3,"file":"product-type.js","sourceRoot":"","sources":["../../src/services/product-type.ts"],"names":[],"mappings":"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"}

package/dist/services/product-variant.d.ts

@@ -1,12 +1,13 @@
 import { BaseService } from "medusa-interfaces";
 import { EntityManager, SelectQueryBuilder } from "typeorm";
-import { MoneyAmount } from "..";
+import { PriceSelectionContext } from "../interfaces/price-selection-strategy";
+import { MoneyAmount } from "../models/money-amount";
 import { Product } from "../models/product";
 import { ProductOptionValue } from "../models/product-option-value";
 import { ProductVariant } from "../models/product-variant";
 import { FindWithRelationsOptions, ProductVariantRepository } from "../repositories/product-variant";
 import { FindConfig } from "../types/common";
-import { CreateProductVariantInput, FilterableProductVariantProps, ProductVariantPrice, UpdateProductVariantInput } from "../types/product-variant";
+import { CreateProductVariantInput, FilterableProductVariantProps, GetRegionPriceContext, ProductVariantPrice, UpdateProductVariantInput } from "../types/product-variant";
 /**
  * Provides layer to manipulate product variants.
  * @extends BaseService
@@ -22,9 +23,11 @@ declare class ProductVariantService extends BaseService {
     private productRepository_;
     private eventBus_;
     private regionService_;
+    private priceSelectionStrategy_;
     private moneyAmountRepository_;
     private productOptionValueRepository_;
-    constructor({ manager, productVariantRepository, productRepository, eventBusService, regionService, moneyAmountRepository, productOptionValueRepository, }: {
+    private cartRepository_;
+    constructor({ manager, productVariantRepository, productRepository, eventBusService, regionService, moneyAmountRepository, productOptionValueRepository, cartRepository, priceSelectionStrategy, }: {
         manager: any;
         productVariantRepository: any;
         productRepository: any;
@@ -32,6 +35,8 @@ declare class ProductVariantService extends BaseService {
         regionService: any;
         moneyAmountRepository: any;
         productOptionValueRepository: any;
+        cartRepository: any;
+        priceSelectionStrategy: any;
     });
     withTransaction(transactionManager: EntityManager): ProductVariantService;
     /**
@@ -40,14 +45,14 @@ declare class ProductVariantService extends BaseService {
      * @param {FindConfig<ProductVariant>} config - query config object for variant retrieval.
      * @return {Promise<Product>} the product document.
      */
-    retrieve(variantId: string, config?: FindConfig<ProductVariant>): Promise<ProductVariant>;
+    retrieve(variantId: string, config?: FindConfig<ProductVariant> & PriceSelectionContext): Promise<ProductVariant>;
     /**
      * Gets a product variant by id.
      * @param {string} sku - The unique stock keeping unit used to identify the product variant.
      * @param {FindConfig<ProductVariant>} config - query config object for variant retrieval.
      * @return {Promise<Product>} the product document.
      */
-    retrieveBySKU(sku: string, config?: FindConfig<ProductVariant>): Promise<ProductVariant>;
+    retrieveBySKU(sku: string, config?: FindConfig<ProductVariant> & PriceSelectionContext): Promise<ProductVariant>;
     /**
      * Creates an unpublished product variant. Will validate against parent product
      * to ensure that the variant can in fact be created.
@@ -62,6 +67,7 @@ declare class ProductVariantService extends BaseService {
      * The function will throw, if price updates are attempted.
      * @param {string | ProductVariant} variantOrVariantId - variant or id of a variant.
      * @param {object} update - an object with the update values.
+     * @param {object} config - an object with the config values for returning the variant.
      * @return {Promise} resolves to the update result.
      */
     update(variantOrVariantId: string | Partial<ProductVariant>, update: UpdateProductVariantInput): Promise<ProductVariant>;
@@ -78,10 +84,10 @@ declare class ProductVariantService extends BaseService {
      * exists the function will try to use a currency price. If no default
      * currency price exists the function will throw an error.
      * @param {string} variantId - the id of the variant to get price from
-     * @param {string} regionId - the id of the region to get price for
+     * @param {GetRegionPriceContext} context - context for getting region price
      * @return {number} the price specific to the region
      */
-    getRegionPrice(variantId: string, regionId: string): Promise<number>;
+    getRegionPrice(variantId: string, context: GetRegionPriceContext): Promise<number>;
     /**
      * Sets the default price of a specific region
      * @param {string} variantId - the id of the variant to update
@@ -130,13 +136,13 @@ declare class ProductVariantService extends BaseService {
      * @param {FindConfig<ProductVariant>} config - query config object for variant retrieval
      * @return {Promise} the result of the find operation
      */
-    listAndCount(selector: FilterableProductVariantProps, config?: FindConfig<ProductVariant>): Promise<[ProductVariant[], number]>;
+    listAndCount(selector: FilterableProductVariantProps, config?: FindConfig<ProductVariant> & PriceSelectionContext): Promise<[ProductVariant[], number]>;
     /**
      * @param {FilterableProductVariantProps} selector - the query object for find
      * @param {FindConfig<ProductVariant>} config - query config object for variant retrieval
      * @return {Promise} the result of the find operation
      */
-    list(selector: FilterableProductVariantProps, config?: FindConfig<ProductVariant>): Promise<ProductVariant[]>;
+    list(selector: FilterableProductVariantProps, config?: FindConfig<ProductVariant> & PriceSelectionContext): Promise<ProductVariant[]>;
     /**
      * Deletes variant.
      * Will never fail due to delete being idempotent.
@@ -174,5 +180,16 @@ declare class ProductVariantService extends BaseService {
      *   count of products that matches the query as the second element.
      */
     getFreeTextQueryBuilder_(variantRepo: ProductVariantRepository, query: FindWithRelationsOptions, q?: string): SelectQueryBuilder<ProductVariant>;
+    /**
+     * Set additional prices on a list of variants.
+     * @param {ProductVariant | ProductVariant[] } variant variant on which to set additional prices
+     * @param {string} currency_code currency code to fetch prices for
+     * @param {string} region_id region to fetch prices for
+     * @param {string} cart_id string of cart to use as a basis for getting currency and region
+     * @param {string} customer_id id of potentially logged in customer, used to get prices valid for their customer groups
+     * @param {boolean} include_discount_prices should result include discount pricing
+     * @return {Promise<ProductVariant | ProductVariant[]>} A list of variants with variants decorated with "additional_prices"
+     */
+    setAdditionalPrices(variant: any, currency_code: any, region_id: any, cart_id: any, customer_id: any, include_discount_prices?: boolean): Promise<ProductVariant | ProductVariant[]>;
 }
 export default ProductVariantService;

package/dist/services/product-variant.js

@@ -72,17 +72,6 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -99,6 +88,26 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var medusa_core_utils_1 = require("medusa-core-utils");
 var medusa_interfaces_1 = require("medusa-interfaces");
@@ -110,7 +119,7 @@ var typeorm_1 = require("typeorm");
 var ProductVariantService = /** @class */ (function (_super) {
     __extends(ProductVariantService, _super);
     function ProductVariantService(_a) {
-        var manager = _a.manager, productVariantRepository = _a.productVariantRepository, productRepository = _a.productRepository, eventBusService = _a.eventBusService, regionService = _a.regionService, moneyAmountRepository = _a.moneyAmountRepository, productOptionValueRepository = _a.productOptionValueRepository;
+        var manager = _a.manager, productVariantRepository = _a.productVariantRepository, productRepository = _a.productRepository, eventBusService = _a.eventBusService, regionService = _a.regionService, moneyAmountRepository = _a.moneyAmountRepository, productOptionValueRepository = _a.productOptionValueRepository, cartRepository = _a.cartRepository, priceSelectionStrategy = _a.priceSelectionStrategy;
         var _this = _super.call(this) || this;
         /** @private @const {EntityManager} */
         _this.manager_ = manager;
@@ -124,6 +133,8 @@ var ProductVariantService = /** @class */ (function (_super) {
         _this.regionService_ = regionService;
         _this.moneyAmountRepository_ = moneyAmountRepository;
         _this.productOptionValueRepository_ = productOptionValueRepository;
+        _this.cartRepository_ = cartRepository;
+        _this.priceSelectionStrategy_ = priceSelectionStrategy;
         return _this;
     }
     ProductVariantService.prototype.withTransaction = function (transactionManager) {
@@ -138,6 +149,8 @@ var ProductVariantService = /** @class */ (function (_super) {
             regionService: this.regionService_,
             moneyAmountRepository: this.moneyAmountRepository_,
             productOptionValueRepository: this.productOptionValueRepository_,
+            cartRepository: this.cartRepository_,
+            priceSelectionStrategy: this.priceSelectionStrategy_,
         });
         cloned.transactionManager_ = transactionManager;
         return cloned;
@@ -149,22 +162,38 @@ var ProductVariantService = /** @class */ (function (_super) {
      * @return {Promise<Product>} the product document.
      */
     ProductVariantService.prototype.retrieve = function (variantId, config) {
-        if (config === void 0) { config = {}; }
+        var _a, _b;
+        if (config === void 0) { config = {
+            include_discount_prices: false,
+        }; }
         return __awaiter(this, void 0, void 0, function () {
-            var variantRepo, validatedId, query, variant;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var variantRepo, validatedId, priceIndex, query, variant, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         variantRepo = this.manager_.getCustomRepository(this.productVariantRepository_);
                         validatedId = this.validateId_(variantId);
+                        priceIndex = (_b = (_a = config.relations) === null || _a === void 0 ? void 0 : _a.indexOf("prices")) !== null && _b !== void 0 ? _b : -1;
+                        if (priceIndex >= 0 && config.relations) {
+                            config.relations = __spreadArray([], __read(config.relations), false);
+                            config.relations.splice(priceIndex, 1);
+                        }
                         query = this.buildQuery_({ id: validatedId }, config);
                         return [4 /*yield*/, variantRepo.findOne(query)];
                     case 1:
-                        variant = _a.sent();
+                        variant = _d.sent();
                         if (!variant) {
                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Variant with id: ".concat(variantId, " was not found"));
                         }
-                        return [2 /*return*/, variant];
+                        if (!(priceIndex >= 0)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.setAdditionalPrices(variant, config.currency_code, config.region_id, config.cart_id, config.customer_id, config.include_discount_prices)];
+                    case 2:
+                        _c = (_d.sent());
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _c = variant;
+                        _d.label = 4;
+                    case 4: return [2 /*return*/, _c];
                 }
             });
         });
@@ -176,21 +205,37 @@ var ProductVariantService = /** @class */ (function (_super) {
      * @return {Promise<Product>} the product document.
      */
     ProductVariantService.prototype.retrieveBySKU = function (sku, config) {
-        if (config === void 0) { config = {}; }
+        var _a, _b;
+        if (config === void 0) { config = {
+            include_discount_prices: false,
+        }; }
         return __awaiter(this, void 0, void 0, function () {
-            var variantRepo, query, variant;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var variantRepo, priceIndex, query, variant, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         variantRepo = this.manager_.getCustomRepository(this.productVariantRepository_);
+                        priceIndex = (_b = (_a = config.relations) === null || _a === void 0 ? void 0 : _a.indexOf("prices")) !== null && _b !== void 0 ? _b : -1;
+                        if (priceIndex >= 0 && config.relations) {
+                            config.relations = __spreadArray([], __read(config.relations), false);
+                            config.relations.splice(priceIndex, 1);
+                        }
                         query = this.buildQuery_({ sku: sku }, config);
                         return [4 /*yield*/, variantRepo.findOne(query)];
                     case 1:
-                        variant = _a.sent();
+                        variant = _d.sent();
                         if (!variant) {
                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Variant with sku: ".concat(sku, " was not found"));
                         }
-                        return [2 /*return*/, variant];
+                        if (!(priceIndex >= 0)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.setAdditionalPrices(variant, config.currency_code, config.region_id, config.cart_id, config.customer_id, config.include_discount_prices)];
+                    case 2:
+                        _c = (_d.sent());
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _c = variant;
+                        _d.label = 4;
+                    case 4: return [2 /*return*/, _c];
                 }
             });
         });
@@ -311,6 +356,7 @@ var ProductVariantService = /** @class */ (function (_super) {
      * The function will throw, if price updates are attempted.
      * @param {string | ProductVariant} variantOrVariantId - variant or id of a variant.
      * @param {object} update - an object with the update values.
+     * @param {object} config - an object with the config values for returning the variant.
      * @return {Promise} resolves to the update result.
      */
     ProductVariantService.prototype.update = function (variantOrVariantId, update) {
@@ -318,7 +364,7 @@ var ProductVariantService = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var variantRepo, variant, prices, options, metadata, inventory_quantity, rest, options_1, options_1_1, option, e_2_1, _a, _b, _c, key, value, result;
+                        var variantRepo, variant, variantRes, prices, options, metadata, inventory_quantity, rest, options_1, options_1_1, option, e_2_1, _a, _b, _c, key, value, result;
                         var e_2, _d, e_3, _e;
                         return __generator(this, function (_f) {
                             switch (_f.label) {
@@ -326,9 +372,17 @@ var ProductVariantService = /** @class */ (function (_super) {
                                     variantRepo = manager.getCustomRepository(this.productVariantRepository_);
                                     variant = variantOrVariantId;
                                     if (!(typeof variant === "string")) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, this.retrieve(variantOrVariantId)];
+                                    return [4 /*yield*/, variantRepo.findOne({
+                                            where: { id: variantOrVariantId },
+                                        })];
                                 case 1:
-                                    variant = _f.sent();
+                                    variantRes = _f.sent();
+                                    if (typeof variant === "undefined") {
+                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Variant with id ".concat(variantOrVariantId, " was not found"));
+                                    }
+                                    else {
+                                        variant = variantRes;
+                                    }
                                     return [3 /*break*/, 3];
                                 case 2:
                                     if (!variant.id) {
@@ -371,7 +425,7 @@ var ProductVariantService = /** @class */ (function (_super) {
                                     finally { if (e_2) throw e_2.error; }
                                     return [7 /*endfinally*/];
                                 case 13:
-                                    if (metadata) {
+                                    if (typeof metadata === "object") {
                                         variant.metadata = this.setMetadata_(variant, metadata);
                                     }
                                     if (typeof inventory_quantity === "number") {
@@ -479,47 +533,34 @@ var ProductVariantService = /** @class */ (function (_super) {
      * exists the function will try to use a currency price. If no default
      * currency price exists the function will throw an error.
      * @param {string} variantId - the id of the variant to get price from
-     * @param {string} regionId - the id of the region to get price for
+     * @param {GetRegionPriceContext} context - context for getting region price
      * @return {number} the price specific to the region
      */
-    ProductVariantService.prototype.getRegionPrice = function (variantId, regionId) {
+    ProductVariantService.prototype.getRegionPrice = function (variantId, context) {
         return __awaiter(this, void 0, void 0, function () {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var moneyAmountRepo, region, moneyAmount;
+                        var region, prices;
                         return __generator(this, function (_a) {
                             switch (_a.label) {
-                                case 0:
-                                    moneyAmountRepo = manager.getCustomRepository(this.moneyAmountRepository_);
-                                    return [4 /*yield*/, this.regionService_
-                                            .withTransaction(manager)
-                                            .retrieve(regionId)
-                                        // Find region price based on region id
-                                    ];
+                                case 0: return [4 /*yield*/, this.regionService_
+                                        .withTransaction(manager)
+                                        .retrieve(context.regionId)];
                                 case 1:
                                     region = _a.sent();
-                                    return [4 /*yield*/, moneyAmountRepo.findOne({
-                                            where: { region_id: regionId, variant_id: variantId },
-                                        })
-                                        // If no price could be find based on region id, we try to fetch
-                                        // based on the region currency code
-                                    ];
-                                case 2:
-                                    moneyAmount = _a.sent();
-                                    if (!!moneyAmount) return [3 /*break*/, 4];
-                                    return [4 /*yield*/, moneyAmountRepo.findOne({
-                                            where: { variant_id: variantId, currency_code: region.currency_code },
+                                    return [4 /*yield*/, this.priceSelectionStrategy_
+                                            .withTransaction(manager)
+                                            .calculateVariantPrice(variantId, {
+                                            region_id: context.regionId,
+                                            currency_code: region.currency_code,
+                                            quantity: context.quantity,
+                                            customer_id: context.customer_id,
+                                            include_discount_prices: !!context.include_discount_prices,
                                         })];
-                                case 3:
-                                    moneyAmount = _a.sent();
-                                    _a.label = 4;
-                                case 4:
-                                    // Still, if no price is found, we throw
-                                    if (!moneyAmount) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "A price for region: ".concat(region.name, " could not be found"));
-                                    }
-                                    return [2 /*return*/, moneyAmount.amount];
+                                case 2:
+                                    prices = _a.sent();
+                                    return [2 /*return*/, prices.calculatedPrice];
                             }
                         });
                     }); })];
@@ -704,26 +745,48 @@ var ProductVariantService = /** @class */ (function (_super) {
      * @return {Promise} the result of the find operation
      */
     ProductVariantService.prototype.listAndCount = function (selector, config) {
-        var _a;
-        if (config === void 0) { config = { relations: [], skip: 0, take: 20 }; }
+        var _a, _b, _c;
+        if (config === void 0) { config = {
+            relations: [],
+            skip: 0,
+            take: 20,
+            include_discount_prices: false,
+        }; }
         return __awaiter(this, void 0, void 0, function () {
-            var variantRepo, _b, q, query, relations, qb, _c, raw, count, variants;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var variantRepo, priceIndex, _d, q, query, relations, qb, _e, raw, count_1, variants_1, res, _f, variants, count, res;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
                     case 0:
                         variantRepo = this.manager_.getCustomRepository(this.productVariantRepository_);
-                        _b = this.prepareListQuery_(selector, config), q = _b.q, query = _b.query, relations = _b.relations;
-                        if (!q) return [3 /*break*/, 3];
+                        priceIndex = (_b = (_a = config.relations) === null || _a === void 0 ? void 0 : _a.indexOf("prices")) !== null && _b !== void 0 ? _b : -1;
+                        if (priceIndex >= 0 && config.relations) {
+                            config.relations = __spreadArray([], __read(config.relations), false);
+                            config.relations.splice(priceIndex, 1);
+                        }
+                        _d = this.prepareListQuery_(selector, config), q = _d.q, query = _d.query, relations = _d.relations;
+                        if (!q) return [3 /*break*/, 5];
                         qb = this.getFreeTextQueryBuilder_(variantRepo, query, q);
                         return [4 /*yield*/, qb.getManyAndCount()];
                     case 1:
-                        _c = __read.apply(void 0, [_d.sent(), 2]), raw = _c[0], count = _c[1];
-                        return [4 /*yield*/, variantRepo.findWithRelations(relations, raw.map(function (i) { return i.id; }), (_a = query.withDeleted) !== null && _a !== void 0 ? _a : false)];
+                        _e = __read.apply(void 0, [_g.sent(), 2]), raw = _e[0], count_1 = _e[1];
+                        return [4 /*yield*/, variantRepo.findWithRelations(relations, raw.map(function (i) { return i.id; }), (_c = query.withDeleted) !== null && _c !== void 0 ? _c : false)];
                     case 2:
-                        variants = _d.sent();
-                        return [2 /*return*/, [variants, count]];
-                    case 3: return [4 /*yield*/, variantRepo.findWithRelationsAndCount(relations, query)];
-                    case 4: return [2 /*return*/, _d.sent()];
+                        variants_1 = _g.sent();
+                        if (!(priceIndex >= 0)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.setAdditionalPrices(variants_1, config.currency_code, config.region_id, config.cart_id, config.customer_id, config.include_discount_prices)];
+                    case 3:
+                        res = _g.sent();
+                        return [2 /*return*/, [res, count_1]];
+                    case 4: return [2 /*return*/, [variants_1, count_1]];
+                    case 5: return [4 /*yield*/, variantRepo.findWithRelationsAndCount(relations, query)];
+                    case 6:
+                        _f = __read.apply(void 0, [_g.sent(), 2]), variants = _f[0], count = _f[1];
+                        if (!(priceIndex >= 0)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.setAdditionalPrices(variants, config.currency_code, config.region_id, config.cart_id, config.customer_id, config.include_discount_prices)];
+                    case 7:
+                        res = _g.sent();
+                        return [2 /*return*/, [res, count]];
+                    case 8: return [2 /*return*/, [variants, count]];
                 }
             });
         });
@@ -734,13 +797,23 @@ var ProductVariantService = /** @class */ (function (_super) {
      * @return {Promise} the result of the find operation
      */
     ProductVariantService.prototype.list = function (selector, config) {
-        if (config === void 0) { config = { relations: [], skip: 0, take: 20 }; }
+        var _a, _b;
+        if (config === void 0) { config = {
+            relations: [],
+            skip: 0,
+            take: 20,
+        }; }
         return __awaiter(this, void 0, void 0, function () {
-            var productVariantRepo, q, query, where_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var productVariantRepo, priceIndex, q, query, where_1, variants, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         productVariantRepo = this.manager_.getCustomRepository(this.productVariantRepository_);
+                        priceIndex = (_b = (_a = config.relations) === null || _a === void 0 ? void 0 : _a.indexOf("prices")) !== null && _b !== void 0 ? _b : -1;
+                        if (priceIndex >= 0 && config.relations) {
+                            config.relations = __spreadArray([], __read(config.relations), false);
+                            config.relations.splice(priceIndex, 1);
+                        }
                         if ("q" in selector) {
                             q = selector.q;
                             delete selector.q;
@@ -765,7 +838,17 @@ var ProductVariantService = /** @class */ (function (_super) {
                             };
                         }
                         return [4 /*yield*/, productVariantRepo.find(query)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1:
+                        variants = _d.sent();
+                        if (!(priceIndex >= 0)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.setAdditionalPrices(variants, config.currency_code, config.region_id, config.cart_id, config.customer_id, config.include_discount_prices)];
+                    case 2:
+                        _c = (_d.sent());
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _c = variants;
+                        _d.label = 4;
+                    case 4: return [2 /*return*/, _c];
                 }
             });
         });
@@ -789,7 +872,7 @@ var ProductVariantService = /** @class */ (function (_super) {
                                     variantRepo = manager.getCustomRepository(this.productVariantRepository_);
                                     return [4 /*yield*/, variantRepo.findOne({
                                             where: { id: variantId },
-                                            relations: ["prices"],
+                                            relations: ["prices", "options"],
                                         })];
                                 case 1:
                                     variant = _a.sent();
@@ -906,6 +989,69 @@ var ProductVariantService = /** @class */ (function (_super) {
         }
         return qb;
     };
+    /**
+     * Set additional prices on a list of variants.
+     * @param {ProductVariant | ProductVariant[] } variant variant on which to set additional prices
+     * @param {string} currency_code currency code to fetch prices for
+     * @param {string} region_id region to fetch prices for
+     * @param {string} cart_id string of cart to use as a basis for getting currency and region
+     * @param {string} customer_id id of potentially logged in customer, used to get prices valid for their customer groups
+     * @param {boolean} include_discount_prices should result include discount pricing
+     * @return {Promise<ProductVariant | ProductVariant[]>} A list of variants with variants decorated with "additional_prices"
+     */
+    ProductVariantService.prototype.setAdditionalPrices = function (variant, currency_code, region_id, cart_id, customer_id, include_discount_prices) {
+        if (include_discount_prices === void 0) { include_discount_prices = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                        var cartRepo, regionId, currencyCode, cart, variantArray, priceSelectionStrategy, variantsWithPrices;
+                        var _this = this;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    cartRepo = manager.getCustomRepository(this.cartRepository_);
+                                    regionId = region_id;
+                                    currencyCode = currency_code;
+                                    if (!cart_id) return [3 /*break*/, 2];
+                                    return [4 /*yield*/, cartRepo.findOne({
+                                            where: { id: cart_id },
+                                            relations: ["region"],
+                                        })];
+                                case 1:
+                                    cart = _a.sent();
+                                    regionId = cart.region.id;
+                                    currencyCode = cart.region.currency_code;
+                                    _a.label = 2;
+                                case 2:
+                                    variantArray = Array.isArray(variant) ? variant : [variant];
+                                    priceSelectionStrategy = this.priceSelectionStrategy_.withTransaction(manager);
+                                    return [4 /*yield*/, Promise.all(variantArray.map(function (v) { return __awaiter(_this, void 0, void 0, function () {
+                                            var prices;
+                                            return __generator(this, function (_a) {
+                                                switch (_a.label) {
+                                                    case 0: return [4 /*yield*/, priceSelectionStrategy.calculateVariantPrice(v.id, {
+                                                            region_id: regionId,
+                                                            currency_code: currencyCode,
+                                                            cart_id: cart_id,
+                                                            customer_id: customer_id,
+                                                            include_discount_prices: include_discount_prices,
+                                                        })];
+                                                    case 1:
+                                                        prices = _a.sent();
+                                                        return [2 /*return*/, __assign(__assign({}, v), { prices: prices.prices, original_price: prices.originalPrice, calculated_price: prices.calculatedPrice, calculated_price_type: prices.calculatedPriceType })];
+                                                }
+                                            });
+                                        }); }))];
+                                case 3:
+                                    variantsWithPrices = _a.sent();
+                                    return [2 /*return*/, Array.isArray(variant) ? variantsWithPrices : variantsWithPrices[0]];
+                            }
+                        });
+                    }); })];
+            });
+        });
+    };
     ProductVariantService.Events = {
         UPDATED: "product-variant.updated",
         CREATED: "product-variant.created",