Skip to content

Commit

Permalink
Update changelog, stories and messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@dominik-zeglen
dominik-zeglen committed Sep 24, 2020
1 parent 9a9c6a0 commit 5b6a420
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Fix avatar change button - #719 by @orzechdev
- Change plural form of "informations" to "information" strings across the app #722 by @mmarkusik
- Fix misaligned rich text draft controls - #725 by @orzechdev
- Allow taxes to be configured per product - #728 by @dominik-zeglen

## 2.10.1

Expand Down
15 changes: 12 additions & 3 deletions locale/defaultMessages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4322,9 +4322,6 @@
"context": "product price",
"string": "Price"
},
"src_dot_products_dot_components_dot_ProductPricing_dot_3015886868": {
"string": "Charge taxes for this item"
},
"src_dot_products_dot_components_dot_ProductShipping_dot_1325966144": {
"context": "product shipping",
"string": "Shipping"
Expand Down Expand Up @@ -4359,6 +4356,18 @@
"src_dot_products_dot_components_dot_ProductStocks_dot_849869830": {
"string": "Active inventory tracking will automatically calculate changes of stock"
},
"src_dot_products_dot_components_dot_ProductTaxes_dot_1943864488": {
"context": "checkbox",
"string": "Charge taxes on this product"
},
"src_dot_products_dot_components_dot_ProductTaxes_dot_2022558114": {
"context": "select tax ratte",
"string": "Tax Rate"
},
"src_dot_products_dot_components_dot_ProductTaxes_dot_2771905943": {
"context": "checkbox",
"string": "Override the product type's tax rate"
},
"src_dot_products_dot_components_dot_ProductUpdatePage_dot_2232321263": {
"context": "product publication date label",
"string": "will become published on {date}"
Expand Down
3 changes: 3 additions & 0 deletions src/products/components/ProductTaxes/ProductTaxes.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const ProductTaxes: React.FC<ProductTaxesProps> = ({
<ControlledCheckbox
checked={data.changeTaxCode}
disabled={disabled}
data-test="override-tax-type"
label={intl.formatMessage({
defaultMessage: "Override the product type's tax rate",
description: "checkbox"
Expand All @@ -70,6 +71,7 @@ const ProductTaxes: React.FC<ProductTaxesProps> = ({
<ControlledCheckbox
checked={data.chargeTaxes}
disabled={disabled}
data-test="charge-taxes"
label={intl.formatMessage({
defaultMessage: "Charge taxes on this product",
description: "checkbox"
Expand All @@ -82,6 +84,7 @@ const ProductTaxes: React.FC<ProductTaxesProps> = ({
className={classes.select}
disabled={disabled}
displayValue={selectedTaxTypeDisplayName}
data-test="select-tax-type"
label={intl.formatMessage({
defaultMessage: "Tax Rate",
description: "select tax ratte"
Expand Down
29 changes: 29 additions & 0 deletions src/storybook/__snapshots__/Stories.test.ts.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138044,6 +138044,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
data-test="override-tax-type"
>
<span
aria-disabled="true"
Expand Down Expand Up @@ -138089,6 +138090,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
data-test="charge-taxes"
>
<span
aria-disabled="true"
Expand Down Expand Up @@ -139317,6 +139319,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -139360,6 +139363,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -140601,6 +140605,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -140644,6 +140649,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -146396,6 +146402,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -146445,6 +146452,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -146491,6 +146499,7 @@ Ctrl + K"
</label>
<div
class="SingleAutocompleteSelectField-container-id ProductTaxes-select-id"
data-test="select-tax-type"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
Expand Down Expand Up @@ -148610,6 +148619,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -148659,6 +148669,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -148705,6 +148716,7 @@ Ctrl + K"
</label>
<div
class="SingleAutocompleteSelectField-container-id ProductTaxes-select-id"
data-test="select-tax-type"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
Expand Down Expand Up @@ -151117,6 +151129,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -151166,6 +151179,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -151212,6 +151226,7 @@ Ctrl + K"
</label>
<div
class="SingleAutocompleteSelectField-container-id ProductTaxes-select-id"
data-test="select-tax-type"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
Expand Down Expand Up @@ -153758,6 +153773,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -153807,6 +153823,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -153853,6 +153870,7 @@ Ctrl + K"
</label>
<div
class="SingleAutocompleteSelectField-container-id ProductTaxes-select-id"
data-test="select-tax-type"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
Expand Down Expand Up @@ -156231,6 +156249,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -156280,6 +156299,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -156326,6 +156346,7 @@ Ctrl + K"
</label>
<div
class="SingleAutocompleteSelectField-container-id ProductTaxes-select-id"
data-test="select-tax-type"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
Expand Down Expand Up @@ -157720,6 +157741,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
data-test="override-tax-type"
>
<span
aria-disabled="true"
Expand Down Expand Up @@ -157765,6 +157787,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
data-test="charge-taxes"
>
<span
aria-disabled="true"
Expand Down Expand Up @@ -160082,6 +160105,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -160131,6 +160155,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -160177,6 +160202,7 @@ Ctrl + K"
</label>
<div
class="SingleAutocompleteSelectField-container-id ProductTaxes-select-id"
data-test="select-tax-type"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
Expand Down Expand Up @@ -162723,6 +162749,7 @@ Ctrl + K"
>
<label
class="MuiFormControlLabel-root-id"
data-test="override-tax-type"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -162772,6 +162799,7 @@ Ctrl + K"
/>
<label
class="MuiFormControlLabel-root-id"
data-test="charge-taxes"
>
<span
aria-disabled="false"
Expand Down Expand Up @@ -162818,6 +162846,7 @@ Ctrl + K"
</label>
<div
class="SingleAutocompleteSelectField-container-id ProductTaxes-select-id"
data-test="select-tax-type"
>
<div
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
Expand Down

0 comments on commit 5b6a420

Please sign in to comment.