@medusajs/medusa 1.2.2-dev.53 → 1.3.1-alpha.63

package/dist/services/cart.js

@@ -103,18 +103,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var lodash_1 = __importDefault(require("lodash"));
 var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_interfaces_1 = require("medusa-interfaces");
+var typeorm_1 = require("typeorm");
+var interfaces_1 = require("../interfaces");
+var models_1 = require("../models");
+var utils_1 = require("../utils");
 /* Provides layer to manipulate carts.
  * @implements BaseService
  */
 var CartService = /** @class */ (function (_super) {
     __extends(CartService, _super);
     function CartService(_a) {
-        var manager = _a.manager, cartRepository = _a.cartRepository, shippingMethodRepository = _a.shippingMethodRepository, eventBusService = _a.eventBusService, paymentProviderService = _a.paymentProviderService, productService = _a.productService, productVariantService = _a.productVariantService, taxProviderService = _a.taxProviderService, regionService = _a.regionService, lineItemService = _a.lineItemService, shippingOptionService = _a.shippingOptionService, customerService = _a.customerService, discountService = _a.discountService, giftCardService = _a.giftCardService, totalsService = _a.totalsService, addressRepository = _a.addressRepository, paymentSessionRepository = _a.paymentSessionRepository, inventoryService = _a.inventoryService, customShippingOptionService = _a.customShippingOptionService;
-        var _this = _super.call(this) || this;
+        var manager = _a.manager, cartRepository = _a.cartRepository, shippingMethodRepository = _a.shippingMethodRepository, lineItemRepository = _a.lineItemRepository, eventBusService = _a.eventBusService, paymentProviderService = _a.paymentProviderService, productService = _a.productService, productVariantService = _a.productVariantService, taxProviderService = _a.taxProviderService, regionService = _a.regionService, lineItemService = _a.lineItemService, shippingOptionService = _a.shippingOptionService, customerService = _a.customerService, discountService = _a.discountService, giftCardService = _a.giftCardService, totalsService = _a.totalsService, addressRepository = _a.addressRepository, paymentSessionRepository = _a.paymentSessionRepository, inventoryService = _a.inventoryService, customShippingOptionService = _a.customShippingOptionService, lineItemAdjustmentService = _a.lineItemAdjustmentService, priceSelectionStrategy = _a.priceSelectionStrategy;
+        var _this = 
+        // eslint-disable-next-line prefer-rest-params
+        _super.call(this, arguments[0]) || this;
         _this.manager_ = manager;
         _this.shippingMethodRepository_ = shippingMethodRepository;
         _this.cartRepository_ = cartRepository;
+        _this.lineItemRepository_ = lineItemRepository;
         _this.eventBus_ = eventBusService;
         _this.productVariantService_ = productVariantService;
         _this.productService_ = productService;
@@ -131,36 +137,10 @@ var CartService = /** @class */ (function (_super) {
         _this.inventoryService_ = inventoryService;
         _this.customShippingOptionService_ = customShippingOptionService;
         _this.taxProviderService_ = taxProviderService;
+        _this.lineItemAdjustmentService_ = lineItemAdjustmentService;
+        _this.priceSelectionStrategy_ = priceSelectionStrategy;
         return _this;
     }
-    CartService.prototype.withTransaction = function (transactionManager) {
-        if (!transactionManager) {
-            return this;
-        }
-        var cloned = new CartService({
-            manager: transactionManager,
-            taxProviderService: this.taxProviderService_,
-            cartRepository: this.cartRepository_,
-            eventBusService: this.eventBus_,
-            paymentProviderService: this.paymentProviderService_,
-            paymentSessionRepository: this.paymentSessionRepository_,
-            shippingMethodRepository: this.shippingMethodRepository_,
-            productService: this.productService_,
-            productVariantService: this.productVariantService_,
-            regionService: this.regionService_,
-            lineItemService: this.lineItemService_,
-            shippingOptionService: this.shippingOptionService_,
-            customerService: this.customerService_,
-            discountService: this.discountService_,
-            totalsService: this.totalsService_,
-            addressRepository: this.addressRepository_,
-            giftCardService: this.giftCardService_,
-            inventoryService: this.inventoryService_,
-            customShippingOptionService: this.customShippingOptionService_,
-        });
-        cloned.transactionManager_ = transactionManager;
-        return cloned;
-    };
     CartService.prototype.transformQueryForTotals_ = function (config) {
         var select = config.select, relations = config.relations;
         if (!select) {
@@ -188,7 +168,6 @@ var CartService = /** @class */ (function (_super) {
             relationSet.add("gift_cards");
             relationSet.add("discounts");
             relationSet.add("discounts.rule");
-            relationSet.add("discounts.rule.valid_for");
             // relationSet.add("discounts.parent_discount")
             // relationSet.add("discounts.parent_discount.rule")
             // relationSet.add("discounts.parent_discount.regions")
@@ -288,13 +267,21 @@ var CartService = /** @class */ (function (_super) {
     CartService.prototype.list = function (selector, config) {
         if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var cartRepo, query;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        cartRepo = this.manager_.getCustomRepository(this.cartRepository_);
-                        query = this.buildQuery_(selector, config);
-                        return [4 /*yield*/, cartRepo.find(query)];
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cartRepo, query;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        query = (0, utils_1.buildQuery)(selector, config);
+                                        return [4 /*yield*/, cartRepo.find(query)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -311,33 +298,41 @@ var CartService = /** @class */ (function (_super) {
         if (options === void 0) { options = {}; }
         if (totalsConfig === void 0) { totalsConfig = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var cartRepo, validatedId, _a, select, relations, totalsToSelect, query, rels, raw;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        cartRepo = this.manager_.getCustomRepository(this.cartRepository_);
-                        validatedId = this.validateId_(cartId);
-                        _a = this.transformQueryForTotals_(options), select = _a.select, relations = _a.relations, totalsToSelect = _a.totalsToSelect;
-                        query = this.buildQuery_({ id: validatedId }, __assign(__assign({}, options), { select: select, relations: relations }));
-                        if (relations && relations.length > 0) {
-                            query.relations = relations;
-                        }
-                        if (select && select.length > 0) {
-                            query.select = select;
-                        }
-                        else {
-                            delete query.select;
-                        }
-                        rels = query.relations;
-                        delete query.relations;
-                        return [4 /*yield*/, cartRepo.findOneWithRelations(rels, query)];
-                    case 1:
-                        raw = _b.sent();
-                        if (!raw) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Cart with ".concat(cartId, " was not found"));
-                        }
-                        return [4 /*yield*/, this.decorateTotals_(raw, totalsToSelect, totalsConfig)];
-                    case 2: return [2 /*return*/, _b.sent()];
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cartRepo, validatedId, _a, select, relations, totalsToSelect, query, queryRelations, raw;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        validatedId = (0, utils_1.validateId)(cartId);
+                                        _a = this.transformQueryForTotals_(options), select = _a.select, relations = _a.relations, totalsToSelect = _a.totalsToSelect;
+                                        query = (0, utils_1.buildQuery)({ id: validatedId }, __assign(__assign({}, options), { select: select, relations: relations }));
+                                        if (relations && relations.length > 0) {
+                                            query.relations = relations;
+                                        }
+                                        if (select && select.length > 0) {
+                                            query.select = select;
+                                        }
+                                        else {
+                                            query.select = undefined;
+                                        }
+                                        queryRelations = query.relations;
+                                        query.relations = undefined;
+                                        return [4 /*yield*/, cartRepo.findOneWithRelations(queryRelations, query)];
+                                    case 1:
+                                        raw = _b.sent();
+                                        if (!raw) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Cart with ".concat(cartId, " was not found"));
+                                        }
+                                        return [4 /*yield*/, this.decorateTotals_(raw, totalsToSelect, totalsConfig)];
+                                    case 2: return [2 /*return*/, _b.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -351,101 +346,108 @@ var CartService = /** @class */ (function (_super) {
         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, addressRepo, region_id, region, regCountries, toCreate, customer, addr, remainingFields, remainingFields_1, remainingFields_1_1, k, inProgress, result;
-                        var e_2, _a;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    cartRepo = manager.getCustomRepository(this.cartRepository_);
-                                    addressRepo = manager.getCustomRepository(this.addressRepository_);
-                                    region_id = data.region_id;
-                                    if (!region_id) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "A region_id must be provided when creating a cart");
-                                    }
-                                    return [4 /*yield*/, this.regionService_.retrieve(region_id, {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cartRepo, addressRepo, region_id, rawCart, customer, region, regCountries, addr, remainingFields, remainingFields_1, remainingFields_1_1, remainingField, createdCart, cart;
+                            var e_2, _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        addressRepo = transactionManager.getCustomRepository(this.addressRepository_);
+                                        region_id = data.region_id;
+                                        if (!region_id) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "A region_id must be provided when creating a cart");
+                                        }
+                                        rawCart = {};
+                                        if (!data.email) return [3 /*break*/, 2];
+                                        return [4 /*yield*/, this.createOrFetchUserFromEmail_(data.email)];
+                                    case 1:
+                                        customer = _b.sent();
+                                        rawCart.customer = customer;
+                                        rawCart.customer_id = customer.id;
+                                        rawCart.email = customer.email;
+                                        _b.label = 2;
+                                    case 2: return [4 /*yield*/, this.regionService_
+                                            .withTransaction(transactionManager)
+                                            .retrieve(region_id, {
                                             relations: ["countries"],
                                         })];
-                                case 1:
-                                    region = _b.sent();
-                                    regCountries = region.countries.map(function (_a) {
-                                        var iso_2 = _a.iso_2;
-                                        return iso_2;
-                                    });
-                                    toCreate = {};
-                                    toCreate.region_id = region.id;
-                                    if (!(typeof data.email !== "undefined")) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, this.createOrFetchUserFromEmail_(data.email)];
-                                case 2:
-                                    customer = _b.sent();
-                                    toCreate.customer = customer;
-                                    toCreate.customer_id = customer.id;
-                                    toCreate.email = customer.email;
-                                    _b.label = 3;
-                                case 3:
-                                    if (!(typeof data.shipping_address_id !== "undefined")) return [3 /*break*/, 5];
-                                    return [4 /*yield*/, addressRepo.findOne(data.shipping_address_id)];
-                                case 4:
-                                    addr = _b.sent();
-                                    if (addr && !regCountries.includes(addr.country_code)) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Shipping country not in region");
-                                    }
-                                    toCreate.shipping_address = addr;
-                                    _b.label = 5;
-                                case 5:
-                                    if (!data.shipping_address) {
+                                    case 3:
+                                        region = _b.sent();
+                                        regCountries = region.countries.map(function (_a) {
+                                            var iso_2 = _a.iso_2;
+                                            return iso_2;
+                                        });
+                                        rawCart.region_id = region.id;
+                                        if (!(!data.shipping_address && !data.shipping_address_id)) return [3 /*break*/, 4];
                                         if (region.countries.length === 1) {
-                                            // Preselect the country if the region only has 1
-                                            // and create address entity
-                                            toCreate.shipping_address = addressRepo.create({
+                                            rawCart.shipping_address = addressRepo.create({
                                                 country_code: regCountries[0],
                                             });
                                         }
-                                    }
-                                    else {
-                                        if (!regCountries.includes(data.shipping_address.country_code)) {
+                                        return [3 /*break*/, 6];
+                                    case 4:
+                                        if (data.shipping_address) {
+                                            if (!regCountries.includes(data.shipping_address.country_code)) {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Shipping country not in region");
+                                            }
+                                            rawCart.shipping_address = data.shipping_address;
+                                        }
+                                        if (!data.shipping_address_id) return [3 /*break*/, 6];
+                                        return [4 /*yield*/, addressRepo.findOne(data.shipping_address_id)];
+                                    case 5:
+                                        addr = _b.sent();
+                                        if (addr && !regCountries.includes(addr.country_code)) {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Shipping country not in region");
                                         }
-                                        toCreate.shipping_address = data.shipping_address;
-                                    }
-                                    remainingFields = [
-                                        "billing_address_id",
-                                        "context",
-                                        "type",
-                                        "metadata",
-                                        "discounts",
-                                        "gift_cards",
-                                    ];
-                                    try {
-                                        for (remainingFields_1 = __values(remainingFields), remainingFields_1_1 = remainingFields_1.next(); !remainingFields_1_1.done; remainingFields_1_1 = remainingFields_1.next()) {
-                                            k = remainingFields_1_1.value;
-                                            if (typeof data[k] !== "undefined" && k !== "object") {
-                                                toCreate[k] = data[k];
+                                        rawCart.shipping_address_id = data.shipping_address_id;
+                                        _b.label = 6;
+                                    case 6:
+                                        remainingFields = [
+                                            "billing_address_id",
+                                            "context",
+                                            "type",
+                                            "metadata",
+                                            "discounts",
+                                            "gift_cards",
+                                        ];
+                                        try {
+                                            for (remainingFields_1 = __values(remainingFields), remainingFields_1_1 = remainingFields_1.next(); !remainingFields_1_1.done; remainingFields_1_1 = remainingFields_1.next()) {
+                                                remainingField = remainingFields_1_1.value;
+                                                if (typeof data[remainingField] !== "undefined" &&
+                                                    remainingField !== "object") {
+                                                    /* TODO: See how to fix the error TS2590 properly while keeping the DeepPartial type */
+                                                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                                                    // @ts-ignore
+                                                    rawCart[remainingField] = data[remainingField];
+                                                }
                                             }
                                         }
-                                    }
-                                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                                    finally {
-                                        try {
-                                            if (remainingFields_1_1 && !remainingFields_1_1.done && (_a = remainingFields_1.return)) _a.call(remainingFields_1);
+                                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                                        finally {
+                                            try {
+                                                if (remainingFields_1_1 && !remainingFields_1_1.done && (_a = remainingFields_1.return)) _a.call(remainingFields_1);
+                                            }
+                                            finally { if (e_2) throw e_2.error; }
                                         }
-                                        finally { if (e_2) throw e_2.error; }
-                                    }
-                                    inProgress = cartRepo.create(toCreate);
-                                    return [4 /*yield*/, cartRepo.save(inProgress)];
-                                case 6:
-                                    result = _b.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.CREATED, {
-                                            id: result.id,
-                                        })];
-                                case 7:
-                                    _b.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                                        createdCart = cartRepo.create(rawCart);
+                                        return [4 /*yield*/, cartRepo.save(createdCart)];
+                                    case 7:
+                                        cart = _b.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.CREATED, {
+                                                id: cart.id,
+                                            })];
+                                    case 8:
+                                        _b.sent();
+                                        return [2 /*return*/, cart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -459,102 +461,72 @@ var CartService = /** @class */ (function (_super) {
         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 cart, lineItem, _a, _b, method, e_3_1, _c, _d, itm, e_4_1, result;
-                        var e_3, _e, e_4, _f;
-                        return __generator(this, function (_g) {
-                            switch (_g.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: [
-                                            "items",
-                                            "items.variant",
-                                            "items.variant.product",
-                                            "payment_sessions",
-                                        ],
-                                    })];
-                                case 1:
-                                    cart = _g.sent();
-                                    lineItem = cart.items.find(function (li) { return li.id === lineItemId; });
-                                    if (!lineItem) {
-                                        return [2 /*return*/, cart];
-                                    }
-                                    if (!(cart.shipping_methods && cart.shipping_methods.length)) return [3 /*break*/, 9];
-                                    _g.label = 2;
-                                case 2:
-                                    _g.trys.push([2, 7, 8, 9]);
-                                    _a = __values(cart.shipping_methods), _b = _a.next();
-                                    _g.label = 3;
-                                case 3:
-                                    if (!!_b.done) return [3 /*break*/, 6];
-                                    method = _b.value;
-                                    return [4 /*yield*/, this.shippingOptionService_
-                                            .withTransaction(manager)
-                                            .deleteShippingMethod(method)];
-                                case 4:
-                                    _g.sent();
-                                    _g.label = 5;
-                                case 5:
-                                    _b = _a.next();
-                                    return [3 /*break*/, 3];
-                                case 6: return [3 /*break*/, 9];
-                                case 7:
-                                    e_3_1 = _g.sent();
-                                    e_3 = { error: e_3_1 };
-                                    return [3 /*break*/, 9];
-                                case 8:
-                                    try {
-                                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
-                                    }
-                                    finally { if (e_3) throw e_3.error; }
-                                    return [7 /*endfinally*/];
-                                case 9:
-                                    _g.trys.push([9, 14, 15, 16]);
-                                    _c = __values(cart.items), _d = _c.next();
-                                    _g.label = 10;
-                                case 10:
-                                    if (!!_d.done) return [3 /*break*/, 13];
-                                    itm = _d.value;
-                                    return [4 /*yield*/, this.lineItemService_.withTransaction(manager).update(itm.id, {
-                                            has_shipping: false,
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, lineItem, lineItemRepository, result;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: [
+                                                "items",
+                                                "items.variant",
+                                                "items.variant.product",
+                                                "payment_sessions",
+                                            ],
                                         })];
-                                case 11:
-                                    _g.sent();
-                                    _g.label = 12;
-                                case 12:
-                                    _d = _c.next();
-                                    return [3 /*break*/, 10];
-                                case 13: return [3 /*break*/, 16];
-                                case 14:
-                                    e_4_1 = _g.sent();
-                                    e_4 = { error: e_4_1 };
-                                    return [3 /*break*/, 16];
-                                case 15:
-                                    try {
-                                        if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
-                                    }
-                                    finally { if (e_4) throw e_4.error; }
-                                    return [7 /*endfinally*/];
-                                case 16: return [4 /*yield*/, this.lineItemService_.withTransaction(manager).delete(lineItem.id)];
-                                case 17:
-                                    _g.sent();
-                                    return [4 /*yield*/, this.retrieve(cartId)
+                                    case 1:
+                                        cart = _b.sent();
+                                        lineItem = cart.items.find(function (item) { return item.id === lineItemId; });
+                                        if (!lineItem) {
+                                            return [2 /*return*/, cart];
+                                        }
+                                        if (!((_a = cart.shipping_methods) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.shippingOptionService_
+                                                .withTransaction(transactionManager)
+                                                .deleteShippingMethods(cart.shipping_methods)];
+                                    case 2:
+                                        _b.sent();
+                                        _b.label = 3;
+                                    case 3:
+                                        lineItemRepository = transactionManager.getCustomRepository(this.lineItemRepository_);
+                                        return [4 /*yield*/, lineItemRepository.update({
+                                                id: (0, typeorm_1.In)(cart.items.map(function (item) { return item.id; })),
+                                            }, {
+                                                has_shipping: false,
+                                            })];
+                                    case 4:
+                                        _b.sent();
+                                        return [4 /*yield*/, this.lineItemService_
+                                                .withTransaction(transactionManager)
+                                                .delete(lineItem.id)];
+                                    case 5:
+                                        _b.sent();
+                                        return [4 /*yield*/, this.retrieve(cartId, {
+                                                relations: ["items", "discounts", "discounts.rule"],
+                                            })];
+                                    case 6:
+                                        result = _b.sent();
+                                        return [4 /*yield*/, this.refreshAdjustments_(result)
+                                            // Notify subscribers
+                                        ];
+                                    case 7:
+                                        _b.sent();
                                         // Notify subscribers
-                                    ];
-                                case 18:
-                                    result = _g.sent();
-                                    // Notify subscribers
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, {
-                                            id: result.id,
-                                        })];
-                                case 19:
-                                    // Notify subscribers
-                                    _g.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, {
+                                                id: cart.id,
+                                            })];
+                                    case 8:
+                                        // Notify subscribers
+                                        _b.sent();
+                                        return [2 /*return*/, this.retrieve(cartId)];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -593,128 +565,86 @@ var CartService = /** @class */ (function (_super) {
         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 cart, currentItem, newQuantity, _a, _b, itm, e_5_1, _c, _d, method, e_6_1, result;
-                        var e_5, _e, e_6, _f;
-                        return __generator(this, function (_g) {
-                            switch (_g.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: [
-                                            "shipping_methods",
-                                            "items",
-                                            "payment_sessions",
-                                            "items.variant",
-                                            "items.variant.product",
-                                        ],
-                                    })];
-                                case 1:
-                                    cart = _g.sent();
-                                    if (lineItem.should_merge) {
-                                        currentItem = cart.items.find(function (line) {
-                                            if (line.should_merge && line.variant_id === lineItem.variant_id) {
-                                                return lodash_1.default.isEqual(line.metadata, lineItem.metadata);
-                                            }
-                                            return false;
-                                        });
-                                    }
-                                    if (!currentItem) return [3 /*break*/, 4];
-                                    newQuantity = currentItem.quantity + lineItem.quantity;
-                                    // Confirm inventory or throw error
-                                    return [4 /*yield*/, this.inventoryService_
-                                            .withTransaction(manager)
-                                            .confirmInventory(lineItem.variant_id, newQuantity)];
-                                case 2:
-                                    // Confirm inventory or throw error
-                                    _g.sent();
-                                    return [4 /*yield*/, this.lineItemService_
-                                            .withTransaction(manager)
-                                            .update(currentItem.id, {
-                                            quantity: newQuantity,
-                                        })];
-                                case 3:
-                                    _g.sent();
-                                    return [3 /*break*/, 7];
-                                case 4: 
-                                // Confirm inventory or throw error
-                                return [4 /*yield*/, this.inventoryService_
-                                        .withTransaction(manager)
-                                        .confirmInventory(lineItem.variant_id, lineItem.quantity)];
-                                case 5:
-                                    // Confirm inventory or throw error
-                                    _g.sent();
-                                    return [4 /*yield*/, this.lineItemService_.withTransaction(manager).create(__assign(__assign({}, lineItem), { has_shipping: false, cart_id: cartId }))];
-                                case 6:
-                                    _g.sent();
-                                    _g.label = 7;
-                                case 7:
-                                    _g.trys.push([7, 12, 13, 14]);
-                                    _a = __values(cart.items), _b = _a.next();
-                                    _g.label = 8;
-                                case 8:
-                                    if (!!_b.done) return [3 /*break*/, 11];
-                                    itm = _b.value;
-                                    return [4 /*yield*/, this.lineItemService_.withTransaction(manager).update(itm.id, {
-                                            has_shipping: false,
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, currentItem, quantity, lineItemRepository, result;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: [
+                                                "shipping_methods",
+                                                "items",
+                                                "items.adjustments",
+                                                "payment_sessions",
+                                                "items.variant",
+                                                "items.variant.product",
+                                                "discounts",
+                                                "discounts.rule",
+                                            ],
                                         })];
-                                case 9:
-                                    _g.sent();
-                                    _g.label = 10;
-                                case 10:
-                                    _b = _a.next();
-                                    return [3 /*break*/, 8];
-                                case 11: return [3 /*break*/, 14];
-                                case 12:
-                                    e_5_1 = _g.sent();
-                                    e_5 = { error: e_5_1 };
-                                    return [3 /*break*/, 14];
-                                case 13:
-                                    try {
-                                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
-                                    }
-                                    finally { if (e_5) throw e_5.error; }
-                                    return [7 /*endfinally*/];
-                                case 14:
-                                    if (!(cart.shipping_methods && cart.shipping_methods.length)) return [3 /*break*/, 22];
-                                    _g.label = 15;
-                                case 15:
-                                    _g.trys.push([15, 20, 21, 22]);
-                                    _c = __values(cart.shipping_methods), _d = _c.next();
-                                    _g.label = 16;
-                                case 16:
-                                    if (!!_d.done) return [3 /*break*/, 19];
-                                    method = _d.value;
-                                    return [4 /*yield*/, this.shippingOptionService_
-                                            .withTransaction(manager)
-                                            .deleteShippingMethod(method)];
-                                case 17:
-                                    _g.sent();
-                                    _g.label = 18;
-                                case 18:
-                                    _d = _c.next();
-                                    return [3 /*break*/, 16];
-                                case 19: return [3 /*break*/, 22];
-                                case 20:
-                                    e_6_1 = _g.sent();
-                                    e_6 = { error: e_6_1 };
-                                    return [3 /*break*/, 22];
-                                case 21:
-                                    try {
-                                        if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
-                                    }
-                                    finally { if (e_6) throw e_6.error; }
-                                    return [7 /*endfinally*/];
-                                case 22: return [4 /*yield*/, this.retrieve(cartId)];
-                                case 23:
-                                    result = _g.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, result)];
-                                case 24:
-                                    _g.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                                    case 1:
+                                        cart = _a.sent();
+                                        if (lineItem.should_merge) {
+                                            currentItem = cart.items.find(function (item) {
+                                                if (item.should_merge && item.variant_id === lineItem.variant_id) {
+                                                    return lodash_1.default.isEqual(item.metadata, lineItem.metadata);
+                                                }
+                                                return false;
+                                            });
+                                        }
+                                        quantity = currentItem
+                                            ? (currentItem.quantity += lineItem.quantity)
+                                            : lineItem.quantity;
+                                        // Confirm inventory or throw error
+                                        return [4 /*yield*/, this.inventoryService_
+                                                .withTransaction(transactionManager)
+                                                .confirmInventory(lineItem.variant_id, quantity)];
+                                    case 2:
+                                        // Confirm inventory or throw error
+                                        _a.sent();
+                                        if (!currentItem) return [3 /*break*/, 4];
+                                        return [4 /*yield*/, this.lineItemService_
+                                                .withTransaction(transactionManager)
+                                                .update(currentItem.id, {
+                                                quantity: currentItem.quantity,
+                                            })];
+                                    case 3:
+                                        _a.sent();
+                                        return [3 /*break*/, 6];
+                                    case 4: return [4 /*yield*/, this.lineItemService_
+                                            .withTransaction(transactionManager)
+                                            .create(__assign(__assign({}, lineItem), { has_shipping: false, cart_id: cartId }))];
+                                    case 5:
+                                        _a.sent();
+                                        _a.label = 6;
+                                    case 6:
+                                        lineItemRepository = transactionManager.getCustomRepository(this.lineItemRepository_);
+                                        return [4 /*yield*/, lineItemRepository.update({
+                                                id: (0, typeorm_1.In)(cart.items.map(function (item) { return item.id; })),
+                                            }, {
+                                                has_shipping: false,
+                                            })];
+                                    case 7:
+                                        _a.sent();
+                                        return [4 /*yield*/, this.retrieve(cartId, {
+                                                relations: ["items", "discounts", "discounts.rule"],
+                                            })];
+                                    case 8:
+                                        result = _a.sent();
+                                        return [4 /*yield*/, this.refreshAdjustments_(result)];
+                                    case 9:
+                                        _a.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, result)];
+                                    case 10:
+                                        _a.sent();
+                                        return [2 /*return*/, result];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -729,50 +659,60 @@ var CartService = /** @class */ (function (_super) {
         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 cart, lineItemExists, hasInventory, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: ["items", "payment_sessions"],
-                                    })
-                                    // Ensure that the line item exists in the cart
-                                ];
-                                case 1:
-                                    cart = _a.sent();
-                                    lineItemExists = cart.items.find(function (i) { return i.id === lineItemId; });
-                                    if (!lineItemExists) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "A line item with the provided id doesn't exist in the cart");
-                                    }
-                                    if (!lineItemUpdate.quantity) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, this.inventoryService_
-                                            .withTransaction(manager)
-                                            .confirmInventory(lineItemExists.variant_id, lineItemUpdate.quantity)];
-                                case 2:
-                                    hasInventory = _a.sent();
-                                    if (!hasInventory) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Inventory doesn't cover the desired quantity");
-                                    }
-                                    _a.label = 3;
-                                case 3: return [4 /*yield*/, this.lineItemService_
-                                        .withTransaction(manager)
-                                        .update(lineItemId, lineItemUpdate)
-                                    // Update the line item
-                                ];
-                                case 4:
-                                    _a.sent();
-                                    return [4 /*yield*/, this.retrieve(cartId)];
-                                case 5:
-                                    result = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, result)];
-                                case 6:
-                                    _a.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, lineItemExists, hasInventory, updatedCart;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: ["items", "items.adjustments", "payment_sessions"],
+                                        })
+                                        // Ensure that the line item exists in the cart
+                                    ];
+                                    case 1:
+                                        cart = _a.sent();
+                                        lineItemExists = cart.items.find(function (i) { return i.id === lineItemId; });
+                                        if (!lineItemExists) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "A line item with the provided id doesn't exist in the cart");
+                                        }
+                                        if (!lineItemUpdate.quantity) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.inventoryService_
+                                                .withTransaction(transactionManager)
+                                                .confirmInventory(lineItemExists.variant_id, lineItemUpdate.quantity)];
+                                    case 2:
+                                        hasInventory = _a.sent();
+                                        if (!hasInventory) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Inventory doesn't cover the desired quantity");
+                                        }
+                                        _a.label = 3;
+                                    case 3: return [4 /*yield*/, this.lineItemService_
+                                            .withTransaction(transactionManager)
+                                            .update(lineItemId, lineItemUpdate)];
+                                    case 4:
+                                        _a.sent();
+                                        return [4 /*yield*/, this.retrieve(cartId, {
+                                                relations: ["items", "discounts", "discounts.rule"],
+                                            })];
+                                    case 5:
+                                        updatedCart = _a.sent();
+                                        return [4 /*yield*/, this.refreshAdjustments_(updatedCart)
+                                            // Update the line item
+                                        ];
+                                    case 6:
+                                        _a.sent();
+                                        // Update the line item
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 7:
+                                        // Update the line item
+                                        _a.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -786,260 +726,214 @@ var CartService = /** @class */ (function (_super) {
      * @return void
      */
     CartService.prototype.adjustFreeShipping_ = function (cart, shouldAdd) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
+            var transactionManager, shippingMethodRepository_1;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
-                        if (!((_a = cart.shipping_methods) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 4];
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        if (!((_b = cart.shipping_methods) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 4];
+                        shippingMethodRepository_1 = transactionManager.getCustomRepository(this.shippingMethodRepository_);
                         if (!shouldAdd) return [3 /*break*/, 2];
-                        return [4 /*yield*/, Promise.all(cart.shipping_methods.map(function (sm) { return __awaiter(_this, void 0, void 0, function () {
-                                var smRepo, method;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
-                                        case 0:
-                                            smRepo = this.manager_.getCustomRepository(this.shippingMethodRepository_);
-                                            return [4 /*yield*/, smRepo.findOne({ where: { id: sm.id } })];
-                                        case 1:
-                                            method = _a.sent();
-                                            if (!method) return [3 /*break*/, 3];
-                                            method.price = 0;
-                                            return [4 /*yield*/, smRepo.save(method)];
-                                        case 2:
-                                            _a.sent();
-                                            _a.label = 3;
-                                        case 3: return [2 /*return*/];
-                                    }
-                                });
-                            }); }))];
+                        return [4 /*yield*/, shippingMethodRepository_1.update({
+                                id: (0, typeorm_1.In)(cart.shipping_methods.map(function (shippingMethod) { return shippingMethod.id; })),
+                            }, {
+                                price: 0,
+                            })];
                     case 1:
-                        _b.sent();
+                        _c.sent();
                         return [3 /*break*/, 4];
-                    case 2: return [4 /*yield*/, Promise.all(cart.shipping_methods.map(function (sm) { return __awaiter(_this, void 0, void 0, function () {
-                            var smRepo;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
+                    case 2: return [4 /*yield*/, Promise.all(cart.shipping_methods.map(function (shippingMethod) { return __awaiter(_this, void 0, void 0, function () {
+                            var _a, _b;
+                            var _c;
+                            return __generator(this, function (_d) {
+                                switch (_d.label) {
                                     case 0:
-                                        smRepo = this.manager_.getCustomRepository(this.shippingMethodRepository_);
                                         // if free shipping discount is removed, we adjust the shipping
                                         // back to its original amount
-                                        sm.price = sm.shipping_option.amount;
-                                        return [4 /*yield*/, smRepo.save(sm)];
-                                    case 1:
-                                        _a.sent();
-                                        return [2 /*return*/];
+                                        // if shipping option amount is null, we assume the option is calculated
+                                        _a = shippingMethod;
+                                        if (!((_c = shippingMethod.shipping_option.amount) !== null && _c !== void 0)) return [3 /*break*/, 1];
+                                        _b = _c;
+                                        return [3 /*break*/, 3];
+                                    case 1: return [4 /*yield*/, this.shippingOptionService_.getPrice_(shippingMethod.shipping_option, shippingMethod.data, cart)];
+                                    case 2:
+                                        _b = (_d.sent());
+                                        _d.label = 3;
+                                    case 3:
+                                        // if free shipping discount is removed, we adjust the shipping
+                                        // back to its original amount
+                                        // if shipping option amount is null, we assume the option is calculated
+                                        _a.price = _b;
+                                        return [2 /*return*/, shippingMethodRepository_1.save(shippingMethod)];
                                 }
                             });
                         }); }))];
                     case 3:
-                        _b.sent();
-                        _b.label = 4;
+                        _c.sent();
+                        _c.label = 4;
                     case 4: return [2 /*return*/];
                 }
             });
         });
     };
-    CartService.prototype.update = function (cartId, update) {
+    CartService.prototype.update = function (cartId, data) {
         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, cart, countryCode, customer, addrRepo, address, address, previousDiscounts, _a, _b, code, e_7_1, hasFreeShipping, _c, _d, code, e_8_1, prevContext, result;
-                        var e_7, _e, e_8, _f;
-                        var _g, _h;
-                        return __generator(this, function (_j) {
-                            switch (_j.label) {
-                                case 0:
-                                    cartRepo = manager.getCustomRepository(this.cartRepository_);
-                                    return [4 /*yield*/, this.retrieve(cartId, {
-                                            select: [
-                                                "subtotal",
-                                                "tax_total",
-                                                "shipping_total",
-                                                "discount_total",
-                                                "total",
-                                            ],
-                                            relations: [
-                                                "items",
-                                                "shipping_methods",
-                                                "shipping_address",
-                                                "billing_address",
-                                                "gift_cards",
-                                                "customer",
-                                                "region",
-                                                "payment_sessions",
-                                                "region.countries",
-                                                "discounts",
-                                                "discounts.rule",
-                                                "discounts.rule.valid_for",
-                                                "discounts.regions",
-                                            ],
-                                        })];
-                                case 1:
-                                    cart = _j.sent();
-                                    if (!(typeof update.region_id !== "undefined")) return [3 /*break*/, 3];
-                                    countryCode = (_h = (update.country_code || ((_g = update.shipping_address) === null || _g === void 0 ? void 0 : _g.country_code))) !== null && _h !== void 0 ? _h : null;
-                                    return [4 /*yield*/, this.setRegion_(cart, update.region_id, countryCode)];
-                                case 2:
-                                    _j.sent();
-                                    _j.label = 3;
-                                case 3:
-                                    if (!(typeof update.customer_id !== "undefined")) return [3 /*break*/, 5];
-                                    return [4 /*yield*/, this.updateCustomerId_(cart, update.customer_id)];
-                                case 4:
-                                    _j.sent();
-                                    return [3 /*break*/, 7];
-                                case 5:
-                                    if (!(typeof update.email !== "undefined")) return [3 /*break*/, 7];
-                                    return [4 /*yield*/, this.createOrFetchUserFromEmail_(update.email)];
-                                case 6:
-                                    customer = _j.sent();
-                                    cart.customer = customer;
-                                    cart.customer_id = customer.id;
-                                    cart.email = customer.email;
-                                    _j.label = 7;
-                                case 7:
-                                    addrRepo = manager.getCustomRepository(this.addressRepository_);
-                                    if (!("shipping_address_id" in update || "shipping_address" in update)) return [3 /*break*/, 9];
-                                    address = void 0;
-                                    if (typeof update.shipping_address_id !== "undefined") {
-                                        address = update.shipping_address_id;
-                                    }
-                                    else if (typeof update.shipping_address !== "undefined") {
-                                        address = update.shipping_address;
-                                    }
-                                    if (!(typeof address !== "undefined")) return [3 /*break*/, 9];
-                                    return [4 /*yield*/, this.updateShippingAddress_(cart, address, addrRepo)];
-                                case 8:
-                                    _j.sent();
-                                    _j.label = 9;
-                                case 9:
-                                    if (!("billing_address_id" in update || "billing_address" in update)) return [3 /*break*/, 11];
-                                    address = void 0;
-                                    if (typeof update.billing_address_id !== "undefined") {
-                                        address = update.billing_address_id;
-                                    }
-                                    else if (typeof update.billing_address !== "undefined") {
-                                        address = update.billing_address;
-                                    }
-                                    if (!(typeof address !== "undefined")) return [3 /*break*/, 11];
-                                    return [4 /*yield*/, this.updateBillingAddress_(cart, address, addrRepo)];
-                                case 10:
-                                    _j.sent();
-                                    _j.label = 11;
-                                case 11:
-                                    if (!(typeof update.discounts !== "undefined")) return [3 /*break*/, 23];
-                                    previousDiscounts = cart.discounts;
-                                    cart.discounts = [];
-                                    _j.label = 12;
-                                case 12:
-                                    _j.trys.push([12, 17, 18, 19]);
-                                    _a = __values(update.discounts), _b = _a.next();
-                                    _j.label = 13;
-                                case 13:
-                                    if (!!_b.done) return [3 /*break*/, 16];
-                                    code = _b.value.code;
-                                    return [4 /*yield*/, this.applyDiscount(cart, code)];
-                                case 14:
-                                    _j.sent();
-                                    _j.label = 15;
-                                case 15:
-                                    _b = _a.next();
-                                    return [3 /*break*/, 13];
-                                case 16: return [3 /*break*/, 19];
-                                case 17:
-                                    e_7_1 = _j.sent();
-                                    e_7 = { error: e_7_1 };
-                                    return [3 /*break*/, 19];
-                                case 18:
-                                    try {
-                                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
-                                    }
-                                    finally { if (e_7) throw e_7.error; }
-                                    return [7 /*endfinally*/];
-                                case 19:
-                                    hasFreeShipping = cart.discounts.some(function (_a) {
-                                        var rule = _a.rule;
-                                        return rule.type === "free_shipping";
-                                    });
-                                    if (!(previousDiscounts.some(function (_a) {
-                                        var rule = _a.rule;
-                                        return rule.type === "free_shipping";
-                                    }) &&
-                                        !hasFreeShipping)) return [3 /*break*/, 21];
-                                    return [4 /*yield*/, this.adjustFreeShipping_(cart, false)];
-                                case 20:
-                                    _j.sent();
-                                    _j.label = 21;
-                                case 21:
-                                    if (!hasFreeShipping) return [3 /*break*/, 23];
-                                    return [4 /*yield*/, this.adjustFreeShipping_(cart, true)];
-                                case 22:
-                                    _j.sent();
-                                    _j.label = 23;
-                                case 23:
-                                    if (!("gift_cards" in update)) return [3 /*break*/, 31];
-                                    cart.gift_cards = [];
-                                    _j.label = 24;
-                                case 24:
-                                    _j.trys.push([24, 29, 30, 31]);
-                                    _c = __values(update.gift_cards), _d = _c.next();
-                                    _j.label = 25;
-                                case 25:
-                                    if (!!_d.done) return [3 /*break*/, 28];
-                                    code = _d.value.code;
-                                    return [4 /*yield*/, this.applyGiftCard_(cart, code)];
-                                case 26:
-                                    _j.sent();
-                                    _j.label = 27;
-                                case 27:
-                                    _d = _c.next();
-                                    return [3 /*break*/, 25];
-                                case 28: return [3 /*break*/, 31];
-                                case 29:
-                                    e_8_1 = _j.sent();
-                                    e_8 = { error: e_8_1 };
-                                    return [3 /*break*/, 31];
-                                case 30:
-                                    try {
-                                        if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
-                                    }
-                                    finally { if (e_8) throw e_8.error; }
-                                    return [7 /*endfinally*/];
-                                case 31:
-                                    if ("metadata" in update) {
-                                        cart.metadata = this.setMetadata_(cart, update.metadata);
-                                    }
-                                    if ("context" in update) {
-                                        prevContext = cart.context || {};
-                                        cart.context = __assign(__assign({}, prevContext), update.context);
-                                    }
-                                    if ("completed_at" in update) {
-                                        cart.completed_at = update.completed_at;
-                                    }
-                                    if ("payment_authorized_at" in update) {
-                                        cart.payment_authorized_at = update.payment_authorized_at;
-                                    }
-                                    return [4 /*yield*/, cartRepo.save(cart)];
-                                case 32:
-                                    result = _j.sent();
-                                    if (!("email" in update || "customer_id" in update)) return [3 /*break*/, 34];
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.CUSTOMER_UPDATED, result.id)];
-                                case 33:
-                                    _j.sent();
-                                    _j.label = 34;
-                                case 34: return [4 /*yield*/, this.eventBus_
-                                        .withTransaction(manager)
-                                        .emit(CartService.Events.UPDATED, result)];
-                                case 35:
-                                    _j.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cartRepo, cart, customer, countryCode, addrRepo, billingAddress, shippingAddress, previousDiscounts, hasFreeShipping, prevContext, updatedCart;
+                            var _this = this;
+                            var _a, _b, _c, _d, _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
+                                    case 0:
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        return [4 /*yield*/, this.retrieve(cartId, {
+                                                select: [
+                                                    "subtotal",
+                                                    "tax_total",
+                                                    "shipping_total",
+                                                    "discount_total",
+                                                    "total",
+                                                ],
+                                                relations: [
+                                                    "items",
+                                                    "shipping_methods",
+                                                    "shipping_address",
+                                                    "billing_address",
+                                                    "gift_cards",
+                                                    "customer",
+                                                    "region",
+                                                    "payment_sessions",
+                                                    "region.countries",
+                                                    "discounts",
+                                                    "discounts.rule",
+                                                    "discounts.regions",
+                                                ],
+                                            })];
+                                    case 1:
+                                        cart = _f.sent();
+                                        if (!data.customer_id) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.updateCustomerId_(cart, data.customer_id)];
+                                    case 2:
+                                        _f.sent();
+                                        return [3 /*break*/, 5];
+                                    case 3:
+                                        if (!(typeof data.email !== "undefined")) return [3 /*break*/, 5];
+                                        return [4 /*yield*/, this.createOrFetchUserFromEmail_(data.email)];
+                                    case 4:
+                                        customer = _f.sent();
+                                        cart.customer = customer;
+                                        cart.customer_id = customer.id;
+                                        cart.email = customer.email;
+                                        _f.label = 5;
+                                    case 5:
+                                        if (!(typeof data.region_id !== "undefined")) return [3 /*break*/, 7];
+                                        countryCode = (_b = (data.country_code || ((_a = data.shipping_address) === null || _a === void 0 ? void 0 : _a.country_code))) !== null && _b !== void 0 ? _b : null;
+                                        return [4 /*yield*/, this.setRegion_(cart, data.region_id, countryCode)];
+                                    case 6:
+                                        _f.sent();
+                                        _f.label = 7;
+                                    case 7:
+                                        if (!(typeof data.customer_id !== "undefined" ||
+                                            typeof data.region_id !== "undefined")) return [3 /*break*/, 9];
+                                        return [4 /*yield*/, this.updateUnitPrices_(cart, data.region_id, data.customer_id)];
+                                    case 8:
+                                        _f.sent();
+                                        _f.label = 9;
+                                    case 9:
+                                        addrRepo = transactionManager.getCustomRepository(this.addressRepository_);
+                                        billingAddress = (_c = data.billing_address_id) !== null && _c !== void 0 ? _c : data.billing_address;
+                                        if (!(billingAddress !== undefined)) return [3 /*break*/, 11];
+                                        return [4 /*yield*/, this.updateBillingAddress_(cart, billingAddress, addrRepo)];
+                                    case 10:
+                                        _f.sent();
+                                        _f.label = 11;
+                                    case 11:
+                                        shippingAddress = (_d = data.shipping_address_id) !== null && _d !== void 0 ? _d : data.shipping_address;
+                                        if (!(shippingAddress !== undefined)) return [3 /*break*/, 13];
+                                        return [4 /*yield*/, this.updateShippingAddress_(cart, shippingAddress, addrRepo)];
+                                    case 12:
+                                        _f.sent();
+                                        _f.label = 13;
+                                    case 13:
+                                        if (!(typeof data.discounts !== "undefined")) return [3 /*break*/, 18];
+                                        previousDiscounts = __spreadArray([], __read(cart.discounts), false);
+                                        cart.discounts.length = 0;
+                                        return [4 /*yield*/, Promise.all(data.discounts.map(function (_a) {
+                                                var code = _a.code;
+                                                return _this.applyDiscount(cart, code);
+                                            }))];
+                                    case 14:
+                                        _f.sent();
+                                        hasFreeShipping = cart.discounts.some(function (_a) {
+                                            var rule = _a.rule;
+                                            return (rule === null || rule === void 0 ? void 0 : rule.type) === "free_shipping";
+                                        });
+                                        if (!(previousDiscounts.some(function (_a) {
+                                            var rule = _a.rule;
+                                            return rule.type === "free_shipping";
+                                        }) &&
+                                            !hasFreeShipping)) return [3 /*break*/, 16];
+                                        return [4 /*yield*/, this.adjustFreeShipping_(cart, false)];
+                                    case 15:
+                                        _f.sent();
+                                        _f.label = 16;
+                                    case 16:
+                                        if (!hasFreeShipping) return [3 /*break*/, 18];
+                                        return [4 /*yield*/, this.adjustFreeShipping_(cart, true)];
+                                    case 17:
+                                        _f.sent();
+                                        _f.label = 18;
+                                    case 18:
+                                        if (!("gift_cards" in data)) return [3 /*break*/, 20];
+                                        cart.gift_cards = [];
+                                        return [4 /*yield*/, Promise.all(((_e = data.gift_cards) !== null && _e !== void 0 ? _e : []).map(function (_a) {
+                                                var code = _a.code;
+                                                return _this.applyGiftCard_(cart, code);
+                                            }))];
+                                    case 19:
+                                        _f.sent();
+                                        _f.label = 20;
+                                    case 20:
+                                        if (data === null || data === void 0 ? void 0 : data.metadata) {
+                                            cart.metadata = (0, utils_1.setMetadata)(cart, data.metadata);
+                                        }
+                                        if ("context" in data) {
+                                            prevContext = cart.context || {};
+                                            cart.context = __assign(__assign({}, prevContext), data.context);
+                                        }
+                                        if ("completed_at" in data) {
+                                            cart.completed_at = data.completed_at;
+                                        }
+                                        if ("payment_authorized_at" in data) {
+                                            cart.payment_authorized_at = data.payment_authorized_at;
+                                        }
+                                        return [4 /*yield*/, cartRepo.save(cart)];
+                                    case 21:
+                                        updatedCart = _f.sent();
+                                        if (!("email" in data || "customer_id" in data)) return [3 /*break*/, 23];
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.CUSTOMER_UPDATED, updatedCart.id)];
+                                    case 22:
+                                        _f.sent();
+                                        _f.label = 23;
+                                    case 23: return [4 /*yield*/, this.eventBus_
+                                            .withTransaction(transactionManager)
+                                            .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 24:
+                                        _f.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1111,27 +1005,27 @@ var CartService = /** @class */ (function (_super) {
     CartService.prototype.updateBillingAddress_ = function (cart, addressOrId, addrRepo) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var address, updated, addr, created;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var address, _c, addr;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (!(typeof addressOrId === "string")) return [3 /*break*/, 2];
                         return [4 /*yield*/, addrRepo.findOne({
                                 where: { id: addressOrId },
                             })];
                     case 1:
-                        address = (_c.sent());
+                        address = (_d.sent());
                         return [3 /*break*/, 3];
                     case 2:
                         address = addressOrId;
-                        _c.label = 3;
+                        _d.label = 3;
                     case 3:
                         address.country_code = (_b = (_a = address.country_code) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : null;
                         if (!address.id) return [3 /*break*/, 5];
+                        _c = cart;
                         return [4 /*yield*/, addrRepo.save(address)];
                     case 4:
-                        updated = _c.sent();
-                        cart.billing_address = updated;
+                        _c.billing_address = _d.sent();
                         return [3 /*break*/, 9];
                     case 5:
                         if (!cart.billing_address_id) return [3 /*break*/, 8];
@@ -1139,15 +1033,14 @@ var CartService = /** @class */ (function (_super) {
                                 where: { id: cart.billing_address_id },
                             })];
                     case 6:
-                        addr = _c.sent();
+                        addr = _d.sent();
                         return [4 /*yield*/, addrRepo.save(__assign(__assign({}, addr), address))];
                     case 7:
-                        _c.sent();
+                        _d.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        created = addrRepo.create(__assign({}, address));
-                        cart.billing_address = created;
-                        _c.label = 9;
+                        cart.billing_address = addrRepo.create(__assign({}, address));
+                        _d.label = 9;
                     case 9: return [2 /*return*/];
                 }
             });
@@ -1163,9 +1056,9 @@ var CartService = /** @class */ (function (_super) {
     CartService.prototype.updateShippingAddress_ = function (cart, addressOrId, addrRepo) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var address, updated, addr, created;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var address, _c, addr;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (addressOrId === null) {
                             cart.shipping_address = null;
@@ -1176,11 +1069,11 @@ var CartService = /** @class */ (function (_super) {
                                 where: { id: addressOrId },
                             })];
                     case 1:
-                        address = (_c.sent());
+                        address = (_d.sent());
                         return [3 /*break*/, 3];
                     case 2:
                         address = addressOrId;
-                        _c.label = 3;
+                        _d.label = 3;
                     case 3:
                         address.country_code = (_b = (_a = address.country_code) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : null;
                         if (address.country_code &&
@@ -1191,10 +1084,10 @@ var CartService = /** @class */ (function (_super) {
                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Shipping country must be in the cart region");
                         }
                         if (!address.id) return [3 /*break*/, 5];
+                        _c = cart;
                         return [4 /*yield*/, addrRepo.save(address)];
                     case 4:
-                        updated = _c.sent();
-                        cart.shipping_address = updated;
+                        _c.shipping_address = _d.sent();
                         return [3 /*break*/, 9];
                     case 5:
                         if (!cart.shipping_address_id) return [3 /*break*/, 8];
@@ -1202,15 +1095,14 @@ var CartService = /** @class */ (function (_super) {
                                 where: { id: cart.shipping_address_id },
                             })];
                     case 6:
-                        addr = _c.sent();
+                        addr = _d.sent();
                         return [4 /*yield*/, addrRepo.save(__assign(__assign({}, addr), address))];
                     case 7:
-                        _c.sent();
+                        _d.sent();
                         return [3 /*break*/, 9];
                     case 8:
-                        created = addrRepo.create(__assign({}, address));
-                        cart.shipping_address = created;
-                        _c.label = 9;
+                        cart.shipping_address = addrRepo.create(__assign({}, address));
+                        _d.label = 9;
                     case 9: return [2 /*return*/];
                 }
             });
@@ -1221,7 +1113,9 @@ var CartService = /** @class */ (function (_super) {
             var giftCard;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.giftCardService_.retrieveByCode(code)];
+                    case 0: return [4 /*yield*/, this.giftCardService_
+                            .withTransaction(this.transactionManager_)
+                            .retrieveByCode(code)];
                     case 1:
                         giftCard = _a.sent();
                         if (giftCard.is_disabled) {
@@ -1235,7 +1129,7 @@ var CartService = /** @class */ (function (_super) {
                             var id = _a.id;
                             return id === giftCard.id;
                         })) {
-                            return [2 /*return*/, Promise.resolve()];
+                            return [2 /*return*/];
                         }
                         cart.gift_cards = __spreadArray(__spreadArray([], __read(cart.gift_cards), false), [giftCard], false);
                         return [2 /*return*/];
@@ -1254,80 +1148,65 @@ var CartService = /** @class */ (function (_super) {
      */
     CartService.prototype.applyDiscount = function (cart, discountCode) {
         return __awaiter(this, void 0, void 0, function () {
-            var discount, rule, today, regions, parent, toParse, sawNotShipping, newDiscounts;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.discountService_.retrieveByCode(discountCode, [
-                            "rule",
-                            "rule.valid_for",
-                            "regions",
-                        ])];
-                    case 1:
-                        discount = _a.sent();
-                        rule = discount.rule;
-                        // if limit is set and reached, we make an early exit
-                        if (discount.usage_limit) {
-                            discount.usage_count = discount.usage_count || 0;
-                            if (discount.usage_count >= discount.usage_limit) {
-                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount has been used maximum allowed times");
-                            }
-                        }
-                        today = new Date();
-                        if (discount.starts_at > today) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is not valid yet");
-                        }
-                        if (discount.ends_at && discount.ends_at < today) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Discount is expired");
-                        }
-                        regions = discount.regions;
-                        if (!discount.parent_discount_id) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.discountService_.retrieve(discount.parent_discount_id, {
-                                relations: ["rule", "regions"],
-                            })];
-                    case 2:
-                        parent = _a.sent();
-                        regions = parent.regions;
-                        _a.label = 3;
-                    case 3:
-                        if (discount.is_disabled) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "The discount code is disabled");
-                        }
-                        if (!regions.find(function (_a) {
-                            var id = _a.id;
-                            return id === cart.region_id;
-                        })) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "The discount is not available in current region");
-                        }
-                        // if discount is already there, we simply resolve
-                        if (cart.discounts.find(function (_a) {
-                            var id = _a.id;
-                            return id === discount.id;
-                        })) {
-                            return [2 /*return*/, Promise.resolve()];
-                        }
-                        toParse = __spreadArray(__spreadArray([], __read(cart.discounts), false), [discount], false);
-                        sawNotShipping = false;
-                        newDiscounts = toParse.map(function (d) {
-                            var drule = d.rule;
-                            switch (drule.type) {
-                                case "free_shipping":
-                                    if (d.rule.type === rule.type) {
-                                        return discount;
-                                    }
-                                    return d;
-                                default:
-                                    if (!sawNotShipping) {
-                                        sawNotShipping = true;
-                                        if (rule.type !== "free_shipping") {
-                                            return discount;
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var discount, rule, toParse, sawNotShipping, newDiscounts;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.discountService_
+                                            .withTransaction(transactionManager)
+                                            .retrieveByCode(discountCode, { relations: ["rule", "regions"] })];
+                                    case 1:
+                                        discount = _a.sent();
+                                        return [4 /*yield*/, this.discountService_
+                                                .withTransaction(transactionManager)
+                                                .validateDiscountForCartOrThrow(cart, discount)];
+                                    case 2:
+                                        _a.sent();
+                                        rule = discount.rule;
+                                        // if discount is already there, we simply resolve
+                                        if (cart.discounts.find(function (_a) {
+                                            var id = _a.id;
+                                            return id === discount.id;
+                                        })) {
+                                            return [2 /*return*/];
                                         }
-                                        return d;
-                                    }
-                                    return null;
-                            }
-                        });
-                        cart.discounts = newDiscounts.filter(Boolean);
-                        return [2 /*return*/];
+                                        toParse = __spreadArray(__spreadArray([], __read(cart.discounts), false), [discount], false);
+                                        sawNotShipping = false;
+                                        newDiscounts = toParse.map(function (discountToParse) {
+                                            var _a;
+                                            switch ((_a = discountToParse.rule) === null || _a === void 0 ? void 0 : _a.type) {
+                                                case models_1.DiscountRuleType.FREE_SHIPPING:
+                                                    if (discountToParse.rule.type === rule.type) {
+                                                        return discount;
+                                                    }
+                                                    return discountToParse;
+                                                default:
+                                                    if (!sawNotShipping) {
+                                                        sawNotShipping = true;
+                                                        if ((rule === null || rule === void 0 ? void 0 : rule.type) !== "free_shipping") {
+                                                            return discount;
+                                                        }
+                                                        return discountToParse;
+                                                    }
+                                                    return null;
+                                            }
+                                        });
+                                        cart.discounts = newDiscounts.filter(function (newDiscount) {
+                                            return !!newDiscount;
+                                        });
+                                        if (!((rule === null || rule === void 0 ? void 0 : rule.type) !== "free_shipping" && (cart === null || cart === void 0 ? void 0 : cart.items))) return [3 /*break*/, 4];
+                                        return [4 /*yield*/, this.refreshAdjustments_(cart)];
+                                    case 3:
+                                        _a.sent();
+                                        _a.label = 4;
+                                    case 4: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -1342,89 +1221,96 @@ var CartService = /** @class */ (function (_super) {
         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 cart, cartRepo, result;
-                        var _a;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: [
-                                            "discounts",
-                                            "discounts.rule",
-                                            "discounts.rule.valid_for",
-                                            "payment_sessions",
-                                            "shipping_methods",
-                                        ],
-                                    })];
-                                case 1:
-                                    cart = _b.sent();
-                                    if (!cart.discounts.some(function (_a) {
-                                        var rule = _a.rule;
-                                        return rule.type === "free_shipping";
-                                    })) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, this.adjustFreeShipping_(cart, false)];
-                                case 2:
-                                    _b.sent();
-                                    _b.label = 3;
-                                case 3:
-                                    cart.discounts = cart.discounts.filter(function (d) { return d.code !== discountCode; });
-                                    cartRepo = manager.getCustomRepository(this.cartRepository_);
-                                    return [4 /*yield*/, cartRepo.save(cart)];
-                                case 4:
-                                    result = _b.sent();
-                                    if (!((_a = cart.payment_sessions) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 6];
-                                    return [4 /*yield*/, this.setPaymentSessions(cartId)];
-                                case 5:
-                                    _b.sent();
-                                    _b.label = 6;
-                                case 6: return [4 /*yield*/, this.eventBus_
-                                        .withTransaction(manager)
-                                        .emit(CartService.Events.UPDATED, result)];
-                                case 7:
-                                    _b.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
-            });
-        });
-    };
-    /**
-     * Updates the currently selected payment session.
-     * @param cartId - the id of the cart to update the payment session for
-     * @param update - the data to update the payment session with
-     * @return the resulting cart
-     */
-    CartService.prototype.updatePaymentSession = function (cartId, update) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, cartRepo, updatedCart;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: [
+                                                "discounts",
+                                                "discounts.rule",
+                                                "payment_sessions",
+                                                "shipping_methods",
+                                            ],
+                                        })];
+                                    case 1:
+                                        cart = _b.sent();
+                                        if (!cart.discounts.some(function (_a) {
+                                            var rule = _a.rule;
+                                            return rule.type === "free_shipping";
+                                        })) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.adjustFreeShipping_(cart, false)];
+                                    case 2:
+                                        _b.sent();
+                                        _b.label = 3;
+                                    case 3:
+                                        cart.discounts = cart.discounts.filter(function (discount) { return discount.code !== discountCode; });
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        return [4 /*yield*/, cartRepo.save(cart)];
+                                    case 4:
+                                        updatedCart = _b.sent();
+                                        if (!((_a = updatedCart.payment_sessions) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 6];
+                                        return [4 /*yield*/, this.setPaymentSessions(cartId)];
+                                    case 5:
+                                        _b.sent();
+                                        _b.label = 6;
+                                    case 6: return [4 /*yield*/, this.eventBus_
+                                            .withTransaction(transactionManager)
+                                            .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 7:
+                                        _b.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    /**
+     * Updates the currently selected payment session.
+     * @param cartId - the id of the cart to update the payment session for
+     * @param update - the data to update the payment session with
+     * @return the resulting cart
+     */
+    CartService.prototype.updatePaymentSession = function (cartId, update) {
         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 cart, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: ["payment_sessions"],
-                                    })];
-                                case 1:
-                                    cart = _a.sent();
-                                    if (!cart.payment_session) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, this.paymentProviderService_.updateSessionData(cart.payment_session, update)];
-                                case 2:
-                                    _a.sent();
-                                    _a.label = 3;
-                                case 3: return [4 /*yield*/, this.retrieve(cart.id)];
-                                case 4:
-                                    result = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, result)];
-                                case 5:
-                                    _a.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, updatedCart;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: ["payment_sessions"],
+                                        })];
+                                    case 1:
+                                        cart = _a.sent();
+                                        if (!cart.payment_session) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .updateSessionData(cart.payment_session, update)];
+                                    case 2:
+                                        _a.sent();
+                                        _a.label = 3;
+                                    case 3: return [4 /*yield*/, this.retrieve(cart.id)];
+                                    case 4:
+                                        updatedCart = _a.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 5:
+                                        _a.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1445,58 +1331,64 @@ var CartService = /** @class */ (function (_super) {
         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 cartRepository, cart, session, freshCart, payment, updated;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    cartRepository = manager.getCustomRepository(this.cartRepository_);
-                                    return [4 /*yield*/, this.retrieve(cartId, {
-                                            select: ["total"],
-                                            relations: ["region", "payment_sessions"],
-                                        })];
-                                case 1:
-                                    cart = _a.sent();
-                                    if (typeof cart.total === "undefined") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.UNEXPECTED_STATE, "cart.total should be defined");
-                                    }
-                                    // If cart total is 0, we don't perform anything payment related
-                                    if (cart.total <= 0) {
-                                        cart.payment_authorized_at = new Date();
-                                        return [2 /*return*/, cartRepository.save(cart)];
-                                    }
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .authorizePayment(cart.payment_session, context)];
-                                case 2:
-                                    session = _a.sent();
-                                    return [4 /*yield*/, this.retrieve(cart.id, {
-                                            select: ["total"],
-                                            relations: ["payment_sessions"],
-                                        })];
-                                case 3:
-                                    freshCart = _a.sent();
-                                    if (!(session.status === "authorized")) return [3 /*break*/, 5];
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .createPayment(freshCart)];
-                                case 4:
-                                    payment = _a.sent();
-                                    freshCart.payment = payment;
-                                    freshCart.payment_authorized_at = new Date();
-                                    _a.label = 5;
-                                case 5: return [4 /*yield*/, cartRepository.save(freshCart)];
-                                case 6:
-                                    updated = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, updated)];
-                                case 7:
-                                    _a.sent();
-                                    return [2 /*return*/, updated];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cartRepository, cart, session, freshCart, _a, updatedCart;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        cartRepository = transactionManager.getCustomRepository(this.cartRepository_);
+                                        return [4 /*yield*/, this.retrieve(cartId, {
+                                                select: ["total"],
+                                                relations: ["region", "payment_sessions"],
+                                            })];
+                                    case 1:
+                                        cart = _b.sent();
+                                        if (typeof cart.total === "undefined") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.UNEXPECTED_STATE, "cart.total should be defined");
+                                        }
+                                        // If cart total is 0, we don't perform anything payment related
+                                        if (cart.total <= 0) {
+                                            cart.payment_authorized_at = new Date();
+                                            return [2 /*return*/, cartRepository.save(cart)];
+                                        }
+                                        if (!cart.payment_session) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "You cannot complete a cart without a payment session.");
+                                        }
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .authorizePayment(cart.payment_session, context)];
+                                    case 2:
+                                        session = _b.sent();
+                                        return [4 /*yield*/, this.retrieve(cart.id, {
+                                                select: ["total"],
+                                                relations: ["payment_sessions", "items", "items.adjustments"],
+                                            })];
+                                    case 3:
+                                        freshCart = _b.sent();
+                                        if (!(session.status === "authorized")) return [3 /*break*/, 5];
+                                        _a = freshCart;
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .createPayment(freshCart)];
+                                    case 4:
+                                        _a.payment = _b.sent();
+                                        freshCart.payment_authorized_at = new Date();
+                                        _b.label = 5;
+                                    case 5: return [4 /*yield*/, cartRepository.save(freshCart)];
+                                    case 6:
+                                        updatedCart = _b.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 7:
+                                        _b.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1510,66 +1402,66 @@ var CartService = /** @class */ (function (_super) {
         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 psRepo, cart, sess, result;
-                        var _this = this;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    psRepo = manager.getCustomRepository(this.paymentSessionRepository_);
-                                    return [4 /*yield*/, this.retrieve(cartId, {
-                                            select: [
-                                                "total",
-                                                "subtotal",
-                                                "tax_total",
-                                                "discount_total",
-                                                "gift_card_total",
-                                            ],
-                                            relations: ["region", "region.payment_providers", "payment_sessions"],
-                                        })
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var psRepo, cart, paymentSession, updatedCart;
+                            var _this = this;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        psRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
+                                        return [4 /*yield*/, this.retrieve(cartId, {
+                                                select: [
+                                                    "total",
+                                                    "subtotal",
+                                                    "tax_total",
+                                                    "discount_total",
+                                                    "gift_card_total",
+                                                ],
+                                                relations: ["region", "region.payment_providers", "payment_sessions"],
+                                            })
+                                            // The region must have the provider id in its providers array
+                                        ];
+                                    case 1:
+                                        cart = _a.sent();
                                         // The region must have the provider id in its providers array
-                                    ];
-                                case 1:
-                                    cart = _a.sent();
-                                    // The region must have the provider id in its providers array
-                                    if (providerId !== "system" &&
-                                        !(cart.region.payment_providers.length &&
-                                            cart.region.payment_providers.find(function (_a) {
-                                                var id = _a.id;
-                                                return providerId === id;
-                                            }))) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "The payment method is not available in this region");
-                                    }
-                                    return [4 /*yield*/, Promise.all(cart.payment_sessions.map(function (ps) { return __awaiter(_this, void 0, void 0, function () {
-                                            return __generator(this, function (_a) {
-                                                switch (_a.label) {
-                                                    case 0: return [4 /*yield*/, psRepo.save(__assign(__assign({}, ps), { is_selected: null }))];
-                                                    case 1: return [2 /*return*/, _a.sent()];
-                                                }
-                                            });
-                                        }); }))];
-                                case 2:
-                                    _a.sent();
-                                    sess = cart.payment_sessions.find(function (ps) { return ps.provider_id === providerId; });
-                                    if (!sess) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.UNEXPECTED_STATE, "Could not find payment session");
-                                    }
-                                    sess.is_selected = true;
-                                    return [4 /*yield*/, psRepo.save(sess)];
-                                case 3:
-                                    _a.sent();
-                                    return [4 /*yield*/, this.retrieve(cartId)];
-                                case 4:
-                                    result = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, result)];
-                                case 5:
-                                    _a.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); }, "SERIALIZABLE")];
+                                        if (providerId !== "system" &&
+                                            !(cart.region.payment_providers.length &&
+                                                cart.region.payment_providers.find(function (_a) {
+                                                    var id = _a.id;
+                                                    return providerId === id;
+                                                }))) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "The payment method is not available in this region");
+                                        }
+                                        return [4 /*yield*/, Promise.all(cart.payment_sessions.map(function (paymentSession) { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    return [2 /*return*/, psRepo.save(__assign(__assign({}, paymentSession), { is_selected: null }))];
+                                                });
+                                            }); }))];
+                                    case 2:
+                                        _a.sent();
+                                        paymentSession = cart.payment_sessions.find(function (ps) { return ps.provider_id === providerId; });
+                                        if (!paymentSession) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.UNEXPECTED_STATE, "Could not find payment session");
+                                        }
+                                        paymentSession.is_selected = true;
+                                        return [4 /*yield*/, psRepo.save(paymentSession)];
+                                    case 3:
+                                        _a.sent();
+                                        return [4 /*yield*/, this.retrieve(cartId)];
+                                    case 4:
+                                        updatedCart = _a.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 5:
+                                        _a.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); }, "SERIALIZABLE")];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1586,147 +1478,105 @@ var CartService = /** @class */ (function (_super) {
         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 psRepo, cartId, cart, total, region, seen, _loop_1, this_1, _a, _b, session, e_9_1, p, sess, _c, _d, provider, e_10_1;
-                        var e_9, _e, e_10, _f;
-                        return __generator(this, function (_g) {
-                            switch (_g.label) {
-                                case 0:
-                                    psRepo = manager.getCustomRepository(this.paymentSessionRepository_);
-                                    cartId = typeof cartOrCartId === "string" ? cartOrCartId : cartOrCartId.id;
-                                    return [4 /*yield*/, this.retrieve(cartId, {
-                                            select: [
-                                                "total",
-                                                "subtotal",
-                                                "tax_total",
-                                                "discount_total",
-                                                "shipping_total",
-                                                "gift_card_total",
-                                            ],
-                                            relations: [
-                                                "items",
-                                                "discounts",
-                                                "discounts.rule",
-                                                "discounts.rule.valid_for",
-                                                "gift_cards",
-                                                "shipping_methods",
-                                                "billing_address",
-                                                "shipping_address",
-                                                "region",
-                                                "region.tax_rates",
-                                                "region.payment_providers",
-                                                "payment_sessions",
-                                                "customer",
-                                            ],
-                                        }, { force_taxes: true })];
-                                case 1:
-                                    cart = _g.sent();
-                                    total = cart.total, region = cart.region;
-                                    if (typeof total === "undefined") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.UNEXPECTED_STATE, "cart.total must be defined");
-                                    }
-                                    seen = [];
-                                    if (!(cart.payment_sessions && cart.payment_sessions.length)) return [3 /*break*/, 9];
-                                    _loop_1 = function (session) {
-                                        return __generator(this, function (_h) {
-                                            switch (_h.label) {
-                                                case 0:
-                                                    if (!(total <= 0 ||
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var psRepo, cartId, cart, total, region, seen, paymentProvider, paymentSession;
+                            var _this = this;
+                            var _a;
+                            return __generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        psRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
+                                        cartId = typeof cartOrCartId === "string" ? cartOrCartId : cartOrCartId.id;
+                                        return [4 /*yield*/, this.retrieve(cartId, {
+                                                select: [
+                                                    "total",
+                                                    "subtotal",
+                                                    "tax_total",
+                                                    "discount_total",
+                                                    "shipping_total",
+                                                    "gift_card_total",
+                                                ],
+                                                relations: [
+                                                    "items",
+                                                    "items.adjustments",
+                                                    "discounts",
+                                                    "discounts.rule",
+                                                    "gift_cards",
+                                                    "shipping_methods",
+                                                    "billing_address",
+                                                    "shipping_address",
+                                                    "region",
+                                                    "region.tax_rates",
+                                                    "region.payment_providers",
+                                                    "payment_sessions",
+                                                    "customer",
+                                                ],
+                                            }, { force_taxes: true })];
+                                    case 1:
+                                        cart = _b.sent();
+                                        total = cart.total, region = cart.region;
+                                        if (typeof total === "undefined") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.UNEXPECTED_STATE, "cart.total must be defined");
+                                        }
+                                        seen = [];
+                                        if (!((_a = cart.payment_sessions) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, Promise.all(cart.payment_sessions.map(function (paymentSession) { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    if (total <= 0 ||
                                                         !region.payment_providers.find(function (_a) {
                                                             var id = _a.id;
-                                                            return id === session.provider_id;
-                                                        }))) return [3 /*break*/, 2];
-                                                    return [4 /*yield*/, this_1.paymentProviderService_
-                                                            .withTransaction(manager)
-                                                            .deleteSession(session)];
-                                                case 1:
-                                                    _h.sent();
-                                                    return [3 /*break*/, 4];
-                                                case 2:
-                                                    seen.push(session.provider_id);
-                                                    return [4 /*yield*/, this_1.paymentProviderService_
-                                                            .withTransaction(manager)
-                                                            .updateSession(session, cart)];
-                                                case 3:
-                                                    _h.sent();
-                                                    _h.label = 4;
-                                                case 4: return [2 /*return*/];
-                                            }
-                                        });
-                                    };
-                                    this_1 = this;
-                                    _g.label = 2;
-                                case 2:
-                                    _g.trys.push([2, 7, 8, 9]);
-                                    _a = __values(cart.payment_sessions), _b = _a.next();
-                                    _g.label = 3;
-                                case 3:
-                                    if (!!_b.done) return [3 /*break*/, 6];
-                                    session = _b.value;
-                                    return [5 /*yield**/, _loop_1(session)];
-                                case 4:
-                                    _g.sent();
-                                    _g.label = 5;
-                                case 5:
-                                    _b = _a.next();
-                                    return [3 /*break*/, 3];
-                                case 6: return [3 /*break*/, 9];
-                                case 7:
-                                    e_9_1 = _g.sent();
-                                    e_9 = { error: e_9_1 };
-                                    return [3 /*break*/, 9];
-                                case 8:
-                                    try {
-                                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
-                                    }
-                                    finally { if (e_9) throw e_9.error; }
-                                    return [7 /*endfinally*/];
-                                case 9:
-                                    if (!(total > 0)) return [3 /*break*/, 19];
-                                    if (!(region.payment_providers.length === 1 && !cart.payment_session)) return [3 /*break*/, 12];
-                                    p = region.payment_providers[0];
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .createSession(p.id, cart)];
-                                case 10:
-                                    sess = _g.sent();
-                                    sess.is_selected = true;
-                                    return [4 /*yield*/, psRepo.save(sess)];
-                                case 11:
-                                    _g.sent();
-                                    return [3 /*break*/, 19];
-                                case 12:
-                                    _g.trys.push([12, 17, 18, 19]);
-                                    _c = __values(region.payment_providers), _d = _c.next();
-                                    _g.label = 13;
-                                case 13:
-                                    if (!!_d.done) return [3 /*break*/, 16];
-                                    provider = _d.value;
-                                    if (!!seen.includes(provider.id)) return [3 /*break*/, 15];
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .createSession(provider.id, cart)];
-                                case 14:
-                                    _g.sent();
-                                    _g.label = 15;
-                                case 15:
-                                    _d = _c.next();
-                                    return [3 /*break*/, 13];
-                                case 16: return [3 /*break*/, 19];
-                                case 17:
-                                    e_10_1 = _g.sent();
-                                    e_10 = { error: e_10_1 };
-                                    return [3 /*break*/, 19];
-                                case 18:
-                                    try {
-                                        if (_d && !_d.done && (_f = _c.return)) _f.call(_c);
-                                    }
-                                    finally { if (e_10) throw e_10.error; }
-                                    return [7 /*endfinally*/];
-                                case 19: return [2 /*return*/];
-                            }
-                        });
-                    }); })];
+                                                            return id === paymentSession.provider_id;
+                                                        })) {
+                                                        return [2 /*return*/, this.paymentProviderService_
+                                                                .withTransaction(transactionManager)
+                                                                .deleteSession(paymentSession)];
+                                                    }
+                                                    else {
+                                                        seen.push(paymentSession.provider_id);
+                                                        return [2 /*return*/, this.paymentProviderService_
+                                                                .withTransaction(transactionManager)
+                                                                .updateSession(paymentSession, cart)];
+                                                    }
+                                                    return [2 /*return*/];
+                                                });
+                                            }); }))];
+                                    case 2:
+                                        _b.sent();
+                                        _b.label = 3;
+                                    case 3:
+                                        if (!(total > 0)) return [3 /*break*/, 8];
+                                        if (!(region.payment_providers.length === 1 && !cart.payment_session)) return [3 /*break*/, 6];
+                                        paymentProvider = region.payment_providers[0];
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .createSession(paymentProvider.id, cart)];
+                                    case 4:
+                                        paymentSession = _b.sent();
+                                        paymentSession.is_selected = true;
+                                        return [4 /*yield*/, psRepo.save(paymentSession)];
+                                    case 5:
+                                        _b.sent();
+                                        return [3 /*break*/, 8];
+                                    case 6: return [4 /*yield*/, Promise.all(region.payment_providers.map(function (paymentProvider) { return __awaiter(_this, void 0, void 0, function () {
+                                            return __generator(this, function (_a) {
+                                                if (!seen.includes(paymentProvider.id)) {
+                                                    return [2 /*return*/, this.paymentProviderService_
+                                                            .withTransaction(transactionManager)
+                                                            .createSession(paymentProvider.id, cart)];
+                                                }
+                                                return [2 /*return*/];
+                                            });
+                                        }); }))];
+                                    case 7:
+                                        _b.sent();
+                                        _b.label = 8;
+                                    case 8: return [2 /*return*/];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1741,46 +1591,49 @@ var CartService = /** @class */ (function (_super) {
         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 cart, cartRepo, session;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: ["payment_sessions"],
-                                    })];
-                                case 1:
-                                    cart = _a.sent();
-                                    cartRepo = manager.getCustomRepository(this.cartRepository_);
-                                    if (!cart.payment_sessions) return [3 /*break*/, 3];
-                                    session = cart.payment_sessions.find(function (_a) {
-                                        var provider_id = _a.provider_id;
-                                        return provider_id === providerId;
-                                    });
-                                    cart.payment_sessions = cart.payment_sessions.filter(function (_a) {
-                                        var provider_id = _a.provider_id;
-                                        return provider_id !== providerId;
-                                    });
-                                    if (!session) return [3 /*break*/, 3];
-                                    // Delete the session with the provider
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .deleteSession(session)];
-                                case 2:
-                                    // Delete the session with the provider
-                                    _a.sent();
-                                    _a.label = 3;
-                                case 3: return [4 /*yield*/, cartRepo.save(cart)];
-                                case 4:
-                                    _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, cart)];
-                                case 5:
-                                    _a.sent();
-                                    return [2 /*return*/, cart];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, cartRepo, paymentSession;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: ["payment_sessions"],
+                                        })];
+                                    case 1:
+                                        cart = _a.sent();
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        if (!cart.payment_sessions) return [3 /*break*/, 3];
+                                        paymentSession = cart.payment_sessions.find(function (_a) {
+                                            var provider_id = _a.provider_id;
+                                            return provider_id === providerId;
+                                        });
+                                        cart.payment_sessions = cart.payment_sessions.filter(function (_a) {
+                                            var provider_id = _a.provider_id;
+                                            return provider_id !== providerId;
+                                        });
+                                        if (!paymentSession) return [3 /*break*/, 3];
+                                        // Delete the session with the provider
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .deleteSession(paymentSession)];
+                                    case 2:
+                                        // Delete the session with the provider
+                                        _a.sent();
+                                        _a.label = 3;
+                                    case 3: return [4 /*yield*/, cartRepo.save(cart)];
+                                    case 4:
+                                        _a.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, cart)];
+                                    case 5:
+                                        _a.sent();
+                                        return [2 /*return*/, cart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1795,41 +1648,44 @@ var CartService = /** @class */ (function (_super) {
         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 cart, session, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: ["payment_sessions"],
-                                    })];
-                                case 1:
-                                    cart = _a.sent();
-                                    if (!cart.payment_sessions) return [3 /*break*/, 3];
-                                    session = cart.payment_sessions.find(function (_a) {
-                                        var provider_id = _a.provider_id;
-                                        return provider_id === providerId;
-                                    });
-                                    if (!session) return [3 /*break*/, 3];
-                                    // Delete the session with the provider
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .refreshSession(session, cart)];
-                                case 2:
-                                    // Delete the session with the provider
-                                    _a.sent();
-                                    _a.label = 3;
-                                case 3: return [4 /*yield*/, this.retrieve(cartId)];
-                                case 4:
-                                    result = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, result)];
-                                case 5:
-                                    _a.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, paymentSession, updatedCart;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: ["payment_sessions"],
+                                        })];
+                                    case 1:
+                                        cart = _a.sent();
+                                        if (!cart.payment_sessions) return [3 /*break*/, 3];
+                                        paymentSession = cart.payment_sessions.find(function (_a) {
+                                            var provider_id = _a.provider_id;
+                                            return provider_id === providerId;
+                                        });
+                                        if (!paymentSession) return [3 /*break*/, 3];
+                                        // Delete the session with the provider
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .refreshSession(paymentSession, cart)];
+                                    case 2:
+                                        // Delete the session with the provider
+                                        _a.sent();
+                                        _a.label = 3;
+                                    case 3: return [4 /*yield*/, this.retrieve(cartId)];
+                                    case 4:
+                                        updatedCart = _a.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 5:
+                                        _a.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1849,133 +1705,119 @@ var CartService = /** @class */ (function (_super) {
         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 cart, cartCustomShippingOptions, customShippingOption, shipping_methods, shippingMethodConfig, newMethod, methods, shipping_methods_1, shipping_methods_1_1, sm, e_11_1, _a, _b, item, e_12_1, result;
-                        var e_11, _c, e_12, _d;
-                        return __generator(this, function (_e) {
-                            switch (_e.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(cartId, {
-                                        select: ["subtotal"],
-                                        relations: [
-                                            "shipping_methods",
-                                            "discounts",
-                                            "discounts.rule",
-                                            "discounts.rule.valid_for",
-                                            "shipping_methods.shipping_option",
-                                            "items",
-                                            "items.variant",
-                                            "payment_sessions",
-                                            "items.variant.product",
-                                        ],
-                                    })];
-                                case 1:
-                                    cart = _e.sent();
-                                    return [4 /*yield*/, this.customShippingOptionService_.list({ cart_id: cart.id })];
-                                case 2:
-                                    cartCustomShippingOptions = _e.sent();
-                                    customShippingOption = this.findCustomShippingOption(cartCustomShippingOptions, optionId);
-                                    shipping_methods = cart.shipping_methods;
-                                    shippingMethodConfig = customShippingOption
-                                        ? { cart_id: cart.id, price: customShippingOption.price }
-                                        : {
-                                            cart: cart,
-                                        };
-                                    return [4 /*yield*/, this.shippingOptionService_
-                                            .withTransaction(manager)
-                                            .createShippingMethod(optionId, data, shippingMethodConfig)];
-                                case 3:
-                                    newMethod = _e.sent();
-                                    methods = [newMethod];
-                                    if (!shipping_methods.length) return [3 /*break*/, 12];
-                                    _e.label = 4;
-                                case 4:
-                                    _e.trys.push([4, 10, 11, 12]);
-                                    shipping_methods_1 = __values(shipping_methods), shipping_methods_1_1 = shipping_methods_1.next();
-                                    _e.label = 5;
-                                case 5:
-                                    if (!!shipping_methods_1_1.done) return [3 /*break*/, 9];
-                                    sm = shipping_methods_1_1.value;
-                                    if (!(sm.shipping_option.profile_id ===
-                                        newMethod.shipping_option.profile_id)) return [3 /*break*/, 7];
-                                    return [4 /*yield*/, this.shippingOptionService_
-                                            .withTransaction(manager)
-                                            .deleteShippingMethod(sm)];
-                                case 6:
-                                    _e.sent();
-                                    return [3 /*break*/, 8];
-                                case 7:
-                                    methods.push(sm);
-                                    _e.label = 8;
-                                case 8:
-                                    shipping_methods_1_1 = shipping_methods_1.next();
-                                    return [3 /*break*/, 5];
-                                case 9: return [3 /*break*/, 12];
-                                case 10:
-                                    e_11_1 = _e.sent();
-                                    e_11 = { error: e_11_1 };
-                                    return [3 /*break*/, 12];
-                                case 11:
-                                    try {
-                                        if (shipping_methods_1_1 && !shipping_methods_1_1.done && (_c = shipping_methods_1.return)) _c.call(shipping_methods_1);
-                                    }
-                                    finally { if (e_11) throw e_11.error; }
-                                    return [7 /*endfinally*/];
-                                case 12:
-                                    _e.trys.push([12, 17, 18, 19]);
-                                    _a = __values(cart.items), _b = _a.next();
-                                    _e.label = 13;
-                                case 13:
-                                    if (!!_b.done) return [3 /*break*/, 16];
-                                    item = _b.value;
-                                    return [4 /*yield*/, this.lineItemService_.withTransaction(manager).update(item.id, {
-                                            has_shipping: this.validateLineItemShipping_(methods, item),
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, cartCustomShippingOptions, customShippingOption, shipping_methods, shippingMethodConfig, newShippingMethod, methods, shipping_methods_1, shipping_methods_1_1, shippingMethod, e_3_1, updatedCart;
+                            var e_3, _a;
+                            var _this = this;
+                            var _b;
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(cartId, {
+                                            select: ["subtotal"],
+                                            relations: [
+                                                "shipping_methods",
+                                                "discounts",
+                                                "discounts.rule",
+                                                "shipping_methods.shipping_option",
+                                                "items",
+                                                "items.variant",
+                                                "payment_sessions",
+                                                "items.variant.product",
+                                            ],
                                         })];
-                                case 14:
-                                    _e.sent();
-                                    _e.label = 15;
-                                case 15:
-                                    _b = _a.next();
-                                    return [3 /*break*/, 13];
-                                case 16: return [3 /*break*/, 19];
-                                case 17:
-                                    e_12_1 = _e.sent();
-                                    e_12 = { error: e_12_1 };
-                                    return [3 /*break*/, 19];
-                                case 18:
-                                    try {
-                                        if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
-                                    }
-                                    finally { if (e_12) throw e_12.error; }
-                                    return [7 /*endfinally*/];
-                                case 19: return [4 /*yield*/, this.retrieve(cartId, {
-                                        relations: [
-                                            "discounts",
-                                            "discounts.rule",
-                                            "discounts.rule.valid_for",
-                                            "shipping_methods",
-                                        ],
-                                    })
-                                    // if cart has freeshipping, adjust price
-                                ];
-                                case 20:
-                                    result = _e.sent();
-                                    if (!result.discounts.some(function (_a) {
-                                        var rule = _a.rule;
-                                        return rule.type === "free_shipping";
-                                    })) return [3 /*break*/, 22];
-                                    return [4 /*yield*/, this.adjustFreeShipping_(result, true)];
-                                case 21:
-                                    _e.sent();
-                                    _e.label = 22;
-                                case 22: return [4 /*yield*/, this.eventBus_
-                                        .withTransaction(manager)
-                                        .emit(CartService.Events.UPDATED, result)];
-                                case 23:
-                                    _e.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); }, "SERIALIZABLE")];
+                                    case 1:
+                                        cart = _c.sent();
+                                        return [4 /*yield*/, this.customShippingOptionService_
+                                                .withTransaction(transactionManager)
+                                                .list({ cart_id: cart.id })];
+                                    case 2:
+                                        cartCustomShippingOptions = _c.sent();
+                                        customShippingOption = this.findCustomShippingOption(cartCustomShippingOptions, optionId);
+                                        shipping_methods = cart.shipping_methods;
+                                        shippingMethodConfig = customShippingOption
+                                            ? { cart_id: cart.id, price: customShippingOption.price }
+                                            : { cart: cart };
+                                        return [4 /*yield*/, this.shippingOptionService_
+                                                .withTransaction(transactionManager)
+                                                .createShippingMethod(optionId, data, shippingMethodConfig)];
+                                    case 3:
+                                        newShippingMethod = _c.sent();
+                                        methods = [newShippingMethod];
+                                        if (!(shipping_methods === null || shipping_methods === void 0 ? void 0 : shipping_methods.length)) return [3 /*break*/, 12];
+                                        _c.label = 4;
+                                    case 4:
+                                        _c.trys.push([4, 10, 11, 12]);
+                                        shipping_methods_1 = __values(shipping_methods), shipping_methods_1_1 = shipping_methods_1.next();
+                                        _c.label = 5;
+                                    case 5:
+                                        if (!!shipping_methods_1_1.done) return [3 /*break*/, 9];
+                                        shippingMethod = shipping_methods_1_1.value;
+                                        if (!(shippingMethod.shipping_option.profile_id ===
+                                            newShippingMethod.shipping_option.profile_id)) return [3 /*break*/, 7];
+                                        return [4 /*yield*/, this.shippingOptionService_
+                                                .withTransaction(transactionManager)
+                                                .deleteShippingMethods(shippingMethod)];
+                                    case 6:
+                                        _c.sent();
+                                        return [3 /*break*/, 8];
+                                    case 7:
+                                        methods.push(shippingMethod);
+                                        _c.label = 8;
+                                    case 8:
+                                        shipping_methods_1_1 = shipping_methods_1.next();
+                                        return [3 /*break*/, 5];
+                                    case 9: return [3 /*break*/, 12];
+                                    case 10:
+                                        e_3_1 = _c.sent();
+                                        e_3 = { error: e_3_1 };
+                                        return [3 /*break*/, 12];
+                                    case 11:
+                                        try {
+                                            if (shipping_methods_1_1 && !shipping_methods_1_1.done && (_a = shipping_methods_1.return)) _a.call(shipping_methods_1);
+                                        }
+                                        finally { if (e_3) throw e_3.error; }
+                                        return [7 /*endfinally*/];
+                                    case 12:
+                                        if (!((_b = cart.items) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 14];
+                                        return [4 /*yield*/, Promise.all(cart.items.map(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    return [2 /*return*/, this.lineItemService_
+                                                            .withTransaction(transactionManager)
+                                                            .update(item.id, {
+                                                            has_shipping: this.validateLineItemShipping_(methods, item),
+                                                        })];
+                                                });
+                                            }); }))];
+                                    case 13:
+                                        _c.sent();
+                                        _c.label = 14;
+                                    case 14: return [4 /*yield*/, this.retrieve(cartId, {
+                                            relations: ["discounts", "discounts.rule", "shipping_methods"],
+                                        })
+                                        // if cart has freeshipping, adjust price
+                                    ];
+                                    case 15:
+                                        updatedCart = _c.sent();
+                                        if (!updatedCart.discounts.some(function (_a) {
+                                            var rule = _a.rule;
+                                            return rule.type === "free_shipping";
+                                        })) return [3 /*break*/, 17];
+                                        return [4 /*yield*/, this.adjustFreeShipping_(updatedCart, true)];
+                                    case 16:
+                                        _c.sent();
+                                        _c.label = 17;
+                                    case 17: return [4 /*yield*/, this.eventBus_
+                                            .withTransaction(transactionManager)
+                                            .emit(CartService.Events.UPDATED, updatedCart)];
+                                    case 18:
+                                        _c.sent();
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); }, "SERIALIZABLE")];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1994,74 +1836,103 @@ var CartService = /** @class */ (function (_super) {
         }
         return customOption;
     };
