fix: Merge conflicts with master

packages/medusa/src/models/order.ts

@@ -250,6 +250,8 @@ export class Order extends BaseEntity {
   gift_card_total: number
   gift_card_tax_total: number
 
+  returnable_items?: LineItem[]
+
   @BeforeInsert()
   private async beforeInsert(): Promise<void> {
     this.id = generateEntityId(this.id, "order")
@@ -540,6 +542,11 @@ export class Order extends BaseEntity {
  *     description: The total of gift cards with taxes
  *     type: integer
  *     example: 0
+ *   returnable_items:
+ *     description: The items that are returnable as part of the order, order swaps or order claims
+ *     type: array
+ *     items:
+ *       $ref: "#/components/schemas/LineItem"
  *   created_at:
  *     description: The date with timezone at which the resource was created.
  *     type: string

packages/medusa/src/models/return.ts

@@ -11,12 +11,12 @@ import {
 import { DbAwareColumn, resolveDbType } from "../utils/db-aware-column"
 
 import { BaseEntity } from "../interfaces/models/base-entity"
+import { generateEntityId } from "../utils/generate-entity-id"
 import { ClaimOrder } from "./claim-order"
 import { Order } from "./order"
 import { ReturnItem } from "./return-item"
 import { ShippingMethod } from "./shipping-method"
 import { Swap } from "./swap"
-import { generateEntityId } from "../utils/generate-entity-id"
 
 export enum ReturnStatus {
   REQUESTED = "requested",
@@ -36,7 +36,7 @@ export class Return extends BaseEntity {
 
   @OneToMany(() => ReturnItem, (item) => item.return_order, {
     eager: true,
-    cascade: ["insert"],
+    cascade: ["insert", "update"],
   })
   items: ReturnItem[]