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

Merge pull request #628 from mirumee/fix/minor-bugs

Browse source 
Fix minor bugs
This commit is contained in:
Dominik Żegleń 2020-07-30 14:37:47 +02:00 committed by GitHub
commit 1eb3ec7b2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -14,6 +14,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Add Cypress e2e runner - #584 by @krzysztofwolski - Add Cypress e2e runner - #584 by @krzysztofwolski
- create Apps - #599 by @AlicjaSzu - create Apps - #599 by @AlicjaSzu
- Refactor authorization - #624 by @dominik-zeglen - Refactor authorization - #624 by @dominik-zeglen
- Fix minor bugs - #628 by @dominik-zeglen
## 2.10.1 ## 2.10.1

12
locale/defaultMessages.json
View file

@ -250,10 +250,6 @@
"context": "optional field", "context": "optional field",
"string": "Optional" "string": "Optional"
}, },
"productVariantPriceOptionalPriceField": {
"context": "optional field",
"string": "Optional"
},
"saleDetailsPageCategoriesQuantity": { "saleDetailsPageCategoriesQuantity": {
"context": "number of categories", "context": "number of categories",
"string": "Categories ({quantity})" "string": "Categories ({quantity})"
@ -4393,11 +4389,11 @@
"context": "product pricing, section header", "context": "product pricing, section header",
"string": "Pricing" "string": "Pricing"
}, },
"src_dot_products_dot_components_dot_ProductVariantPrice_dot_1416480328": { "src_dot_products_dot_components_dot_ProductVariantPrice_dot_1134347598": {
"string": "Cost price override" "string": "Price"
}, },
"src_dot_products_dot_components_dot_ProductVariantPrice_dot_2238565650": { "src_dot_products_dot_components_dot_ProductVariantPrice_dot_819659341": {
"string": "Selling price override" "string": "Cost price"
}, },
"src_dot_products_dot_components_dot_ProductVariants_dot_1001303107": { "src_dot_products_dot_components_dot_ProductVariants_dot_1001303107": {
"context": "product variant inventory", "context": "product variant inventory",

1
src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx
View file

@ -151,6 +151,7 @@ const OrderDraftDetailsProducts: React.FC<OrderDraftDetailsProductsProps> = prop
type="number" type="number"
value={data.quantity} value={data.quantity}
onChange={debounce} onChange={debounce}
onBlur={submit}
/> />
)} )}
</DebounceForm> </DebounceForm>

12
src/products/components/ProductVariantPrice/ProductVariantPrice.tsx
View file