-    /**
-     * Set's the region of a cart.
-     * @param cart - the cart to set region on
-     * @param regionId - the id of the region to set the region to
-     * @param countryCode - the country code to set the country to
-     * @return the result of the update operation
-     */
-    CartService.prototype.setRegion_ = function (cart, regionId, countryCode) {
+    CartService.prototype.updateUnitPrices_ = function (cart, regionId, customer_id) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var region, addrRepo, _a, shippingAddress, updated, updated, smRepo, newDiscounts;
+            var transactionManager, region_1, _c;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        if (cart.completed_at || cart.payment_authorized_at) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot change the region of a completed cart");
-                        }
-                        return [4 /*yield*/, this.regionService_.retrieve(regionId, {
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        if (!((_b = cart.items) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.regionService_
+                                .withTransaction(this.transactionManager_)
+                                .retrieve(regionId || cart.region_id, {
                                 relations: ["countries"],
                             })];
                     case 1:
-                        region = _b.sent();
-                        addrRepo = this.manager_.getCustomRepository(this.addressRepository_);
-                        cart.region = region;
-                        cart.region_id = region.id;
-                        if (!cart.items.length) return [3 /*break*/, 3];
-                        _a = cart;
-                        return [4 /*yield*/, Promise.all(cart.items
-                                .map(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                        region_1 = _d.sent();
+                        _c = cart;
+                        return [4 /*yield*/, Promise.all(cart.items.map(function (item) { return __awaiter(_this, void 0, void 0, function () {
                                 var availablePrice;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        case 0: return [4 /*yield*/, this.productVariantService_
-                                                .getRegionPrice(item.variant_id, regionId)
+                                        case 0: return [4 /*yield*/, this.priceSelectionStrategy_
+                                                .withTransaction(transactionManager)
+                                                .calculateVariantPrice(item.variant_id, {
+                                                region_id: region_1.id,
+                                                currency_code: region_1.currency_code,
+                                                quantity: item.quantity,
+                                                customer_id: customer_id || cart.customer_id,
+                                                include_discount_prices: true,
+                                            })
                                                 .catch(function () { return undefined; })];
                                         case 1:
                                             availablePrice = _a.sent();
-                                            if (!(availablePrice !== undefined)) return [3 /*break*/, 2];
+                                            if (!(availablePrice !== undefined &&
+                                                availablePrice.calculatedPrice !== null)) return [3 /*break*/, 2];
                                             return [2 /*return*/, this.lineItemService_
-                                                    .withTransaction(this.transactionManager_)
+                                                    .withTransaction(transactionManager)
                                                     .update(item.id, {
                                                     has_shipping: false,
-                                                    unit_price: availablePrice,
+                                                    unit_price: availablePrice.calculatedPrice,
                                                 })];
                                         case 2: return [4 /*yield*/, this.lineItemService_
-                                                .withTransaction(this.transactionManager_)
+                                                .withTransaction(transactionManager)
                                                 .delete(item.id)];
                                         case 3:
                                             _a.sent();
-                                            return [2 /*return*/, null];
+                                            return [2 /*return*/];
                                     }
                                 });
-                            }); })
-                                .filter(Boolean))];
+                            }); }))];
                     case 2:
