From 5b6a420199a132e2f24d097188bac18a70e11ff1 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Thu, 24 Sep 2020 13:44:19 +0200
Subject: [PATCH] Update changelog, stories and messages

---
 CHANGELOG.md                                  |  1 +
 locale/defaultMessages.json                   | 15 ++++++++--
 .../components/ProductTaxes/ProductTaxes.tsx  |  3 ++
 .../__snapshots__/Stories.test.ts.snap        | 29 +++++++++++++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2baa06eda3..4aabe2613e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
index 95db1b0700..d1bf04bfa9 100644
--- a/locale/defaultMessages.json
+++ b/locale/defaultMessages.json
@@ -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"
@@ -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}"
diff --git a/src/products/components/ProductTaxes/ProductTaxes.tsx b/src/products/components/ProductTaxes/ProductTaxes.tsx
index ec6de48411..a95afe9d1a 100644
--- a/src/products/components/ProductTaxes/ProductTaxes.tsx
+++ b/src/products/components/ProductTaxes/ProductTaxes.tsx
@@ -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"
@@ -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"
@@ -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"
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index 3fb03fc7ce..3bbb85fc9b 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -138044,6 +138044,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="true"
@@ -138089,6 +138090,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="true"
@@ -139317,6 +139319,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -139360,6 +139363,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -140601,6 +140605,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -140644,6 +140649,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -146396,6 +146402,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -146445,6 +146452,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -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"
@@ -148610,6 +148619,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -148659,6 +148669,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -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"
@@ -151117,6 +151129,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -151166,6 +151179,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -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"
@@ -153758,6 +153773,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -153807,6 +153823,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -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"
@@ -156231,6 +156249,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -156280,6 +156299,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -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"
@@ -157720,6 +157741,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="true"
@@ -157765,6 +157787,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id MuiFormControlLabel-disabled-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="true"
@@ -160082,6 +160105,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -160131,6 +160155,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -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"
@@ -162723,6 +162749,7 @@ Ctrl + K"
             >
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="override-tax-type"
               >
                 <span
                   aria-disabled="false"
@@ -162772,6 +162799,7 @@ Ctrl + K"
               />
               <label
                 class="MuiFormControlLabel-root-id"
+                data-test="charge-taxes"
               >
                 <span
                   aria-disabled="false"
@@ -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"