@ -51,16 +51,8 @@ const ProductVariantPrice: React.FC<ProductVariantPriceProps> = props => {
error={!!formErrors.price} error={!!formErrors.price}
name="price" name="price"
label={intl.formatMessage({ label={intl.formatMessage({
defaultMessage: "Selling price override" defaultMessage: "Price"
})} })}
hint={
getProductErrorMessage(formErrors.price, intl) ||
intl.formatMessage({
defaultMessage: "Optional",
description: "optional field",
id: "productVariantPriceOptionalPriceField"
})
}
value={price} value={price}
currencySymbol={currencySymbol} currencySymbol={currencySymbol}
onChange={onChange} onChange={onChange}
@ -72,7 +64,7 @@ const ProductVariantPrice: React.FC<ProductVariantPriceProps> = props => {
error={!!formErrors.cost_price} error={!!formErrors.cost_price}
name="costPrice" name="costPrice"
label={intl.formatMessage({ label={intl.formatMessage({
defaultMessage: "Cost price override" defaultMessage: "Cost price"
})} })}
hint={ hint={
getProductErrorMessage(formErrors.cost_price, intl) || getProductErrorMessage(formErrors.cost_price, intl) ||

2
src/shipping/views/ShippingZoneDetails/data.ts
View file

@ -28,7 +28,7 @@ export function getCreateShippingRateVariables(
minimumOrderPrice: minimumOrderPrice:
params.type === ShippingMethodTypeEnum.PRICE params.type === ShippingMethodTypeEnum.PRICE
? getValue(data.maxValue, data.noLimits) ? getValue(data.minValue, data.noLimits)
: null, : null,
minimumOrderWeight: minimumOrderWeight:
params.type === ShippingMethodTypeEnum.WEIGHT params.type === ShippingMethodTypeEnum.WEIGHT

63
src/storybook/__snapshots__/Stories.test.ts.snap
View file

@ -117229,7 +117229,7 @@ exports[`Storyshots Views / Products / Create product variant add first variant
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
data-shrink="false" data-shrink="false"
> >
Selling price override Price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -117265,11 +117265,6 @@ exports[`Storyshots Views / Products / Create product variant add first variant
</legend> </legend>
</fieldset> </fieldset>
</div> </div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
>
Optional
</p>
</div> </div>
</div> </div>
<div> <div>
@ -117280,7 +117275,7 @@ exports[`Storyshots Views / Products / Create product variant add first variant
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
data-shrink="false" data-shrink="false"
> >
Cost price override Cost price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -117901,7 +117896,7 @@ exports[`Storyshots Views / Products / Create product variant default 1`] = `
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
data-shrink="false" data-shrink="false"
> >
Selling price override Price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -117937,11 +117932,6 @@ exports[`Storyshots Views / Products / Create product variant default 1`] = `
</legend> </legend>
</fieldset> </fieldset>
</div> </div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
>
Optional
</p>
</div> </div>
</div> </div>
<div> <div>
@ -117952,7 +117942,7 @@ exports[`Storyshots Views / Products / Create product variant default 1`] = `
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
data-shrink="false" data-shrink="false"
> >
Cost price override Cost price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -118495,7 +118485,7 @@ exports[`Storyshots Views / Products / Create product variant when loading data
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
data-shrink="false" data-shrink="false"
> >
Selling price override Price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -118532,11 +118522,6 @@ exports[`Storyshots Views / Products / Create product variant when loading data
</legend> </legend>
</fieldset> </fieldset>
</div> </div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-disabled-id"
>
Optional
</p>
</div> </div>
</div> </div>
<div> <div>
@ -118547,7 +118532,7 @@ exports[`Storyshots Views / Products / Create product variant when loading data
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
data-shrink="false" data-shrink="false"
> >
Cost price override Cost price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -119186,7 +119171,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
data-shrink="false" data-shrink="false"
> >
Selling price override Price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -119222,11 +119207,6 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
</legend> </legend>
</fieldset> </fieldset>
</div> </div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id"
>
Optional
</p>
</div> </div>
</div> </div>
<div> <div>
@ -119237,7 +119217,7 @@ exports[`Storyshots Views / Products / Create product variant with errors 1`] =
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id"
data-shrink="false" data-shrink="false"
> >
Cost price override Cost price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -139289,7 +139269,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
data-shrink="true" data-shrink="true"
> >
Selling price override Price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -139325,11 +139305,6 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
</legend> </legend>
</fieldset> </fieldset>
</div> </div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
>
Optional
</p>
</div> </div>
</div> </div>
<div> <div>
@ -139340,7 +139315,7 @@ exports[`Storyshots Views / Products / Product variant details attribute errors
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
data-shrink="true" data-shrink="true"
> >
Cost price override Cost price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -140259,7 +140234,7 @@ exports[`Storyshots Views / Products / Product variant details when loaded data
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
data-shrink="true" data-shrink="true"
> >
Selling price override Price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -140295,11 +140270,6 @@ exports[`Storyshots Views / Products / Product variant details when loaded data
</legend> </legend>
</fieldset> </fieldset>
</div> </div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
>
Optional
</p>
</div> </div>
</div> </div>
<div> <div>
@ -140310,7 +140280,7 @@ exports[`Storyshots Views / Products / Product variant details when loaded data
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
data-shrink="true" data-shrink="true"
> >
Cost price override Cost price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -141009,7 +140979,7 @@ exports[`Storyshots Views / Products / Product variant details when loading data
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
data-shrink="false" data-shrink="false"
> >
Selling price override Price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"
@ -141038,11 +141008,6 @@ exports[`Storyshots Views / Products / Product variant details when loading data
</legend> </legend>
</fieldset> </fieldset>
</div> </div>
<p
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-disabled-id"
>
Optional
</p>
</div> </div>
</div> </div>
<div> <div>
@ -141053,7 +141018,7 @@ exports[`Storyshots Views / Products / Product variant details when loading data
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id" class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
data-shrink="false" data-shrink="false"
> >
Cost price override Cost price
</label> </label>
<div <div
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id" class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id MuiInputBase-adornedEnd-id MuiOutlinedInput-adornedEnd-id"