-                        _a.items = _b.sent();
-                        _b.label = 3;
-                    case 3:
+                        _c.items = (_d.sent()).filter(function (item) { return !!item; });
+                        _d.label = 3;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Set's the region of a cart.
+     * @param cart - the cart to set region on
+     * @param regionId - the id of the region to set the region to
+     * @param countryCode - the country code to set the country to
+     * @return the result of the update operation
+     */
+    CartService.prototype.setRegion_ = function (cart, regionId, countryCode) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var transactionManager, region, addrRepo, shippingAddress, updated, updated, paymentSessionRepo;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        if (cart.completed_at || cart.payment_authorized_at) {
+                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot change the region of a completed cart");
+                        }
+                        return [4 /*yield*/, this.regionService_
+                                .withTransaction(this.transactionManager_)
+                                .retrieve(regionId, {
+                                relations: ["countries"],
+                            })];
+                    case 1:
+                        region = _b.sent();
+                        addrRepo = transactionManager.getCustomRepository(this.addressRepository_);
+                        cart.region = region;
+                        cart.region_id = region.id;
                         shippingAddress = {};
-                        if (!cart.shipping_address_id) return [3 /*break*/, 5];
+                        if (!cart.shipping_address_id) return [3 /*break*/, 3];
                         return [4 /*yield*/, addrRepo.findOne({
                                 where: { id: cart.shipping_address_id },
                             })];
