@medusajs/medusa 1.7.2 → 1.7.3-alpha.0

package/dist/services/cart.js

@@ -116,7 +116,7 @@ var is_email_1 = require("../utils/is-email");
 var CartService = /** @class */ (function (_super) {
     __extends(CartService, _super);
     function CartService(_a) {
-        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, newTotalsService = _a.newTotalsService, addressRepository = _a.addressRepository, paymentSessionRepository = _a.paymentSessionRepository, inventoryService = _a.inventoryService, customShippingOptionService = _a.customShippingOptionService, lineItemAdjustmentService = _a.lineItemAdjustmentService, priceSelectionStrategy = _a.priceSelectionStrategy, salesChannelService = _a.salesChannelService, featureFlagRouter = _a.featureFlagRouter, storeService = _a.storeService;
+        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, newTotalsService = _a.newTotalsService, addressRepository = _a.addressRepository, paymentSessionRepository = _a.paymentSessionRepository, customShippingOptionService = _a.customShippingOptionService, lineItemAdjustmentService = _a.lineItemAdjustmentService, priceSelectionStrategy = _a.priceSelectionStrategy, salesChannelService = _a.salesChannelService, featureFlagRouter = _a.featureFlagRouter, storeService = _a.storeService, productVariantInventoryService = _a.productVariantInventoryService;
         var _this = 
         // eslint-disable-next-line prefer-rest-params
         _super.call(this, arguments[0]) || this;
@@ -138,7 +138,6 @@ var CartService = /** @class */ (function (_super) {
         _this.newTotalsService_ = newTotalsService;
         _this.addressRepository_ = addressRepository;
         _this.paymentSessionRepository_ = paymentSessionRepository;
-        _this.inventoryService_ = inventoryService;
         _this.customShippingOptionService_ = customShippingOptionService;
         _this.taxProviderService_ = taxProviderService;
         _this.lineItemAdjustmentService_ = lineItemAdjustmentService;
@@ -146,6 +145,7 @@ var CartService = /** @class */ (function (_super) {
         _this.salesChannelService_ = salesChannelService;
         _this.featureFlagRouter_ = featureFlagRouter;
         _this.storeService_ = storeService;
+        _this.productVariantInventoryService_ = productVariantInventoryService;
         return _this;
     }
     /**
@@ -568,7 +568,7 @@ var CartService = /** @class */ (function (_super) {
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        if (!sales_channel_id) {
+                        if (!sales_channel_id || !lineItem.variant_id) {
                             return [2 /*return*/, true];
                         }
                         if (!((_b = lineItem.variant) === null || _b === void 0 ? void 0 : _b.product_id)) return [3 /*break*/, 1];
@@ -613,7 +613,7 @@ var CartService = /** @class */ (function (_super) {
                             select.push("sales_channel_id");
                         }
                         return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
-                                var cart, lineItemServiceTx, currentItem, _a, existingItem, quantity;
+                                var cart, lineItemIsValid, lineItemServiceTx, currentItem, _a, existingItem, quantity, isCovered;
                                 return __generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0: return [4 /*yield*/, this.retrieve(cartId, { select: select })];
@@ -621,9 +621,11 @@ var CartService = /** @class */ (function (_super) {
                                             cart = _b.sent();
                                             if (!this.featureFlagRouter_.isFeatureEnabled("sales_channels")) return [3 /*break*/, 3];
                                             if (!config.validateSalesChannels) return [3 /*break*/, 3];
+                                            if (!lineItem.variant_id) return [3 /*break*/, 3];
                                             return [4 /*yield*/, this.validateLineItem(cart, lineItem)];
                                         case 2:
-                                            if (!(_b.sent())) {
+                                            lineItemIsValid = _b.sent();
+                                            if (!lineItemIsValid) {
                                                 throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "The product \"".concat(lineItem.title, "\" must belongs to the sales channel on which the cart has been created."));
                                             }
                                             _b.label = 3;
@@ -646,25 +648,27 @@ var CartService = /** @class */ (function (_super) {
                                             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)];
+                                            if (!lineItem.variant_id) return [3 /*break*/, 7];
+                                            return [4 /*yield*/, this.productVariantInventoryService_.confirmInventory(lineItem.variant_id, quantity, { salesChannelId: cart.sales_channel_id })];
                                         case 6:
-                                            // Confirm inventory or throw error
-                                            _b.sent();
-                                            if (!currentItem) return [3 /*break*/, 8];
+                                            isCovered = _b.sent();
+                                            if (!isCovered) {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Variant with id: ".concat(lineItem.variant_id, " does not have the required inventory"), medusa_core_utils_1.MedusaError.Codes.INSUFFICIENT_INVENTORY);
+                                            }
+                                            _b.label = 7;
+                                        case 7:
+                                            if (!currentItem) return [3 /*break*/, 9];
                                             return [4 /*yield*/, lineItemServiceTx.update(currentItem.id, {
                                                     quantity: currentItem.quantity,
                                                 })];
-                                        case 7:
+                                        case 8:
                                             _b.sent();
-                                            return [3 /*break*/, 10];
-                                        case 8: return [4 /*yield*/, lineItemServiceTx.create(__assign(__assign({}, lineItem), { has_shipping: false, cart_id: cart.id }))];
-                                        case 9:
+                                            return [3 /*break*/, 11];
+                                        case 9: return [4 /*yield*/, lineItemServiceTx.create(__assign(__assign({}, lineItem), { has_shipping: false, cart_id: cart.id }))];
+                                        case 10:
                                             _b.sent();
-                                            _b.label = 10;
-                                        case 10: return [4 /*yield*/, lineItemServiceTx
+                                            _b.label = 11;
+                                        case 11: return [4 /*yield*/, lineItemServiceTx
                                                 .update({ cart_id: cartId, has_shipping: true }, { has_shipping: false })
                                                 .catch(function (err) {
                                                 // We only want to catch the errors related to not found items since we don't care if there is not item to update
@@ -673,20 +677,20 @@ var CartService = /** @class */ (function (_super) {
                                                 }
                                                 throw err;
                                             })];
-                                        case 11:
+                                        case 12:
                                             _b.sent();
                                             return [4 /*yield*/, this.retrieve(cart.id, {
                                                     relations: ["items", "discounts", "discounts.rule", "region"],
                                                 })];
-                                        case 12:
+                                        case 13:
                                             cart = _b.sent();
                                             return [4 /*yield*/, this.refreshAdjustments_(cart)];
-                                        case 13:
+                                        case 14:
                                             _b.sent();
                                             return [4 /*yield*/, this.eventBus_
                                                     .withTransaction(transactionManager)
                                                     .emit(CartService.Events.UPDATED, { id: cart.id })];
-                                        case 14:
+                                        case 15:
                                             _b.sent();
                                             return [2 /*return*/];
                                     }
@@ -721,7 +725,7 @@ var CartService = /** @class */ (function (_super) {
                             select.push("sales_channel_id");
                         }
                         return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
-                                var cart, areValid, invalidProducts, lineItemServiceTx, inventoryServiceTx, existingItems, existingItemsVariantMap, lineItemsToCreate, lineItemsToUpdate, items_1, items_1_1, item, currentItem, existingItem, e_2_1, itemKeysToUpdate;
+                                var cart, areValid, invalidProducts, lineItemServiceTx, productVariantInventoryServiceTx, existingItems, existingItemsVariantMap, lineItemsToCreate, lineItemsToUpdate, items_1, items_1_1, item, currentItem, existingItem, isSufficient, e_2_1, itemKeysToUpdate;
                                 var e_2, _a;
                                 var _this = this;
                                 return __generator(this, function (_b) {
@@ -734,8 +738,11 @@ var CartService = /** @class */ (function (_super) {
                                             return [4 /*yield*/, Promise.all(items.map(function (item) { return __awaiter(_this, void 0, void 0, function () {
                                                     return __generator(this, function (_a) {
                                                         switch (_a.label) {
-                                                            case 0: return [4 /*yield*/, this.validateLineItem(cart, item)];
+                                                            case 0:
+                                                                if (!item.variant_id) return [3 /*break*/, 2];
+                                                                return [4 /*yield*/, this.validateLineItem(cart, item)];
                                                             case 1: return [2 /*return*/, _a.sent()];
+                                                            case 2: return [2 /*return*/, true];
                                                         }
                                                     });
                                                 }); }))];
@@ -754,7 +761,7 @@ var CartService = /** @class */ (function (_super) {
                                             _b.label = 3;
                                         case 3:
                                             lineItemServiceTx = this.lineItemService_.withTransaction(transactionManager);
-                                            inventoryServiceTx = this.inventoryService_.withTransaction(transactionManager);
+                                            productVariantInventoryServiceTx = this.productVariantInventoryService_.withTransaction(transactionManager);
                                             return [4 /*yield*/, lineItemServiceTx.list({
                                                     cart_id: cart.id,
                                                     variant_id: (0, typeorm_1.In)([items.map(function (item) { return item.variant_id; })]),
@@ -770,11 +777,11 @@ var CartService = /** @class */ (function (_super) {
                                             lineItemsToUpdate = [];
                                             _b.label = 5;
                                         case 5:
-                                            _b.trys.push([5, 10, 11, 12]);
+                                            _b.trys.push([5, 11, 12, 13]);
                                             items_1 = __values(items), items_1_1 = items_1.next();
                                             _b.label = 6;
                                         case 6:
-                                            if (!!items_1_1.done) return [3 /*break*/, 9];
+                                            if (!!items_1_1.done) return [3 /*break*/, 10];
                                             item = items_1_1.value;
                                             currentItem = void 0;
                                             existingItem = existingItemsVariantMap.get(item.variant_id);
@@ -788,9 +795,15 @@ var CartService = /** @class */ (function (_super) {
                                             item.quantity = currentItem
                                                 ? (currentItem.quantity += item.quantity)
                                                 : item.quantity;
-                                            return [4 /*yield*/, inventoryServiceTx.confirmInventory(item.variant_id, item.quantity)];
+                                            if (!item.variant_id) return [3 /*break*/, 8];
+                                            return [4 /*yield*/, productVariantInventoryServiceTx.confirmInventory(item.variant_id, item.quantity, { salesChannelId: cart.sales_channel_id })];
                                         case 7:
-                                            _b.sent();
+                                            isSufficient = _b.sent();
+                                            if (!isSufficient) {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Variant with id: ".concat(item.variant_id, " does not have the required inventory"), medusa_core_utils_1.MedusaError.Codes.INSUFFICIENT_INVENTORY);
+                                            }
+                                            _b.label = 8;
+                                        case 8:
                                             if (currentItem) {
                                                 lineItemsToUpdate[currentItem.id] = {
                                                     quantity: item.quantity,
@@ -804,24 +817,24 @@ var CartService = /** @class */ (function (_super) {
                                                 item.cart_id = cart.id;
                                                 lineItemsToCreate.push(item);
                                             }
-                                            _b.label = 8;
-                                        case 8:
+                                            _b.label = 9;
+                                        case 9:
                                             items_1_1 = items_1.next();
                                             return [3 /*break*/, 6];
-                                        case 9: return [3 /*break*/, 12];
-                                        case 10:
+                                        case 10: return [3 /*break*/, 13];
+                                        case 11:
                                             e_2_1 = _b.sent();
                                             e_2 = { error: e_2_1 };
-                                            return [3 /*break*/, 12];
-                                        case 11:
+                                            return [3 /*break*/, 13];
+                                        case 12:
                                             try {
                                                 if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
                                             }
                                             finally { if (e_2) throw e_2.error; }
                                             return [7 /*endfinally*/];
-                                        case 12:
+                                        case 13:
                                             itemKeysToUpdate = Object.keys(lineItemsToUpdate);
-                                            if (!itemKeysToUpdate.length) return [3 /*break*/, 14];
+                                            if (!itemKeysToUpdate.length) return [3 /*break*/, 15];
                                             return [4 /*yield*/, Promise.all(itemKeysToUpdate.map(function (id) { return __awaiter(_this, void 0, void 0, function () {
                                                     return __generator(this, function (_a) {
                                                         switch (_a.label) {
@@ -830,13 +843,13 @@ var CartService = /** @class */ (function (_super) {
                                                         }
                                                     });
                                                 }); }))];
-                                        case 13:
+                                        case 14:
                                             _b.sent();
-                                            _b.label = 14;
-                                        case 14: 
+                                            _b.label = 15;
+                                        case 15: 
                                         // Create all items that needs to be created
                                         return [4 /*yield*/, lineItemServiceTx.create(lineItemsToCreate)];
-                                        case 15:
+                                        case 16:
                                             // Create all items that needs to be created
                                             _b.sent();
                                             return [4 /*yield*/, lineItemServiceTx
@@ -851,20 +864,20 @@ var CartService = /** @class */ (function (_super) {
                                                     }
                                                     throw err;
                                                 })];
-                                        case 16:
+                                        case 17:
                                             _b.sent();
                                             return [4 /*yield*/, this.retrieve(cart.id, {
                                                     relations: ["items", "discounts", "discounts.rule", "region"],
                                                 })];
-                                        case 17:
+                                        case 18:
                                             cart = _b.sent();
                                             return [4 /*yield*/, this.refreshAdjustments_(cart)];
-                                        case 18:
+                                        case 19:
                                             _b.sent();
                                             return [4 /*yield*/, this.eventBus_
                                                     .withTransaction(transactionManager)
                                                     .emit(CartService.Events.UPDATED, { id: cart.id })];
-                                        case 19:
+                                        case 20:
                                             _b.sent();
                                             return [2 /*return*/];
                                     }
@@ -888,50 +901,54 @@ var CartService = /** @class */ (function (_super) {
             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 cart, lineItemExists, hasInventory, updatedCart;
+                            var lineItem, select, cart, 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 0: return [4 /*yield*/, this.lineItemService_.retrieve(lineItemId, {
+                                            select: ["id", "quantity", "variant_id", "cart_id"],
+                                        })];
                                     case 1:
-                                        cart = _a.sent();
-                                        lineItemExists = cart.items.find(function (i) { return i.id === lineItemId; });
-                                        if (!lineItemExists) {
+                                        lineItem = _a.sent();
+                                        if (lineItem.cart_id !== cartId) {
+                                            // Ensure that the line item exists in the cart
                                             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)];
+                                        if (!lineItemUpdate.quantity) return [3 /*break*/, 4];
+                                        if (!lineItem.variant_id) return [3 /*break*/, 4];
+                                        select = ["id"];
+                                        if (this.featureFlagRouter_.isFeatureEnabled(sales_channels_1.default.key)) {
+                                            select.push("sales_channel_id");
+                                        }
+                                        return [4 /*yield*/, this.retrieve(cartId, { select: select })];
                                     case 2:
+                                        cart = _a.sent();
+                                        return [4 /*yield*/, this.productVariantInventoryService_.confirmInventory(lineItem.variant_id, lineItemUpdate.quantity, { salesChannelId: cart.sales_channel_id })];
+                                    case 3:
                                         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_
+                                        _a.label = 4;
+                                    case 4: return [4 /*yield*/, this.lineItemService_
                                             .withTransaction(transactionManager)
                                             .update(lineItemId, lineItemUpdate)];
-                                    case 4:
+                                    case 5:
                                         _a.sent();
                                         return [4 /*yield*/, this.retrieve(cartId, {
                                                 relations: ["items", "discounts", "discounts.rule", "region"],
                                             })];
-                                    case 5:
+                                    case 6:
                                         updatedCart = _a.sent();
                                         return [4 /*yield*/, this.refreshAdjustments_(updatedCart)
                                             // Update the line item
                                         ];
-                                    case 6:
+                                    case 7:
                                         _a.sent();
                                         // Update the line item
                                         return [4 /*yield*/, this.eventBus_
                                                 .withTransaction(transactionManager)
                                                 .emit(CartService.Events.UPDATED, updatedCart)];
-                                    case 7:
+                                    case 8:
                                         // Update the line item
                                         _a.sent();
                                         return [2 /*return*/, updatedCart];
@@ -1703,10 +1720,9 @@ var CartService = /** @class */ (function (_super) {
         });
     };
     /**
-     * Sets a payment method for a cart.
+     * Selects a payment session for a cart and creates a payment object in the external provider system
      * @param cartId - the id of the cart to add payment method to
      * @param providerId - the id of the provider to be set to the cart
-     * @return result of update operation
      */
     CartService.prototype.setPaymentSession = function (cartId, providerId) {
         return __awaiter(this, void 0, void 0, function () {
@@ -1714,52 +1730,73 @@ var CartService = /** @class */ (function (_super) {
             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 psRepo, cart, paymentSession, updatedCart;
-                            var _this = this;
+                            var psRepo, cart, isProviderPresent, cartPaymentSessionIds, paymentSession, sessionInput;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
                                         psRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
                                         return [4 /*yield*/, this.retrieveWithTotals(cartId, {
-                                                relations: ["region", "region.payment_providers", "payment_sessions"],
-                                            })
-                                            // The region must have the provider id in its providers array
-                                        ];
+                                                relations: [
+                                                    "customer",
+                                                    "region",
+                                                    "region.payment_providers",
+                                                    "payment_sessions",
+                                                ],
+                                            })];
                                     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;
-                                                }))) {
+                                        isProviderPresent = cart.region.payment_providers.find(function (_a) {
+                                            var id = _a.id;
+                                            return providerId === id;
+                                        });
+                                        if (providerId !== "system" && !isProviderPresent) {
                                             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 }))];
-                                                });
-                                            }); }))];
+                                        cartPaymentSessionIds = cart.payment_sessions.map(function (p) { return p.id; });
+                                        return [4 /*yield*/, psRepo.update({ id: (0, typeorm_1.In)(cartPaymentSessionIds) }, {
+                                                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)];
+                                        sessionInput = {
+                                            cart: cart,
+                                            customer: cart.customer,
+                                            amount: cart.total,
+                                            currency_code: cart.region.currency_code,
+                                            provider_id: providerId,
+                                            payment_session_id: paymentSession.id,
+                                        };
+                                        if (!paymentSession.is_selected) return [3 /*break*/, 4];
+                                        // update the session remotely
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .updateSession(paymentSession, sessionInput)];
                                     case 3:
+                                        // update the session remotely
                                         _a.sent();
-                                        return [4 /*yield*/, this.retrieve(cartId)];
+                                        _a.label = 4;
                                     case 4:
-                                        updatedCart = _a.sent();
-                                        return [4 /*yield*/, this.eventBus_
+                                        if (!!paymentSession.is_initiated) return [3 /*break*/, 6];
+                                        return [4 /*yield*/, this.paymentProviderService_
                                                 .withTransaction(transactionManager)
-                                                .emit(CartService.Events.UPDATED, updatedCart)];
+                                                .createSession(sessionInput)];
                                     case 5:
+                                        // Create the session remotely
+                                        paymentSession = _a.sent();
+                                        _a.label = 6;
+                                    case 6: return [4 /*yield*/, psRepo.update(paymentSession.id, { is_selected: true })];
+                                    case 7:
                                         _a.sent();
-                                        return [2 /*return*/, updatedCart];
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(CartService.Events.UPDATED, { id: cartId })];
+                                    case 8:
+                                        _a.sent();
+                                        return [2 /*return*/];
                                 }
                             });
                         }); }, "SERIALIZABLE")];
@@ -1783,13 +1820,13 @@ var CartService = /** @class */ (function (_super) {
             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 psRepo, cartId, cart, total, region, partialSessionInput, seen, paymentProvider, paymentSessionInput, paymentSession;
+                            var psRepo, paymentProviderServiceTx, cartId, cart, total, region, deleteSessionAppropriately, providerSet, alreadyConsumedProviderIds, partialSessionInput, partialPaymentSessionData, paymentProvider, paymentSessionInput, paymentSession;
                             var _this = this;
-                            var _a;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
                                     case 0:
                                         psRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
+                                        paymentProviderServiceTx = this.paymentProviderService_.withTransaction(transactionManager);
                                         cartId = typeof cartOrCartId === "string" ? cartOrCartId : cartOrCartId.id;
                                         return [4 /*yield*/, this.retrieveWithTotals(cartId, {
                                                 relations: [
@@ -1809,72 +1846,118 @@ var CartService = /** @class */ (function (_super) {
                                                 ],
                                             }, { force_taxes: true })];
                                     case 1:
-                                        cart = _b.sent();
+                                        cart = _a.sent();
                                         total = cart.total, region = cart.region;
+                                        deleteSessionAppropriately = function (session) { return __awaiter(_this, void 0, void 0, function () {
+                                            return __generator(this, function (_a) {
+                                                if (session.is_selected || session.is_initiated) {
+                                                    return [2 /*return*/, paymentProviderServiceTx.deleteSession(session)];
+                                                }
+                                                return [2 /*return*/, psRepo.delete(session)];
+                                            });
+                                        }); };
+                                        if (!(total <= 0)) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, Promise.all(cart.payment_sessions.map(function (session) { return __awaiter(_this, void 0, void 0, function () {
+                                                return __generator(this, function (_a) {
+                                                    return [2 /*return*/, deleteSessionAppropriately(session)];
+                                                });
+                                            }); }))];
+                                    case 2:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                    case 3:
+                                        providerSet = new Set(region.payment_providers.map(function (p) { return p.id; }));
+                                        alreadyConsumedProviderIds = new Set();
                                         partialSessionInput = {
                                             cart: cart,
                                             customer: cart.customer,
-                                            amount: cart.total,
+                                            amount: total,
                                             currency_code: cart.region.currency_code,
                                         };
-                                        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 () {
-                                                var paymentSessionInput;
+                                        partialPaymentSessionData = {
+                                            cart_id: cartId,
+                                            data: {},
+                                            status: models_1.PaymentSessionStatus.PENDING,
+                                            amount: total,
+                                        };
+                                        return [4 /*yield*/, Promise.all(cart.payment_sessions.map(function (session) { return __awaiter(_this, void 0, void 0, function () {
+                                                var paymentSessionInput, updatedSession;
                                                 return __generator(this, function (_a) {
-                                                    if (total <= 0 ||
-                                                        !region.payment_providers.find(function (_a) {
-                                                            var id = _a.id;
-                                                            return id === paymentSession.provider_id;
-                                                        })) {
-                                                        return [2 /*return*/, this.paymentProviderService_
-                                                                .withTransaction(transactionManager)
-                                                                .deleteSession(paymentSession)];
+                                                    switch (_a.label) {
+                                                        case 0:
+                                                            if (!!providerSet.has(session.provider_id)) return [3 /*break*/, 2];
+                                                            return [4 /*yield*/, deleteSessionAppropriately(session)];
+                                                        case 1: 
+                                                        /**
+                                                         * if the provider does not belong to the region then delete the session.
+                                                         * The deletion occurs locally if there is no external data or if it is not selected
+                                                         * otherwise the deletion will also occur remotely through the external provider.
+                                                         */
+                                                        return [2 /*return*/, _a.sent()];
+                                                        case 2:
+                                                            /**
+                                                             * if the provider belongs to the region then update or delete the session.
+                                                             * The update occurs locally if it is not selected
+                                                             * otherwise the update will also occur remotely through the external provider.
+                                                             * In case the session is not selected but contains an external provider data, we delete the external provider
+                                                             * session to be in a clean state.
+                                                             */
+                                                            // We are saving the provider id on which the work below will be done. That way,
+                                                            // when handling the providers from the cart region at a later point below, we do not double the work on the sessions that already
+                                                            // exists for the same provider.
+                                                            alreadyConsumedProviderIds.add(session.provider_id);
+                                                            // Update remotely
+                                                            if (session.is_selected) {
+                                                                paymentSessionInput = __assign(__assign({}, partialSessionInput), { provider_id: session.provider_id });
+                                                                return [2 /*return*/, paymentProviderServiceTx.updateSession(session, paymentSessionInput)];
+                                                            }
+                                                            if (!session.is_initiated) return [3 /*break*/, 4];
+                                                            return [4 /*yield*/, paymentProviderServiceTx.deleteSession(session)];
+                                                        case 3:
+                                                            _a.sent();
+                                                            updatedSession = psRepo.create(__assign(__assign({}, partialPaymentSessionData), { provider_id: session.provider_id }));
+                                                            return [3 /*break*/, 5];
+                                                        case 4:
+                                                            updatedSession = __assign(__assign({}, session), { amount: total });
+                                                            _a.label = 5;
+                                                        case 5: return [2 /*return*/, psRepo.save(updatedSession)];
                                                     }
-                                                    else {
-                                                        seen.push(paymentSession.provider_id);
-                                                        paymentSessionInput = __assign(__assign({}, partialSessionInput), { provider_id: paymentSession.provider_id });
-                                                        return [2 /*return*/, this.paymentProviderService_
-                                                                .withTransaction(transactionManager)
-                                                                .updateSession(paymentSession, paymentSessionInput)];
-                                                    }
-                                                    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];
+                                            }); }))
+                                            /**
+                                             * From now on, the sessions have been cleanup. We can now
+                                             * - Set the provider session as selected if it is the only one existing and there is no payment session on the cart
+                                             * - Create a session per provider locally if it does not already exists on the cart as per the previous step
+                                             */
+                                            // If only one provider exists and there is no session on the cart, create the session and select it.
+                                        ];
+                                    case 4:
+                                        _a.sent();
+                                        if (!(region.payment_providers.length === 1 && !cart.payment_session)) return [3 /*break*/, 7];
                                         paymentProvider = region.payment_providers[0];
                                         paymentSessionInput = __assign(__assign({}, partialSessionInput), { provider_id: paymentProvider.id });
                                         return [4 /*yield*/, this.paymentProviderService_
                                                 .withTransaction(transactionManager)
                                                 .createSession(paymentSessionInput)];
-                                    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 () {
-                                            var paymentSessionInput;
+                                        paymentSession = _a.sent();
+                                        return [4 /*yield*/, psRepo.update(paymentSession.id, { is_selected: true })];
+                                    case 6:
+                                        _a.sent();
+                                        return [2 /*return*/];
+                                    case 7: return [4 /*yield*/, Promise.all(region.payment_providers.map(function (paymentProvider) { return __awaiter(_this, void 0, void 0, function () {
+                                            var paymentSession;
                                             return __generator(this, function (_a) {
-                                                if (!seen.includes(paymentProvider.id)) {
-                                                    paymentSessionInput = __assign(__assign({}, partialSessionInput), { provider_id: paymentProvider.id });
-                                                    return [2 /*return*/, this.paymentProviderService_
-                                                            .withTransaction(transactionManager)
-                                                            .createSession(paymentSessionInput)];
+                                                if (alreadyConsumedProviderIds.has(paymentProvider.id)) {
+                                                    return [2 /*return*/];
                                                 }
-                                                return [2 /*return*/];
+                                                paymentSession = psRepo.create(__assign(__assign({}, partialPaymentSessionData), { provider_id: paymentProvider.id }));
+                                                return [2 /*return*/, psRepo.save(paymentSession)];
                                             });
                                         }); }))];
-                                    case 7:
-                                        _b.sent();
-                                        _b.label = 8;
-                                    case 8: return [2 /*return*/];
+                                    case 8:
+                                        _a.sent();
+                                        return [2 /*return*/];
                                 }
                             });
                         }); })];
@@ -1896,7 +1979,7 @@ var CartService = /** @class */ (function (_super) {
             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 cart, cartRepo, paymentSession;
+                            var cart, cartRepo, paymentSession, psRepo;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0: return [4 /*yield*/, this.retrieve(cartId, {
@@ -1905,7 +1988,7 @@ var CartService = /** @class */ (function (_super) {
                                     case 1:
                                         cart = _a.sent();
                                         cartRepo = transactionManager.getCustomRepository(this.cartRepository_);
-                                        if (!cart.payment_sessions) return [3 /*break*/, 3];
+                                        if (!cart.payment_sessions) return [3 /*break*/, 5];
                                         paymentSession = cart.payment_sessions.find(function (_a) {
                                             var provider_id = _a.provider_id;
                                             return provider_id === providerId;
@@ -1914,24 +1997,28 @@ var CartService = /** @class */ (function (_super) {
                                             var provider_id = _a.provider_id;
                                             return provider_id !== providerId;
                                         });
-                                        if (!paymentSession) return [3 /*break*/, 3];
-                                        // Delete the session with the provider
+                                        psRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
+                                        if (!paymentSession) return [3 /*break*/, 5];
+                                        if (!(paymentSession.is_selected || paymentSession.is_initiated)) return [3 /*break*/, 3];
                                         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)];
+                                        return [3 /*break*/, 5];
+                                    case 3: return [4 /*yield*/, psRepo.delete(paymentSession)];
                                     case 4:
+                                        _a.sent();
+                                        _a.label = 5;
+                                    case 5: return [4 /*yield*/, cartRepo.save(cart)];
+                                    case 6:
                                         _a.sent();
                                         return [4 /*yield*/, this.eventBus_
                                                 .withTransaction(transactionManager)
-                                                .emit(CartService.Events.UPDATED, cart)];
-                                    case 5:
+                                                .emit(CartService.Events.UPDATED, { id: cart.id })];
+                                    case 7:
                                         _a.sent();
-                                        return [2 /*return*/, cart];
+                                        return [2 /*return*/];
                                 }
                             });
                         }); })];
@@ -1945,7 +2032,7 @@ var CartService = /** @class */ (function (_super) {
      * @param cartId - the id of the cart to remove from
      * @param providerId - the id of the provider whoose payment session
      *    should be removed.
-     * @return {Promise<Cart>} the resulting cart.
+     * @return {Promise<void>} the resulting cart.
      */
     CartService.prototype.refreshPaymentSession = function (cartId, providerId) {
         return __awaiter(this, void 0, void 0, function () {
@@ -1953,7 +2040,7 @@ var CartService = /** @class */ (function (_super) {
             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 cart, paymentSession, updatedCart;
+                            var cart, paymentSession, psRepo;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0: return [4 /*yield*/, this.retrieveWithTotals(cartId, {
@@ -1961,13 +2048,13 @@ var CartService = /** @class */ (function (_super) {
                                         })];
                                     case 1:
                                         cart = _a.sent();
-                                        if (!cart.payment_sessions) return [3 /*break*/, 3];
+                                        if (!cart.payment_sessions) return [3 /*break*/, 5];
                                         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
+                                        if (!paymentSession) return [3 /*break*/, 5];
+                                        if (!paymentSession.is_selected) return [3 /*break*/, 3];
                                         return [4 /*yield*/, this.paymentProviderService_
                                                 .withTransaction(transactionManager)
                                                 .refreshSession(paymentSession, {
@@ -1978,18 +2065,22 @@ var CartService = /** @class */ (function (_super) {
                                                 provider_id: providerId,
                                             })];
                                     case 2:
-                                        // Delete the session with the provider
                                         _a.sent();
-                                        _a.label = 3;
-                                    case 3: return [4 /*yield*/, this.retrieve(cartId)];
+                                        return [3 /*break*/, 5];
+                                    case 3:
+                                        psRepo = transactionManager.getCustomRepository(this.paymentSessionRepository_);
+                                        return [4 /*yield*/, psRepo.update(paymentSession.id, {
+                                                amount: cart.total,
+                                            })];
                                     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];
+                                        _a.label = 5;
+                                    case 5: return [4 /*yield*/, this.eventBus_
+                                            .withTransaction(transactionManager)
+                                            .emit(CartService.Events.UPDATED, { id: cartId })];
+                                    case 6:
+                                        _a.sent();
+                                        return [2 /*return*/];
                                 }
                             });
                         }); })];
@@ -2166,28 +2257,31 @@ var CartService = /** @class */ (function (_super) {
                                 var availablePrice;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
-                                        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 0:
+                                            if (!item.variant_id) {
+                                                return [2 /*return*/, item];
+                                            }
+                                            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 &&
-                                                availablePrice.calculatedPrice !== null)) return [3 /*break*/, 2];
-                                            return [2 /*return*/, lineItemServiceTx_2.update(item.id, {
+                                                availablePrice.calculatedPrice !== null)) return [3 /*break*/, 3];
+                                            return [4 /*yield*/, lineItemServiceTx_2.update(item.id, {
                                                     has_shipping: false,
                                                     unit_price: availablePrice.calculatedPrice,
                                                 })];
-                                        case 2: return [4 /*yield*/, lineItemServiceTx_2.delete(item.id)];
-                                        case 3:
-                                            _a.sent();
-                                            return [2 /*return*/];
+                                        case 2: return [2 /*return*/, _a.sent()];
+                                        case 3: return [4 /*yield*/, lineItemServiceTx_2.delete(item.id)];
+                                        case 4: return [2 /*return*/, _a.sent()];
                                     }
                                 });
                             }); }))];