Merged in release/2021-11-12 (pull request #263)

release/2021-11-12

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -8685,6 +8685,27 @@
                             <folder_node>
                                 <name>validation</name>
                                 <children>
+                                    <concept_node>
+                                        <name>centermustexist</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>larsplit</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/email-test/email-test-component.jsx

@@ -7,10 +7,12 @@ import { selectCurrentUser } from "../../redux/user/user.selectors";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
+
 const mapDispatchToProps = (dispatch) => ({
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
 });
@@ -24,9 +26,20 @@ export function EmailTestComponent({ currentUser, setEmailOptions }) {
       {
         name: values.key,
         variables: {
+          ...(values.start
+            ? {
+                start: moment(values.start).startOf("day").format("YYYY-MM-DD"),
+              }
+            : {}),
+          ...(values.end
+            ? { end: moment(values.end).endOf("day").format("YYYY-MM-DD") }
+            : {}),
+          ...(values.start
+            ? { starttz: moment(values.start).startOf("day") }
+            : {}),
+          ...(values.end ? { endtz: moment(values.end).endOf("day") } : {}),
+
           ...(values.id ? { id: values.id } : {}),
-          ...(values.start ? { start: values.start } : {}),
-          ...(values.end ? { end: values.end } : {}),
         },
       },
       {

client/src/translations/en_us/common.json

@@ -536,6 +536,7 @@
 				"save": "Shop configuration saved successfully. "
 			},
 			"validation": {
+				"centermustexist": "The chosen responsibility center does not exist.",
 				"larsplit": "Refinish hour split must add up to 1.",
 				"useremailmustexist": "This email is not a valid user."
 			}

client/src/translations/es/common.json

@@ -536,6 +536,7 @@
 				"save": ""
 			},
 			"validation": {
+				"centermustexist": "",
 				"larsplit": "",
 				"useremailmustexist": ""
 			}

client/src/translations/fr/common.json

@@ -536,6 +536,7 @@
 				"save": ""
 			},
 			"validation": {
+				"centermustexist": "",
 				"larsplit": "",
 				"useremailmustexist": ""
 			}