-                    case 4:
+                    case 2:
                         shippingAddress = (_b.sent());
-                        _b.label = 5;
-                    case 5:
-                        if (!(countryCode !== null)) return [3 /*break*/, 7];
+                        _b.label = 3;
+                    case 3:
+                        if (!(countryCode !== null)) return [3 /*break*/, 5];
                         if (!region.countries.find(function (_a) {
                             var iso_2 = _a.iso_2;
                             return iso_2 === countryCode.toLowerCase();
@@ -2070,10 +1941,10 @@ var CartService = /** @class */ (function (_super) {
                         }
                         updated = __assign(__assign({}, shippingAddress), { country_code: countryCode.toLowerCase() });
                         return [4 /*yield*/, addrRepo.save(updated)];
-                    case 6:
+                    case 4:
                         _b.sent();
-                        return [3 /*break*/, 9];
-                    case 7:
+                        return [3 /*break*/, 7];
+                    case 5:
                         updated = __assign({}, shippingAddress);
                         // If the country code of a shipping address is set we need to clear it
                         if (!lodash_1.default.isEmpty(shippingAddress) && shippingAddress.country_code) {
@@ -2084,42 +1955,38 @@ var CartService = /** @class */ (function (_super) {
                             updated = __assign(__assign({}, updated), { country_code: region.countries[0].iso_2 });
                         }
                         return [4 /*yield*/, this.updateShippingAddress_(cart, updated, addrRepo)];
+                    case 6:
+                        _b.sent();
+                        _b.label = 7;
+                    case 7:
+                        if (!(cart.shipping_methods && cart.shipping_methods.length)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, this.shippingOptionService_
+                                .withTransaction(transactionManager)
+                                .deleteShippingMethods(cart.shipping_methods)];
                     case 8:
                         _b.sent();
                         _b.label = 9;
                     case 9:
-                        if (!(cart.shipping_methods && cart.shipping_methods.length)) return [3 /*break*/, 11];
-                        smRepo = this.manager_.getCustomRepository(this.shippingMethodRepository_);
-                        return [4 /*yield*/, smRepo.remove(cart.shipping_methods)];
-                    case 10:
-                        _b.sent();
-                        _b.label = 11;
-                    case 11:
                         if (cart.discounts && cart.discounts.length) {
-                            newDiscounts = cart.discounts.map(function (d) {
-                                if (d.regions.find(function (_a) {
+                            cart.discounts = cart.discounts.filter(function (discount) {
+                                return discount.regions.find(function (_a) {
                                     var id = _a.id;
                                     return id === regionId;
-                                })) {
-                                    return d;
-                                }
-                                return null;
+                                });
                             });
-                            cart.discounts = newDiscounts.filter(Boolean);
                         }
                         cart.gift_cards = [];
-                        if (!(cart.payment_sessions && cart.payment_sessions.length)) return [3 /*break*/, 13];
-                        return [4 /*yield*/, Promise.all(cart.payment_sessions.map(function (ps) {
-                                return _this.paymentProviderService_
-                                    .withTransaction(_this.manager_)
-                                    .deleteSession(ps);
-                            }))];
-                    case 12:
+                        if (!(cart.payment_sessions && cart.payment_sessions.length)) return [3 /*break*/, 11];
+                        paymentSessionRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
+                        return [4 /*yield*/, paymentSessionRepo.delete({
+                                id: (0, typeorm_1.In)(cart.payment_sessions.map(function (paymentSession) { return paymentSession.id; })),
+                            })];
+                    case 10:
                         _b.sent();
-                        cart.payment_sessions = [];
+                        cart.payment_sessions.length = 0;
                         cart.payment_session = null;
-                        _b.label = 13;
-                    case 13: return [2 /*return*/];
+                        _b.label = 11;
+                    case 11: return [2 /*return*/];
                 }
             });
         });
@@ -2134,7 +2001,7 @@ var CartService = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
                             var cart, cartRepo;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -2143,7 +2010,6 @@ var CartService = /** @class */ (function (_super) {
                                                 "items",
                                                 "discounts",
                                                 "discounts.rule",
-                                                "discounts.rule.valid_for",
                                                 "payment_sessions",
                                             ],
                                         })];
@@ -2155,7 +2021,7 @@ var CartService = /** @class */ (function (_super) {
                                         if (cart.payment_authorized_at) {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Can't delete a cart with an authorized payment");
                                         }
-                                        cartRepo = manager.getCustomRepository(this.cartRepository_);
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
                                         return [2 /*return*/, cartRepo.remove(cart)];
                                 }
                             });
