@medusajs/medusa 1.3.2 → 1.3.3

package/dist/services/claim.js

@@ -84,18 +84,23 @@ 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 models_1 = require("../models");
 var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_interfaces_1 = require("medusa-interfaces");
+var interfaces_1 = require("../interfaces");
+var utils_1 = require("../utils");
 var ClaimService = /** @class */ (function (_super) {
     __extends(ClaimService, _super);
     function ClaimService(_a) {
-        var manager = _a.manager, addressRepository = _a.addressRepository, claimItemService = _a.claimItemService, claimRepository = _a.claimRepository, eventBusService = _a.eventBusService, fulfillmentProviderService = _a.fulfillmentProviderService, fulfillmentService = _a.fulfillmentService, inventoryService = _a.inventoryService, lineItemService = _a.lineItemService, paymentProviderService = _a.paymentProviderService, regionService = _a.regionService, returnService = _a.returnService, shippingOptionService = _a.shippingOptionService, taxProviderService = _a.taxProviderService, totalsService = _a.totalsService;
-        var _this = _super.call(this) || this;
-        /** @private @constant {EntityManager} */
+        var manager = _a.manager, addressRepository = _a.addressRepository, claimRepository = _a.claimRepository, shippingMethodRepository = _a.shippingMethodRepository, lineItemRepository = _a.lineItemRepository, claimItemService = _a.claimItemService, eventBusService = _a.eventBusService, fulfillmentProviderService = _a.fulfillmentProviderService, fulfillmentService = _a.fulfillmentService, inventoryService = _a.inventoryService, lineItemService = _a.lineItemService, paymentProviderService = _a.paymentProviderService, regionService = _a.regionService, returnService = _a.returnService, shippingOptionService = _a.shippingOptionService, taxProviderService = _a.taxProviderService, totalsService = _a.totalsService;
+        var _this = 
+        // eslint-disable-next-line prefer-rest-params
+        _super.call(this, arguments[0]) || this;
         _this.manager_ = manager;
-        _this.addressRepo_ = addressRepository;
-        _this.claimItemService_ = claimItemService;
+        _this.addressRepository_ = addressRepository;
         _this.claimRepository_ = claimRepository;
+        _this.shippingMethodRepository_ = shippingMethodRepository;
+        _this.lineItemRepository_ = lineItemRepository;
+        _this.claimItemService_ = claimItemService;
         _this.eventBus_ = eventBusService;
         _this.fulfillmentProviderService_ = fulfillmentProviderService;
         _this.fulfillmentService_ = fulfillmentService;
@@ -109,684 +114,696 @@ var ClaimService = /** @class */ (function (_super) {
         _this.totalsService_ = totalsService;
         return _this;
     }
-    ClaimService.prototype.withTransaction = function (manager) {
-        if (!manager) {
-            return this;
-        }
-        var cloned = new ClaimService({
-            manager: manager,
-            addressRepository: this.addressRepo_,
-            claimItemService: this.claimItemService_,
-            claimRepository: this.claimRepository_,
-            eventBusService: this.eventBus_,
-            fulfillmentProviderService: this.fulfillmentProviderService_,
-            fulfillmentService: this.fulfillmentService_,
-            inventoryService: this.inventoryService_,
-            lineItemService: this.lineItemService_,
-            paymentProviderService: this.paymentProviderService_,
-            regionService: this.regionService_,
-            returnService: this.returnService_,
-            shippingOptionService: this.shippingOptionService_,
-            totalsService: this.totalsService_,
-            taxProviderService: this.taxProviderService_,
-        });
-        cloned.transactionManager_ = manager;
-        return cloned;
-    };
     ClaimService.prototype.update = function (id, data) {
-        var _this = this;
-        return this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-            var claimRepo, claim, claim_items, shipping_methods, metadata, no_notification, _a, _b, m, e_1_1, shipping_methods_1, shipping_methods_1_1, method, e_2_1, claim_items_1, claim_items_1_1, i, e_3_1;
-            var e_1, _c, e_2, _d, e_3, _e;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        claimRepo = manager.getCustomRepository(this.claimRepository_);
-                        return [4 /*yield*/, this.retrieve(id, { relations: ["shipping_methods"] })];
-                    case 1:
-                        claim = _f.sent();
-                        if (claim.canceled_at) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be updated");
-                        }
-                        claim_items = data.claim_items, shipping_methods = data.shipping_methods, metadata = data.metadata, no_notification = data.no_notification;
-                        if (!metadata) return [3 /*break*/, 3];
-                        claim.metadata = this.setMetadata_(claim, metadata);
-                        return [4 /*yield*/, claimRepo.save(claim)];
-                    case 2:
-                        _f.sent();
-                        _f.label = 3;
-                    case 3:
-                        if (!shipping_methods) return [3 /*break*/, 20];
-                        _f.label = 4;
-                    case 4:
-                        _f.trys.push([4, 9, 10, 11]);
-                        _a = __values(claim.shipping_methods), _b = _a.next();
-                        _f.label = 5;
-                    case 5:
-                        if (!!_b.done) return [3 /*break*/, 8];
-                        m = _b.value;
-                        return [4 /*yield*/, this.shippingOptionService_
-                                .withTransaction(manager)
-                                .updateShippingMethod(m.id, {
-                                claim_order_id: null,
-                            })];
-                    case 6:
-                        _f.sent();
-                        _f.label = 7;
-                    case 7:
-                        _b = _a.next();
-                        return [3 /*break*/, 5];
-                    case 8: return [3 /*break*/, 11];
-                    case 9:
-                        e_1_1 = _f.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 11];
-                    case 10:
-                        try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                        return [7 /*endfinally*/];
-                    case 11:
-                        _f.trys.push([11, 18, 19, 20]);
-                        shipping_methods_1 = __values(shipping_methods), shipping_methods_1_1 = shipping_methods_1.next();
-                        _f.label = 12;
-                    case 12:
-                        if (!!shipping_methods_1_1.done) return [3 /*break*/, 17];
-                        method = shipping_methods_1_1.value;
-                        if (!method.id) return [3 /*break*/, 14];
-                        return [4 /*yield*/, this.shippingOptionService_
-                                .withTransaction(manager)
-                                .updateShippingMethod(method.id, {
-                                claim_order_id: claim.id,
-                            })];
-                    case 13:
-                        _f.sent();
-                        return [3 /*break*/, 16];
-                    case 14: return [4 /*yield*/, this.shippingOptionService_
-                            .withTransaction(manager)
-                            .createShippingMethod(method.option_id, method.data, {
-                            claim_order_id: claim.id,
-                            price: method.price,
-                        })];
-                    case 15:
-                        _f.sent();
-                        _f.label = 16;
-                    case 16:
-                        shipping_methods_1_1 = shipping_methods_1.next();
-                        return [3 /*break*/, 12];
-                    case 17: return [3 /*break*/, 20];
-                    case 18:
-                        e_2_1 = _f.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 20];
-                    case 19:
-                        try {
-                            if (shipping_methods_1_1 && !shipping_methods_1_1.done && (_d = shipping_methods_1.return)) _d.call(shipping_methods_1);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                        return [7 /*endfinally*/];
-                    case 20:
-                        if (!(no_notification !== undefined)) return [3 /*break*/, 22];
-                        claim.no_notification = no_notification;
-                        return [4 /*yield*/, claimRepo.save(claim)];
-                    case 21:
-                        _f.sent();
-                        _f.label = 22;
-                    case 22:
-                        if (!claim_items) return [3 /*break*/, 30];
-                        _f.label = 23;
-                    case 23:
-                        _f.trys.push([23, 28, 29, 30]);
-                        claim_items_1 = __values(claim_items), claim_items_1_1 = claim_items_1.next();
-                        _f.label = 24;
-                    case 24:
-                        if (!!claim_items_1_1.done) return [3 /*break*/, 27];
-                        i = claim_items_1_1.value;
-                        if (!i.id) return [3 /*break*/, 26];
-                        return [4 /*yield*/, this.claimItemService_
-                                .withTransaction(manager)
-                                .update(i.id, i)];
-                    case 25:
-                        _f.sent();
-                        _f.label = 26;
-                    case 26:
-                        claim_items_1_1 = claim_items_1.next();
-                        return [3 /*break*/, 24];
-                    case 27: return [3 /*break*/, 30];
-                    case 28:
-                        e_3_1 = _f.sent();
-                        e_3 = { error: e_3_1 };
-                        return [3 /*break*/, 30];
-                    case 29:
-                        try {
-                            if (claim_items_1_1 && !claim_items_1_1.done && (_e = claim_items_1.return)) _e.call(claim_items_1);
-                        }
-                        finally { if (e_3) throw e_3.error; }
-                        return [7 /*endfinally*/];
-                    case 30: return [4 /*yield*/, this.eventBus_
-                            .withTransaction(manager)
-                            .emit(ClaimService.Events.UPDATED, {
-                            id: claim.id,
-                            no_notification: claim.no_notification,
-                        })];
-                    case 31:
-                        _f.sent();
-                        return [2 /*return*/, claim];
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var claimRepo, claim, claim_items, shipping_methods, metadata, no_notification, _a, _b, m, e_1_1, shipping_methods_1, shipping_methods_1_1, method, e_2_1, claim_items_1, claim_items_1_1, i, e_3_1;
+                            var e_1, _c, e_2, _d, e_3, _e;
+                            return __generator(this, function (_f) {
+                                switch (_f.label) {
+                                    case 0:
+                                        claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                        return [4 /*yield*/, this.retrieve(id, {
+                                                relations: ["shipping_methods"],
+                                            })];
+                                    case 1:
+                                        claim = _f.sent();
+                                        if (claim.canceled_at) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be updated");
+                                        }
+                                        claim_items = data.claim_items, shipping_methods = data.shipping_methods, metadata = data.metadata, no_notification = data.no_notification;
+                                        if (!metadata) return [3 /*break*/, 3];
+                                        claim.metadata = (0, utils_1.setMetadata)(claim, metadata);
+                                        return [4 /*yield*/, claimRepo.save(claim)];
+                                    case 2:
+                                        _f.sent();
+                                        _f.label = 3;
+                                    case 3:
+                                        if (!shipping_methods) return [3 /*break*/, 20];
+                                        _f.label = 4;
+                                    case 4:
+                                        _f.trys.push([4, 9, 10, 11]);
+                                        _a = __values(claim.shipping_methods), _b = _a.next();
+                                        _f.label = 5;
+                                    case 5:
+                                        if (!!_b.done) return [3 /*break*/, 8];
+                                        m = _b.value;
+                                        return [4 /*yield*/, this.shippingOptionService_
+                                                .withTransaction(transactionManager)
+                                                .updateShippingMethod(m.id, {
+                                                claim_order_id: null,
+                                            })];
+                                    case 6:
+                                        _f.sent();
+                                        _f.label = 7;
+                                    case 7:
+                                        _b = _a.next();
+                                        return [3 /*break*/, 5];
+                                    case 8: return [3 /*break*/, 11];
+                                    case 9:
+                                        e_1_1 = _f.sent();
+                                        e_1 = { error: e_1_1 };
+                                        return [3 /*break*/, 11];
+                                    case 10:
+                                        try {
+                                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                        }
+                                        finally { if (e_1) throw e_1.error; }
+                                        return [7 /*endfinally*/];
+                                    case 11:
+                                        _f.trys.push([11, 18, 19, 20]);
+                                        shipping_methods_1 = __values(shipping_methods), shipping_methods_1_1 = shipping_methods_1.next();
+                                        _f.label = 12;
+                                    case 12:
+                                        if (!!shipping_methods_1_1.done) return [3 /*break*/, 17];
+                                        method = shipping_methods_1_1.value;
+                                        if (!method.id) return [3 /*break*/, 14];
+                                        return [4 /*yield*/, this.shippingOptionService_
+                                                .withTransaction(transactionManager)
+                                                .updateShippingMethod(method.id, {
+                                                claim_order_id: claim.id,
+                                            })];
+                                    case 13:
+                                        _f.sent();
+                                        return [3 /*break*/, 16];
+                                    case 14: return [4 /*yield*/, this.shippingOptionService_
+                                            .withTransaction(transactionManager)
+                                            .createShippingMethod(method.option_id, method.data, {
+                                            claim_order_id: claim.id,
+                                            price: method.price,
+                                        })];
+                                    case 15:
+                                        _f.sent();
+                                        _f.label = 16;
+                                    case 16:
+                                        shipping_methods_1_1 = shipping_methods_1.next();
+                                        return [3 /*break*/, 12];
+                                    case 17: return [3 /*break*/, 20];
+                                    case 18:
+                                        e_2_1 = _f.sent();
+                                        e_2 = { error: e_2_1 };
+                                        return [3 /*break*/, 20];
+                                    case 19:
+                                        try {
+                                            if (shipping_methods_1_1 && !shipping_methods_1_1.done && (_d = shipping_methods_1.return)) _d.call(shipping_methods_1);
+                                        }
+                                        finally { if (e_2) throw e_2.error; }
+                                        return [7 /*endfinally*/];
+                                    case 20:
+                                        if (!(no_notification !== undefined)) return [3 /*break*/, 22];
+                                        claim.no_notification = no_notification;
+                                        return [4 /*yield*/, claimRepo.save(claim)];
+                                    case 21:
+                                        _f.sent();
+                                        _f.label = 22;
+                                    case 22:
+                                        if (!claim_items) return [3 /*break*/, 30];
+                                        _f.label = 23;
+                                    case 23:
+                                        _f.trys.push([23, 28, 29, 30]);
+                                        claim_items_1 = __values(claim_items), claim_items_1_1 = claim_items_1.next();
+                                        _f.label = 24;
+                                    case 24:
+                                        if (!!claim_items_1_1.done) return [3 /*break*/, 27];
+                                        i = claim_items_1_1.value;
+                                        if (!i.id) return [3 /*break*/, 26];
+                                        return [4 /*yield*/, this.claimItemService_
+                                                .withTransaction(transactionManager)
+                                                .update(i.id, i)];
+                                    case 25:
+                                        _f.sent();
+                                        _f.label = 26;
+                                    case 26:
+                                        claim_items_1_1 = claim_items_1.next();
+                                        return [3 /*break*/, 24];
+                                    case 27: return [3 /*break*/, 30];
+                                    case 28:
+                                        e_3_1 = _f.sent();
+                                        e_3 = { error: e_3_1 };
+                                        return [3 /*break*/, 30];
+                                    case 29:
+                                        try {
+                                            if (claim_items_1_1 && !claim_items_1_1.done && (_e = claim_items_1.return)) _e.call(claim_items_1);
+                                        }
+                                        finally { if (e_3) throw e_3.error; }
+                                        return [7 /*endfinally*/];
+                                    case 30: return [4 /*yield*/, this.eventBus_
+                                            .withTransaction(transactionManager)
+                                            .emit(ClaimService.Events.UPDATED, {
+                                            id: claim.id,
+                                            no_notification: claim.no_notification,
+                                        })];
+                                    case 31:
+                                        _f.sent();
+                                        return [2 /*return*/, claim];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
-        }); });
+        });
     };
     /**
      * Creates a Claim on an Order. Claims consists of items that are claimed and
      * optionally items to be sent as replacement for the claimed items. The
      * shipping address that the new items will be shipped to
-     * @param {Object} data - the object containing all data required to create a claim
-     * @return {Object} created claim
+     * @param data - the object containing all data required to create a claim
+     * @return created claim
      */
     ClaimService.prototype.create = function (data) {
-        var _this = this;
-        return this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-            var claimRepo, type, claim_items, order, return_shipping, additional_items, shipping_methods, refund_amount, shipping_address, shipping_address_id, no_notification, rest, claim_items_2, claim_items_2_1, item, line, e_4_1, addressId, addressRepo, created_1, saved, toRefund, lines, newItems, additional_items_1, additional_items_1_1, item, e_5_1, newItems_1, newItems_1_1, newItem, e_6_1, evaluatedNoNotification, created, result, calcContext, lineItems, shipping_methods_2, shipping_methods_2_1, method, e_7_1, claim_items_3, claim_items_3_1, ci, e_8_1;
-            var e_4, _a, e_5, _b, e_6, _c, e_7, _d, e_8, _e;
+        return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            var _f, _g, _h;
-            return __generator(this, function (_j) {
-                switch (_j.label) {
-                    case 0:
-                        claimRepo = manager.getCustomRepository(this.claimRepository_);
-                        type = data.type, claim_items = data.claim_items, order = data.order, return_shipping = data.return_shipping, additional_items = data.additional_items, shipping_methods = data.shipping_methods, refund_amount = data.refund_amount, shipping_address = data.shipping_address, shipping_address_id = data.shipping_address_id, no_notification = data.no_notification, rest = __rest(data, ["type", "claim_items", "order", "return_shipping", "additional_items", "shipping_methods", "refund_amount", "shipping_address", "shipping_address_id", "no_notification"]);
-                        _j.label = 1;
-                    case 1:
-                        _j.trys.push([1, 6, 7, 8]);
-                        claim_items_2 = __values(claim_items), claim_items_2_1 = claim_items_2.next();
-                        _j.label = 2;
-                    case 2:
-                        if (!!claim_items_2_1.done) return [3 /*break*/, 5];
-                        item = claim_items_2_1.value;
-                        return [4 /*yield*/, this.lineItemService_.retrieve(item.item_id, {
-                                relations: ["order", "swap", "claim_order", "tax_lines"],
-                            })];
-                    case 3:
-                        line = _j.sent();
-                        if (((_f = line.order) === null || _f === void 0 ? void 0 : _f.canceled_at) ||
-                            ((_g = line.swap) === null || _g === void 0 ? void 0 : _g.canceled_at) ||
-                            ((_h = line.claim_order) === null || _h === void 0 ? void 0 : _h.canceled_at)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Cannot create a claim on a canceled item.");
-                        }
-                        _j.label = 4;
-                    case 4:
-                        claim_items_2_1 = claim_items_2.next();
-                        return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 8];
-                    case 6:
-                        e_4_1 = _j.sent();
-                        e_4 = { error: e_4_1 };
-                        return [3 /*break*/, 8];
-                    case 7:
-                        try {
-                            if (claim_items_2_1 && !claim_items_2_1.done && (_a = claim_items_2.return)) _a.call(claim_items_2);
-                        }
-                        finally { if (e_4) throw e_4.error; }
-                        return [7 /*endfinally*/];
-                    case 8:
-                        addressId = shipping_address_id || order.shipping_address_id;
-                        if (!shipping_address) return [3 /*break*/, 10];
-                        addressRepo = manager.getCustomRepository(this.addressRepo_);
-                        created_1 = addressRepo.create(shipping_address);
-                        return [4 /*yield*/, addressRepo.save(created_1)];
-                    case 9:
-                        saved = _j.sent();
-                        addressId = saved.id;
-                        _j.label = 10;
-                    case 10:
-                        if (type !== "refund" && type !== "replace") {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claim type must be one of \"refund\" or \"replace\".");
-                        }
-                        if (type === "replace" && !(additional_items === null || additional_items === void 0 ? void 0 : additional_items.length)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claims with type \"replace\" must have at least one additional item.");
-                        }
-                        if (!(claim_items === null || claim_items === void 0 ? void 0 : claim_items.length)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claims must have at least one claim item.");
-                        }
-                        if (refund_amount && type !== "refund") {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claim has type \"".concat(type, "\" but must be type \"refund\" to have a refund_amount."));
-                        }
-                        toRefund = refund_amount;
-                        if (!(type === "refund" && typeof refund_amount === "undefined")) return [3 /*break*/, 12];
-                        lines = claim_items.map(function (ci) {
-                            var e_9, _a, e_10, _b;
-                            var _c, _d;
-                            var allOrderItems = order.items;
-                            if ((_c = order.swaps) === null || _c === void 0 ? void 0 : _c.length) {
-                                try {
-                                    for (var _e = __values(order.swaps), _f = _e.next(); !_f.done; _f = _e.next()) {
-                                        var swap = _f.value;
-                                        swap.additional_items.forEach(function (it) {
-                                            if (it.shipped_quantity ||
-                                                it.shipped_quantity === it.fulfilled_quantity) {
-                                                allOrderItems.push(it);
+            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 claimRepo, type, claim_items, order, return_shipping, additional_items, shipping_methods, refund_amount, shipping_address, shipping_address_id, no_notification, rest, claim_items_2, claim_items_2_1, item, line, e_4_1, addressId, addressRepo, created_1, saved, toRefund, lines, newItems, additional_items_1, additional_items_1_1, item, e_5_1, newItems_1, newItems_1_1, newItem, e_6_1, evaluatedNoNotification, created, result, calcContext, lineItems, shipping_methods_2, shipping_methods_2_1, method, e_7_1, claim_items_3, claim_items_3_1, ci, e_8_1;
+                            var e_4, _a, e_5, _b, e_6, _c, e_7, _d, e_8, _e;
+                            var _this = this;
+                            var _f, _g, _h;
+                            return __generator(this, function (_j) {
+                                switch (_j.label) {
+                                    case 0:
+                                        claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                        type = data.type, claim_items = data.claim_items, order = data.order, return_shipping = data.return_shipping, additional_items = data.additional_items, shipping_methods = data.shipping_methods, refund_amount = data.refund_amount, shipping_address = data.shipping_address, shipping_address_id = data.shipping_address_id, no_notification = data.no_notification, rest = __rest(data, ["type", "claim_items", "order", "return_shipping", "additional_items", "shipping_methods", "refund_amount", "shipping_address", "shipping_address_id", "no_notification"]);
+                                        _j.label = 1;
+                                    case 1:
+                                        _j.trys.push([1, 6, 7, 8]);
+                                        claim_items_2 = __values(claim_items), claim_items_2_1 = claim_items_2.next();
+                                        _j.label = 2;
+                                    case 2:
+                                        if (!!claim_items_2_1.done) return [3 /*break*/, 5];
+                                        item = claim_items_2_1.value;
+                                        return [4 /*yield*/, this.lineItemService_
+                                                .withTransaction(transactionManager)
+                                                .retrieve(item.item_id, {
+                                                relations: ["order", "swap", "claim_order", "tax_lines"],
+                                            })];
+                                    case 3:
+                                        line = _j.sent();
+                                        if (((_f = line.order) === null || _f === void 0 ? void 0 : _f.canceled_at) ||
+                                            ((_g = line.swap) === null || _g === void 0 ? void 0 : _g.canceled_at) ||
+                                            ((_h = line.claim_order) === null || _h === void 0 ? void 0 : _h.canceled_at)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Cannot create a claim on a canceled item.");
+                                        }
+                                        _j.label = 4;
+                                    case 4:
+                                        claim_items_2_1 = claim_items_2.next();
+                                        return [3 /*break*/, 2];
+                                    case 5: return [3 /*break*/, 8];
+                                    case 6:
+                                        e_4_1 = _j.sent();
+                                        e_4 = { error: e_4_1 };
+                                        return [3 /*break*/, 8];
+                                    case 7:
+                                        try {
+                                            if (claim_items_2_1 && !claim_items_2_1.done && (_a = claim_items_2.return)) _a.call(claim_items_2);
+                                        }
+                                        finally { if (e_4) throw e_4.error; }
+                                        return [7 /*endfinally*/];
+                                    case 8:
+                                        addressId = shipping_address_id || order.shipping_address_id;
+                                        if (!shipping_address) return [3 /*break*/, 10];
+                                        addressRepo = transactionManager.getCustomRepository(this.addressRepository_);
+                                        created_1 = addressRepo.create(shipping_address);
+                                        return [4 /*yield*/, addressRepo.save(created_1)];
+                                    case 9:
+                                        saved = _j.sent();
+                                        addressId = saved.id;
+                                        _j.label = 10;
+                                    case 10:
+                                        if (type !== models_1.ClaimType.REFUND && type !== models_1.ClaimType.REPLACE) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claim type must be one of \"refund\" or \"replace\".");
+                                        }
+                                        if (type === models_1.ClaimType.REPLACE && !(additional_items === null || additional_items === void 0 ? void 0 : additional_items.length)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claims with type \"replace\" must have at least one additional item.");
+                                        }
+                                        if (!(claim_items === null || claim_items === void 0 ? void 0 : claim_items.length)) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claims must have at least one claim item.");
+                                        }
+                                        if (refund_amount && type !== models_1.ClaimType.REFUND) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Claim has type \"".concat(type, "\" but must be type \"refund\" to have a refund_amount."));
+                                        }
+                                        toRefund = refund_amount;
+                                        if (!(type === models_1.ClaimType.REFUND && typeof refund_amount === "undefined")) return [3 /*break*/, 12];
+                                        lines = claim_items.map(function (ci) {
+                                            var e_9, _a, e_10, _b;
+                                            var _c, _d;
+                                            var allOrderItems = order.items;
+                                            if ((_c = order.swaps) === null || _c === void 0 ? void 0 : _c.length) {
+                                                try {
+                                                    for (var _e = __values(order.swaps), _f = _e.next(); !_f.done; _f = _e.next()) {
+                                                        var swap = _f.value;
+                                                        swap.additional_items.forEach(function (it) {
+                                                            if (it.shipped_quantity ||
+                                                                it.shipped_quantity === it.fulfilled_quantity) {
+                                                                allOrderItems.push(it);
+                                                            }
+                                                        });
+                                                    }
+                                                }
+                                                catch (e_9_1) { e_9 = { error: e_9_1 }; }
+                                                finally {
+                                                    try {
+                                                        if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                                                    }
+                                                    finally { if (e_9) throw e_9.error; }
+                                                }
                                             }
-                                        });
-                                    }
-                                }
-                                catch (e_9_1) { e_9 = { error: e_9_1 }; }
-                                finally {
-                                    try {
-                                        if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
-                                    }
-                                    finally { if (e_9) throw e_9.error; }
-                                }
-                            }
-                            if ((_d = order.claims) === null || _d === void 0 ? void 0 : _d.length) {
-                                try {
-                                    for (var _g = __values(order.claims), _h = _g.next(); !_h.done; _h = _g.next()) {
-                                        var claim = _h.value;
-                                        claim.additional_items.forEach(function (it) {
-                                            if (it.shipped_quantity ||
-                                                it.shipped_quantity === it.fulfilled_quantity) {
-                                                allOrderItems.push(it);
+                                            if ((_d = order.claims) === null || _d === void 0 ? void 0 : _d.length) {
+                                                try {
+                                                    for (var _g = __values(order.claims), _h = _g.next(); !_h.done; _h = _g.next()) {
+                                                        var claim = _h.value;
+                                                        claim.additional_items.forEach(function (it) {
+                                                            if (it.shipped_quantity ||
+                                                                it.shipped_quantity === it.fulfilled_quantity) {
+                                                                allOrderItems.push(it);
+                                                            }
+                                                        });
+                                                    }
+                                                }
+                                                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                                                finally {
+                                                    try {
+                                                        if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                                                    }
+                                                    finally { if (e_10) throw e_10.error; }
+                                                }
                                             }
+                                            var orderItem = allOrderItems.find(function (oi) { return oi.id === ci.item_id; });
+                                            return __assign(__assign({}, orderItem), { quantity: ci.quantity });
                                         });
-                                    }
-                                }
-                                catch (e_10_1) { e_10 = { error: e_10_1 }; }
-                                finally {
-                                    try {
-                                        if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
-                                    }
-                                    finally { if (e_10) throw e_10.error; }
+                                        return [4 /*yield*/, this.totalsService_.getRefundTotal(order, lines)];
+                                    case 11:
+                                        toRefund = _j.sent();
+                                        _j.label = 12;
+                                    case 12:
+                                        newItems = [];
+                                        if (!(typeof additional_items !== "undefined")) return [3 /*break*/, 29];
+                                        _j.label = 13;
+                                    case 13:
+                                        _j.trys.push([13, 18, 19, 20]);
+                                        additional_items_1 = __values(additional_items), additional_items_1_1 = additional_items_1.next();
+                                        _j.label = 14;
+                                    case 14:
+                                        if (!!additional_items_1_1.done) return [3 /*break*/, 17];
+                                        item = additional_items_1_1.value;
+                                        return [4 /*yield*/, this.inventoryService_
+                                                .withTransaction(transactionManager)
+                                                .confirmInventory(item.variant_id, item.quantity)];
+                                    case 15:
+                                        _j.sent();
+                                        _j.label = 16;
+                                    case 16:
+                                        additional_items_1_1 = additional_items_1.next();
+                                        return [3 /*break*/, 14];
+                                    case 17: return [3 /*break*/, 20];
+                                    case 18:
+                                        e_5_1 = _j.sent();
+                                        e_5 = { error: e_5_1 };
+                                        return [3 /*break*/, 20];
+                                    case 19:
+                                        try {
+                                            if (additional_items_1_1 && !additional_items_1_1.done && (_b = additional_items_1.return)) _b.call(additional_items_1);
+                                        }
+                                        finally { if (e_5) throw e_5.error; }
+                                        return [7 /*endfinally*/];
+                                    case 20: return [4 /*yield*/, Promise.all(additional_items.map(function (i) {
+                                            return _this.lineItemService_
+                                                .withTransaction(transactionManager)
+                                                .generate(i.variant_id, order.region_id, i.quantity);
+                                        }))];
+                                    case 21:
+                                        newItems = _j.sent();
+                                        _j.label = 22;
+                                    case 22:
+                                        _j.trys.push([22, 27, 28, 29]);
+                                        newItems_1 = __values(newItems), newItems_1_1 = newItems_1.next();
+                                        _j.label = 23;
+                                    case 23:
+                                        if (!!newItems_1_1.done) return [3 /*break*/, 26];
+                                        newItem = newItems_1_1.value;
+                                        return [4 /*yield*/, this.inventoryService_
+                                                .withTransaction(transactionManager)
+                                                .adjustInventory(newItem.variant_id, -newItem.quantity)];
+                                    case 24:
+                                        _j.sent();
+                                        _j.label = 25;
+                                    case 25:
+                                        newItems_1_1 = newItems_1.next();
+                                        return [3 /*break*/, 23];
+                                    case 26: return [3 /*break*/, 29];
+                                    case 27:
+                                        e_6_1 = _j.sent();
+                                        e_6 = { error: e_6_1 };
+                                        return [3 /*break*/, 29];
+                                    case 28:
+                                        try {
+                                            if (newItems_1_1 && !newItems_1_1.done && (_c = newItems_1.return)) _c.call(newItems_1);
+                                        }
+                                        finally { if (e_6) throw e_6.error; }
+                                        return [7 /*endfinally*/];
+                                    case 29:
+                                        evaluatedNoNotification = no_notification !== undefined
+                                            ? no_notification
+                                            : order.no_notification;
+                                        created = claimRepo.create(__assign({ shipping_address_id: addressId, payment_status: type === models_1.ClaimType.REFUND ? "not_refunded" : "na", refund_amount: toRefund, type: type, additional_items: newItems, order_id: order.id, no_notification: evaluatedNoNotification }, rest));
+                                        return [4 /*yield*/, claimRepo.save(created)];
+                                    case 30:
+                                        result = _j.sent();
+                                        if (!(result.additional_items && result.additional_items.length)) return [3 /*break*/, 33];
+                                        calcContext = this.totalsService_.getCalculationContext(order);
+                                        return [4 /*yield*/, this.lineItemService_
+                                                .withTransaction(transactionManager)
+                                                .list({
+                                                id: result.additional_items.map(function (i) { return i.id; }),
+                                            })];
+                                    case 31:
+                                        lineItems = _j.sent();
+                                        return [4 /*yield*/, this.taxProviderService_
+                                                .withTransaction(transactionManager)
+                                                .createTaxLines(lineItems, calcContext)];
+                                    case 32:
+                                        _j.sent();
+                                        _j.label = 33;
+                                    case 33:
+                                        if (!shipping_methods) return [3 /*break*/, 43];
+                                        _j.label = 34;
+                                    case 34:
+                                        _j.trys.push([34, 41, 42, 43]);
+                                        shipping_methods_2 = __values(shipping_methods), shipping_methods_2_1 = shipping_methods_2.next();
+                                        _j.label = 35;
+                                    case 35:
+                                        if (!!shipping_methods_2_1.done) return [3 /*break*/, 40];
+                                        method = shipping_methods_2_1.value;
+                                        if (!method.id) return [3 /*break*/, 37];
+                                        return [4 /*yield*/, this.shippingOptionService_
+                                                .withTransaction(transactionManager)
+                                                .updateShippingMethod(method.id, {
+                                                claim_order_id: result.id,
+                                            })];
+                                    case 36:
+                                        _j.sent();
+                                        return [3 /*break*/, 39];
+                                    case 37: return [4 /*yield*/, this.shippingOptionService_
+                                            .withTransaction(transactionManager)
+                                            .createShippingMethod(method.option_id, method.data, {
+                                            claim_order_id: result.id,
+                                            price: method.price,
+                                        })];
+                                    case 38:
+                                        _j.sent();
+                                        _j.label = 39;
+                                    case 39:
+                                        shipping_methods_2_1 = shipping_methods_2.next();
+                                        return [3 /*break*/, 35];
+                                    case 40: return [3 /*break*/, 43];
+                                    case 41:
+                                        e_7_1 = _j.sent();
+                                        e_7 = { error: e_7_1 };
+                                        return [3 /*break*/, 43];
+                                    case 42:
+                                        try {
+                                            if (shipping_methods_2_1 && !shipping_methods_2_1.done && (_d = shipping_methods_2.return)) _d.call(shipping_methods_2);
+                                        }
+                                        finally { if (e_7) throw e_7.error; }
+                                        return [7 /*endfinally*/];
+                                    case 43:
+                                        _j.trys.push([43, 48, 49, 50]);
+                                        claim_items_3 = __values(claim_items), claim_items_3_1 = claim_items_3.next();
+                                        _j.label = 44;
+                                    case 44:
+                                        if (!!claim_items_3_1.done) return [3 /*break*/, 47];
+                                        ci = claim_items_3_1.value;
+                                        return [4 /*yield*/, this.claimItemService_
+                                                .withTransaction(transactionManager)
+                                                .create(__assign(__assign({}, ci), { claim_order_id: result.id }))];
+                                    case 45:
+                                        _j.sent();
+                                        _j.label = 46;
+                                    case 46:
+                                        claim_items_3_1 = claim_items_3.next();
+                                        return [3 /*break*/, 44];
+                                    case 47: return [3 /*break*/, 50];
+                                    case 48:
+                                        e_8_1 = _j.sent();
+                                        e_8 = { error: e_8_1 };
+                                        return [3 /*break*/, 50];
+                                    case 49:
+                                        try {
+                                            if (claim_items_3_1 && !claim_items_3_1.done && (_e = claim_items_3.return)) _e.call(claim_items_3);
+                                        }
+                                        finally { if (e_8) throw e_8.error; }
+                                        return [7 /*endfinally*/];
+                                    case 50:
+                                        if (!return_shipping) return [3 /*break*/, 52];
+                                        return [4 /*yield*/, this.returnService_.withTransaction(transactionManager).create({
+                                                order_id: order.id,
+                                                claim_order_id: result.id,
+                                                items: claim_items.map(function (ci) { return ({
+                                                    item_id: ci.item_id,
+                                                    quantity: ci.quantity,
+                                                    metadata: ci.metadata,
+                                                }); }),
+                                                shipping_method: return_shipping,
+                                                no_notification: evaluatedNoNotification,
+                                            })];
+                                    case 51:
+                                        _j.sent();
+                                        _j.label = 52;
+                                    case 52: return [4 /*yield*/, this.eventBus_
+                                            .withTransaction(transactionManager)
+                                            .emit(ClaimService.Events.CREATED, {
+                                            id: result.id,
+                                            no_notification: result.no_notification,
+                                        })];
+                                    case 53:
+                                        _j.sent();
+                                        return [2 /*return*/, result];
                                 }
-                            }
-                            var orderItem = allOrderItems.find(function (oi) { return oi.id === ci.item_id; });
-                            return __assign(__assign({}, orderItem), { quantity: ci.quantity });
-                        });
-                        return [4 /*yield*/, this.totalsService_.getRefundTotal(order, lines)];
-                    case 11:
-                        toRefund = _j.sent();
-                        _j.label = 12;
-                    case 12:
-                        newItems = [];
-                        if (!(typeof additional_items !== "undefined")) return [3 /*break*/, 29];
-                        _j.label = 13;
-                    case 13:
-                        _j.trys.push([13, 18, 19, 20]);
-                        additional_items_1 = __values(additional_items), additional_items_1_1 = additional_items_1.next();
-                        _j.label = 14;
-                    case 14:
-                        if (!!additional_items_1_1.done) return [3 /*break*/, 17];
-                        item = additional_items_1_1.value;
-                        return [4 /*yield*/, this.inventoryService_
-                                .withTransaction(manager)
-                                .confirmInventory(item.variant_id, item.quantity)];
-                    case 15:
-                        _j.sent();
-                        _j.label = 16;
-                    case 16:
-                        additional_items_1_1 = additional_items_1.next();
-                        return [3 /*break*/, 14];
-                    case 17: return [3 /*break*/, 20];
-                    case 18:
-                        e_5_1 = _j.sent();
-                        e_5 = { error: e_5_1 };
-                        return [3 /*break*/, 20];
-                    case 19:
-                        try {
-                            if (additional_items_1_1 && !additional_items_1_1.done && (_b = additional_items_1.return)) _b.call(additional_items_1);
-                        }
-                        finally { if (e_5) throw e_5.error; }
-                        return [7 /*endfinally*/];
-                    case 20: return [4 /*yield*/, Promise.all(additional_items.map(function (i) {
-                            return _this.lineItemService_
-                                .withTransaction(manager)
-                                .generate(i.variant_id, order.region_id, i.quantity);
-                        }))];
-                    case 21:
-                        newItems = _j.sent();
-                        _j.label = 22;
-                    case 22:
-                        _j.trys.push([22, 27, 28, 29]);
-                        newItems_1 = __values(newItems), newItems_1_1 = newItems_1.next();
-                        _j.label = 23;
-                    case 23:
-                        if (!!newItems_1_1.done) return [3 /*break*/, 26];
-                        newItem = newItems_1_1.value;
-                        return [4 /*yield*/, this.inventoryService_
-                                .withTransaction(manager)
-                                .adjustInventory(newItem.variant_id, -newItem.quantity)];
-                    case 24:
-                        _j.sent();
-                        _j.label = 25;
-                    case 25:
-                        newItems_1_1 = newItems_1.next();
-                        return [3 /*break*/, 23];
-                    case 26: return [3 /*break*/, 29];
-                    case 27:
-                        e_6_1 = _j.sent();
-                        e_6 = { error: e_6_1 };
-                        return [3 /*break*/, 29];
-                    case 28:
-                        try {
-                            if (newItems_1_1 && !newItems_1_1.done && (_c = newItems_1.return)) _c.call(newItems_1);
-                        }
-                        finally { if (e_6) throw e_6.error; }
-                        return [7 /*endfinally*/];
-                    case 29:
-                        evaluatedNoNotification = no_notification !== undefined ? no_notification : order.no_notification;
-                        created = claimRepo.create(__assign(__assign({ shipping_address_id: addressId, payment_status: type === "refund" ? "not_refunded" : "na" }, rest), { refund_amount: toRefund, type: type, additional_items: newItems, order_id: order.id, no_notification: evaluatedNoNotification }));
-                        return [4 /*yield*/, claimRepo.save(created)];
-                    case 30:
-                        result = _j.sent();
-                        if (!(result.additional_items && result.additional_items.length)) return [3 /*break*/, 33];
-                        calcContext = this.totalsService_.getCalculationContext(order);
-                        return [4 /*yield*/, this.lineItemService_
-                                .withTransaction(manager)
-                                .list({
-                                id: result.additional_items.map(function (i) { return i.id; }),
-                            })];
-                    case 31:
-                        lineItems = _j.sent();
-                        return [4 /*yield*/, this.taxProviderService_
-                                .withTransaction(manager)
-                                .createTaxLines(lineItems, calcContext)];
-                    case 32:
-                        _j.sent();
-                        _j.label = 33;
-                    case 33:
-                        if (!shipping_methods) return [3 /*break*/, 43];
-                        _j.label = 34;
-                    case 34:
-                        _j.trys.push([34, 41, 42, 43]);
-                        shipping_methods_2 = __values(shipping_methods), shipping_methods_2_1 = shipping_methods_2.next();
-                        _j.label = 35;
-                    case 35:
-                        if (!!shipping_methods_2_1.done) return [3 /*break*/, 40];
-                        method = shipping_methods_2_1.value;
-                        if (!method.id) return [3 /*break*/, 37];
-                        return [4 /*yield*/, this.shippingOptionService_
-                                .withTransaction(manager)
-                                .updateShippingMethod(method.id, {
-                                claim_order_id: result.id,
-                            })];
-                    case 36:
-                        _j.sent();
-                        return [3 /*break*/, 39];
-                    case 37: return [4 /*yield*/, this.shippingOptionService_
-                            .withTransaction(manager)
-                            .createShippingMethod(method.option_id, method.data, {
-                            claim_order_id: result.id,
-                            price: method.price,
-                        })];
-                    case 38:
-                        _j.sent();
-                        _j.label = 39;
-                    case 39:
-                        shipping_methods_2_1 = shipping_methods_2.next();
-                        return [3 /*break*/, 35];
-                    case 40: return [3 /*break*/, 43];
-                    case 41:
-                        e_7_1 = _j.sent();
-                        e_7 = { error: e_7_1 };
-                        return [3 /*break*/, 43];
-                    case 42:
-                        try {
-                            if (shipping_methods_2_1 && !shipping_methods_2_1.done && (_d = shipping_methods_2.return)) _d.call(shipping_methods_2);
-                        }
-                        finally { if (e_7) throw e_7.error; }
-                        return [7 /*endfinally*/];
-                    case 43:
-                        _j.trys.push([43, 48, 49, 50]);
-                        claim_items_3 = __values(claim_items), claim_items_3_1 = claim_items_3.next();
-                        _j.label = 44;
-                    case 44:
-                        if (!!claim_items_3_1.done) return [3 /*break*/, 47];
-                        ci = claim_items_3_1.value;
-                        return [4 /*yield*/, this.claimItemService_.withTransaction(manager).create(__assign(__assign({}, ci), { claim_order_id: result.id }))];
-                    case 45:
-                        _j.sent();
-                        _j.label = 46;
-                    case 46:
-                        claim_items_3_1 = claim_items_3.next();
-                        return [3 /*break*/, 44];
-                    case 47: return [3 /*break*/, 50];
-                    case 48:
-                        e_8_1 = _j.sent();
-                        e_8 = { error: e_8_1 };
-                        return [3 /*break*/, 50];
-                    case 49:
-                        try {
-                            if (claim_items_3_1 && !claim_items_3_1.done && (_e = claim_items_3.return)) _e.call(claim_items_3);
-                        }
-                        finally { if (e_8) throw e_8.error; }
-                        return [7 /*endfinally*/];
-                    case 50:
-                        if (!return_shipping) return [3 /*break*/, 52];
-                        return [4 /*yield*/, this.returnService_.withTransaction(manager).create({
-                                order_id: order.id,
-                                claim_order_id: result.id,
-                                items: claim_items.map(function (ci) { return ({
-                                    item_id: ci.item_id,
-                                    quantity: ci.quantity,
-                                    metadata: ci.metadata,
-                                }); }),
-                                shipping_method: return_shipping,
-                                no_notification: evaluatedNoNotification,
-                            })];
-                    case 51:
-                        _j.sent();
-                        _j.label = 52;
-                    case 52: return [4 /*yield*/, this.eventBus_
-                            .withTransaction(manager)
-                            .emit(ClaimService.Events.CREATED, {
-                            id: result.id,
-                            no_notification: result.no_notification,
-                        })];
-                    case 53:
-                        _j.sent();
-                        return [2 /*return*/, result];
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
-        }); });
+        });
     };
     /**
-     * @param {string} id - the object containing all data required to create a claim
-     * @param {Object} config - config object
-     * @param {Object | undefined}  config.metadata - config metadata
-     * @param {boolean|undefined}  config.no_notification - config no notification
-     * @return {Claim} created claim
+     * @param id - the object containing all data required to create a claim
+     * @param config - config object
+     * @param config.metadata - config metadata
+     * @param config.no_notification - config no notification
+     * @return created claim
      */
     ClaimService.prototype.createFulfillment = function (id, config) {
-        var _this = this;
         if (config === void 0) { config = {
             metadata: {},
-            no_notification: undefined,
         }; }
-        var metadata = config.metadata, no_notification = config.no_notification;
-        return this.atomicPhase_(function (manager) { return __awaiter(_this, void 0, void 0, function () {
-            var claim, order, evaluatedNoNotification, fulfillments, successfullyFulfilled, fulfillments_1, fulfillments_1_1, f, _loop_1, this_1, _a, _b, item, e_11_1, claimRepo, result, fulfillments_2, fulfillments_2_1, fulfillment, e_12_1;
-            var e_13, _c, e_11, _d, e_12, _e;
-            var _f;
-            return __generator(this, function (_g) {
-                switch (_g.label) {
-                    case 0: return [4 /*yield*/, this.retrieve(id, {
-                            relations: [
-                                "additional_items",
-                                "additional_items.tax_lines",
-                                "shipping_methods",
-                                "shipping_methods.tax_lines",
-                                "shipping_address",
-                                "order",
-                                "order.billing_address",
-                                "order.discounts",
-                                "order.discounts.rule",
-                                "order.payments",
-                            ],
-                        })];
-                    case 1:
-                        claim = _g.sent();
-                        if (claim.canceled_at) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be fulfilled");
-                        }
-                        order = claim.order;
-                        if (claim.fulfillment_status !== "not_fulfilled" &&
-                            claim.fulfillment_status !== "canceled") {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "The claim has already been fulfilled.");
-                        }
-                        if (claim.type !== "replace") {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Claims with the type \"".concat(claim.type, "\" can not be fulfilled."));
-                        }
-                        if (!((_f = claim.shipping_methods) === null || _f === void 0 ? void 0 : _f.length)) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot fulfill a claim without a shipping method.");
-                        }
-                        evaluatedNoNotification = no_notification !== undefined ? no_notification : claim.no_notification;
-                        return [4 /*yield*/, this.fulfillmentService_
-                                .withTransaction(manager)
-                                .createFulfillment(__assign(__assign({}, claim), { email: order.email, payments: order.payments, 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: claim.additional_items, shipping_methods: claim.shipping_methods, is_claim: true, no_notification: evaluatedNoNotification }), claim.additional_items.map(function (i) { return ({
-                                item_id: i.id,
-                                quantity: i.quantity,
-                            }); }), { claim_order_id: id, metadata: metadata })];
-                    case 2:
-                        fulfillments = _g.sent();
-                        successfullyFulfilled = [];
-                        try {
-                            for (fulfillments_1 = __values(fulfillments), fulfillments_1_1 = fulfillments_1.next(); !fulfillments_1_1.done; fulfillments_1_1 = fulfillments_1.next()) {
-                                f = fulfillments_1_1.value;
-                                successfullyFulfilled = successfullyFulfilled.concat(f.items);
-                            }
-                        }
-                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
-                        finally {
-                            try {
-                                if (fulfillments_1_1 && !fulfillments_1_1.done && (_c = fulfillments_1.return)) _c.call(fulfillments_1);
-                            }
-                            finally { if (e_13) throw e_13.error; }
-                        }
-                        claim.fulfillment_status = "fulfilled";
-                        _loop_1 = function (item) {
-                            var fulfillmentItem, fulfilledQuantity;
-                            return __generator(this, function (_h) {
-                                switch (_h.label) {
-                                    case 0:
-                                        fulfillmentItem = successfullyFulfilled.find(function (f) { return item.id === f.item_id; });
-                                        if (!fulfillmentItem) return [3 /*break*/, 2];
-                                        fulfilledQuantity = (item.fulfilled_quantity || 0) + fulfillmentItem.quantity;
-                                        // Update the fulfilled quantity
-                                        return [4 /*yield*/, this_1.lineItemService_.withTransaction(manager).update(item.id, {
-                                                fulfilled_quantity: fulfilledQuantity,
+        return __awaiter(this, void 0, void 0, function () {
+            var metadata, no_notification;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        metadata = config.metadata, no_notification = config.no_notification;
+                        return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                                var claim, order, evaluatedNoNotification, fulfillments, successfullyFulfilledItems, fulfillments_1, fulfillments_1_1, fulfillment, _loop_1, this_1, _a, _b, item, e_11_1, claimRepo, claimOrder, fulfillments_2, fulfillments_2_1, fulfillment, e_12_1;
+                                var e_13, _c, e_11, _d, e_12, _e;
+                                var _f;
+                                return __generator(this, function (_g) {
+                                    switch (_g.label) {
+                                        case 0: return [4 /*yield*/, this.retrieve(id, {
+                                                relations: [
+                                                    "additional_items",
+                                                    "additional_items.tax_lines",
+                                                    "shipping_methods",
+                                                    "shipping_methods.tax_lines",
+                                                    "shipping_address",
+                                                    "order",
+                                                    "order.billing_address",
+                                                    "order.discounts",
+                                                    "order.discounts.rule",
+                                                    "order.payments",
+                                                ],
                                             })];
-                                    case 1:
-                                        // Update the fulfilled quantity
-                                        _h.sent();
-                                        if (item.quantity !== fulfilledQuantity) {
-                                            claim.fulfillment_status = "requires_action";
-                                        }
-                                        return [3 /*break*/, 3];
-                                    case 2:
-                                        if (item.quantity !== item.fulfilled_quantity) {
-                                            claim.fulfillment_status = "requires_action";
-                                        }
-                                        _h.label = 3;
-                                    case 3: return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
-                        _g.label = 3;
-                    case 3:
-                        _g.trys.push([3, 8, 9, 10]);
-                        _a = __values(claim.additional_items), _b = _a.next();
-                        _g.label = 4;
-                    case 4:
-                        if (!!_b.done) return [3 /*break*/, 7];
-                        item = _b.value;
-                        return [5 /*yield**/, _loop_1(item)];
-                    case 5:
-                        _g.sent();
-                        _g.label = 6;
-                    case 6:
-                        _b = _a.next();
-                        return [3 /*break*/, 4];
-                    case 7: return [3 /*break*/, 10];
-                    case 8:
-                        e_11_1 = _g.sent();
-                        e_11 = { error: e_11_1 };
-                        return [3 /*break*/, 10];
-                    case 9:
-                        try {
-                            if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
-                        }
-                        finally { if (e_11) throw e_11.error; }
-                        return [7 /*endfinally*/];
-                    case 10:
-                        claimRepo = manager.getCustomRepository(this.claimRepository_);
-                        return [4 /*yield*/, claimRepo.save(claim)];
-                    case 11:
-                        result = _g.sent();
-                        _g.label = 12;
-                    case 12:
-                        _g.trys.push([12, 17, 18, 19]);
-                        fulfillments_2 = __values(fulfillments), fulfillments_2_1 = fulfillments_2.next();
-                        _g.label = 13;
-                    case 13:
-                        if (!!fulfillments_2_1.done) return [3 /*break*/, 16];
-                        fulfillment = fulfillments_2_1.value;
-                        return [4 /*yield*/, this.eventBus_
-                                .withTransaction(manager)
-                                .emit(ClaimService.Events.FULFILLMENT_CREATED, {
-                                id: id,
-                                fulfillment_id: fulfillment.id,
-                                no_notification: claim.no_notification,
-                            })];
-                    case 14:
-                        _g.sent();
-                        _g.label = 15;
-                    case 15:
-                        fulfillments_2_1 = fulfillments_2.next();
-                        return [3 /*break*/, 13];
-                    case 16: return [3 /*break*/, 19];
-                    case 17:
-                        e_12_1 = _g.sent();
-                        e_12 = { error: e_12_1 };
-                        return [3 /*break*/, 19];
-                    case 18:
-                        try {
-                            if (fulfillments_2_1 && !fulfillments_2_1.done && (_e = fulfillments_2.return)) _e.call(fulfillments_2);
-                        }
-                        finally { if (e_12) throw e_12.error; }
-                        return [7 /*endfinally*/];
-                    case 19: return [2 /*return*/, result];
+                                        case 1:
+                                            claim = _g.sent();
+                                            if (claim.canceled_at) {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be fulfilled");
+                                            }
+                                            order = claim.order;
+                                            if (claim.fulfillment_status !== "not_fulfilled" &&
+                                                claim.fulfillment_status !== "canceled") {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "The claim has already been fulfilled.");
+                                            }
+                                            if (claim.type !== "replace") {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Claims with the type \"".concat(claim.type, "\" can not be fulfilled."));
+                                            }
+                                            if (!((_f = claim.shipping_methods) === null || _f === void 0 ? void 0 : _f.length)) {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Cannot fulfill a claim without a shipping method.");
+                                            }
+                                            evaluatedNoNotification = no_notification !== undefined
+                                                ? no_notification
+                                                : claim.no_notification;
+                                            return [4 /*yield*/, this.fulfillmentService_
+                                                    .withTransaction(transactionManager)
+                                                    .createFulfillment(__assign(__assign({}, claim), { email: order.email, payments: order.payments, 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: claim.additional_items, shipping_methods: claim.shipping_methods, is_claim: true, no_notification: evaluatedNoNotification }), claim.additional_items.map(function (i) { return ({
+                                                    item_id: i.id,
+                                                    quantity: i.quantity,
+                                                }); }), { claim_order_id: id, metadata: metadata })];
+                                        case 2:
+                                            fulfillments = _g.sent();
+                                            successfullyFulfilledItems = [];
+                                            try {
+                                                for (fulfillments_1 = __values(fulfillments), fulfillments_1_1 = fulfillments_1.next(); !fulfillments_1_1.done; fulfillments_1_1 = fulfillments_1.next()) {
+                                                    fulfillment = fulfillments_1_1.value;
+                                                    successfullyFulfilledItems = successfullyFulfilledItems.concat(fulfillment.items);
+                                                }
+                                            }
+                                            catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                                            finally {
+                                                try {
+                                                    if (fulfillments_1_1 && !fulfillments_1_1.done && (_c = fulfillments_1.return)) _c.call(fulfillments_1);
+                                                }
+                                                finally { if (e_13) throw e_13.error; }
+                                            }
+                                            claim.fulfillment_status = models_1.ClaimFulfillmentStatus.FULFILLED;
+                                            _loop_1 = function (item) {
+                                                var fulfillmentItem, fulfilledQuantity;
+                                                return __generator(this, function (_h) {
+                                                    switch (_h.label) {
+                                                        case 0:
+                                                            fulfillmentItem = successfullyFulfilledItems.find(function (successfullyFulfilledItem) {
+                                                                return successfullyFulfilledItem.item_id === item.id;
+                                                            });
+                                                            if (!fulfillmentItem) return [3 /*break*/, 2];
+                                                            fulfilledQuantity = (item.fulfilled_quantity || 0) + fulfillmentItem.quantity;
+                                                            // Update the fulfilled quantity
+                                                            return [4 /*yield*/, this_1.lineItemService_
+                                                                    .withTransaction(transactionManager)
+                                                                    .update(item.id, {
+                                                                    fulfilled_quantity: fulfilledQuantity,
+                                                                })];
+                                                        case 1:
+                                                            // Update the fulfilled quantity
+                                                            _h.sent();
+                                                            if (item.quantity !== fulfilledQuantity) {
+                                                                claim.fulfillment_status = models_1.ClaimFulfillmentStatus.REQUIRES_ACTION;
+                                                            }
+                                                            return [3 /*break*/, 3];
+                                                        case 2:
+                                                            if (item.quantity !== item.fulfilled_quantity) {
+                                                                claim.fulfillment_status = models_1.ClaimFulfillmentStatus.REQUIRES_ACTION;
+                                                            }
+                                                            _h.label = 3;
+                                                        case 3: return [2 /*return*/];
+                                                    }
+                                                });
+                                            };
+                                            this_1 = this;
+                                            _g.label = 3;
+                                        case 3:
+                                            _g.trys.push([3, 8, 9, 10]);
+                                            _a = __values(claim.additional_items), _b = _a.next();
+                                            _g.label = 4;
+                                        case 4:
+                                            if (!!_b.done) return [3 /*break*/, 7];
+                                            item = _b.value;
+                                            return [5 /*yield**/, _loop_1(item)];
+                                        case 5:
+                                            _g.sent();
+                                            _g.label = 6;
+                                        case 6:
+                                            _b = _a.next();
+                                            return [3 /*break*/, 4];
+                                        case 7: return [3 /*break*/, 10];
+                                        case 8:
+                                            e_11_1 = _g.sent();
+                                            e_11 = { error: e_11_1 };
+                                            return [3 /*break*/, 10];
+                                        case 9:
+                                            try {
+                                                if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                                            }
+                                            finally { if (e_11) throw e_11.error; }
+                                            return [7 /*endfinally*/];
+                                        case 10:
+                                            claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                            return [4 /*yield*/, claimRepo.save(claim)];
+                                        case 11:
+                                            claimOrder = _g.sent();
+                                            _g.label = 12;
+                                        case 12:
+                                            _g.trys.push([12, 17, 18, 19]);
+                                            fulfillments_2 = __values(fulfillments), fulfillments_2_1 = fulfillments_2.next();
+                                            _g.label = 13;
+                                        case 13:
+                                            if (!!fulfillments_2_1.done) return [3 /*break*/, 16];
+                                            fulfillment = fulfillments_2_1.value;
+                                            return [4 /*yield*/, this.eventBus_
+                                                    .withTransaction(transactionManager)
+                                                    .emit(ClaimService.Events.FULFILLMENT_CREATED, {
+                                                    id: id,
+                                                    fulfillment_id: fulfillment.id,
+                                                    no_notification: claim.no_notification,
+                                                })];
+                                        case 14:
+                                            _g.sent();
+                                            _g.label = 15;
+                                        case 15:
+                                            fulfillments_2_1 = fulfillments_2.next();
+                                            return [3 /*break*/, 13];
+                                        case 16: return [3 /*break*/, 19];
+                                        case 17:
+                                            e_12_1 = _g.sent();
+                                            e_12 = { error: e_12_1 };
+                                            return [3 /*break*/, 19];
+                                        case 18:
+                                            try {
+                                                if (fulfillments_2_1 && !fulfillments_2_1.done && (_e = fulfillments_2.return)) _e.call(fulfillments_2);
+                                            }
+                                            finally { if (e_12) throw e_12.error; }
+                                            return [7 /*endfinally*/];
+                                        case 19: return [2 /*return*/, claimOrder];
+                                    }
+                                });
+                            }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
-        }); });
+        });
     };
     ClaimService.prototype.cancelFulfillment = function (fulfillmentId) {
         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 canceled, claim, claimRepo, updated;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.fulfillmentService_
-                                        .withTransaction(manager)
-                                        .cancelFulfillment(fulfillmentId)];
-                                case 1:
-                                    canceled = _a.sent();
-                                    if (!canceled.claim_order_id) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Fufillment not related to a claim");
-                                    }
-                                    return [4 /*yield*/, this.retrieve(canceled.claim_order_id)];
-                                case 2:
-                                    claim = _a.sent();
-                                    claim.fulfillment_status = "canceled";
-                                    claimRepo = manager.getCustomRepository(this.claimRepository_);
-                                    return [4 /*yield*/, claimRepo.save(claim)];
-                                case 3:
-                                    updated = _a.sent();
-                                    return [2 /*return*/, updated];
-                            }
-                        });
-                    }); })];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var canceled, claim, claimRepo;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.fulfillmentService_
+                                            .withTransaction(transactionManager)
+                                            .cancelFulfillment(fulfillmentId)];
+                                    case 1:
+                                        canceled = _a.sent();
+                                        if (!canceled.claim_order_id) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Fufillment not related to a claim");
+                                        }
+                                        return [4 /*yield*/, this.retrieve(canceled.claim_order_id)];
+                                    case 2:
+                                        claim = _a.sent();
+                                        claim.fulfillment_status = models_1.ClaimFulfillmentStatus.CANCELED;
+                                        claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                        return [2 /*return*/, claimRepo.save(claim)];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -794,50 +811,54 @@ var ClaimService = /** @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 claim, claimRepo, result;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(id, {
-                                        relations: ["order", "order.payments"],
-                                    })];
-                                case 1:
-                                    claim = _a.sent();
-                                    if (claim.canceled_at) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be processed");
-                                    }
-                                    if (claim.type !== "refund") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Claim must have type \"refund\" to create a refund.");
-                                    }
-                                    if (!claim.refund_amount) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, this.paymentProviderService_
-                                            .withTransaction(manager)
-                                            .refundPayment(claim.order.payments, claim.refund_amount, "claim")];
-                                case 2:
-                                    _a.sent();
-                                    _a.label = 3;
-                                case 3:
-                                    claim.payment_status = "refunded";
-                                    claimRepo = manager.getCustomRepository(this.claimRepository_);
-                                    return [4 /*yield*/, claimRepo.save(claim)];
-                                case 4:
-                                    result = _a.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(ClaimService.Events.REFUND_PROCESSED, {
-                                            id: id,
-                                            no_notification: result.no_notification,
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var claim, claimRepo, claimOrder;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(id, {
+                                            relations: ["order", "order.payments"],
                                         })];
-                                case 5:
-                                    _a.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                                    case 1:
+                                        claim = _a.sent();
+                                        if (claim.canceled_at) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be processed");
+                                        }
+                                        if (claim.type !== "refund") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Claim must have type \"refund\" to create a refund.");
+                                        }
+                                        if (!claim.refund_amount) return [3 /*break*/, 3];
+                                        return [4 /*yield*/, this.paymentProviderService_
+                                                .withTransaction(transactionManager)
+                                                .refundPayment(claim.order.payments, claim.refund_amount, "claim")];
+                                    case 2:
+                                        _a.sent();
+                                        _a.label = 3;
+                                    case 3:
+                                        claim.payment_status = models_1.ClaimPaymentStatus.REFUNDED;
+                                        claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                        return [4 /*yield*/, claimRepo.save(claim)];
+                                    case 4:
+                                        claimOrder = _a.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(ClaimService.Events.REFUND_PROCESSED, {
+                                                id: id,
+                                                no_notification: claimOrder.no_notification,
+                                            })];
+                                    case 5:
+                                        _a.sent();
+                                        return [2 /*return*/, claimOrder];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
     ClaimService.prototype.createShipment = function (id, fulfillmentId, trackingLinks, config) {
+        if (trackingLinks === void 0) { trackingLinks = []; }
         if (config === void 0) { config = {
             metadata: {},
             no_notification: undefined,
@@ -846,101 +867,110 @@ var ClaimService = /** @class */ (function (_super) {
             var metadata, no_notification;
             var _this = this;
             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 claim, evaluatedNoNotification, shipment, _loop_2, this_2, _a, _b, i, e_14_1, claimRepo, result;
-                        var e_14, _c;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(id, {
-                                        relations: ["additional_items"],
-                                    })];
-                                case 1:
-                                    claim = _d.sent();
-                                    if (claim.canceled_at) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be fulfilled as shipped");
-                                    }
-                                    evaluatedNoNotification = no_notification !== undefined ? no_notification : claim.no_notification;
-                                    return [4 /*yield*/, this.fulfillmentService_
-                                            .withTransaction(manager)
-                                            .createShipment(fulfillmentId, trackingLinks, {
-                                            metadata: metadata,
-                                            no_notification: evaluatedNoNotification,
-                                        })];
-                                case 2:
-                                    shipment = _d.sent();
-                                    claim.fulfillment_status = "shipped";
-                                    _loop_2 = function (i) {
-                                        var shipped, shippedQty;
-                                        return __generator(this, function (_e) {
-                                            switch (_e.label) {
-                                                case 0:
-                                                    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_2.lineItemService_.withTransaction(manager).update(i.id, {
-                                                            shipped_quantity: shippedQty,
-                                                        })];
-                                                case 1:
-                                                    _e.sent();
-                                                    if (shippedQty !== i.quantity) {
-                                                        claim.fulfillment_status = "partially_shipped";
-                                                    }
-                                                    return [3 /*break*/, 3];
-                                                case 2:
-                                                    if (i.shipped_quantity !== i.quantity) {
-                                                        claim.fulfillment_status = "partially_shipped";
+                switch (_a.label) {
+                    case 0:
+                        metadata = config.metadata, no_notification = config.no_notification;
+                        return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                                var claim, evaluatedNoNotification, shipment, _loop_2, this_2, _a, _b, additionalItem, e_14_1, claimRepo, claimOrder;
+                                var e_14, _c;
+                                return __generator(this, function (_d) {
+                                    switch (_d.label) {
+                                        case 0: return [4 /*yield*/, this.retrieve(id, {
+                                                relations: ["additional_items"],
+                                            })];
+                                        case 1:
+                                            claim = _d.sent();
+                                            if (claim.canceled_at) {
+                                                throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Canceled claim cannot be fulfilled as shipped");
+                                            }
+                                            evaluatedNoNotification = no_notification !== undefined
+                                                ? no_notification
+                                                : claim.no_notification;
+                                            return [4 /*yield*/, this.fulfillmentService_
+                                                    .withTransaction(transactionManager)
+                                                    .createShipment(fulfillmentId, trackingLinks, {
+                                                    metadata: metadata,
+                                                    no_notification: evaluatedNoNotification,
+                                                })];
+                                        case 2:
+                                            shipment = _d.sent();
+                                            claim.fulfillment_status = models_1.ClaimFulfillmentStatus.SHIPPED;
+                                            _loop_2 = function (additionalItem) {
+                                                var shipped, shippedQty;
+                                                return __generator(this, function (_e) {
+                                                    switch (_e.label) {
+                                                        case 0:
+                                                            shipped = shipment.items.find(function (si) { return si.item_id === additionalItem.id; });
+                                                            if (!shipped) return [3 /*break*/, 2];
+                                                            shippedQty = (additionalItem.shipped_quantity || 0) + shipped.quantity;
+                                                            return [4 /*yield*/, this_2.lineItemService_
+                                                                    .withTransaction(transactionManager)
+                                                                    .update(additionalItem.id, {
+                                                                    shipped_quantity: shippedQty,
+                                                                })];
+                                                        case 1:
+                                                            _e.sent();
+                                                            if (shippedQty !== additionalItem.quantity) {
+                                                                claim.fulfillment_status =
+                                                                    models_1.ClaimFulfillmentStatus.PARTIALLY_SHIPPED;
+                                                            }
+                                                            return [3 /*break*/, 3];
+                                                        case 2:
+                                                            if (additionalItem.shipped_quantity !== additionalItem.quantity) {
+                                                                claim.fulfillment_status = models_1.ClaimFulfillmentStatus.PARTIALLY_SHIPPED;
+                                                            }
+                                                            _e.label = 3;
+                                                        case 3: return [2 /*return*/];
                                                     }
-                                                    _e.label = 3;
-                                                case 3: return [2 /*return*/];
+                                                });
+                                            };
+                                            this_2 = this;
+                                            _d.label = 3;
+                                        case 3:
+                                            _d.trys.push([3, 8, 9, 10]);
+                                            _a = __values(claim.additional_items), _b = _a.next();
+                                            _d.label = 4;
+                                        case 4:
+                                            if (!!_b.done) return [3 /*break*/, 7];
+                                            additionalItem = _b.value;
+                                            return [5 /*yield**/, _loop_2(additionalItem)];
+                                        case 5:
+                                            _d.sent();
+                                            _d.label = 6;
+                                        case 6:
+                                            _b = _a.next();
+                                            return [3 /*break*/, 4];
+                                        case 7: return [3 /*break*/, 10];
+                                        case 8:
+                                            e_14_1 = _d.sent();
+                                            e_14 = { error: e_14_1 };
+                                            return [3 /*break*/, 10];
+                                        case 9:
+                                            try {
+                                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                                             }
-                                        });
-                                    };
-                                    this_2 = this;
-                                    _d.label = 3;
-                                case 3:
-                                    _d.trys.push([3, 8, 9, 10]);
-                                    _a = __values(claim.additional_items), _b = _a.next();
-                                    _d.label = 4;
-                                case 4:
-                                    if (!!_b.done) return [3 /*break*/, 7];
-                                    i = _b.value;
-                                    return [5 /*yield**/, _loop_2(i)];
-                                case 5:
-                                    _d.sent();
-                                    _d.label = 6;
-                                case 6:
-                                    _b = _a.next();
-                                    return [3 /*break*/, 4];
-                                case 7: return [3 /*break*/, 10];
-                                case 8:
-                                    e_14_1 = _d.sent();
-                                    e_14 = { error: e_14_1 };
-                                    return [3 /*break*/, 10];
-                                case 9:
-                                    try {
-                                        if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                            finally { if (e_14) throw e_14.error; }
+                                            return [7 /*endfinally*/];
+                                        case 10:
+                                            claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                            return [4 /*yield*/, claimRepo.save(claim)];
+                                        case 11:
+                                            claimOrder = _d.sent();
+                                            return [4 /*yield*/, this.eventBus_
+                                                    .withTransaction(transactionManager)
+                                                    .emit(ClaimService.Events.SHIPMENT_CREATED, {
+                                                    id: id,
+                                                    fulfillment_id: shipment.id,
+                                                    no_notification: evaluatedNoNotification,
+                                                })];
+                                        case 12:
+                                            _d.sent();
+                                            return [2 /*return*/, claimOrder];
                                     }
-                                    finally { if (e_14) throw e_14.error; }
-                                    return [7 /*endfinally*/];
-                                case 10:
-                                    claimRepo = manager.getCustomRepository(this.claimRepository_);
-                                    return [4 /*yield*/, claimRepo.save(claim)];
-                                case 11:
-                                    result = _d.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(ClaimService.Events.SHIPMENT_CREATED, {
-                                            id: id,
-                                            fulfillment_id: shipment.id,
-                                            no_notification: evaluatedNoNotification,
-                                        })];
-                                case 12:
-                                    _d.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                                });
+                            }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
@@ -948,124 +978,126 @@ var ClaimService = /** @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 claim, _a, _b, f, claimRepo, result;
-                        var e_15, _c;
-                        return __generator(this, function (_d) {
-                            switch (_d.label) {
-                                case 0: return [4 /*yield*/, this.retrieve(id, {
-                                        relations: ["return_order", "fulfillments", "order", "order.refunds"],
-                                    })];
-                                case 1:
-                                    claim = _d.sent();
-                                    if (claim.refund_amount) {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Claim with a refund cannot be canceled");
-                                    }
-                                    if (claim.fulfillments) {
-                                        try {
-                                            for (_a = __values(claim.fulfillments), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                                f = _b.value;
-                                                if (!f.canceled_at) {
-                                                    throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "All fulfillments must be canceled before the claim can be canceled");
-                                                }
-                                            }
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var claim, _a, _b, f, claimRepo, claimOrder;
+                            var e_15, _c;
+                            return __generator(this, function (_d) {
+                                switch (_d.label) {
+                                    case 0: return [4 /*yield*/, this.retrieve(id, {
+                                            relations: ["return_order", "fulfillments", "order", "order.refunds"],
+                                        })];
+                                    case 1:
+                                        claim = _d.sent();
+                                        if (claim.refund_amount) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Claim with a refund cannot be canceled");
                                         }
-                                        catch (e_15_1) { e_15 = { error: e_15_1 }; }
-                                        finally {
+                                        if (claim.fulfillments) {
                                             try {
-                                                if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                                for (_a = __values(claim.fulfillments), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                                    f = _b.value;
+                                                    if (!f.canceled_at) {
+                                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "All fulfillments must be canceled before the claim can be canceled");
+                                                    }
+                                                }
+                                            }
+                                            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+                                            finally {
+                                                try {
+                                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                                }
+                                                finally { if (e_15) throw e_15.error; }
                                             }
-                                            finally { if (e_15) throw e_15.error; }
                                         }
-                                    }
-                                    if (claim.return_order && claim.return_order.status !== "canceled") {
-                                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Return must be canceled before the claim can be canceled");
-                                    }
-                                    claim.fulfillment_status = "canceled";
-                                    claim.canceled_at = new Date();
-                                    claimRepo = manager.getCustomRepository(this.claimRepository_);
-                                    return [4 /*yield*/, claimRepo.save(claim)];
-                                case 2:
-                                    result = _d.sent();
-                                    return [4 /*yield*/, this.eventBus_
-                                            .withTransaction(manager)
-                                            .emit(ClaimService.Events.CANCELED, {
-                                            id: result.id,
-                                            no_notification: result.no_notification,
-                                        })];
-                                case 3:
-                                    _d.sent();
-                                    return [2 /*return*/, result];
-                            }
-                        });
-                    }); })];
+                                        if (claim.return_order && claim.return_order.status !== "canceled") {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_ALLOWED, "Return must be canceled before the claim can be canceled");
+                                        }
+                                        claim.fulfillment_status = models_1.ClaimFulfillmentStatus.CANCELED;
+                                        claim.canceled_at = new Date();
+                                        claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                        return [4 /*yield*/, claimRepo.save(claim)];
+                                    case 2:
+                                        claimOrder = _d.sent();
+                                        return [4 /*yield*/, this.eventBus_
+                                                .withTransaction(transactionManager)
+                                                .emit(ClaimService.Events.CANCELED, {
+                                                id: claimOrder.id,
+                                                no_notification: claimOrder.no_notification,
+                                            })];
+                                    case 3:
+                                        _d.sent();
+                                        return [2 /*return*/, claimOrder];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
     /**
-     * @param {Object} selector - the query object for find
-     * @param {Object} config - the config object containing query settings
-     * @return {Promise} the result of the find operation
+     * @param selector - the query object for find
+     * @param config - the config object containing query settings
+     * @return the result of the find operation
      */
     ClaimService.prototype.list = function (selector, config) {
-        if (config === void 0) { config = { skip: 0, take: 50, order: { created_at: "DESC" } }; }
+        if (config === void 0) { config = {
+            skip: 0,
+            take: 50,
+            order: { created_at: "DESC" },
+        }; }
         return __awaiter(this, void 0, void 0, function () {
-            var claimRepo, query;
+            var _this = this;
             return __generator(this, function (_a) {
-                claimRepo = this.manager_.getCustomRepository(this.claimRepository_);
-                query = this.buildQuery_(selector, config);
-                return [2 /*return*/, claimRepo.find(query)];
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var claimRepo, query;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                        query = (0, utils_1.buildQuery)(selector, config);
+                                        return [4 /*yield*/, claimRepo.find(query)];
+                                    case 1: return [2 /*return*/, _a.sent()];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
             });
         });
     };
     /**
      * Gets an order by id.
-     * @param {string} claimId - id of order to retrieve
-     * @param {Object} config - the config object containing query settings
-     * @return {Promise<Order>} the order document
+     * @param id - id of the claim order to retrieve
+     * @param config - the config object containing query settings
+     * @return the order document
      */
