@medusajs/medusa 1.3.3 → 1.3.6-next.0

package/dist/api/routes/admin/orders/process-swap-payment.js

@@ -44,10 +44,10 @@ var _1 = require(".");
  * description: "When there are differences between the returned and shipped Products in a Swap, the difference must be processed. Either a Refund will be issued or a Payment will be captured."
  * x-authenticated: true
  * parameters:
- *   - (path) id=* {string} The id of the Order.
- *   - (path) swap_id=* {string} The id of the Swap.
+ *   - (path) id=* {string} The ID of the Order.
+ *   - (path) swap_id=* {string} The ID of the Swap.
  * tags:
- *   - Order
+ *   - Swap
  * responses:
  *   200:
  *     description: OK

package/dist/api/routes/admin/orders/process-swap-payment.js.map

@@ -1 +1 @@
-{"version":3,"file":"process-swap-payment.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/orders/process-swap-payment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sBAAyE;AAGzE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;gBACtB,KAAkB,GAAG,CAAC,MAAM,EAA1B,EAAE,QAAA,EAAE,OAAO,aAAA,CAAe;gBAE5B,YAAY,GAAiB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;gBAC9D,WAAW,GAAgB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;gBAC3D,aAAa,GAAkB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;gBAEjE,qBAAM,aAAa,CAAC,WAAW,CAAC,UAAO,OAAO;;;;wCAC5C,qBAAM,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAA;;oCAArE,SAAqE,CAAA;oCAEvD,qBAAM,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;4CACrE,MAAM,EAAE,2BAAwB;4CAChC,SAAS,EAAE,8BAA2B;yCACvC,CAAC,EAAA;;oCAHI,KAAK,GAAG,SAGZ;oCAEF,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,OAAA,EAAE,CAAC,CAAA;;;;yBACpB,CAAC,EAAA;;gBATF,SASE,CAAA;;;;KACH,EAAA"}
+{"version":3,"file":"process-swap-payment.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/orders/process-swap-payment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,sBAAyE;AAIzE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;gBACtB,KAAkB,GAAG,CAAC,MAAM,EAA1B,EAAE,QAAA,EAAE,OAAO,aAAA,CAAe;gBAE5B,YAAY,GAAiB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;gBAC9D,WAAW,GAAgB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;gBAC3D,aAAa,GAAkB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;gBAEjE,qBAAM,aAAa,CAAC,WAAW,CAAC,UAAO,OAAO;;;;wCAC5C,qBAAM,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAA;;oCAArE,SAAqE,CAAA;oCAEvD,qBAAM,YAAY,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE;4CACrE,MAAM,EAAE,2BAAwB;4CAChC,SAAS,EAAE,8BAA2B;yCACvC,CAAC,EAAA;;oCAHI,KAAK,GAAG,SAGZ;oCAEF,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,OAAA,EAAE,CAAC,CAAA;;;;yBACpB,CAAC,EAAA;;gBATF,SASE,CAAA;;;;KACH,EAAA"}

package/dist/api/routes/admin/orders/refund-payment.d.ts

@@ -1,12 +1,11 @@
-declare const _default: (req: any, res: any) => Promise<void>;
 /**
- * @oas [post] /orders/{id}/refunds
+ * @oas [post] /orders/{id}/refund
  * operationId: "PostOrdersOrderRefunds"
  * summary: "Create a Refund"
  * description: "Issues a Refund."
  * x-authenticated: true
  * parameters:
- *   - (path) id=* {string} The id of the Order.
+ *   - (path) id=* {string} The ID of the Order.
  * requestBody:
  *   content:
  *     application/json:
@@ -22,7 +21,7 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *             description: The reason for the Refund.
  *             type: string
  *           note:
- *             description: A not with additional details about the Refund.
+ *             description: A note with additional details about the Refund.
  *             type: string
  *           no_notification:
  *             description: If set to true no notification will be send related to this Refund.
@@ -39,6 +38,7 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *             order:
  *               $ref: "#/components/schemas/order"
  */