@@ -2179,29 +2045,32 @@ var CartService = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                            var cartRepo, validatedId, cart, existing, result;
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cartRepo, validatedId, cart, existing, updatedCart;
                             var _a;
                             return __generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
-                                        cartRepo = manager.getCustomRepository(this.cartRepository_);
-                                        validatedId = this.validateId_(cartId);
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        validatedId = (0, utils_1.validateId)(cartId);
                                         if (typeof key !== "string") {
                                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Key type is invalid. Metadata keys must be strings");
                                         }
                                         return [4 /*yield*/, cartRepo.findOne(validatedId)];
                                     case 1:
-                                        cart = (_b.sent());
+                                        cart = _b.sent();
+                                        if (!cart) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Unable to find the cart with the given id");
+                                        }
                                         existing = cart.metadata || {};
                                         cart.metadata = __assign(__assign({}, existing), (_a = {}, _a[key] = value, _a));
                                         return [4 /*yield*/, cartRepo.save(cart)];
                                     case 2:
-                                        result = _b.sent();
+                                        updatedCart = _b.sent();
                                         this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(CartService.Events.UPDATED, result);
-                                        return [2 /*return*/, result];
+                                            .withTransaction(transactionManager)
+                                            .emit(CartService.Events.UPDATED, updatedCart);
+                                        return [2 /*return*/, updatedCart];
                                 }
                             });
                         }); })];
