Skip to content

Commit

Permalink
fix(dashboard,js-sdk,types): Remove redundant body for markAsDelivered (
Browse files Browse the repository at this point in the history
medusajs#10964)

Resolves CMRC-623
  • Loading branch information
kasperkristensen authored Jan 20, 2025
1 parent 45b47bf commit d4e042e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 21 deletions.
7 changes: 7 additions & 0 deletions .changeset/brave-students-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@medusajs/dashboard": patch
"@medusajs/js-sdk": patch
"@medusajs/types": patch
---

fix(dashboard,js-sdk,types): Remove redundant body for markAsDelivered
5 changes: 2 additions & 3 deletions packages/admin/dashboard/src/hooks/api/orders.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -259,12 +259,11 @@ export const useMarkOrderFulfillmentAsDelivered = (
options?: UseMutationOptions<
{ order: HttpTypes.AdminOrder },
FetchError,
HttpTypes.AdminMarkOrderFulfillmentAsDelivered
void
>
) => {
return useMutation({
mutationFn: (payload: HttpTypes.AdminMarkOrderFulfillmentAsDelivered) =>
sdk.admin.order.markAsDelivered(orderId, fulfillmentId, payload),
mutationFn: () => sdk.admin.order.markAsDelivered(orderId, fulfillmentId),
onSuccess: (data: any, variables: any, context: any) => {
queryClient.invalidateQueries({
queryKey: ordersQueryKeys.all,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,14 @@ const Fulfillment = ({
})

if (res) {
await markAsDelivered(
{},
{
onSuccess: () => {
toast.success(t("orders.fulfillment.toast.fulfillmentDelivered"))
},
onError: (e) => {
toast.error(e.message)
},
}
)
await markAsDelivered(undefined, {
onSuccess: () => {
toast.success(t("orders.fulfillment.toast.fulfillmentDelivered"))
},
onError: (e) => {
toast.error(e.message)
},
})
}
}

Expand Down
6 changes: 1 addition & 5 deletions packages/core/js-sdk/src/admin/order.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {
AdminOrderChangesResponse,
FindParams,
HttpTypes,
PaginatedResponse,
SelectParams,
} from "@medusajs/types"
import { AdminOrderChangesResponse } from "@medusajs/types"

import { Client } from "../client"
import { ClientHeaders } from "../types"
Expand Down Expand Up @@ -411,7 +411,6 @@ export class Order {
*
* @param id - The order's ID.
* @param fulfillmentId - The fulfillment's ID.
* @param body - The delivery details.
* @param query - Configure the fields to retrieve in the order.
* @param headers - Headers to pass in the request
* @returns The order's details.
Expand All @@ -420,7 +419,6 @@ export class Order {
* sdk.admin.order.markAsDelivered(
* "order_123",
* "ful_123",
* {}
* )
* .then(({ order }) => {
* console.log(order)
Expand All @@ -429,7 +427,6 @@ export class Order {
async markAsDelivered(
id: string,
fulfillmentId: string,
body: HttpTypes.AdminMarkOrderFulfillmentAsDelivered,
query?: SelectParams,
headers?: ClientHeaders
) {
Expand All @@ -438,7 +435,6 @@ export class Order {
{
method: "POST",
headers,
body,
query,
}
)
Expand Down
2 changes: 0 additions & 2 deletions packages/core/types/src/http/order/admin/payload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ export interface AdminCancelOrderFulfillment {
no_notification?: boolean
}

export interface AdminMarkOrderFulfillmentAsDelivered {}

export interface AdminRequestOrderTransfer {
customer_id: string
internal_note?: string
Expand Down

0 comments on commit d4e042e

Please sign in to comment.