-    ClaimService.prototype.retrieve = function (claimId, config) {
+    ClaimService.prototype.retrieve = function (id, config) {
         if (config === void 0) { config = {}; }
         return __awaiter(this, void 0, void 0, function () {
-            var claimRepo, validatedId, query, claim;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        claimRepo = this.manager_.getCustomRepository(this.claimRepository_);
-                        validatedId = this.validateId_(claimId);
-                        query = this.buildQuery_({ id: validatedId }, config);
-                        return [4 /*yield*/, claimRepo.findOne(query)];
-                    case 1:
-                        claim = _a.sent();
-                        if (!claim) {
-                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Claim with ".concat(claimId, " was not found"));
-                        }
-                        return [2 /*return*/, claim];
-                }
-            });
-        });
-    };
-    /**
-     * Dedicated method to delete metadata for an order.
-     * @param {string} orderId - the order to delete metadata from.
-     * @param {string} key - key for metadata field
-     * @return {Promise} resolves to the updated result.
-     */
-    ClaimService.prototype.deleteMetadata = function (orderId, key) {
-        return __awaiter(this, void 0, void 0, function () {
-            var validatedId, keyPath;
-            var _a;
-            return __generator(this, function (_b) {
-                validatedId = this.validateId_(orderId);
-                if (typeof key !== "string") {
-                    throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_ARGUMENT, "Key type is invalid. Metadata keys must be strings");
+                    case 0: return [4 /*yield*/, this.atomicPhase_(function (transactionManager) { return __awaiter(_this, void 0, void 0, function () {
+                            var claimRepo, query, claim;
+                            return __generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        claimRepo = transactionManager.getCustomRepository(this.claimRepository_);
+                                        query = (0, utils_1.buildQuery)({ id: id }, config);
+                                        return [4 /*yield*/, claimRepo.findOne(query)];
+                                    case 1:
+                                        claim = _a.sent();
+                                        if (!claim) {
+                                            throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.NOT_FOUND, "Claim with ".concat(id, " was not found"));
+                                        }
+                                        return [2 /*return*/, claim];
+                                }
+                            });
+                        }); })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
-                keyPath = "metadata.".concat(key);
-                return [2 /*return*/, this.orderModel_
-                        .updateOne({ _id: validatedId }, { $unset: (_a = {}, _a[keyPath] = "", _a) })
-                        .catch(function (err) {
-                        throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.DB_ERROR, err.message);
-                    })];
             });
         });
     };
@@ -1078,6 +1110,6 @@ var ClaimService = /** @class */ (function (_super) {
         REFUND_PROCESSED: "claim.refund_processed",
     };
     return ClaimService;
-}(medusa_interfaces_1.BaseService));
+}(interfaces_1.TransactionBaseService));
 exports.default = ClaimService;
 //# sourceMappingURL=claim.js.map