@@ -2214,34 +2083,72 @@ var CartService = /** @class */ (function (_super) {
         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 cart, calculationContext;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(id, {
-                                        relations: [
-                                            "items",
-                                            "gift_cards",
-                                            "discounts",
-                                            "discounts.rule",
-                                            "discounts.rule.valid_for",
-                                            "shipping_methods",
-                                            "region",
-                                            "region.tax_rates",
-                                        ],
-                                    })];
-                                case 1:
-                                    cart = _a.sent();
-                                    calculationContext = this.totalsService_.getCalculationContext(cart);
-                                    return [4 /*yield*/, this.taxProviderService_
-                                            .withTransaction(manager)
-                                            .createTaxLines(cart, calculationContext)];
-                                case 2:
-                                    _a.sent();
-                                    return [2 /*return*/, cart];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cart, calculationContext;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(id, {
+                                            relations: [
+                                                "items",
+                                                "gift_cards",
+                                                "discounts",
+                                                "discounts.rule",
+                                                "shipping_methods",
+                                                "region",
+                                                "region.tax_rates",
+                                            ],
+                                        })];
+                                    case 1:
+                                        cart = _a.sent();
+                                        calculationContext = this.totalsService_
+                                            .withTransaction(transactionManager)
+                                            .getCalculationContext(cart);
+                                        return [4 /*yield*/, this.taxProviderService_
+                                                .withTransaction(transactionManager)
+                                                .createTaxLines(cart, calculationContext)];
+                                    case 2:
+                                        _a.sent();
+                                        return [2 /*return*/, cart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    CartService.prototype.refreshAdjustments_ = function (cart) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function () {
+            var transactionManager, nonReturnLineIDs;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        transactionManager = (_a = this.transactionManager_) !== null && _a !== void 0 ? _a : this.manager_;
+                        nonReturnLineIDs = cart.items
+                            .filter(function (item) { return !item.is_return; })
+                            .map(function (i) { return i.id; });
+                        // delete all old non return line item adjustments
+                        return [4 /*yield*/, this.lineItemAdjustmentService_
+                                .withTransaction(transactionManager)
+                                .delete({
+                                item_id: nonReturnLineIDs,
+                            })
+                            // potentially create/update line item adjustments
+                        ];
+                    case 1:
+                        // delete all old non return line item adjustments
+                        _b.sent();
+                        // potentially create/update line item adjustments
+                        return [4 /*yield*/, this.lineItemAdjustmentService_
+                                .withTransaction(transactionManager)
+                                .createAdjustments(cart)];
+                    case 2:
+                        // potentially create/update line item adjustments
+                        _b.sent();
+                        return [2 /*return*/];
+                }
             });
         });
     };
