djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display correct weight unit

Browse source
This commit is contained in:
dominik-zeglen 2020-07-13 12:17:31 +02:00
parent 8173624fca
commit d5f6f27b2c
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/productTypes/components/ProductTypeCreatePage/ProductTypeCreatePage.tsx
View file

@ -105,7 +105,7 @@ const ProductTypeCreatePage: React.FC<ProductTypeCreatePageProps> = ({
<ProductTypeShipping
disabled={disabled}
data={data}
defaultWeightUnit={defaultWeightUnit}
weightUnit={defaultWeightUnit}
onChange={change}
/>
</div>

2
src/productTypes/components/ProductTypeDetailsPage/ProductTypeDetailsPage.tsx
View file

@ -199,7 +199,7 @@ const ProductTypeDetailsPage: React.FC<ProductTypeDetailsPageProps> = ({
<ProductTypeShipping
disabled={disabled}
data={data}
defaultWeightUnit={defaultWeightUnit}
weightUnit={productType?.weight?.unit || defaultWeightUnit}
onChange={change}
/>
</div>

7
src/productTypes/components/ProductTypeShipping/ProductTypeShipping.tsx
View file

@ -6,21 +6,20 @@ import { useIntl } from "react-intl";
import CardTitle from "@saleor/components/CardTitle";
import { ControlledCheckbox } from "@saleor/components/ControlledCheckbox";
import { WeightUnitsEnum } from "../../../types/globalTypes";
interface ProductTypeShippingProps {
data: {
isShippingRequired: boolean;
weight: number | null;
};
defaultWeightUnit: WeightUnitsEnum;
weightUnit: string;
disabled: boolean;
onChange: (event: React.ChangeEvent<any>) => void;
}
const ProductTypeShipping: React.FC<ProductTypeShippingProps> = ({
data,
defaultWeightUnit,
weightUnit,
disabled,
onChange
}) => {
@ -48,7 +47,7 @@ const ProductTypeShipping: React.FC<ProductTypeShippingProps> = ({
{data.isShippingRequired && (
<TextField
disabled={disabled}
InputProps={{ endAdornment: defaultWeightUnit }}
InputProps={{ endAdornment: weightUnit }}
label={intl.formatMessage({
defaultMessage: "Weight"
})}