Skip to content

Commit 9ebdcb3

Browse files
committed
Merge branch 'feat/scoped-variant-images' into feat/scoped-variant-images-ui
2 parents 2073f6b + 5a1e2ca commit 9ebdcb3

File tree

95 files changed

+9316
-8608
lines changed

Some content is hidden

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

95 files changed

+9316
-8608
lines changed

.changeset/chilled-chicken-bow.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/workflow-engine-redis": patch
3+
"@medusajs/orchestration": patch
4+
---
5+
6+
fix: avoid jobId collisions on retry

.changeset/cool-brooms-travel.md

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): merge custom metadata along with session_id on payment initiation

.changeset/five-donuts-obey.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@medusajs/order": patch
3+
"@medusajs/dashboard": patch
4+
---
5+
6+
feat(order,dashboard): version order credit lines

.changeset/late-seals-mix.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/types": patch
4+
---
5+
6+
Added shipping method data to tax module context

.changeset/pink-boats-type.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@medusajs/test-utils": patch
3+
---
4+
5+
fix(test-utils): Event subscribers duplicated durin tests

.changeset/poor-llamas-march.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@medusajs/cart": patch
3+
"@medusajs/customer": patch
4+
"@medusajs/inventory": patch
5+
"@medusajs/order": patch
6+
"@medusajs/product": patch
7+
---
8+
9+
fix(): Remove redundant indexes from product, cart, order, customer, and inventory modules to improve database schema health.

packages/admin/dashboard/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import {
3838
} from "@medusajs/ui"
3939

4040
import { AdminReservation } from "@medusajs/types/src/http"
41-
import { format } from "date-fns"
4241
import { ActionMenu } from "../../../../../components/common/action-menu"
4342
import DisplayId from "../../../../../components/common/display-id/display-id"
4443
import { Thumbnail } from "../../../../../components/common/thumbnail"
@@ -872,26 +871,6 @@ const DiscountAndTotalBreakdown = ({
872871
<span className="txt-small text-ui-fg-subtle mx-1">
873872
-
874873
</span>
875-
<Tooltip
876-
content={format(
877-
new Date(creditLine.created_at),
878-
"dd MMM, yyyy, HH:mm:ss"
879-
)}
880-
>
881-
<Text
882-
size="small"
883-
leading="compact"
884-
className="txt-small text-ui-fg-subtle"
885-
>
886-
{format(
887-
new Date(creditLine.created_at),
888-
"dd MMM, yyyy"
889-
)}
890-
</Text>
891-
</Tooltip>
892-
<span className="txt-small text-ui-fg-subtle mx-1">
893-
-
894-
</span>
895874
<Text
896875
size="small"
897876
leading="compact"

packages/core/core-flows/src/tax/steps/get-item-tax-lines.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ function normalizeTaxModuleContext(
9191
},
9292
customer,
9393
is_return: isReturn ?? false,
94+
shipping_methods: orderOrCart.shipping_methods?.map((method) => ({
95+
id: method.id,
96+
name: method.name,
97+
shipping_option_id: method.shipping_option_id,
98+
amount: method.amount,
99+
})),
94100
}
95101
}
96102

packages/core/js-sdk/src/admin/refund-reasons.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class RefundReason {
101101
*
102102
* ```ts
103103
* sdk.admin.refundReason.retrieve("refr_123", {
104-
* fields: "id,value"
104+
* fields: "id,code"
105105
* })
106106
* .then(({ refund_reason }) => {
107107
* console.log(refund_reason)
@@ -138,7 +138,7 @@ export class RefundReason {
138138
*
139139
* @example
140140
* sdk.admin.refundReason.create({
141-
* value: "refund",
141+
* code: "refund",
142142
* label: "Refund",
143143
* })
144144
* .then(({ refund_reason }) => {
@@ -176,7 +176,7 @@ export class RefundReason {
176176
*
177177
* @example
178178
* sdk.admin.refundReason.update("ret_123", {
179-
* value: "refund",
179+
* code: "refund",
180180
* label: "Refund",
181181
* })
182182
* .then(({ refund_reason }) => {

packages/core/orchestration/src/transaction/transaction-step.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export class TransactionStep {
177177
!!(
178178
this.lastAttempt &&
179179
this.definition.retryInterval &&
180-
Date.now() - this.lastAttempt > this.definition.retryInterval * 1e3
180+
Date.now() - this.lastAttempt >= this.definition.retryInterval * 1e3
181181
)
182182
)
183183
}

0 commit comments

Comments
 (0)