fix(dashboard): Set default tax region as parent if no province is chosen (#7484)
* chore: allow tax region to be optional if no province is chosen * chore: fallback region
This commit is contained in:
+14
-13
@@ -1,13 +1,13 @@
|
|||||||
import { zodResolver } from "@hookform/resolvers/zod"
|
import { zodResolver } from "@hookform/resolvers/zod"
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
clx,
|
clx,
|
||||||
DropdownMenu,
|
DropdownMenu,
|
||||||
Heading,
|
Heading,
|
||||||
Input,
|
Input,
|
||||||
Select,
|
Select,
|
||||||
Switch,
|
Switch,
|
||||||
Text,
|
Text,
|
||||||
} from "@medusajs/ui"
|
} from "@medusajs/ui"
|
||||||
import { useForm, useWatch } from "react-hook-form"
|
import { useForm, useWatch } from "react-hook-form"
|
||||||
import { useTranslation } from "react-i18next"
|
import { useTranslation } from "react-i18next"
|
||||||
@@ -20,16 +20,16 @@ import { Form } from "../../../../../components/common/form"
|
|||||||
import { PercentageInput } from "../../../../../components/inputs/percentage-input"
|
import { PercentageInput } from "../../../../../components/inputs/percentage-input"
|
||||||
import { SplitView } from "../../../../../components/layout/split-view"
|
import { SplitView } from "../../../../../components/layout/split-view"
|
||||||
import {
|
import {
|
||||||
RouteFocusModal,
|
RouteFocusModal,
|
||||||
useRouteModal,
|
useRouteModal,
|
||||||
} from "../../../../../components/route-modal"
|
} from "../../../../../components/route-modal"
|
||||||
import { useCreateTaxRate } from "../../../../../hooks/api/tax-rates"
|
import { useCreateTaxRate } from "../../../../../hooks/api/tax-rates"
|
||||||
import { useTaxRegions } from "../../../../../hooks/api/tax-regions"
|
import { useTaxRegions } from "../../../../../hooks/api/tax-regions"
|
||||||
import { ConditionsDrawer } from "../../../common/components/conditions-drawer"
|
import { ConditionsDrawer } from "../../../common/components/conditions-drawer"
|
||||||
import { ConditionEntities } from "../../../common/constants"
|
import { ConditionEntities } from "../../../common/constants"
|
||||||
import {
|
import {
|
||||||
ConditionEntitiesValues,
|
ConditionEntitiesValues,
|
||||||
ConditionsOption,
|
ConditionsOption,
|
||||||
} from "../../../common/types"
|
} from "../../../common/types"
|
||||||
import { Condition } from "../condition"
|
import { Condition } from "../condition"
|
||||||
|
|
||||||
@@ -72,6 +72,7 @@ export const TaxRateCreateForm = ({
|
|||||||
|
|
||||||
const form = useForm<zod.infer<typeof CreateTaxRateSchema>>({
|
const form = useForm<zod.infer<typeof CreateTaxRateSchema>>({
|
||||||
defaultValues: {
|
defaultValues: {
|
||||||
|
tax_region_id: taxRegion.id,
|
||||||
selected_condition_types: {
|
selected_condition_types: {
|
||||||
[ConditionEntities.PRODUCT]: true,
|
[ConditionEntities.PRODUCT]: true,
|
||||||
[ConditionEntities.PRODUCT_TYPE]: false,
|
[ConditionEntities.PRODUCT_TYPE]: false,
|
||||||
@@ -102,7 +103,7 @@ export const TaxRateCreateForm = ({
|
|||||||
code: data.code,
|
code: data.code,
|
||||||
rate: data.rate,
|
rate: data.rate,
|
||||||
is_combinable: data.is_combinable,
|
is_combinable: data.is_combinable,
|
||||||
tax_region_id: data.tax_region_id,
|
tax_region_id: data.tax_region_id || taxRegion.id,
|
||||||
rules:
|
rules:
|
||||||
data.products?.map((product) => ({
|
data.products?.map((product) => ({
|
||||||
reference: "product",
|
reference: "product",
|
||||||
|
|||||||
Reference in New Issue
Block a user