IO-2485 Correct onlyFuture on typed values

Release/2023 11 24

client/src/components/form-date-picker/form-date-picker.component.jsx

@@ -65,8 +65,17 @@ export function FormDatePicker({
       });
     }
 
-    if (_a.isValid() && onChange)
+    if (_a.isValid() && onChange) {
-      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+      if (onlyFuture) {
+        if (moment().subtract(1, "day").isBefore(_a)) {
+          onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+        } else {
+          onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
+        }
+      } else {
+        onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+      }
+    }
   };
 
   return (

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -1,9 +1,9 @@
 import React, { forwardRef } from "react";
 //import DatePicker from "react-datepicker";
 //import "react-datepicker/src/stylesheets/datepicker.scss";
-import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import { TimePicker } from "antd";
 import moment from "moment";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //To be used as a form element only.
 
 const DateTimePicker = (
@@ -26,20 +26,21 @@ const DateTimePicker = (
         value={value}
         onBlur={onBlur}
         onChange={onChange}
+        onlyFuture={onlyFuture}
         isDateOnly={false}
       />
 
       <TimePicker
-      value={value ? moment(value) : null}
+        value={value ? moment(value) : null}
-      {...(onlyFuture && {
+        {...(onlyFuture && {
-        disabledDate: (d) => moment().isAfter(d),
+          disabledDate: (d) => moment().isAfter(d),
-      })}
+        })}
-      onChange={onChange}
+        onChange={onChange}
-      showSecond={false}
+        showSecond={false}
-      minuteStep={15}
+        minuteStep={15}
-      onBlur={onBlur}
+        onBlur={onBlur}
-      format="hh:mm a"
+        format="hh:mm a"
-      {...restProps}
+        {...restProps}
       />
     </div>
   );

client/src/components/shop-info/shop-info.general.component.jsx

@@ -49,13 +49,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
         header={t("bodyshop.labels.businessinformation")}
         id="businessinformation"
       >
-        <Form.Item
-        label={t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
-        name={["md_functionality_toggles","parts_queue_toggle"]}
-        valuePropName="checked"
-        >
-          <Switch />
-        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.shopname")}
           name="shopname"
@@ -688,6 +681,13 @@ export function ShopInfoGeneral({ form, bodyshop }) {
         >
           <Select mode="tags" />
         </Form.Item>
+        <Form.Item
+            label={t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+            name={["md_functionality_toggles","parts_queue_toggle"]}
+            valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           name={["last_name_first"]}
           label={t("bodyshop.fields.last_name_first")}

client/src/translations/en_us/common.json

@@ -350,7 +350,7 @@
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
 				"md_functionality_toggles":  {
-					"parts_queue_toggle": "Automatically Add Imported/Supplemented Jobs to Parts Queue"
+					"parts_queue_toggle": "Auto Add Imported/Supplemented Jobs to Parts Queue"
 				},
 				"md_tasks_presets": {
 					"hourstype": "",

client/src/translations/es/common.json

@@ -255,7 +255,7 @@
 				"address2": "",
 				"appt_alt_transport": "",
 				"md_functionality_toggles":  {
-					"parts_queue_toggle": "Parts Queue Toggle"
+					"parts_queue_toggle": ""
 				},
 				"appt_colors": {
 					"color": "",

client/src/translations/fr/common.json

@@ -332,7 +332,7 @@
 					"prep": ""
 				},
 				"md_functionality_toggles":  {
-					"parts_queue_toggle": "Parts Queue Toggle"
+					"parts_queue_toggle": ""
 				},
 				"md_ins_co": {
 					"city": "",