-
- {filters && filters.length > 0 && (
-
- )}
+ (search || orderBy || filters || prefix) && (
+
+
+ {filters && filters.length > 0 && (
+
+ )}
+
+
+ {search && }
+ {orderBy && }
+
-
- {search && }
- {orderBy && }
-
-
+ )
)
}
diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/taxes/type-cell/index.ts b/packages/admin-next/dashboard/src/components/table/table-cells/taxes/type-cell/index.ts
new file mode 100644
index 0000000000..4db84006ba
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/table/table-cells/taxes/type-cell/index.ts
@@ -0,0 +1 @@
+export * from "./type-cell"
diff --git a/packages/admin-next/dashboard/src/components/table/table-cells/taxes/type-cell/type-cell.tsx b/packages/admin-next/dashboard/src/components/table/table-cells/taxes/type-cell/type-cell.tsx
new file mode 100644
index 0000000000..15b41543e0
--- /dev/null
+++ b/packages/admin-next/dashboard/src/components/table/table-cells/taxes/type-cell/type-cell.tsx
@@ -0,0 +1,33 @@
+import { Badge } from "@medusajs/ui"
+
+type CellProps = {
+ is_combinable: boolean
+}
+
+type HeaderProps = {
+ text: string
+}
+
+export const TypeCell = ({ is_combinable }: CellProps) => {
+ return (
+
+
+ {is_combinable ? (
+
+ Combinable
+
+ ) : (
+ ""
+ )}
+
+
+ )
+}
+
+export const TypeHeader = ({ text }: HeaderProps) => {
+ return (
+
+ {text}
+
+ )
+}
diff --git a/packages/admin-next/dashboard/src/hooks/api/tax-rates.tsx b/packages/admin-next/dashboard/src/hooks/api/tax-rates.tsx
new file mode 100644
index 0000000000..01983f2151
--- /dev/null
+++ b/packages/admin-next/dashboard/src/hooks/api/tax-rates.tsx
@@ -0,0 +1,119 @@
+import {
+ AdminPostTaxRatesReq,
+ AdminPostTaxRatesTaxRateReq,
+} from "@medusajs/medusa"
+import { AdminTaxRateListResponse, AdminTaxRateResponse } from "@medusajs/types"
+import {
+ QueryKey,
+ useMutation,
+ UseMutationOptions,
+ useQuery,
+ UseQueryOptions,
+} from "@tanstack/react-query"
+import { client } from "../../lib/client"
+import { queryClient } from "../../lib/medusa"
+import { queryKeysFactory } from "../../lib/query-key-factory"
+import { TaxRateDeleteRes } from "../../types/api-responses"
+
+const TAX_RATES_QUERY_KEY = "tax_rates" as const
+export const taxRatesQueryKeys = queryKeysFactory(TAX_RATES_QUERY_KEY)
+
+export const useTaxRate = (
+ id: string,
+ query?: Record
,
+ options?: Omit<
+ UseQueryOptions<
+ AdminTaxRateResponse,
+ Error,
+ AdminTaxRateResponse,
+ QueryKey
+ >,
+ "queryFn" | "queryKey"
+ >
+) => {
+ const { data, ...rest } = useQuery({
+ queryKey: taxRatesQueryKeys.detail(id),
+ queryFn: async () => client.taxes.retrieveTaxRate(id, query),
+ ...options,
+ })
+
+ return { ...data, ...rest }
+}
+
+export const useTaxRates = (
+ query?: Record,
+ options?: Omit<
+ UseQueryOptions<
+ AdminTaxRateListResponse,
+ Error,
+ AdminTaxRateListResponse,
+ QueryKey
+ >,
+ "queryFn" | "queryKey"
+ >
+) => {
+ const { data, ...rest } = useQuery({
+ queryFn: () => client.taxes.listTaxRates(query),
+ queryKey: taxRatesQueryKeys.list(query),
+ ...options,
+ })
+
+ return { ...data, ...rest }
+}
+
+export const useUpdateTaxRate = (
+ id: string,
+ options?: UseMutationOptions<
+ AdminTaxRateResponse,
+ Error,
+ AdminPostTaxRatesTaxRateReq
+ >
+) => {
+ return useMutation({
+ mutationFn: (payload) => client.taxes.updateTaxRate(id, payload),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({ queryKey: taxRatesQueryKeys.lists() })
+ queryClient.invalidateQueries({
+ queryKey: taxRatesQueryKeys.detail(id),
+ })
+
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
+
+export const useCreateTaxRate = (
+ options?: UseMutationOptions<
+ AdminTaxRateResponse,
+ Error,
+ AdminPostTaxRatesReq
+ >
+) => {
+ return useMutation({
+ mutationFn: (payload) => client.taxes.createTaxRate(payload),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({ queryKey: taxRatesQueryKeys.lists() })
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
+
+export const useDeleteTaxRate = (
+ id: string,
+ options?: UseMutationOptions
+) => {
+ return useMutation({
+ mutationFn: () => client.taxes.deleteTaxRate(id),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({ queryKey: taxRatesQueryKeys.lists() })
+ queryClient.invalidateQueries({
+ queryKey: taxRatesQueryKeys.detail(id),
+ })
+
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
diff --git a/packages/admin-next/dashboard/src/hooks/api/tax-regions.tsx b/packages/admin-next/dashboard/src/hooks/api/tax-regions.tsx
index b98230d3d7..6c516242fa 100644
--- a/packages/admin-next/dashboard/src/hooks/api/tax-regions.tsx
+++ b/packages/admin-next/dashboard/src/hooks/api/tax-regions.tsx
@@ -1,13 +1,22 @@
-import { QueryKey, UseQueryOptions, useQuery } from "@tanstack/react-query"
-import { client } from "../../lib/client"
-import { queryKeysFactory } from "../../lib/query-key-factory"
+import { AdminCreateTaxRegion } from "@medusajs/medusa"
import {
- AdminTaxRegionResponse,
AdminTaxRegionListResponse,
+ AdminTaxRegionResponse,
} from "@medusajs/types"
+import {
+ QueryKey,
+ UseMutationOptions,
+ UseQueryOptions,
+ useMutation,
+ useQuery,
+} from "@tanstack/react-query"
+import { client } from "../../lib/client"
+import { queryClient } from "../../lib/medusa"
+import { queryKeysFactory } from "../../lib/query-key-factory"
+import { TaxRegionDeleteRes } from "../../types/api-responses"
const TAX_REGIONS_QUERY_KEY = "tax_regions" as const
-const taxRegionsQueryKeys = queryKeysFactory(TAX_REGIONS_QUERY_KEY)
+export const taxRegionsQueryKeys = queryKeysFactory(TAX_REGIONS_QUERY_KEY)
export const useTaxRegion = (
id: string,
@@ -51,3 +60,38 @@ export const useTaxRegions = (
return { ...data, ...rest }
}
+
+export const useCreateTaxRegion = (
+ options?: UseMutationOptions<
+ AdminTaxRegionResponse,
+ Error,
+ AdminCreateTaxRegion
+ >
+) => {
+ return useMutation({
+ mutationFn: (payload) => client.taxes.createTaxRegion(payload),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({ queryKey: taxRegionsQueryKeys.all })
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
+
+export const useDeleteTaxRegion = (
+ id: string,
+ options?: UseMutationOptions
+) => {
+ return useMutation({
+ mutationFn: () => client.taxes.deleteTaxRegion(id),
+ onSuccess: (data, variables, context) => {
+ queryClient.invalidateQueries({ queryKey: taxRegionsQueryKeys.lists() })
+ queryClient.invalidateQueries({
+ queryKey: taxRegionsQueryKeys.detail(id),
+ })
+
+ options?.onSuccess?.(data, variables, context)
+ },
+ ...options,
+ })
+}
diff --git a/packages/admin-next/dashboard/src/hooks/table/columns/use-tax-rates-table-columns.tsx b/packages/admin-next/dashboard/src/hooks/table/columns/use-tax-rates-table-columns.tsx
new file mode 100644
index 0000000000..2e96600a36
--- /dev/null
+++ b/packages/admin-next/dashboard/src/hooks/table/columns/use-tax-rates-table-columns.tsx
@@ -0,0 +1,55 @@
+import { createColumnHelper } from "@tanstack/react-table"
+import { useMemo } from "react"
+import { useTranslation } from "react-i18next"
+
+import { TaxRateResponse } from "@medusajs/types"
+import {
+ TextCell,
+ TextHeader,
+} from "../../../components/table/table-cells/common/text-cell"
+
+import {
+ TypeCell,
+ TypeHeader,
+} from "../../../components/table/table-cells/taxes/type-cell"
+
+const columnHelper = createColumnHelper()
+
+export const useTaxRateTableColumns = () => {
+ const { t } = useTranslation()
+
+ return useMemo(
+ () => [
+ columnHelper.display({
+ id: "name",
+ header: () => ,
+ cell: ({ row }) => ,
+ }),
+ columnHelper.display({
+ id: "province",
+ header: () => ,
+ cell: ({ row }) => (
+
+ ),
+ }),
+ columnHelper.display({
+ id: "rate",
+ header: () => ,
+ cell: ({ row }) => ,
+ }),
+ columnHelper.display({
+ id: "is_combinable",
+ header: () => ,
+ cell: ({ row }) => (
+
+ ),
+ }),
+ columnHelper.display({
+ id: "code",
+ header: () => ,
+ cell: ({ row }) => ,
+ }),
+ ],
+ []
+ )
+}
diff --git a/packages/admin-next/dashboard/src/hooks/table/filters/use-tax-rate-table-filters.tsx b/packages/admin-next/dashboard/src/hooks/table/filters/use-tax-rate-table-filters.tsx
new file mode 100644
index 0000000000..2a21625940
--- /dev/null
+++ b/packages/admin-next/dashboard/src/hooks/table/filters/use-tax-rate-table-filters.tsx
@@ -0,0 +1,19 @@
+import { useTranslation } from "react-i18next"
+import { Filter } from "../../../components/table/data-table"
+
+export const useTaxRateTableFilters = () => {
+ const { t } = useTranslation()
+
+ const dateFilters: Filter[] = [
+ { label: t("fields.createdAt"), key: "created_at" },
+ { label: t("fields.updatedAt"), key: "updated_at" },
+ ].map((f) => ({
+ key: f.key,
+ label: f.label,
+ type: "date",
+ }))
+
+ const filters = [...dateFilters]
+
+ return filters
+}
diff --git a/packages/admin-next/dashboard/src/hooks/table/query/use-tax-rate-table-query.tsx b/packages/admin-next/dashboard/src/hooks/table/query/use-tax-rate-table-query.tsx
new file mode 100644
index 0000000000..04fa145750
--- /dev/null
+++ b/packages/admin-next/dashboard/src/hooks/table/query/use-tax-rate-table-query.tsx
@@ -0,0 +1,33 @@
+import { AdminGetTaxRatesParams } from "@medusajs/medusa"
+import { useQueryParams } from "../../use-query-params"
+
+type UseTaxRateTableQueryProps = {
+ prefix?: string
+ pageSize?: number
+}
+
+export const useTaxRateTableQuery = ({
+ prefix,
+ pageSize = 20,
+}: UseTaxRateTableQueryProps) => {
+ const queryObject = useQueryParams(
+ ["offset", "q", "order", "created_at", "updated_at"],
+ prefix
+ )
+
+ const { offset, q, order, created_at, updated_at } = queryObject
+
+ const searchParams: AdminGetTaxRatesParams = {
+ limit: pageSize,
+ offset: offset ? Number(offset) : 0,
+ order,
+ created_at: created_at ? JSON.parse(created_at) : undefined,
+ updated_at: updated_at ? JSON.parse(updated_at) : undefined,
+ q,
+ }
+
+ return {
+ searchParams,
+ raw: queryObject,
+ }
+}
diff --git a/packages/admin-next/dashboard/src/lib/client/taxes.ts b/packages/admin-next/dashboard/src/lib/client/taxes.ts
index 4edb7f0aac..6eb9d4d7c5 100644
--- a/packages/admin-next/dashboard/src/lib/client/taxes.ts
+++ b/packages/admin-next/dashboard/src/lib/client/taxes.ts
@@ -1,8 +1,14 @@
import {
+ AdminCreateTaxRegion,
+ AdminPostTaxRatesTaxRateReq,
+} from "@medusajs/medusa"
+import {
+ AdminTaxRateResponse,
AdminTaxRegionListResponse,
AdminTaxRegionResponse,
} from "@medusajs/types"
-import { getRequest } from "./common"
+import { TaxRateDeleteRes, TaxRegionDeleteRes } from "../../types/api-responses"
+import { deleteRequest, getRequest, postRequest } from "./common"
async function retrieveTaxRegion(id: string, query?: Record) {
return getRequest(`/admin/tax-regions/${id}`, query)
@@ -12,7 +18,42 @@ async function listTaxRegions(query?: Record) {
return getRequest(`/admin/tax-regions`, query)
}
+async function createTaxRegion(payload: AdminCreateTaxRegion) {
+ return postRequest(`/admin/tax-regions`, payload)
+}
+
+async function deleteTaxRegion(id: string) {
+ return deleteRequest(`/admin/tax-regions/${id}`)
+}
+
+async function retrieveTaxRate(id: string, query?: Record) {
+ return getRequest(`/admin/tax-rates/${id}`, query)
+}
+
+async function listTaxRates(query?: Record) {
+ return getRequest(`/admin/tax-rates`, query)
+}
+
+async function updateTaxRate(id: string, payload: AdminPostTaxRatesTaxRateReq) {
+ return postRequest(`/admin/tax-rates/${id}`, payload)
+}
+
+async function createTaxRate(payload: AdminCreateTaxRate) {
+ return postRequest(`/admin/tax-rates`, payload)
+}
+
+async function deleteTaxRate(id: string) {
+ return deleteRequest(`/admin/tax-rates/${id}`)
+}
+
export const taxes = {
retrieveTaxRegion,
listTaxRegions,
+ retrieveTaxRate,
+ listTaxRates,
+ updateTaxRate,
+ createTaxRegion,
+ deleteTaxRegion,
+ createTaxRate,
+ deleteTaxRate,
}
diff --git a/packages/admin-next/dashboard/src/lib/countries.ts b/packages/admin-next/dashboard/src/lib/countries.ts
index 62ce8cea73..bf1fa276d9 100644
--- a/packages/admin-next/dashboard/src/lib/countries.ts
+++ b/packages/admin-next/dashboard/src/lib/countries.ts
@@ -1,6 +1,16 @@
/** This file is auto-generated. Do not modify it manually. */
import type { RegionCountryDTO } from "@medusajs/types"
+export function getCountryByIso2(
+ iso2: string | null
+): Omit | undefined {
+ if (!iso2) {
+ return
+ }
+
+ return countries.find((c) => c.iso_2 === iso2)
+}
+
export const countries: Omit[] = [
{
iso_2: "af",
diff --git a/packages/admin-next/dashboard/src/providers/router-provider/v2.tsx b/packages/admin-next/dashboard/src/providers/router-provider/v2.tsx
index 9505e090bc..0c4b2bf749 100644
--- a/packages/admin-next/dashboard/src/providers/router-provider/v2.tsx
+++ b/packages/admin-next/dashboard/src/providers/router-provider/v2.tsx
@@ -9,6 +9,8 @@ import {
AdminApiKeyResponse,
AdminCustomerGroupResponse,
AdminProductCategoryResponse,
+ AdminTaxRateResponse,
+ AdminTaxRegionResponse,
SalesChannelDTO,
UserDTO,
} from "@medusajs/types"
@@ -757,7 +759,56 @@ export const v2Routes: RouteObject[] = [
{
path: "",
lazy: () => import("../../v2-routes/taxes/tax-region-list"),
- children: [],
+ children: [
+ {
+ path: "create",
+ lazy: () =>
+ import("../../v2-routes/taxes/tax-region-create"),
+ children: [],
+ },
+ ],
+ },
+ {
+ path: ":id",
+ lazy: () => import("../../v2-routes/taxes/tax-region-detail"),
+ handle: {
+ crumb: (data: AdminTaxRegionResponse) => {
+ return data.tax_region.country_code
+ },
+ },
+ children: [
+ {
+ path: "create-default",
+ lazy: () =>
+ import("../../v2-routes/taxes/tax-province-create"),
+ children: [],
+ },
+ {
+ path: "create-override",
+ lazy: () => import("../../v2-routes/taxes/tax-rate-create"),
+ children: [],
+ },
+ {
+ path: "tax-rates",
+ children: [
+ {
+ path: ":taxRateId",
+ children: [
+ {
+ path: "edit",
+ lazy: () =>
+ import("../../v2-routes/taxes/tax-rate-edit"),
+ handle: {
+ crumb: (data: AdminTaxRateResponse) => {
+ return data.tax_rate.code
+ },
+ },
+ },
+ ],
+ },
+ ],
+ },
+ ],
},
],
},
diff --git a/packages/admin-next/dashboard/src/types/api-responses.ts b/packages/admin-next/dashboard/src/types/api-responses.ts
index 6bdfaa7ddb..ffbf536684 100644
--- a/packages/admin-next/dashboard/src/types/api-responses.ts
+++ b/packages/admin-next/dashboard/src/types/api-responses.ts
@@ -142,6 +142,10 @@ export type ProductCollectionListRes = {
} & ListRes
export type ProductCollectionDeleteRes = DeleteRes
+// Taxes
+export type TaxRegionDeleteRes = DeleteRes
+export type TaxRateDeleteRes = DeleteRes
+
// Inventory Items
export type InventoryItemRes = {
inventory_item: InventoryNext.InventoryItemDTO & {
diff --git a/packages/admin-next/dashboard/src/v2-routes/regions/region-list/components/region-list-table/region-list-table.tsx b/packages/admin-next/dashboard/src/v2-routes/regions/region-list/components/region-list-table/region-list-table.tsx
index b07fef8289..d037b1fc2b 100644
--- a/packages/admin-next/dashboard/src/v2-routes/regions/region-list/components/region-list-table/region-list-table.tsx
+++ b/packages/admin-next/dashboard/src/v2-routes/regions/region-list/components/region-list-table/region-list-table.tsx
@@ -1,18 +1,18 @@
import { PencilSquare, Trash } from "@medusajs/icons"
+import { RegionDTO } from "@medusajs/types"
import { Button, Container, Heading, usePrompt } from "@medusajs/ui"
import { createColumnHelper } from "@tanstack/react-table"
import { useMemo } from "react"
import { useTranslation } from "react-i18next"
import { Link } from "react-router-dom"
-import { RegionDTO } from "@medusajs/types"
import { ActionMenu } from "../../../../../components/common/action-menu"
import { DataTable } from "../../../../../components/table/data-table"
+import { useDeleteRegion, useRegions } from "../../../../../hooks/api/regions"
import { useRegionTableColumns } from "../../../../../hooks/table/columns/use-region-table-columns"
import { useRegionTableFilters } from "../../../../../hooks/table/filters/use-region-table-filters"
import { useRegionTableQuery } from "../../../../../hooks/table/query/use-region-table-query"
import { useDataTable } from "../../../../../hooks/use-data-table"
-import { useDeleteRegion, useRegions } from "../../../../../hooks/api/regions"
const PAGE_SIZE = 20
@@ -56,6 +56,7 @@ export const RegionListTable = () => {