Skip to content

Commit b65eb07

Browse files
authored
Merge branch 'develop' into fix(dashboard)/pluralization-schema-pl
2 parents ed659d6 + beb91d8 commit b65eb07

File tree

61 files changed

+801
-311
lines changed

Some content is hidden

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

61 files changed

+801
-311
lines changed

.changeset/dull-donkeys-ring.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(fulfillment) Variants changed from managed inventory to unmanaged are now fulfillable

.changeset/empty-brooms-unite.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/promotion": patch
3+
---
4+
5+
Add metadata support in the promotion model.

.changeset/fresh-needles-wave.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"@medusajs/framework": patch
3+
"@medusajs/cli": patch
4+
"medusa-dev-cli": patch
5+
"@medusajs/admin-bundler": patch
6+
---
7+
8+
chore(): Update glob package

.changeset/funky-schools-hang.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): reference global vite bin from scripts

.changeset/smart-stamps-shake.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): avoid overriding customer and region from setPricingContext hook result

.changeset/sweet-peaches-dress.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/payment": patch
3+
"@medusajs/types": patch
4+
---
5+
6+
fix(payment): Double idempotent capture called with auto capture behavior
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/payment-stripe": patch
3+
---
4+
5+
feat(payment-stripe): OXXO payment provider support with configurable expiration

.changeset/tricky-olives-battle.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@medusajs/medusa": patch
3+
"@medusajs/order": patch
4+
"@medusajs/dashboard": patch
5+
"@medusajs/core-flows": patch
6+
"@medusajs/types": patch
7+
---
8+
9+
Chore/order custom display

integration-tests/modules/__tests__/order/order.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ medusaIntegrationTestRunner({
281281
status: "pending",
282282
version: 1,
283283
display_id: 2,
284+
custom_display_id: null,
284285
payment_collections: [],
285286
payment_status: "not_paid",
286287
region_id: "test_region_id",

packages/admin/admin-bundler/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"compression": "^1.8.0",
3030
"express": "^4.21.0",
3131
"get-port": "^5.1.1",
32-
"glob": "^10.4.5",
32+
"glob": "11.1.0",
3333
"outdent": "^0.8.0",
3434
"postcss": "^8.4.38",
3535
"tailwindcss": "^3.4.3",

0 commit comments

Comments
 (0)