From 672871b733c6e82bd9e68cf90300ff78cf44727a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
 <16856471+fPolic@users.noreply.github.com>
Date: Thu, 12 Jun 2025 15:07:50 +0200
Subject: [PATCH] fix(core-flows): cart complete order address creation
 (#12493)

* fix(core-flows): cart complete order address creation

* fix(order): cascade delete addresses

* fix: revert
---
 .changeset/mighty-spoons-bow.md               |  5 +++++
 .../src/cart/workflows/complete-cart.ts       | 19 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/mighty-spoons-bow.md

diff --git a/.changeset/mighty-spoons-bow.md b/.changeset/mighty-spoons-bow.md
new file mode 100644
index 0000000000..3d25404b46
--- /dev/null
+++ b/.changeset/mighty-spoons-bow.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/core-flows": patch
+---
+
+fix(core-flows): cart complete order address creation
diff --git a/packages/core/core-flows/src/cart/workflows/complete-cart.ts b/packages/core/core-flows/src/cart/workflows/complete-cart.ts
index 6eb9b7b6b2..fb393ea60e 100644
--- a/packages/core/core-flows/src/cart/workflows/complete-cart.ts
+++ b/packages/core/core-flows/src/cart/workflows/complete-cart.ts
@@ -225,6 +225,21 @@ export const completeCartWorkflow = createWorkflow(
           .map((adjustment) => adjustment.code)
           .filter(Boolean)
 
+        const shippingAddress = cart.shipping_address
+          ? { ...cart.shipping_address }
+          : null
+        const billingAddress = cart.billing_address
+          ? { ...cart.billing_address }
+          : null
+
+        if (shippingAddress) {
+          delete shippingAddress.id
+        }
+
+        if (billingAddress) {
+          delete billingAddress.id
+        }
+
         return {
           region_id: cart.region?.id,
           customer_id: cart.customer?.id,
@@ -232,8 +247,8 @@ export const completeCartWorkflow = createWorkflow(
           status: OrderStatus.PENDING,
           email: cart.email,
           currency_code: cart.currency_code,
-          shipping_address: cart.shipping_address,
-          billing_address: cart.billing_address,
+          shipping_address: shippingAddress,
+          billing_address: billingAddress,
           no_notification: false,
           items: allItems,
           shipping_methods: shippingMethods,