{
const CreateView = ({
onSuccess,
token,
- invite,
}: {
onSuccess: () => void
token: string
@@ -197,7 +196,7 @@ const CreateView = ({
const form = useForm>({
resolver: zodResolver(CreateAccountSchema),
defaultValues: {
- email: invite.user_email,
+ email: "",
first_name: "",
last_name: "",
password: "",
@@ -205,37 +204,49 @@ const CreateView = ({
},
})
- const { mutateAsync, isLoading } = useAdminAcceptInvite()
+ const { mutateAsync: createAuthUser, isPending: isCreatingAuthUser } =
+ useCreateAuthUser()
+
+ const { mutateAsync: acceptInvite, isPending: isAcceptingInvite } =
+ useAcceptInvite(token)
const handleSubmit = form.handleSubmit(async (data) => {
- await mutateAsync(
- {
- user: {
- first_name: data.first_name,
- last_name: data.last_name,
- password: data.password,
- },
- token: token!,
- },
- {
- onSuccess,
- onError: (error) => {
- if (isAxiosError(error) && error.response?.status === 400) {
- form.setError("root", {
- type: "manual",
- message: t("invite.invalidInvite"),
- })
- setInvalid(true)
- return
- }
+ try {
+ const { token: authToken } = await createAuthUser({
+ email: data.email,
+ password: data.password,
+ })
- form.setError("root", {
- type: "manual",
- message: t("errors.serverError"),
- })
- },
+ const invitePayload = {
+ email: data.email,
+ first_name: data.first_name,
+ last_name: data.last_name,
}
- )
+
+ await acceptInvite({
+ ...invitePayload,
+ auth_token: authToken,
+ })
+ onSuccess()
+ toast.success(t("general.success"), {
+ description: t("invite.toast.accepted"),
+ dismissLabel: t("actions.close"),
+ })
+ } catch (error) {
+ if (isAxiosError(error) && error.response?.status === 400) {
+ form.setError("root", {
+ type: "manual",
+ message: t("invite.invalidInvite"),
+ })
+ setInvalid(true)
+ return
+ }
+
+ form.setError("root", {
+ type: "manual",
+ message: t("errors.serverError"),
+ })
+ }
})
return (
@@ -257,9 +268,7 @@ const CreateView = ({
{t("fields.email")}
-
-
-
+
@@ -343,7 +352,7 @@ const CreateView = ({
@@ -376,9 +385,9 @@ const SuccessView = () => {
}
const InviteSchema = z.object({
- invite_id: z.string(),
- role: z.string(),
- user_email: z.string().email(),
+ id: z.string(),
+ jti: z.string(),
+ exp: z.number(),
iat: z.number(),
})
diff --git a/packages/admin-next/dashboard/src/routes/login/index.ts b/packages/admin-next/dashboard/src/routes/login/index.ts
index 984b6fdd60..f1fc40c3a3 100644
--- a/packages/admin-next/dashboard/src/routes/login/index.ts
+++ b/packages/admin-next/dashboard/src/routes/login/index.ts
@@ -1 +1 @@
-export { Login as Component } from "./login";
+export { Login as Component } from "./login"
diff --git a/packages/admin-next/dashboard/src/routes/login/login.tsx b/packages/admin-next/dashboard/src/routes/login/login.tsx
index 79fe99c74c..b9938fafd9 100644
--- a/packages/admin-next/dashboard/src/routes/login/login.tsx
+++ b/packages/admin-next/dashboard/src/routes/login/login.tsx
@@ -1,6 +1,5 @@
import { zodResolver } from "@hookform/resolvers/zod"
-import { Button, Heading, Input, Text } from "@medusajs/ui"
-import { useAdminLogin } from "medusa-react"
+import { Alert, Button, Heading, Input, Text } from "@medusajs/ui"
import { useForm } from "react-hook-form"
import { Trans, useTranslation } from "react-i18next"
import { Link, useLocation, useNavigate } from "react-router-dom"
@@ -8,6 +7,7 @@ import * as z from "zod"
import { Form } from "../../components/common/form"
import { LogoBox } from "../../components/common/logo-box"
+import { useEmailPassLogin } from "../../hooks/api/auth"
import { isAxiosError } from "../../lib/is-axios-error"
const LoginSchema = z.object({
@@ -30,42 +30,42 @@ export const Login = () => {
},
})
- const { mutateAsync, isLoading } = useAdminLogin({
- retry: false,
- })
+ // TODO: Update when more than emailpass is supported
+ const { mutateAsync, isPending } = useEmailPassLogin()
const handleSubmit = form.handleSubmit(async ({ email, password }) => {
- await mutateAsync(
- { email, password },
- {
- onSuccess: () => {
- navigate(from, { replace: true })
- },
- onError: (error) => {
- if (isAxiosError(error)) {
- if (error.response?.status === 401) {
- form.setError("email", {
- type: "manual",
- })
+ try {
+ await mutateAsync({
+ email,
+ password,
+ })
- form.setError("password", {
- type: "manual",
- message: t("errors.invalidCredentials"),
- })
-
- return
- }
- }
-
- form.setError("root.serverError", {
+ navigate(from, { replace: true })
+ } catch (error) {
+ if (isAxiosError(error)) {
+ if (error.response?.status === 401) {
+ form.setError("email", {
type: "manual",
- message: t("errors.serverError"),
})
- },
+
+ form.setError("password", {
+ type: "manual",
+ message: t("errors.invalidCredentials"),
+ })
+
+ return
+ }
}
- )
+
+ form.setError("root.serverError", {
+ type: "manual",
+ message: t("errors.serverError"),
+ })
+ }
})
+ const serverError = form.formState.errors?.root?.serverError?.message
+
return (
@@ -117,10 +117,15 @@ export const Login = () => {
}}
/>
-
- {item.quantity}x
+
+ {item.quantity - item.detail.fulfilled_quantity}
+
+ x
@@ -97,19 +103,16 @@ const UnfulfilledItem = ({
)
}
-const UnfulfilledItemBreakdown = ({ order }: { order: Order }) => {
+const UnfulfilledItemBreakdown = ({
+ order,
+}: {
+ order: OrderDTO & { fulfillments: FulfillmentDTO[] }
+}) => {
const { t } = useTranslation()
- const fulfillmentItems = order.fulfillments?.map((f) =>
- f.items.map((i) => ({ id: i.item_id, quantity: i.quantity }))
- )
-
// Create an array of order items that haven't been fulfilled or at least not fully fulfilled
- const unfulfilledItems = order.items.filter(
- (i) =>
- !fulfillmentItems?.some((fi) =>
- fi.some((f) => f.id === i.id && f.quantity === i.quantity)
- )
+ const unfulfilledItems = order.items!.filter(
+ (i) => i.detail.fulfilled_quantity < i.quantity
)
if (!unfulfilledItems.length) {
@@ -122,9 +125,21 @@ const UnfulfilledItemBreakdown = ({ order }: { order: Order }) => {
{t("orders.fulfillment.unfulfilledItems")}
- {t("orders.fulfillment.awaitingFullfillmentBadge")}
+ {t("orders.fulfillment.awaitingFulfillmentBadge")}
-
+
,
+ to: `/orders/${order.id}/fulfillment`,
+ },
+ ],
+ },
+ ]}
+ />
@@ -145,8 +160,8 @@ const Fulfillment = ({
order,
index,
}: {
- fulfillment: MedusaFulfillment
- order: Order
+ fulfillment: FulfillmentDTO
+ order: OrderDTO
index: number
}) => {
const { t } = useTranslation()
@@ -154,7 +169,7 @@ const Fulfillment = ({
const showLocation = !!fulfillment.location_id
- const { stock_location, isError, error } = useAdminStockLocation(
+ const { stock_location, isError, error } = useStockLocation(
fulfillment.location_id!,
{
enabled: showLocation,
@@ -175,11 +190,14 @@ const Fulfillment = ({
statusTimestamp = fulfillment.shipped_at
}
- const { mutateAsync } = useAdminCancelFulfillment(order.id)
+ const { mutateAsync } = useCancelFulfillment(fulfillment.id)
const handleCancel = async () => {
if (fulfillment.shipped_at) {
- // TODO: When we have implemented Toasts we should show an error toast here
+ toast.warning(t("general.warning"), {
+ description: t("orders.fulfillment.toast.fulfillmentShipped"),
+ dismissLabel: t("actions.close"),
+ })
return
}
@@ -191,7 +209,19 @@ const Fulfillment = ({
})
if (res) {
- await mutateAsync(fulfillment.id)
+ try {
+ await mutateAsync(fulfillment.id)
+
+ toast.success(t("general.success"), {
+ description: t("orders.fulfillment.toast.canceled"),
+ dismissLabel: t("actions.close"),
+ })
+ } catch (e) {
+ toast.error(t("general.error"), {
+ description: e.message,
+ dismissLabel: t("actions.close"),
+ })
+ }
}
}
@@ -226,6 +256,7 @@ const Fulfillment = ({
label: t("actions.cancel"),
icon:
,
onClick: handleCancel,
+ disabled: !!fulfillment.canceled_at,
},
],
},
@@ -239,9 +270,9 @@ const Fulfillment = ({
{fulfillment.items.map((f_item) => (
- -
+
-
- {f_item.item.quantity}x {f_item.item.title}
+ {f_item.quantity}x {f_item.title}
))}
@@ -254,7 +285,7 @@ const Fulfillment = ({
{stock_location ? (
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx
index 22f2a9bbd8..16b6b59f76 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-general-section/order-general-section.tsx
@@ -9,7 +9,6 @@ import {
usePrompt,
} from "@medusajs/ui"
import { format } from "date-fns"
-import { useAdminCancelOrder } from "medusa-react"
import { useTranslation } from "react-i18next"
import { ActionMenu } from "../../../../../components/common/action-menu"
import {
@@ -25,7 +24,7 @@ export const OrderGeneralSection = ({ order }: OrderGeneralSectionProps) => {
const { t } = useTranslation()
const prompt = usePrompt()
- const { mutateAsync } = useAdminCancelOrder(order.id)
+ const { mutateAsync } = { mutateAsync: () => {} } // cancel order
const handleCancel = async () => {
const res = await prompt({
@@ -54,7 +53,7 @@ export const OrderGeneralSection = ({ order }: OrderGeneralSectionProps) => {
{t("orders.onDateFromSalesChannel", {
date: format(new Date(order.created_at), "dd MMM, yyyy, HH:mm:ss"),
- salesChannel: order.sales_channel.name,
+ salesChannel: order.sales_channel?.name,
})}
@@ -67,11 +66,11 @@ export const OrderGeneralSection = ({ order }: OrderGeneralSectionProps) => {
groups={[
{
actions: [
- {
- label: t("actions.cancel"),
- onClick: handleCancel,
- icon:
,
- },
+ // {
+ // label: t("actions.cancel"),
+ // onClick: handleCancel,
+ // icon:
,
+ // },
],
},
]}
@@ -84,6 +83,11 @@ export const OrderGeneralSection = ({ order }: OrderGeneralSectionProps) => {
const FulfillmentBadge = ({ order }: { order: Order }) => {
const { t } = useTranslation()
+ /**
+ * TODO: revisit when Order<>Fulfillment are linked
+ */
+ return null
+
const { label, color } = getOrderFulfillmentStatus(
t,
order.fulfillment_status
diff --git a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx
index e4653e43d5..e3019aea9c 100644
--- a/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx
+++ b/packages/admin-next/dashboard/src/routes/orders/order-detail/components/order-summary-section/order-summary-section.tsx
@@ -1,9 +1,8 @@
import { Buildings, PencilSquare, ArrowUturnLeft } from "@medusajs/icons"
-import { LineItem, Order } from "@medusajs/medusa"
-import { ReservationItemDTO } from "@medusajs/types"
+import { OrderDTO, OrderLineItemDTO, ReservationItemDTO } from "@medusajs/types"
import { Container, Copy, Heading, StatusBadge, Text } from "@medusajs/ui"
-import { useAdminReservations } from "medusa-react"
import { useTranslation } from "react-i18next"
+
import { ActionMenu } from "../../../../../components/common/action-menu"
import { Thumbnail } from "../../../../../components/common/thumbnail"
import {
@@ -12,7 +11,7 @@ import {
} from "../../../../../lib/money-amount-helpers"
type OrderSummarySectionProps = {
- order: Order
+ order: OrderDTO
}
export const OrderSummarySection = ({ order }: OrderSummarySectionProps) => {
@@ -26,7 +25,7 @@ export const OrderSummarySection = ({ order }: OrderSummarySectionProps) => {
)
}
-const Header = ({ order }: { order: Order }) => {
+const Header = ({ order }: { order: OrderDTO }) => {
const { t } = useTranslation()
return (
@@ -36,21 +35,21 @@ const Header = ({ order }: { order: Order }) => {
groups={[
{
actions: [
- {
- label: t("orders.summary.editItems"),
- to: `/orders/${order.id}/edit`,
- icon:
,
- },
- {
- label: t("orders.summary.allocateItems"),
- to: "#", // TODO: Open modal to allocate items
- icon:
,
- },
- {
- label: t("orders.summary.requestReturn"),
- to: `/orders/${order.id}/returns`,
- icon:
,
- },
+ // {
+ // label: t("orders.summary.editItems"),
+ // to: `/orders/${order.id}/edit`,
+ // icon:
,
+ // },
+ // {
+ // label: t("orders.summary.allocateItems"),
+ // to: "#", // TODO: Open modal to allocate items
+ // icon:
,
+ // },
+ // {
+ // label: t("orders.summary.requestReturn"),
+ // to: `/orders/${order.id}/returns`,
+ // icon:
,
+ // },
],
},
]}
@@ -64,7 +63,7 @@ const Item = ({
currencyCode,
reservation,
}: {
- item: LineItem
+ item: OrderLineItemDTO
currencyCode: string
reservation?: ReservationItemDTO | null
}) => {
@@ -86,14 +85,14 @@ const Item = ({
>
{item.title}
- {item.variant.sku && (
+ {item.variant_sku && (
- {item.variant.sku}
-
+ {item.variant_sku}
+
)}
- {item.variant.options.map((o) => o.value).join(" ยท ")}
+ {item.variant?.options.map((o) => o.value).join(" ยท ")}