@medusajs/medusa 1.1.64 → 1.2.1

package/dist/services/swap.js

@@ -109,8 +109,8 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var medusa_interfaces_1 = require("medusa-interfaces");
 var medusa_core_utils_1 = require("medusa-core-utils");
+var medusa_interfaces_1 = require("medusa-interfaces");
 /**
  * Handles swaps
  * @extends BaseService
@@ -118,7 +118,7 @@ var medusa_core_utils_1 = require("medusa-core-utils");
 var SwapService = /** @class */ (function (_super) {
     __extends(SwapService, _super);
     function SwapService(_a) {
-        var manager = _a.manager, swapRepository = _a.swapRepository, eventBusService = _a.eventBusService, cartService = _a.cartService, totalsService = _a.totalsService, returnService = _a.returnService, lineItemService = _a.lineItemService, paymentProviderService = _a.paymentProviderService, shippingOptionService = _a.shippingOptionService, fulfillmentService = _a.fulfillmentService, orderService = _a.orderService, inventoryService = _a.inventoryService, customShippingOptionService = _a.customShippingOptionService;
+        var manager = _a.manager, swapRepository = _a.swapRepository, eventBusService = _a.eventBusService, cartService = _a.cartService, totalsService = _a.totalsService, returnService = _a.returnService, lineItemService = _a.lineItemService, paymentProviderService = _a.paymentProviderService, shippingMethodTaxLineRepository = _a.shippingMethodTaxLineRepository, shippingOptionService = _a.shippingOptionService, fulfillmentService = _a.fulfillmentService, orderService = _a.orderService, inventoryService = _a.inventoryService, customShippingOptionService = _a.customShippingOptionService;
         var _this = _super.call(this) || this;
         /** @private @const {EntityManager} */
         _this.manager_ = manager;
@@ -144,6 +144,8 @@ var SwapService = /** @class */ (function (_super) {
         _this.inventoryService_ = inventoryService;
         /** @private @const {EventBusService} */
         _this.eventBus_ = eventBusService;
+        /** @private @const {typeof ShippingMethodTaxLineRepository} */
+        _this.shippingTaxLineRepo_ = shippingMethodTaxLineRepository;
         /** @private @const {CustomShippingOptionService} */
         _this.customShippingOptionService_ = customShippingOptionService;
         return _this;
@@ -160,6 +162,7 @@ var SwapService = /** @class */ (function (_super) {
             totalsService: this.totalsService_,
             returnService: this.returnService_,
             lineItemService: this.lineItemService_,
+            shippingMethodTaxLineRepository: this.shippingTaxLineRepo_,
             paymentProviderService: this.paymentProviderService_,
             shippingOptionService: this.shippingOptionService_,
             orderService: this.orderService_,
@@ -170,87 +173,46 @@ var SwapService = /** @class */ (function (_super) {
         cloned.transactionManager_ = transactionManager;
         return cloned;
     };
-    SwapService.prototype.transformQueryForTotals_ = function (config) {
+    SwapService.prototype.transformQueryForCart_ = function (config) {
         var select = config.select, relations = config.relations;
-        if (!select) {
-            return __assign(__assign({}, config), { totalsToSelect: [] });
-        }
-        var totalFields = [
-            "cart.subtotal",
-            "cart.tax_total",
-            "cart.shipping_total",
-            "cart.discount_total",
-            "cart.gift_card_total",
-            "cart.total",
-        ];
-        var totalsToSelect = select.filter(function (v) { return totalFields.includes(v); });
-        if (totalsToSelect.length > 0) {
-            var relationSet = new Set(relations);
-            relationSet.add("cart");
-            relationSet.add("cart.items");
-            relationSet.add("cart.gift_cards");
-            relationSet.add("cart.discounts");
-            relationSet.add("cart.discounts.rule");
-            relationSet.add("cart.discounts.rule.valid_for");
-            relationSet.add("cart.shipping_methods");
-            relationSet.add("cart.region");
-            relations = __spreadArray([], __read(relationSet), false);
-            select = select.filter(function (v) { return !totalFields.includes(v); });
-        }
-        return __assign(__assign({}, config), { relations: relations, select: select, totalsToSelect: totalsToSelect });
-    };
-    SwapService.prototype.decorateTotals_ = function (cart, totalsFields) {
-        if (totalsFields === void 0) { totalsFields = []; }
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, _b, _c, _d, _e, _f;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0:
-                        if (!totalsFields.includes("cart.shipping_total")) return [3 /*break*/, 2];
-                        _a = cart;
-                        return [4 /*yield*/, this.totalsService_.getShippingTotal(cart)];
-                    case 1:
-                        _a.shipping_total = _g.sent();
-                        _g.label = 2;
-                    case 2:
-                        if (!totalsFields.includes("cart.discount_total")) return [3 /*break*/, 4];
-                        _b = cart;
-                        return [4 /*yield*/, this.totalsService_.getDiscountTotal(cart)];
-                    case 3:
-                        _b.discount_total = _g.sent();
-                        _g.label = 4;
-                    case 4:
-                        if (!totalsFields.includes("cart.tax_total")) return [3 /*break*/, 6];
-                        _c = cart;
-                        return [4 /*yield*/, this.totalsService_.getTaxTotal(cart)];
-                    case 5:
-                        _c.tax_total = _g.sent();
-                        _g.label = 6;
-                    case 6:
-                        if (!totalsFields.includes("cart.gift_card_total")) return [3 /*break*/, 8];
-                        _d = cart;
-                        return [4 /*yield*/, this.totalsService_.getGiftCardTotal(cart)];
-                    case 7:
-                        _d.gift_card_total = _g.sent();
-                        _g.label = 8;
-                    case 8:
-                        if (!totalsFields.includes("cart.subtotal")) return [3 /*break*/, 10];
-                        _e = cart;
-                        return [4 /*yield*/, this.totalsService_.getSubtotal(cart)];
-                    case 9:
-                        _e.subtotal = _g.sent();
-                        _g.label = 10;
-                    case 10:
-                        if (!totalsFields.includes("cart.total")) return [3 /*break*/, 12];
-                        _f = cart;
-                        return [4 /*yield*/, this.totalsService_.getTotal(cart)];
-                    case 11:
-                        _f.total = _g.sent();
-                        _g.label = 12;
-                    case 12: return [2 /*return*/, cart];
+        var cartSelects = null;
+        var cartRelations = null;
+        if (typeof relations !== "undefined" && relations.includes("cart")) {
+            var _a = __read(relations.reduce(function (acc, next) {
+                if (next === "cart") {
+                    return acc;
                 }
-            });
-        });
+                if (next.startsWith("cart.")) {
+                    var _a = __read(next.split(".")), rel = _a.slice(1);
+                    acc[1].push(rel.join("."));
+                }
+                else {
+                    acc[0].push(next);
+                }
+                return acc;
+            }, [[], []]), 2), swapRelations = _a[0], cartRels = _a[1];
+            relations = swapRelations;
+            cartRelations = cartRels;
+            var foundCartId_1 = false;
+            if (typeof select !== "undefined") {
+                var _b = __read(select.reduce(function (acc, next) {
+                    if (next.startsWith("cart.")) {
+                        var _a = __read(next.split(".")), rel = _a.slice(1);
+                        acc[1].push(rel.join("."));
+                    }
+                    else {
+                        if (next === "cart_id") {
+                            foundCartId_1 = true;
+                        }
+                        acc[0].push(next);
+                    }
+                    return acc;
+                }, [[], []]), 2), swapSelects = _b[0], cartSels = _b[1];
+                select = foundCartId_1 ? swapSelects : __spreadArray(__spreadArray([], __read(swapSelects), false), ["cart_id"], false);
+                cartSelects = cartSels;
+            }
+        }
+        return __assign(__assign({}, config), { relations: relations, select: select, cartSelects: cartSelects, cartRelations: cartRelations });
     };
     /**
      * Retrieves a swap with the given id.
@@ -261,13 +223,13 @@ var SwapService = /** @class */ (function (_super) {
     SwapService.prototype.retrieve = function (id, config) {
         if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var swapRepo, validatedId, _a, totalsToSelect, newConfig, query, rels, swap, cart;
+            var swapRepo, validatedId, _a, cartSelects, cartRelations, newConfig, query, rels, swap, cart;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         swapRepo = this.manager_.getCustomRepository(this.swapRepository_);
                         validatedId = this.validateId_(id);
-                        _a = this.transformQueryForTotals_(config), totalsToSelect = _a.totalsToSelect, newConfig = __rest(_a, ["totalsToSelect"]);
+                        _a = this.transformQueryForCart_(config), cartSelects = _a.cartSelects, cartRelations = _a.cartRelations, newConfig = __rest(_a, ["cartSelects", "cartRelations"]);
                         query = this.buildQuery_({ id: validatedId }, newConfig);
                         rels = query.relations;
                         delete query.relations;
@@ -277,8 +239,11 @@ var SwapService = /** @class */ (function (_super) {
                         if (!swap) {
                             throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Swap was not found");
                         }
-                        if (!(rels && rels.includes("cart"))) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.decorateTotals_(swap.cart, totalsToSelect)];
+                        if (!(cartRelations || cartSelects)) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.cartService_.retrieve(swap.cart_id, {
+                                select: cartSelects,
+                                relations: cartRelations,
+                            })];
                     case 2:
                         cart = _b.sent();
                         swap.cart = cart;
@@ -649,11 +614,11 @@ var SwapService = /** @class */ (function (_super) {
             var _this = this;
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var swap, order, discounts, cart, customShippingOptions_1, customShippingOptions_1_1, customShippingOption, e_2_1, _a, _b, item, e_3_1, _loop_1, this_1, _c, _d, r, e_4_1, swapRepo, result;
-                        var e_2, _e, e_3, _f, e_4, _g;
-                        var _h;
-                        return __generator(this, function (_j) {
-                            switch (_j.label) {
+                        var swap, order, discounts, cart, customShippingOptions_1, customShippingOptions_1_1, customShippingOption, e_2_1, _a, _b, item, e_3_1, shippingTaxLineRepo_1, swapRepo;
+                        var e_2, _c, e_3, _d;
+                        var _e;
+                        return __generator(this, function (_f) {
+                            switch (_f.label) {
                                 case 0: return [4 /*yield*/, this.retrieve(swapId, {
                                         relations: [
                                             "order",
@@ -668,10 +633,11 @@ var SwapService = /** @class */ (function (_super) {
                                             "return_order",
                                             "return_order.items",
                                             "return_order.shipping_method",
+                                            "return_order.shipping_method.tax_lines",
                                         ],
                                     })];
                                 case 1:
-                                    swap = _j.sent();
+                                    swap = _f.sent();
                                     if (swap.canceled_at) {
                                         throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled swap cannot be used to create a cart");
                                     }
@@ -679,7 +645,7 @@ var SwapService = /** @class */ (function (_super) {
                                         throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.DUPLICATE_ERROR, "A cart has already been created for the swap");
                                     }
                                     order = swap.order;
-                                    discounts = ((_h = order === null || order === void 0 ? void 0 : order.discounts) === null || _h === void 0 ? void 0 : _h.filter(function (_a) {
+                                    discounts = ((_e = order === null || order === void 0 ? void 0 : order.discounts) === null || _e === void 0 ? void 0 : _e.filter(function (_a) {
                                         var rule = _a.rule;
                                         return rule.type !== "free_shipping";
                                     })) ||
@@ -698,12 +664,12 @@ var SwapService = /** @class */ (function (_super) {
                                             },
                                         })];
                                 case 2:
-                                    cart = _j.sent();
-                                    _j.label = 3;
+                                    cart = _f.sent();
+                                    _f.label = 3;
                                 case 3:
-                                    _j.trys.push([3, 8, 9, 10]);
+                                    _f.trys.push([3, 8, 9, 10]);
                                     customShippingOptions_1 = __values(customShippingOptions), customShippingOptions_1_1 = customShippingOptions_1.next();
-                                    _j.label = 4;
+                                    _f.label = 4;
                                 case 4:
                                     if (!!customShippingOptions_1_1.done) return [3 /*break*/, 7];
                                     customShippingOption = customShippingOptions_1_1.value;
@@ -715,26 +681,26 @@ var SwapService = /** @class */ (function (_super) {
                                             price: customShippingOption.price,
                                         })];
                                 case 5:
-                                    _j.sent();
-                                    _j.label = 6;
+                                    _f.sent();
+                                    _f.label = 6;
                                 case 6:
                                     customShippingOptions_1_1 = customShippingOptions_1.next();
                                     return [3 /*break*/, 4];
                                 case 7: return [3 /*break*/, 10];
                                 case 8:
-                                    e_2_1 = _j.sent();
+                                    e_2_1 = _f.sent();
                                     e_2 = { error: e_2_1 };
                                     return [3 /*break*/, 10];
                                 case 9:
                                     try {
-                                        if (customShippingOptions_1_1 && !customShippingOptions_1_1.done && (_e = customShippingOptions_1.return)) _e.call(customShippingOptions_1);
+                                        if (customShippingOptions_1_1 && !customShippingOptions_1_1.done && (_c = customShippingOptions_1.return)) _c.call(customShippingOptions_1);
                                     }
                                     finally { if (e_2) throw e_2.error; }
                                     return [7 /*endfinally*/];
                                 case 10:
-                                    _j.trys.push([10, 15, 16, 17]);
+                                    _f.trys.push([10, 15, 16, 17]);
                                     _a = __values(swap.additional_items), _b = _a.next();
-                                    _j.label = 11;
+                                    _f.label = 11;
                                 case 11:
                                     if (!!_b.done) return [3 /*break*/, 14];
                                     item = _b.value;
@@ -742,24 +708,25 @@ var SwapService = /** @class */ (function (_super) {
                                             cart_id: cart.id,
                                         })];
                                 case 12:
-                                    _j.sent();
-                                    _j.label = 13;
+                                    _f.sent();
+                                    _f.label = 13;
                                 case 13:
                                     _b = _a.next();
                                     return [3 /*break*/, 11];
                                 case 14: return [3 /*break*/, 17];
                                 case 15:
-                                    e_3_1 = _j.sent();
+                                    e_3_1 = _f.sent();
                                     e_3 = { error: e_3_1 };
                                     return [3 /*break*/, 17];
                                 case 16:
                                     try {
-                                        if (_b && !_b.done && (_f = _a.return)) _f.call(_a);
+                                        if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                                     }
                                     finally { if (e_3) throw e_3.error; }
                                     return [7 /*endfinally*/];
                                 case 17:
                                     if (!(swap.return_order && swap.return_order.shipping_method)) return [3 /*break*/, 19];
+                                    shippingTaxLineRepo_1 = this.manager_.getCustomRepository(this.shippingTaxLineRepo_);
                                     return [4 /*yield*/, this.lineItemService_.withTransaction(manager).create({
                                             cart_id: cart.id,
                                             title: "Return shipping",
@@ -767,103 +734,28 @@ var SwapService = /** @class */ (function (_super) {
                                             has_shipping: true,
                                             allow_discounts: false,
                                             unit_price: swap.return_order.shipping_method.price,
-                                            metadata: {
-                                                is_return_line: true,
-                                            },
+                                            is_return: true,
+                                            tax_lines: swap.return_order.shipping_method.tax_lines.map(function (tl) {
+                                                return shippingTaxLineRepo_1.create({
+                                                    name: tl.name,
+                                                    code: tl.code,
+                                                    rate: tl.rate,
+                                                    metadata: tl.metadata,
+                                                });
+                                            }),
                                         })];
                                 case 18:
-                                    _j.sent();
-                                    _j.label = 19;
-                                case 19:
-                                    _loop_1 = function (r) {
-                                        var allItems, _k, _l, s, _m, _o, c, lineItem, toCreate;
-                                        var e_5, _p, e_6, _q;
-                                        return __generator(this, function (_r) {
-                                            switch (_r.label) {
-                                                case 0:
-                                                    allItems = __spreadArray([], __read(order.items), false);
-                                                    if (order.swaps && order.swaps.length) {
-                                                        try {
-                                                            for (_k = (e_5 = void 0, __values(order.swaps)), _l = _k.next(); !_l.done; _l = _k.next()) {
-                                                                s = _l.value;
-                                                                allItems = __spreadArray(__spreadArray([], __read(allItems), false), __read(s.additional_items), false);
-                                                            }
-                                                        }
-                                                        catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                                                        finally {
-                                                            try {
-                                                                if (_l && !_l.done && (_p = _k.return)) _p.call(_k);
-                                                            }
-                                                            finally { if (e_5) throw e_5.error; }
-                                                        }
-                                                    }
-                                                    if (order.claims && order.claims.length) {
-                                                        try {
-                                                            for (_m = (e_6 = void 0, __values(order.claims)), _o = _m.next(); !_o.done; _o = _m.next()) {
-                                                                c = _o.value;
-                                                                allItems = __spreadArray(__spreadArray([], __read(allItems), false), __read(c.additional_items), false);
-                                                            }
-                                                        }
-                                                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                                                        finally {
-                                                            try {
-                                                                if (_o && !_o.done && (_q = _m.return)) _q.call(_m);
-                                                            }
-                                                            finally { if (e_6) throw e_6.error; }
-                                                        }
-                                                    }
-                                                    lineItem = allItems.find(function (i) { return i.id === r.item_id; });
-                                                    toCreate = {
-                                                        cart_id: cart.id,
-                                                        thumbnail: lineItem.thumbnail,
-                                                        title: lineItem.title,
-                                                        variant_id: lineItem.variant_id,
-                                                        unit_price: -1 * lineItem.unit_price,
-                                                        quantity: r.quantity,
-                                                        allow_discounts: lineItem.allow_discounts,
-                                                        metadata: __assign(__assign({}, lineItem.metadata), { is_return_line: true }),
-                                                    };
-                                                    return [4 /*yield*/, this_1.lineItemService_.withTransaction(manager).create(toCreate)];
-                                                case 1:
-                                                    _r.sent();
-                                                    return [2 /*return*/];
-                                            }
-                                        });
-                                    };
-                                    this_1 = this;
-                                    _j.label = 20;
+                                    _f.sent();
+                                    _f.label = 19;
+                                case 19: return [4 /*yield*/, this.lineItemService_
+                                        .withTransaction(manager)
+                                        .createReturnLines(swap.return_order.id, cart.id)];
                                 case 20:
-                                    _j.trys.push([20, 25, 26, 27]);
-                                    _c = __values(swap.return_order.items), _d = _c.next();
-                                    _j.label = 21;
-                                case 21:
-                                    if (!!_d.done) return [3 /*break*/, 24];
-                                    r = _d.value;
-                                    return [5 /*yield**/, _loop_1(r)];
-                                case 22:
-                                    _j.sent();
-                                    _j.label = 23;
-                                case 23:
-                                    _d = _c.next();
-                                    return [3 /*break*/, 21];
-                                case 24: return [3 /*break*/, 27];
-                                case 25:
-                                    e_4_1 = _j.sent();
-                                    e_4 = { error: e_4_1 };
-                                    return [3 /*break*/, 27];
-                                case 26:
-                                    try {
-                                        if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
-                                    }
-                                    finally { if (e_4) throw e_4.error; }
-                                    return [7 /*endfinally*/];
-                                case 27:
+                                    _f.sent();
                                     swap.cart_id = cart.id;
                                     swapRepo = manager.getCustomRepository(this.swapRepository_);
                                     return [4 /*yield*/, swapRepo.save(swap)];
-                                case 28:
-                                    result = _j.sent();
-                                    return [2 /*return*/, result];
+                                case 21: return [2 /*return*/, _f.sent()];
                             }
                         });
                     }); })];
@@ -877,242 +769,201 @@ var SwapService = /** @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 swap, cart, payment, items, items_1, items_1_1, item, err_3, e_7_1, total, paymentStatus, items_2, items_2_1, item, e_8_1, now, swapRepo, result, _a, _b, method, e_9_1;
-                        var e_7, _c, e_8, _d, e_9, _e;
-                        return __generator(this, function (_f) {
-                            switch (_f.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(swapId, {
-                                        relations: [
-                                            "cart",
-                                            "cart.region",
-                                            "cart.shipping_methods",
-                                            "cart.shipping_address",
-                                            "cart.items",
-                                            "cart.discounts",
-                                            "cart.discounts.rule",
-                                            "cart.payment",
-                                            "cart.gift_cards",
-                                        ],
-                                    })
-                                    // If we already registered the cart completion we just return
-                                ];
-                                case 1:
-                                    swap = _f.sent();
-                                    // If we already registered the cart completion we just return
-                                    if (swap.confirmed_at) {
-                                        return [2 /*return*/, swap];
-                                    }
-                                    if (swap.canceled_at) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Cart related to canceled swap cannot be completed");
-                                    }
-                                    cart = swap.cart;
-                                    payment = cart.payment;
-                                    items = swap.cart.items;
-                                    if (!!swap.allow_backorder) return [3 /*break*/, 14];
-                                    _f.label = 2;
-                                case 2:
-                                    _f.trys.push([2, 12, 13, 14]);
-                                    items_1 = __values(items), items_1_1 = items_1.next();
-                                    _f.label = 3;
-                                case 3:
-                                    if (!!items_1_1.done) return [3 /*break*/, 11];
-                                    item = items_1_1.value;
-                                    _f.label = 4;
-                                case 4:
-                                    _f.trys.push([4, 6, , 10]);
-                                    return [4 /*yield*/, this.inventoryService_
-                                            .withTransaction(manager)
-                                            .confirmInventory(item.variant_id, item.quantity)];
-                                case 5:
-                                    _f.sent();
-                                    return [3 /*break*/, 10];
-                                case 6:
-                                    err_3 = _f.sent();
-                                    if (!payment) return [3 /*break*/, 8];
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .cancelPayment(payment)];
-                                case 7:
-                                    _f.sent();
-                                    _f.label = 8;
-                                case 8: return [4 /*yield*/, this.cartService_
-                                        .withTransaction(manager)
-                                        .update(cart.id, { payment_authorized_at: null })];
-                                case 9:
-                                    _f.sent();
-                                    throw err_3;
-                                case 10:
-                                    items_1_1 = items_1.next();
-                                    return [3 /*break*/, 3];
-                                case 11: return [3 /*break*/, 14];
-                                case 12:
-                                    e_7_1 = _f.sent();
-                                    e_7 = { error: e_7_1 };
-                                    return [3 /*break*/, 14];
-                                case 13:
-                                    try {
-                                        if (items_1_1 && !items_1_1.done && (_c = items_1.return)) _c.call(items_1);
-                                    }
-                                    finally { if (e_7) throw e_7.error; }
-                                    return [7 /*endfinally*/];
-                                case 14: return [4 /*yield*/, this.totalsService_.getTotal(cart)];
-                                case 15:
-                                    total = _f.sent();
-                                    if (!(total > 0)) return [3 /*break*/, 25];
-                                    if (!payment) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Cart does not contain a payment");
-                                    }
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .getStatus(payment)
-                                        // If payment status is not authorized, we throw
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
+                            var swap, cart, payment, items, items_1, items_1_1, item, err_3, e_4_1, total, paymentStatus, items_2, items_2_1, item, e_5_1, now, swapRepo, result, _a, _b, method, e_6_1;
+                            var e_4, _c, e_5, _d, e_6, _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(swapId, {
+                                            select: [
+                                                "id",
+                                                "order_id",
+                                                "no_notification",
+                                                "allow_backorder",
+                                                "canceled_at",
+                                                "confirmed_at",
+                                                "cart_id",
+                                            ],
+                                        })
+                                        // If we already registered the cart completion we just return
                                     ];
-                                case 16:
-                                    paymentStatus = _f.sent();
-                                    // If payment status is not authorized, we throw
-                                    if (paymentStatus !== "authorized" && paymentStatus !== "succeeded") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Payment method is not authorized");
-                                    }
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .updatePayment(payment.id, {
-                                            swap_id: swapId,
-                                            order_id: swap.order_id,
-                                        })];
-                                case 17:
-                                    _f.sent();
-                                    _f.label = 18;
-                                case 18:
-                                    _f.trys.push([18, 23, 24, 25]);
-                                    items_2 = __values(items), items_2_1 = items_2.next();
-                                    _f.label = 19;
-                                case 19:
-                                    if (!!items_2_1.done) return [3 /*break*/, 22];
-                                    item = items_2_1.value;
-                                    return [4 /*yield*/, this.inventoryService_
-                                            .withTransaction(manager)
-                                            .adjustInventory(item.variant_id, -item.quantity)];
-                                case 20:
-                                    _f.sent();
-                                    _f.label = 21;
-                                case 21:
-                                    items_2_1 = items_2.next();
-                                    return [3 /*break*/, 19];
-                                case 22: return [3 /*break*/, 25];
-                                case 23:
-                                    e_8_1 = _f.sent();
-                                    e_8 = { error: e_8_1 };
-                                    return [3 /*break*/, 25];
-                                case 24:
-                                    try {
-                                        if (items_2_1 && !items_2_1.done && (_d = items_2.return)) _d.call(items_2);
-                                    }
-                                    finally { if (e_8) throw e_8.error; }
-                                    return [7 /*endfinally*/];
-                                case 25:
-                                    now = new Date();
-                                    swap.difference_due = total;
-                                    swap.shipping_address_id = cart.shipping_address_id;
-                                    swap.shipping_methods = cart.shipping_methods;
-                                    swap.confirmed_at = now.toISOString();
-                                    swap.payment_status = total === 0 ? "confirmed" : "awaiting";
-                                    swapRepo = manager.getCustomRepository(this.swapRepository_);
-                                    return [4 /*yield*/, swapRepo.save(swap)];
-                                case 26:
-                                    result = _f.sent();
-                                    _f.label = 27;
-                                case 27:
-                                    _f.trys.push([27, 32, 33, 34]);
-                                    _a = __values(cart.shipping_methods), _b = _a.next();
-                                    _f.label = 28;
-                                case 28:
-                                    if (!!_b.done) return [3 /*break*/, 31];
-                                    method = _b.value;
-                                    return [4 /*yield*/, this.shippingOptionService_
-                                            .withTransaction(manager)
-                                            .updateShippingMethod(method.id, {
-                                            swap_id: result.id,
-                                        })];
-                                case 29:
-                                    _f.sent();
-                                    _f.label = 30;
-                                case 30:
-                                    _b = _a.next();
-                                    return [3 /*break*/, 28];
-                                case 31: return [3 /*break*/, 34];
-                                case 32:
-                                    e_9_1 = _f.sent();
-                                    e_9 = { error: e_9_1 };
-                                    return [3 /*break*/, 34];
-                                case 33:
-                                    try {
-                                        if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
-                                    }
-                                    finally { if (e_9) throw e_9.error; }
-                                    return [7 /*endfinally*/];
-                                case 34:
-                                    this.eventBus_
-                                        .withTransaction(manager)
-                                        .emit(SwapService.Events.PAYMENT_COMPLETED, {
-                                        id: swap.id,
-                                        no_notification: swap.no_notification,
-                                    });
-                                    return [4 /*yield*/, this.cartService_
+                                    case 1:
+                                        swap = _f.sent();
+                                        // If we already registered the cart completion we just return
+                                        if (swap.confirmed_at) {
+                                            return [2 /*return*/, swap];
+                                        }
+                                        if (swap.canceled_at) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Cart related to canceled swap cannot be completed");
+                                        }
+                                        return [4 /*yield*/, this.cartService_.retrieve(swap.cart_id, {
+                                                select: ["total"],
+                                                relations: ["payment", "shipping_methods", "items"],
+                                            })];
+                                    case 2:
+                                        cart = _f.sent();
+                                        payment = cart.payment;
+                                        items = cart.items;
+                                        if (!!swap.allow_backorder) return [3 /*break*/, 15];
+                                        _f.label = 3;
+                                    case 3:
+                                        _f.trys.push([3, 13, 14, 15]);
+                                        items_1 = __values(items), items_1_1 = items_1.next();
+                                        _f.label = 4;
+                                    case 4:
+                                        if (!!items_1_1.done) return [3 /*break*/, 12];
+                                        item = items_1_1.value;
+                                        _f.label = 5;
+                                    case 5:
+                                        _f.trys.push([5, 7, , 11]);
+                                        return [4 /*yield*/, this.inventoryService_
+                                                .withTransaction(manager)
+                                                .confirmInventory(item.variant_id, item.quantity)];
+                                    case 6:
+                                        _f.sent();
+                                        return [3 /*break*/, 11];
+                                    case 7:
+                                        err_3 = _f.sent();
+                                        if (!payment) return [3 /*break*/, 9];
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(manager)
+                                                .cancelPayment(payment)];
+                                    case 8:
+                                        _f.sent();
+                                        _f.label = 9;
+                                    case 9: return [4 /*yield*/, this.cartService_
                                             .withTransaction(manager)
-                                            .update(cart.id, { completed_at: new Date() })];
-                                case 35:
-                                    _f.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
-            });
-        });
-    };
-    /**
-     * Registers the return associated with a swap as received. If the return
-     * is received with mismatching return items the swap's status will be updated
-     * to requires_action.
-     * @param {string} swapId - the id of the swap to receive.
-     * @param {Array<ReturnItem>} returnItems - the return items that have been returned
-     * @return {Promise<Swap>} the resulting swap, with an updated return and
-     *   status.
-     */
-    SwapService.prototype.receiveReturn = function (swapId, returnItems) {
-        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 swap, returnId, updatedRet, swapRepo, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(swapId, { relations: ["return_order"] })];
-                                case 1:
-                                    swap = _a.sent();
-                                    if (swap.canceled_at) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled swap cannot be registered as received");
-                                    }
-                                    returnId = swap.return_order && swap.return_order.id;
-                                    if (!returnId) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Swap has no return request");
-                                    }
-                                    return [4 /*yield*/, this.returnService_
+                                            .update(cart.id, { payment_authorized_at: null })];
+                                    case 10:
+                                        _f.sent();
+                                        throw err_3;
+                                    case 11:
+                                        items_1_1 = items_1.next();
+                                        return [3 /*break*/, 4];
+                                    case 12: return [3 /*break*/, 15];
+                                    case 13:
+                                        e_4_1 = _f.sent();
+                                        e_4 = { error: e_4_1 };
+                                        return [3 /*break*/, 15];
+                                    case 14:
+                                        try {
+                                            if (items_1_1 && !items_1_1.done && (_c = items_1.return)) _c.call(items_1);
+                                        }
+                                        finally { if (e_4) throw e_4.error; }
+                                        return [7 /*endfinally*/];
+                                    case 15:
+                                        total = cart.total;
+                                        if (!(total > 0)) return [3 /*break*/, 25];
+                                        if (!payment) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Cart does not contain a payment");
+                                        }
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(manager)
+                                                .getStatus(payment)
+                                            // If payment status is not authorized, we throw
+                                        ];
+                                    case 16:
+                                        paymentStatus = _f.sent();
+                                        // If payment status is not authorized, we throw
+                                        if (paymentStatus !== "authorized" && paymentStatus !== "succeeded") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Payment method is not authorized");
+                                        }
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(manager)
+                                                .updatePayment(payment.id, {
+                                                swap_id: swapId,
+                                                order_id: swap.order_id,
+                                            })];
+                                    case 17:
+                                        _f.sent();
+                                        _f.label = 18;
+                                    case 18:
+                                        _f.trys.push([18, 23, 24, 25]);
+                                        items_2 = __values(items), items_2_1 = items_2.next();
+                                        _f.label = 19;
+                                    case 19:
+                                        if (!!items_2_1.done) return [3 /*break*/, 22];
+                                        item = items_2_1.value;
+                                        return [4 /*yield*/, this.inventoryService_
+                                                .withTransaction(manager)
+                                                .adjustInventory(item.variant_id, -item.quantity)];
+                                    case 20:
+                                        _f.sent();
+                                        _f.label = 21;
+                                    case 21:
+                                        items_2_1 = items_2.next();
+                                        return [3 /*break*/, 19];
+                                    case 22: return [3 /*break*/, 25];
+                                    case 23:
+                                        e_5_1 = _f.sent();
+                                        e_5 = { error: e_5_1 };
+                                        return [3 /*break*/, 25];
+                                    case 24:
+                                        try {
+                                            if (items_2_1 && !items_2_1.done && (_d = items_2.return)) _d.call(items_2);
+                                        }
+                                        finally { if (e_5) throw e_5.error; }
+                                        return [7 /*endfinally*/];
+                                    case 25:
+                                        now = new Date();
+                                        swap.difference_due = total;
+                                        swap.shipping_address_id = cart.shipping_address_id;
+                                        swap.shipping_methods = cart.shipping_methods;
+                                        swap.confirmed_at = now.toISOString();
+                                        swap.payment_status = total === 0 ? "confirmed" : "awaiting";
+                                        swapRepo = manager.getCustomRepository(this.swapRepository_);
+                                        return [4 /*yield*/, swapRepo.save(swap)];
+                                    case 26:
+                                        result = _f.sent();
+                                        _f.label = 27;
+                                    case 27:
+                                        _f.trys.push([27, 32, 33, 34]);
+                                        _a = __values(cart.shipping_methods), _b = _a.next();
+                                        _f.label = 28;
+                                    case 28:
+                                        if (!!_b.done) return [3 /*break*/, 31];
+                                        method = _b.value;
+                                        return [4 /*yield*/, this.shippingOptionService_
+                                                .withTransaction(manager)
+                                                .updateShippingMethod(method.id, {
+                                                swap_id: result.id,
+                                            })];
+                                    case 29:
+                                        _f.sent();
+                                        _f.label = 30;
+                                    case 30:
+                                        _b = _a.next();
+                                        return [3 /*break*/, 28];
+                                    case 31: return [3 /*break*/, 34];
+                                    case 32:
+                                        e_6_1 = _f.sent();
+                                        e_6 = { error: e_6_1 };
+                                        return [3 /*break*/, 34];
+                                    case 33:
+                                        try {
+                                            if (_b && !_b.done && (_e = _a.return)) _e.call(_a);
+                                        }
+                                        finally { if (e_6) throw e_6.error; }
+                                        return [7 /*endfinally*/];
+                                    case 34:
+                                        this.eventBus_
                                             .withTransaction(manager)