@@ -2255,35 +2162,38 @@ var CartService = /** @class */ (function (_super) {
         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, validatedId, cart, updated, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    cartRepo = manager.getCustomRepository(this.cartRepository_);
-                                    validatedId = this.validateId_(cartId);
-                                    if (typeof key !== "string") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Key type is invalid. Metadata keys must be strings");
-                                    }
-                                    return [4 /*yield*/, cartRepo.findOne(validatedId)];
-                                case 1:
-                                    cart = _a.sent();
-                                    if (!cart) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Cart with id: ".concat(validatedId, " was not found"));
-                                    }
-                                    updated = cart.metadata || {};
-                                    delete updated[key];
-                                    cart.metadata = updated;
-                                    return [4 /*yield*/, cartRepo.save(cart)];
-                                case 2:
-                                    result = _a.sent();
-                                    this.eventBus_
-                                        .withTransaction(manager)
-                                        .emit(CartService.Events.UPDATED, result);
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var cartRepo, validatedId, cart, updated, updatedCart;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
+                                        validatedId = (0, utils_1.validateId)(cartId);
+                                        if (typeof key !== "string") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Key type is invalid. Metadata keys must be strings");
+                                        }
+                                        return [4 /*yield*/, cartRepo.findOne(validatedId)];
+                                    case 1:
+                                        cart = _a.sent();
+                                        if (!cart) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Cart with id: ".concat(validatedId, " was not found"));
+                                        }
+                                        updated = cart.metadata || {};
+                                        delete updated[key];
+                                        cart.metadata = updated;
+                                        return [4 /*yield*/, cartRepo.save(cart)];
+                                    case 2:
+                                        updatedCart = _a.sent();
+                                        this.eventBus_
+                                            .withTransaction(transactionManager)
+                                            .emit(CartService.Events.UPDATED, updatedCart);
+                                        return [2 /*return*/, updatedCart];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -2293,6 +2203,6 @@ var CartService = /** @class */ (function (_super) {
         UPDATED: "cart.updated",
     };
     return CartService;
-}(medusa_interfaces_1.BaseService));
+}(interfaces_1.TransactionBaseService));
 exports.default = CartService;
 //# sourceMappingURL=cart.js.map