Skip to content

Commit ba02db3

Browse files
fPolicfPolic
committed
Merge branch 'develop' into chore/add-many-to-many-between-product-and-option
# Conflicts: # packages/admin/dashboard/src/routes/products/product-edit-option/components/edit-product-option-form/edit-product-option-form.tsx # packages/admin/dashboard/src/routes/products/product-edit-option/product-edit-option.tsx
2 parents ef64982 + 344248b commit ba02db3

1,277 files changed

Lines changed: 283390 additions & 225880 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.changeset/add-completed-at-filter.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/types": patch
3+
---
4+
5+
feat(types): Add `completed_at` filterable property to `FilterableCartProps` interface to enable filtering carts by completion date.

‎.changeset/add-marked-shipped-by-field.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/core-flows": patch
3+
"@medusajs/medusa": patch
4+
---
5+
6+
chore(core-flows,medusa): Pass `created_by` to `createOrderShipmentWorkflow` in create order shipment admin endpoint and pass `marked_shipped_by` to `createShipmentWorkflow`

‎.changeset/eager-doors-kneel.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/core-flows": patch
3+
---
4+
5+
fix(core-flows): only consider captures amounts for credit line amount computation

‎.changeset/fix-product-option-id.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/dashboard": patch
3+
---
4+
5+
fix(dashboard): pass product ID explicitly to edit option form
6+
7+
The edit product option form was using `option.product_id` which is undefined when options are fetched as part of a product response. Now passes the product ID from the parent component via props.

‎.changeset/fuzzy-nails-walk.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/utils": patch
3+
---
4+
5+
fix: Prevent translation crash when entity contains arrays of primitive values (e.g. strings)

‎.changeset/gentle-regions-fly.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/cli": patch
3+
---
4+
5+
fix(medusa-cli): verbose log level event name typo

‎.changeset/lazy-cameras-repair.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/core-flows": patch
3+
"@medusajs/framework": patch
4+
"@medusajs/utils": patch
5+
---
6+
7+
feat: add forbidden error 403

‎.changeset/moody-planets-beam.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/medusa": patch
3+
---
4+
5+
chore(medusa): add role users endpoint

‎.changeset/rtl-table-start-68px.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/dashboard": patch
3+
---
4+
5+
fix(dashboard): Use start-[68px] for RTL table sticky cells.

‎.changeset/slick-shoes-drive.md‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)