-                                            .receiveReturn(returnId, returnItems, undefined, false)];
-                                case 2:
-                                    updatedRet = _a.sent();
-                                    if (!(updatedRet.status === "requires_action")) return [3 /*break*/, 4];
-                                    swapRepo = manager.getCustomRepository(this.swapRepository_);
-                                    swap.fulfillment_status = "requires_action";
-                                    return [4 /*yield*/, swapRepo.save(swap)];
-                                case 3:
-                                    result = _a.sent();
-                                    return [2 /*return*/, result];
-                                case 4: return [2 /*return*/, this.retrieve(swapId)];
-                            }
-                        });
-                    }); })];
+                                            .emit(SwapService.Events.PAYMENT_COMPLETED, {
+                                            id: swap.id,
+                                            no_notification: swap.no_notification,
+                                        });
+                                        return [4 /*yield*/, this.cartService_
+                                                .withTransaction(manager)
+                                                .update(cart.id, { completed_at: new Date() })];
+                                    case 35:
+                                        _f.sent();
+                                        return [2 /*return*/, result];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -1129,7 +980,7 @@ var SwapService = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
                         var swap, _a, _b, f, swapRepo, result;
-                        var e_10, _c;
+                        var e_7, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0: return [4 /*yield*/, this.retrieve(swapId, {
@@ -1151,12 +1002,12 @@ var SwapService = /** @class */ (function (_super) {
                                                 }
                                             }
                                         }
-                                        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
                                         finally {
                                             try {
                                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                                             }
-                                            finally { if (e_10) throw e_10.error; }
+                                            finally { if (e_7) throw e_7.error; }
                                         }
                                     }
                                     if (swap.return_order && swap.return_order.status !== "canceled") {
@@ -1202,8 +1053,8 @@ var SwapService = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 metadata = config.metadata, no_notification = config.no_notification;
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var swap, order, evaluatedNoNotification, _a, successfullyFulfilled, _b, _c, f, _loop_2, this_2, _d, _e, item, e_11_1, swapRepo, result;
-                        var e_12, _f, e_11, _g;
+                        var swap, order, evaluatedNoNotification, _a, successfullyFulfilled, _b, _c, f, _loop_1, this_1, _d, _e, item, e_8_1, swapRepo, result;
+                        var e_9, _f, e_8, _g;
                         var _h;
                         return __generator(this, function (_j) {
                             switch (_j.label) {
@@ -1212,8 +1063,11 @@ var SwapService = /** @class */ (function (_super) {
                                             "payment",
                                             "shipping_address",
                                             "additional_items",
+                                            "additional_items.tax_lines",
                                             "shipping_methods",
+                                            "shipping_methods.tax_lines",
                                             "order",
+                                            "order.region",
                                             "order.billing_address",
                                             "order.discounts",
                                             "order.discounts.rule",
@@ -1237,7 +1091,7 @@ var SwapService = /** @class */ (function (_super) {
                                     _a = swap;
                                     return [4 /*yield*/, this.fulfillmentService_
                                             .withTransaction(manager)
-                                            .createFulfillment(__assign(__assign({}, swap), { payments: swap.payment ? [swap.payment] : order.payments, email: order.email, discounts: order.discounts, currency_code: order.currency_code, tax_rate: order.tax_rate, region_id: order.region_id, display_id: order.display_id, billing_address: order.billing_address, items: swap.additional_items, shipping_methods: swap.shipping_methods, is_swap: true, no_notification: evaluatedNoNotification }), swap.additional_items.map(function (i) { return ({
+                                            .createFulfillment(__assign(__assign({}, swap), { payments: swap.payment ? [swap.payment] : order.payments, email: order.email, discounts: order.discounts, currency_code: order.currency_code, tax_rate: order.tax_rate, region_id: order.region_id, region: order.region, display_id: order.display_id, billing_address: order.billing_address, items: swap.additional_items, shipping_methods: swap.shipping_methods, is_swap: true, no_notification: evaluatedNoNotification }), swap.additional_items.map(function (i) { return ({
                                             item_id: i.id,
                                             quantity: i.quantity,
                                         }); }), { swap_id: swapId, metadata: metadata })];
@@ -1250,15 +1104,15 @@ var SwapService = /** @class */ (function (_super) {
                                             successfullyFulfilled = successfullyFulfilled.concat(f.items);
                                         }
                                     }
-                                    catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                                    catch (e_9_1) { e_9 = { error: e_9_1 }; }
                                     finally {
                                         try {
                                             if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
                                         }
-                                        finally { if (e_12) throw e_12.error; }
+                                        finally { if (e_9) throw e_9.error; }
                                     }
                                     swap.fulfillment_status = "fulfilled";
-                                    _loop_2 = function (item) {
+                                    _loop_1 = function (item) {
                                         var fulfillmentItem, fulfilledQuantity;
                                         return __generator(this, function (_k) {
                                             switch (_k.label) {
@@ -1267,7 +1121,7 @@ var SwapService = /** @class */ (function (_super) {
                                                     if (!fulfillmentItem) return [3 /*break*/, 2];
                                                     fulfilledQuantity = (item.fulfilled_quantity || 0) + fulfillmentItem.quantity;
                                                     // Update the fulfilled quantity
-                                                    return [4 /*yield*/, this_2.lineItemService_.withTransaction(manager).update(item.id, {
+                                                    return [4 /*yield*/, this_1.lineItemService_.withTransaction(manager).update(item.id, {
                                                             fulfilled_quantity: fulfilledQuantity,
                                                         })];
                                                 case 1:
@@ -1286,7 +1140,7 @@ var SwapService = /** @class */ (function (_super) {
                                             }
                                         });
                                     };
-                                    this_2 = this;
+                                    this_1 = this;
                                     _j.label = 3;
                                 case 3:
                                     _j.trys.push([3, 8, 9, 10]);
@@ -1295,7 +1149,7 @@ var SwapService = /** @class */ (function (_super) {
                                 case 4:
                                     if (!!_e.done) return [3 /*break*/, 7];
                                     item = _e.value;
-                                    return [5 /*yield**/, _loop_2(item)];
+                                    return [5 /*yield**/, _loop_1(item)];
                                 case 5:
                                     _j.sent();
                                     _j.label = 6;
@@ -1304,14 +1158,14 @@ var SwapService = /** @class */ (function (_super) {
                                     return [3 /*break*/, 4];
                                 case 7: return [3 /*break*/, 10];
                                 case 8:
-                                    e_11_1 = _j.sent();
-                                    e_11 = { error: e_11_1 };
+                                    e_8_1 = _j.sent();
+                                    e_8 = { error: e_8_1 };
                                     return [3 /*break*/, 10];
                                 case 9:
                                     try {
                                         if (_e && !_e.done && (_g = _d.return)) _g.call(_d);
                                     }
-                                    finally { if (e_11) throw e_11.error; }
+                                    finally { if (e_8) throw e_8.error; }
                                     return [7 /*endfinally*/];
                                 case 10:
                                     swapRepo = manager.getCustomRepository(this.swapRepository_);
@@ -1389,8 +1243,8 @@ var SwapService = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 metadata = config.metadata, no_notification = config.no_notification;
                 return [2 /*return*/, this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-                        var swap, evaluatedNoNotification, shipment, _loop_3, this_3, _a, _b, i, e_13_1, swapRepo, result;
-                        var e_13, _c;
+                        var swap, evaluatedNoNotification, shipment, _loop_2, this_2, _a, _b, i, e_10_1, swapRepo, result;
+                        var e_10, _c;
                         return __generator(this, function (_d) {
                             switch (_d.label) {
                                 case 0: return [4 /*yield*/, this.retrieve(swapId, {
@@ -1411,7 +1265,7 @@ var SwapService = /** @class */ (function (_super) {
                                 case 2:
                                     shipment = _d.sent();
                                     swap.fulfillment_status = "shipped";
-                                    _loop_3 = function (i) {
+                                    _loop_2 = function (i) {
                                         var shipped, shippedQty;
                                         return __generator(this, function (_e) {
                                             switch (_e.label) {
@@ -1419,7 +1273,7 @@ var SwapService = /** @class */ (function (_super) {
                                                     shipped = shipment.items.find(function (si) { return si.item_id === i.id; });
                                                     if (!shipped) return [3 /*break*/, 2];
                                                     shippedQty = (i.shipped_quantity || 0) + shipped.quantity;
-                                                    return [4 /*yield*/, this_3.lineItemService_.withTransaction(manager).update(i.id, {
+                                                    return [4 /*yield*/, this_2.lineItemService_.withTransaction(manager).update(i.id, {
                                                             shipped_quantity: shippedQty,
                                                         })];
                                                 case 1:
@@ -1437,7 +1291,7 @@ var SwapService = /** @class */ (function (_super) {
                                             }
                                         });
                                     };
-                                    this_3 = this;
+                                    this_2 = this;
                                     _d.label = 3;
                                 case 3:
                                     _d.trys.push([3, 8, 9, 10]);
@@ -1446,7 +1300,7 @@ var SwapService = /** @class */ (function (_super) {
                                 case 4:
                                     if (!!_b.done) return [3 /*break*/, 7];
                                     i = _b.value;
-                                    return [5 /*yield**/, _loop_3(i)];
+                                    return [5 /*yield**/, _loop_2(i)];
                                 case 5:
                                     _d.sent();
                                     _d.label = 6;
@@ -1455,14 +1309,14 @@ var SwapService = /** @class */ (function (_super) {
                                     return [3 /*break*/, 4];
                                 case 7: return [3 /*break*/, 10];
                                 case 8:
-                                    e_13_1 = _d.sent();
-                                    e_13 = { error: e_13_1 };
+                                    e_10_1 = _d.sent();
+                                    e_10 = { error: e_10_1 };
                                     return [3 /*break*/, 10];
                                 case 9:
                                     try {
                                         if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                                     }
-                                    finally { if (e_13) throw e_13.error; }
+                                    finally { if (e_10) throw e_10.error; }
                                     return [7 /*endfinally*/];
                                 case 10:
                                     swapRepo = manager.getCustomRepository(this.swapRepository_);