+declare const _default: (req: any, res: any) => Promise<void>;
 export default _default;
 export declare class AdminPostOrdersOrderRefundsReq {
     amount: number;

package/dist/api/routes/admin/orders/refund-payment.js

@@ -50,13 +50,13 @@ var class_validator_1 = require("class-validator");
 var _1 = require(".");
 var validator_1 = require("../../../../utils/validator");
 /**
- * @oas [post] /orders/{id}/refunds
+ * @oas [post] /orders/{id}/refund
  * operationId: "PostOrdersOrderRefunds"
  * summary: "Create a Refund"
  * description: "Issues a Refund."
  * x-authenticated: true
  * parameters:
- *   - (path) id=* {string} The id of the Order.
+ *   - (path) id=* {string} The ID of the Order.
  * requestBody:
  *   content:
  *     application/json:
@@ -72,7 +72,7 @@ var validator_1 = require("../../../../utils/validator");
  *             description: The reason for the Refund.
  *             type: string
  *           note:
- *             description: A not with additional details about the Refund.
+ *             description: A note with additional details about the Refund.
  *             type: string
  *           no_notification:
  *             description: If set to true no notification will be send related to this Refund.
@@ -90,7 +90,7 @@ var validator_1 = require("../../../../utils/validator");
  *               $ref: "#/components/schemas/order"
  */
 exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, validated, orderService, order;
+    var id, validated, orderService, manager, order;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -99,9 +99,19 @@ exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0
             case 1:
                 validated = _a.sent();
                 orderService = req.scope.resolve("orderService");
-                return [4 /*yield*/, orderService.createRefund(id, validated.amount, validated.reason, validated.note, {
-                        no_notification: validated.no_notification,
-                    })];
+                manager = req.scope.resolve("manager");
+                return [4 /*yield*/, manager.transaction(function (transactionManager) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, orderService
+                                        .withTransaction(transactionManager)
+                                        .createRefund(id, validated.amount, validated.reason, validated.note, {
+                                        no_notification: validated.no_notification,
+                                    })];
+                                case 1: return [2 /*return*/, _a.sent()];
+                            }
+                        });
+                    }); })];
             case 2:
                 _a.sent();
                 return [4 /*yield*/, orderService.retrieve(id, {

package/dist/api/routes/admin/orders/refund-payment.js.map

@@ -1 +1 @@
-{"version":3,"file":"refund-payment.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/orders/refund-payment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAMwB;AACxB,sBAAyE;AAEzE,yDAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;gBACpB,EAAE,GAAK,GAAG,CAAC,MAAM,GAAf,CAAe;gBAEP,qBAAM,IAAA,qBAAS,EAAC,8BAA8B,EAAE,GAAG,CAAC,IAAI,CAAC,EAAA;;gBAArE,SAAS,GAAG,SAAyD;gBAErE,YAAY,GAAiB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;gBAEpE,qBAAM,YAAY,CAAC,YAAY,CAC7B,EAAE,EACF,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,MAAM,EAChB,SAAS,CAAC,IAAI,EACd;wBACE,eAAe,EAAE,SAAS,CAAC,eAAe;qBAC3C,CACF,EAAA;;gBARD,SAQC,CAAA;gBAEa,qBAAM,YAAY,CAAC,QAAQ,CAAC,EAAE,EAAE;wBAC5C,MAAM,EAAE,2BAAwB;wBAChC,SAAS,EAAE,8BAA2B;qBACvC,CAAC,EAAA;;gBAHI,KAAK,GAAG,SAGZ;gBAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,OAAA,EAAE,CAAC,CAAA;;;;KAChC,EAAA;AAED;IAAA;IAgBA,CAAC;IAbC;QAFC,IAAA,uBAAK,GAAE;QACP,IAAA,4BAAU,GAAE;;kEACC;IAId;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;kEACC;IAId;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;gEACA;IAIb;QAFC,IAAA,2BAAS,GAAE;QACX,IAAA,4BAAU,GAAE;;2EACY;IAC3B,qCAAC;CAAA,AAhBD,IAgBC;AAhBY,wEAA8B"}
+{"version":3,"file":"refund-payment.js","sourceRoot":"","sources":["../../../../../src/api/routes/admin/orders/refund-payment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mDAMwB;AACxB,sBAAyE;AAGzE,yDAAuD;AAGvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,mBAAe,UAAO,GAAG,EAAE,GAAG;;;;;gBACpB,EAAE,GAAK,GAAG,CAAC,MAAM,GAAf,CAAe;gBAEP,qBAAM,IAAA,qBAAS,EAAC,8BAA8B,EAAE,GAAG,CAAC,IAAI,CAAC,EAAA;;gBAArE,SAAS,GAAG,SAAyD;gBAErE,YAAY,GAAiB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;gBAE9D,OAAO,GAAkB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;gBAC3D,qBAAM,OAAO,CAAC,WAAW,CAAC,UAAO,kBAAkB;;;wCAC1C,qBAAM,YAAY;yCACtB,eAAe,CAAC,kBAAkB,CAAC;yCACnC,YAAY,CAAC,EAAE,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,IAAI,EAAE;wCACpE,eAAe,EAAE,SAAS,CAAC,eAAe;qCAC3C,CAAC,EAAA;wCAJJ,sBAAO,SAIH,EAAA;;;yBACL,CAAC,EAAA;;gBANF,SAME,CAAA;gBAEY,qBAAM,YAAY,CAAC,QAAQ,CAAC,EAAE,EAAE;wBAC5C,MAAM,EAAE,2BAAwB;wBAChC,SAAS,EAAE,8BAA2B;qBACvC,CAAC,EAAA;;gBAHI,KAAK,GAAG,SAGZ;gBAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,OAAA,EAAE,CAAC,CAAA;;;;KAChC,EAAA;AAED;IAAA;IAgBA,CAAC;IAbC;QAFC,IAAA,uBAAK,GAAE;QACP,IAAA,4BAAU,GAAE;;kEACC;IAId;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;kEACC;IAId;QAFC,IAAA,0BAAQ,GAAE;QACV,IAAA,4BAAU,GAAE;;gEACA;IAIb;QAFC,IAAA,2BAAS,GAAE;QACX,IAAA,4BAAU,GAAE;;2EACY;IAC3B,qCAAC;CAAA,AAhBD,IAgBC;AAhBY,wEAA8B"}

package/dist/api/routes/admin/orders/request-return.d.ts

@@ -1,13 +1,12 @@
 import { OrdersReturnItem } from "../../../../types/orders";
-declare const _default: (req: any, res: any) => Promise<void>;
 /**
- * @oas [post] /orders/{id}/returns
+ * @oas [post] /orders/{id}/return
  * operationId: "PostOrdersOrderReturns"
  * summary: "Request a Return"
  * description: "Requests a Return. If applicable a return label will be created and other plugins notified."
  * x-authenticated: true
  * parameters:
- *   - (path) id=* {string} The id of the Order.
+ *   - (path) id=* {string} The ID of the Order.
  * requestBody:
  *   content:
  *     application/json:
@@ -19,12 +18,15 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *             description: The Line Items that will be returned.
  *             type: array
  *             items:
+ *               required:
+ *                 - item_id
+ *                 - quantity
  *               properties:
  *                 item_id:
- *                   description: The id of the Line Item.
+ *                   description: The ID of the Line Item.
  *                   type: string
  *                 reason_id:
- *                   description: The id of the Return Reason to use.
+ *                   description: The ID of the Return Reason to use.
  *                   type: string
  *                 note:
  *                   description: An optional note with information about the Return.
@@ -38,13 +40,17 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *             properties:
  *               option_id:
  *                 type: string
- *                 description: The id of the Shipping Option to create the Shipping Method from.
+ *                 description: The ID of the Shipping Option to create the Shipping Method from.
  *               price:
  *                 type: integer
  *                 description: The price to charge for the Shipping Method.
+ *           note:
+ *             description: An optional note with information about the Return.
+ *             type: string
  *           receive_now:
  *             description: A flag to indicate if the Return should be registerd as received immediately.
  *             type: boolean
+ *             default: false
  *           no_notification:
  *             description: A flag to indicate if no notifications should be emitted related to the requested Return.
  *             type: boolean
@@ -52,6 +58,7 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *             description: The amount to refund.
  *             type: integer
  * tags:
+ *   - Return
  *   - Order
  * responses:
  *   200:
@@ -63,6 +70,7 @@ declare const _default: (req: any, res: any) => Promise<void>;
  *             order:
  *               $ref: "#/components/schemas/order"
  */
+declare const _default: (req: any, res: any) => Promise<void>;
 export default _default;
 export declare class AdminPostOrdersOrderReturnsReq {
     items: OrdersReturnItem[];

package/dist/api/routes/admin/orders/request-return.js

@@ -46,20 +46,21 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdminPostOrdersOrderReturnsReq = void 0;
-var class_transformer_1 = require("class-transformer");
 var class_validator_1 = require("class-validator");
-var medusa_core_utils_1 = require("medusa-core-utils");
 var _1 = require(".");
+var medusa_core_utils_1 = require("medusa-core-utils");
 var orders_1 = require("../../../../types/orders");
+var class_transformer_1 = require("class-transformer");
 var validator_1 = require("../../../../utils/validator");
+var utils_1 = require("../../../../utils");
 /**
- * @oas [post] /orders/{id}/returns
+ * @oas [post] /orders/{id}/return
  * operationId: "PostOrdersOrderReturns"
  * summary: "Request a Return"
  * description: "Requests a Return. If applicable a return label will be created and other plugins notified."
  * x-authenticated: true
  * parameters:
- *   - (path) id=* {string} The id of the Order.
+ *   - (path) id=* {string} The ID of the Order.
  * requestBody:
  *   content:
  *     application/json:
@@ -71,12 +72,15 @@ var validator_1 = require("../../../../utils/validator");
  *             description: The Line Items that will be returned.
  *             type: array
  *             items:
+ *               required:
+ *                 - item_id
+ *                 - quantity
  *               properties:
  *                 item_id:
- *                   description: The id of the Line Item.
+ *                   description: The ID of the Line Item.
  *                   type: string
  *                 reason_id:
- *                   description: The id of the Return Reason to use.
+ *                   description: The ID of the Return Reason to use.
  *                   type: string
  *                 note:
  *                   description: An optional note with information about the Return.
@@ -90,13 +94,17 @@ var validator_1 = require("../../../../utils/validator");
  *             properties:
  *               option_id:
  *                 type: string
- *                 description: The id of the Shipping Option to create the Shipping Method from.
+ *                 description: The ID of the Shipping Option to create the Shipping Method from.
  *               price:
  *                 type: integer
  *                 description: The price to charge for the Shipping Method.
+ *           note:
+ *             description: An optional note with information about the Return.
+ *             type: string
  *           receive_now:
  *             description: A flag to indicate if the Return should be registerd as received immediately.
  *             type: boolean
+ *             default: false
  *           no_notification:
  *             description: A flag to indicate if no notifications should be emitted related to the requested Return.
  *             type: boolean
@@ -104,6 +112,7 @@ var validator_1 = require("../../../../utils/validator");
  *             description: The amount to refund.
  *             type: integer
  * tags:
+ *   - Return
  *   - Order
  * responses:
  *   200:
@@ -116,41 +125,53 @@ var validator_1 = require("../../../../utils/validator");
  *               $ref: "#/components/schemas/order"
  */
 exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, value, idempotencyKeyService, headerKey, idempotencyKey, error_1, orderService_1, returnService_1, eventBus_1, inProgress, err, _a, _b, key, error, _c, key, error, err_1;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+    var id, value, idempotencyKeyService, manager, headerKey, idempotencyKey, error_1, orderService_1, returnService_1, eventBus_1, inProgress_1, err_2, _a, err_1;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 id = req.params.id;
                 return [4 /*yield*/, (0, validator_1.validator)(AdminPostOrdersOrderReturnsReq, req.body)];
             case 1:
-                value = _d.sent();
+                value = _b.sent();
                 idempotencyKeyService = req.scope.resolve("idempotencyKeyService");
+                manager = req.scope.resolve("manager");
                 headerKey = req.get("Idempotency-Key") || "";
-                _d.label = 2;
+                _b.label = 2;
             case 2:
-                _d.trys.push([2, 4, , 5]);
-                return [4 /*yield*/, idempotencyKeyService.initializeRequest(headerKey, req.method, req.params, req.path)];
+                _b.trys.push([2, 4, , 5]);
+                return [4 /*yield*/, manager.transaction(function (transactionManager) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, idempotencyKeyService
+                                        .withTransaction(transactionManager)
+                                        .initializeRequest(headerKey, req.method, req.params, req.path)];
+                                case 1:
+                                    idempotencyKey = _a.sent();
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })];
             case 3:
-                idempotencyKey = _d.sent();
+                _b.sent();
                 return [3 /*break*/, 5];
             case 4:
-                error_1 = _d.sent();
+                error_1 = _b.sent();
                 res.status(409).send("Failed to create idempotency key");
                 return [2 /*return*/];
             case 5:
                 res.setHeader("Access-Control-Expose-Headers", "Idempotency-Key");
                 res.setHeader("Idempotency-Key", idempotencyKey.idempotency_key);
-                _d.label = 6;
+                _b.label = 6;
             case 6:
-                _d.trys.push([6, 17, , 18]);
+                _b.trys.push([6, 17, , 18]);
                 orderService_1 = req.scope.resolve("orderService");
                 returnService_1 = req.scope.resolve("returnService");
                 eventBus_1 = req.scope.resolve("eventBusService");
-                inProgress = true;
-                err = false;
-                _d.label = 7;
+                inProgress_1 = true;
+                err_2 = false;
+                _b.label = 7;
             case 7:
-                if (!inProgress) return [3 /*break*/, 16];
+                if (!inProgress_1) return [3 /*break*/, 16];
                 _a = idempotencyKey.recovery_point;
                 switch (_a) {
                     case "started": return [3 /*break*/, 8];
@@ -158,149 +179,186 @@ exports.default = (function (req, res) { return __awaiter(void 0, void 0, void 0
                     case "finished": return [3 /*break*/, 12];
                 }
                 return [3 /*break*/, 13];
-            case 8: return [4 /*yield*/, idempotencyKeyService.workStage(idempotencyKey.idempotency_key, function (manager) { return __awaiter(void 0, void 0, void 0, function () {
-                    var returnObj, order, evaluatedNoNotification, createdReturn;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                returnObj = {
-                                    order_id: id,
-                                    idempotency_key: idempotencyKey.idempotency_key,
-                                    items: value.items,
-                                };
-                                if (value.return_shipping) {
-                                    returnObj.shipping_method = value.return_shipping;
-                                }
-                                if (typeof value.refund !== "undefined" && value.refund < 0) {
-                                    returnObj.refund_amount = 0;
+            case 8: return [4 /*yield*/, manager.transaction(function (transactionManager) { return __awaiter(void 0, void 0, void 0, function () {
+                    var _a, key, error;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0: return [4 /*yield*/, idempotencyKeyService
+                                    .withTransaction(transactionManager)
+                                    .workStage(idempotencyKey.idempotency_key, function (manager) { return __awaiter(void 0, void 0, void 0, function () {
+                                    var returnObj, order, evaluatedNoNotification, createdReturn;
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0:
+                                                returnObj = {
+                                                    order_id: id,
+                                                    idempotency_key: idempotencyKey.idempotency_key,
+                                                    items: value.items,
+                                                };
+                                                if (value.return_shipping) {
+                                                    returnObj.shipping_method = value.return_shipping;
+                                                }
+                                                if ((0, utils_1.isDefined)(value.refund) && value.refund < 0) {
+                                                    returnObj.refund_amount = 0;
+                                                }
+                                                else {
+                                                    if (value.refund && value.refund >= 0) {
+                                                        returnObj.refund_amount = value.refund;
+                                                    }
+                                                }
+                                                return [4 /*yield*/, orderService_1
+                                                        .withTransaction(manager)
+                                                        .retrieve(id)];
+                                            case 1:
+                                                order = _a.sent();
+                                                evaluatedNoNotification = value.no_notification !== undefined
+                                                    ? value.no_notification
+                                                    : order.no_notification;
+                                                returnObj.no_notification = evaluatedNoNotification;
+                                                return [4 /*yield*/, returnService_1
+                                                        .withTransaction(manager)
+                                                        .create(returnObj)];
+                                            case 2:
+                                                createdReturn = _a.sent();
+                                                if (!value.return_shipping) return [3 /*break*/, 4];
+                                                return [4 /*yield*/, returnService_1
+                                                        .withTransaction(manager)
+                                                        .fulfill(createdReturn.id)];
+                                            case 3:
+                                                _a.sent();
+                                                _a.label = 4;
+                                            case 4: return [4 /*yield*/, eventBus_1
+                                                    .withTransaction(manager)
+                                                    .emit("order.return_requested", {
+                                                    id: id,
+                                                    return_id: createdReturn.id,
+                                                    no_notification: evaluatedNoNotification,
+                                                })];
+                                            case 5:
+                                                _a.sent();
+                                                return [2 /*return*/, {
+                                                        recovery_point: "return_requested",
+                                                    }];
+                                        }
+                                    });
+                                }); })];
+                            case 1:
+                                _a = _b.sent(), key = _a.key, error = _a.error;
+                                if (error) {
+                                    inProgress_1 = false;
+                                    err_2 = error;
                                 }
                                 else {
-                                    if (value.refund && value.refund >= 0) {
-                                        returnObj.refund_amount = value.refund;
-                                    }
+                                    idempotencyKey = key;
                                 }
-                                return [4 /*yield*/, orderService_1
-                                        .withTransaction(manager)
-                                        .retrieve(id)];
-                            case 1:
-                                order = _a.sent();
-                                evaluatedNoNotification = value.no_notification !== undefined
-                                    ? value.no_notification
-                                    : order.no_notification;
-                                returnObj.no_notification = evaluatedNoNotification;
-                                return [4 /*yield*/, returnService_1
-                                        .withTransaction(manager)
-                                        .create(returnObj)];
-                            case 2:
-                                createdReturn = _a.sent();
-                                if (!value.return_shipping) return [3 /*break*/, 4];
-                                return [4 /*yield*/, returnService_1
-                                        .withTransaction(manager)
-                                        .fulfill(createdReturn.id)];
-                            case 3:
-                                _a.sent();
-                                _a.label = 4;
-                            case 4: return [4 /*yield*/, eventBus_1
-                                    .withTransaction(manager)
-                                    .emit("order.return_requested", {
-                                    id: id,
-                                    return_id: createdReturn.id,
-                                    no_notification: evaluatedNoNotification,
-                                })];
-                            case 5:
-                                _a.sent();
-                                return [2 /*return*/, {
-                                        recovery_point: "return_requested",
-                                    }];
+                                return [2 /*return*/];
                         }
                     });
                 }); })];
             case 9:
-                _b = _d.sent(), key = _b.key, error = _b.error;
-                if (error) {
-                    inProgress = false;
-                    err = error;
-                }
-                else {
-                    idempotencyKey = key;
-                }
+                _b.sent();
                 return [3 /*break*/, 15];
-            case 10: return [4 /*yield*/, idempotencyKeyService.workStage(idempotencyKey.idempotency_key, function (manager) { return __awaiter(void 0, void 0, void 0, function () {
-                    var order, ret;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, orderService_1
-                                    .withTransaction(manager)
-                                    .retrieve(id, { relations: ["returns"] })
-                                /**
-                                 * If we are ready to receive immediately, we find the newly created return
-                                 * and register it as received.
-                                 */
-                            ];
+            case 10: return [4 /*yield*/, manager.transaction(function (transactionManager) { return __awaiter(void 0, void 0, void 0, function () {
+                    var _a, key, error;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0: return [4 /*yield*/, idempotencyKeyService
+                                    .withTransaction(transactionManager)
+                                    .workStage(idempotencyKey.idempotency_key, function (manager) { return __awaiter(void 0, void 0, void 0, function () {
+                                    var order, ret;
+                                    return __generator(this, function (_a) {
+                                        switch (_a.label) {
+                                            case 0: return [4 /*yield*/, orderService_1
+                                                    .withTransaction(manager)
+                                                    .retrieve(id, { relations: ["returns"] })
+                                                /**
+                                                 * If we are ready to receive immediately, we find the newly created return
+                                                 * and register it as received.
+                                                 */
+                                            ];
+                                            case 1:
+                                                order = _a.sent();
+                                                if (!value.receive_now) return [3 /*break*/, 4];
+                                                return [4 /*yield*/, returnService_1.withTransaction(manager).list({
+                                                        idempotency_key: idempotencyKey.idempotency_key,
+                                                    })];
+                                            case 2:
+                                                ret = _a.sent();
+                                                if (!ret.length) {
+                                                    throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Return not found");
+                                                }
+                                                ret = ret[0];
+                                                return [4 /*yield*/, returnService_1
+                                                        .withTransaction(manager)
+                                                        .receive(ret.id, value.items, value.refund)];
+                                            case 3:
+                                                order = _a.sent();
+                                                _a.label = 4;
+                                            case 4: return [4 /*yield*/, orderService_1
+                                                    .withTransaction(manager)
+                                                    .retrieve(id, {
+                                                    select: _1.defaultAdminOrdersFields,
+                                                    relations: _1.defaultAdminOrdersRelations,
+                                                })];
+                                            case 5:
+                                                order = _a.sent();
+                                                return [2 /*return*/, {
+                                                        response_code: 200,
+                                                        response_body: { order: order },
+                                                    }];
+                                        }
+                                    });
+                                }); })];
                             case 1:
-                                order = _a.sent();
-                                if (!value.receive_now) return [3 /*break*/, 4];
-                                return [4 /*yield*/, returnService_1.withTransaction(manager).list({
-                                        idempotency_key: idempotencyKey.idempotency_key,
-                                    })];
-                            case 2:
-                                ret = _a.sent();
-                                if (!ret.length) {
-                                    throw new medusa_core_utils_1.MedusaError(medusa_core_utils_1.MedusaError.Types.INVALID_DATA, "Return not found");
+                                _a = _b.sent(), key = _a.key, error = _a.error;
+                                if (error) {
+                                    inProgress_1 = false;
+                                    err_2 = error;
                                 }
-                                ret = ret[0];
-                                return [4 /*yield*/, returnService_1
-                                        .withTransaction(manager)
-                                        .receive(ret.id, value.items, value.refund)];
-                            case 3:
-                                order = _a.sent();
-                                _a.label = 4;
-                            case 4: return [4 /*yield*/, orderService_1.withTransaction(manager).retrieve(id, {
-                                    select: _1.defaultAdminOrdersFields,
-                                    relations: _1.defaultAdminOrdersRelations,
-                                })];
-                            case 5:
-                                order = _a.sent();
-                                return [2 /*return*/, {
-                                        response_code: 200,
-                                        response_body: { order: order },
-                                    }];
+                                else {
+                                    idempotencyKey = key;
+                                }
+                                return [2 /*return*/];
                         }
                     });
                 }); })];
             case 11:
-                _c = _d.sent(), key = _c.key, error = _c.error;
-                if (error) {
-                    inProgress = false;
-                    err = error;
-                }
-                else {
-                    idempotencyKey = key;
-                }
+                _b.sent();
                 return [3 /*break*/, 15];
             case 12:
                 {
-                    inProgress = false;
+                    inProgress_1 = false;
                     return [3 /*break*/, 15];
                 }
-                _d.label = 13;
-            case 13: return [4 /*yield*/, idempotencyKeyService.update(idempotencyKey.idempotency_key, {
-                    recovery_point: "finished",
-                    response_code: 500,
-                    response_body: { message: "Unknown recovery point" },
-                })];
+                _b.label = 13;
+            case 13: return [4 /*yield*/, manager.transaction(function (transactionManager) { return __awaiter(void 0, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0: return [4 /*yield*/, idempotencyKeyService
+                                    .withTransaction(transactionManager)
+                                    .update(idempotencyKey.idempotency_key, {
+                                    recovery_point: "finished",
+                                    response_code: 500,
+                                    response_body: { message: "Unknown recovery point" },
+                                })];
+                            case 1:
+                                idempotencyKey = _a.sent();
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })];
             case 14:
-                idempotencyKey = _d.sent();
+                _b.sent();
                 return [3 /*break*/, 15];
             case 15: return [3 /*break*/, 7];
             case 16:
-                if (err) {
-                    throw err;
+                if (err_2) {
+                    throw err_2;
                 }
                 res.status(idempotencyKey.response_code).json(idempotencyKey.response_body);
                 return [3 /*break*/, 18];
             case 17:
-                err_1 = _d.sent();
+                err_1 = _b.sent();
                 console.log(err_1);
                 throw err_1;
             case 18: return [2 /*return*/];