ordering-ui-admin-external 1.37.3 → 1.38.0

package/_modules/components/Orders/OrderNotification/index.js

@@ -91,7 +91,7 @@ var OrderNotificationUI = function OrderNotificationUI(props) {
   };
   var toastNotify = function toastNotify(orderId) {
     var toastConfigure = {
-      position: 'top-right',
+      position: 'bottom-right',
       autoClose: 3000,
       hideProgressBar: false,
       closeOnClick: true,

package/_modules/components/Stores/ProductExtraOptionDetails/index.js

@@ -184,21 +184,6 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
       }
     });
   };
-  var handleEnterAddSuboption = function handleEnterAddSuboption(e) {
-    if (e.key === 'Enter' && e.shiftKey === false) {
-      handleSubmit(handleAddOption)();
-    }
-  };
-  var onChangeAddModifierName = function onChangeAddModifierName(e) {
-    e.persist();
-    clearTimeout(timer);
-    var _timer = setTimeout(function () {
-      if (e.target.value) {
-        handleSubmit(handleAddOption)();
-      }
-    }, 750);
-    setTimer(_timer);
-  };
   var handleUpdateExternalId = function handleUpdateExternalId() {
     handleUpdateOption({
       external_id: externalId
@@ -346,12 +331,16 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
     autoComplete: "off",
     placeholder: t('NAME', 'Name'),
     defaultValue: editSubOptionId === null && (changesState === null || changesState === void 0 || (_changesState$changes3 = changesState.changes) === null || _changesState$changes3 === void 0 ? void 0 : _changesState$changes3.name) || '',
+    onKeyDown: function onKeyDown(e) {
+      var code = e.keyCode || e.which;
+      if (code === 13) {
+        e.preventDefault();
+        return false;
+      }
+    },
     ref: register({
       required: t('NAME_REQUIRED', 'The name is required.')
     }),
-    onChange: function onChange(e) {
-      return onChangeAddModifierName(e);
-    },
     readOnly: optionState === null || optionState === void 0 ? void 0 : optionState.loading
   }))), /*#__PURE__*/_react.default.createElement(_styles2.RightSubOptionContent, null, /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, {
     primary: (optionState === null || optionState === void 0 || (_optionState$option8 = optionState.option) === null || _optionState$option8 === void 0 || (_optionState$option8 = _optionState$option8.suboptions) === null || _optionState$option8 === void 0 ? void 0 : _optionState$option8.length) === 0
@@ -361,10 +350,14 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
     defaultValue: editSubOptionId === null && (changesState === null || changesState === void 0 || (_changesState$changes4 = changesState.changes) === null || _changesState$changes4 === void 0 ? void 0 : _changesState$changes4.price) || 0,
     ref: register(),
     onKeyPress: function onKeyPress(e) {
+      var code = e.keyCode || e.which;
+      if (code === 13) {
+        e.preventDefault();
+        return false;
+      }
       if (!/^[0-9.]$/.test(e.key)) {
         e.preventDefault();
       }
-      handleEnterAddSuboption(e);
     }
   })), (typeof (settingChangeState === null || settingChangeState === void 0 || (_settingChangeState$c5 = settingChangeState.changes) === null || _settingChangeState$c5 === void 0 ? void 0 : _settingChangeState$c5.with_half_option) !== 'undefined' ? settingChangeState === null || settingChangeState === void 0 || (_settingChangeState$c6 = settingChangeState.changes) === null || _settingChangeState$c6 === void 0 ? void 0 : _settingChangeState$c6.with_half_option : optionState === null || optionState === void 0 || (_optionState$option9 = optionState.option) === null || _optionState$option9 === void 0 ? void 0 : _optionState$option9.with_half_option) && /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, {
     primary: (optionState === null || optionState === void 0 || (_optionState$option10 = optionState.option) === null || _optionState$option10 === void 0 || (_optionState$option10 = _optionState$option10.suboptions) === null || _optionState$option10 === void 0 ? void 0 : _optionState$option10.length) === 0
@@ -374,10 +367,14 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
     defaultValue: editSubOptionId === null && (changesState === null || changesState === void 0 || (_changesState$changes5 = changesState.changes) === null || _changesState$changes5 === void 0 ? void 0 : _changesState$changes5.half_price) || '',
     ref: register(),
     onKeyPress: function onKeyPress(e) {
+      var code = e.keyCode || e.which;
+      if (code === 13) {
+        e.preventDefault();
+        return false;
+      }
       if (!/^[0-9.]$/.test(e.key)) {
         e.preventDefault();
       }
-      handleEnterAddSuboption(e);
     }
   })), (typeof (settingChangeState === null || settingChangeState === void 0 || (_settingChangeState$c7 = settingChangeState.changes) === null || _settingChangeState$c7 === void 0 ? void 0 : _settingChangeState$c7.allow_suboption_quantity) !== 'undefined' ? settingChangeState === null || settingChangeState === void 0 || (_settingChangeState$c8 = settingChangeState.changes) === null || _settingChangeState$c8 === void 0 ? void 0 : _settingChangeState$c8.allow_suboption_quantity : optionState === null || optionState === void 0 || (_optionState$option11 = optionState.option) === null || _optionState$option11 === void 0 ? void 0 : _optionState$option11.allow_suboption_quantity) && /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, {
     primary: (optionState === null || optionState === void 0 || (_optionState$option12 = optionState.option) === null || _optionState$option12 === void 0 || (_optionState$option12 = _optionState$option12.suboptions) === null || _optionState$option12 === void 0 ? void 0 : _optionState$option12.length) === 0
@@ -387,10 +384,14 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
     defaultValue: editSubOptionId === null && (changesState === null || changesState === void 0 || (_changesState$changes6 = changesState.changes) === null || _changesState$changes6 === void 0 ? void 0 : _changesState$changes6.max) || '',
     ref: register(),
     onKeyPress: function onKeyPress(e) {
+      var code = e.keyCode || e.which;
+      if (code === 13) {
+        e.preventDefault();
+        return false;
+      }
       if (!/^[0-9.]$/.test(e.key)) {
         e.preventDefault();
       }
-      handleEnterAddSuboption(e);
     }
   })), /*#__PURE__*/_react.default.createElement(_styles2.InputWrapper, {
     maxHeight: true

package/_modules/components/Stores/ProductExtraSuboption/index.js

@@ -256,6 +256,13 @@ var ProductExtraSuboption = function ProductExtraSuboption(props) {
         onChange: function onChange(e) {
           _onChange(e.target.vaue);
           handleChangeInput(e);
+        },
+        onKeyDown: function onKeyDown(e) {
+          var code = e.keyCode || e.which;
+          if (code === 13) {
+            e.preventDefault();
+            return false;
+          }
         }
       });
     },
@@ -278,6 +285,11 @@ var ProductExtraSuboption = function ProductExtraSuboption(props) {
           handleChangeInput(e);
         },
         onKeyPress: function onKeyPress(e) {
+          var code = e.keyCode || e.which;
+          if (code === 13) {
+            e.preventDefault();
+            return false;
+          }
           if (!/^[0-9.]$/.test(e.key)) {
             e.preventDefault();
           }
@@ -302,6 +314,11 @@ var ProductExtraSuboption = function ProductExtraSuboption(props) {
           handleChangeInput(e);
         },
         onKeyPress: function onKeyPress(e) {
+          var code = e.keyCode || e.which;
+          if (code === 13) {
+            e.preventDefault();
+            return false;
+          }
           if (!/^[0-9.]$/.test(e.key)) {
             e.preventDefault();
           }
@@ -323,6 +340,11 @@ var ProductExtraSuboption = function ProductExtraSuboption(props) {
           handleChangeInput(e);
         },
         onKeyPress: function onKeyPress(e) {
+          var code = e.keyCode || e.which;
+          if (code === 13) {
+            e.preventDefault();
+            return false;
+          }
           if (!/^[0-9.]$/.test(e.key)) {
             e.preventDefault();
           }

package/index-template.js

@@ -298,7 +298,7 @@ if (!(window?.location?.hostname === 'localhost')) {
     integrations: [
       new Integrations.BrowserTracing()
     ],
-    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.1.0',
+    release: process.env.npm_package_version ? 'ordering-ui-admin-release@' + process.env.npm_package_version : 'ordering-ui-admin-release@' + '1.1.1',
     // Release health
     autoSessionTracking: true,
     ignoreErrors: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.37.3",
+  "version": "1.38.0",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.37.1",
+    "ordering-components-admin-external": "1.38.0",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Orders/OrderNotification/index.js

@@ -61,7 +61,7 @@ const OrderNotificationUI = (props) => {
 
   const toastNotify = (orderId) => {
     const toastConfigure = {
-      position: 'top-right',
+      position: 'bottom-right',
       autoClose: 3000,
       hideProgressBar: false,
       closeOnClick: true,

package/src/components/Stores/ProductExtraOptionDetails/index.js

@@ -148,23 +148,6 @@ const ProductExtraOptionDetailsUI = (props) => {
     })
   }
 
-  const handleEnterAddSuboption = (e) => {
-    if (e.key === 'Enter' && e.shiftKey === false) {
-      handleSubmit(handleAddOption)()
-    }
-  }
-
-  const onChangeAddModifierName = (e) => {
-    e.persist()
-    clearTimeout(timer)
-    const _timer = setTimeout(function () {
-      if (e.target.value) {
-        handleSubmit(handleAddOption)()
-      }
-    }, 750)
-    setTimer(_timer)
-  }
-
   const handleUpdateExternalId = () => {
     handleUpdateOption({ external_id: externalId })
     setOpenModal({ ...openModal, externalId: false })
@@ -342,10 +325,16 @@ const ProductExtraOptionDetailsUI = (props) => {
                   defaultValue={
                     ((editSubOptionId === null) && changesState?.changes?.name) || ''
                   }
+                  onKeyDown={(e) => {
+                    const code = e.keyCode || e.which
+                    if (code === 13) {
+                      e.preventDefault()
+                      return false
+                    }
+                  }}
                   ref={register({
                     required: t('NAME_REQUIRED', 'The name is required.')
                   })}
-                  onChange={(e) => onChangeAddModifierName(e)}
                   readOnly={optionState?.loading}
                 />
               </InputWrapper>
@@ -360,10 +349,14 @@ const ProductExtraOptionDetailsUI = (props) => {
                   }
                   ref={register()}
                   onKeyPress={(e) => {
+                    const code = e.keyCode || e.which
+                    if (code === 13) {
+                      e.preventDefault()
+                      return false
+                    }
                     if (!/^[0-9.]$/.test(e.key)) {
                       e.preventDefault()
                     }
-                    handleEnterAddSuboption(e)
                   }}
                 />
               </InputWrapper>
@@ -377,10 +370,14 @@ const ProductExtraOptionDetailsUI = (props) => {
                     }
                     ref={register()}
                     onKeyPress={(e) => {
+                      const code = e.keyCode || e.which
+                      if (code === 13) {
+                        e.preventDefault()
+                        return false
+                      }
                       if (!/^[0-9.]$/.test(e.key)) {
                         e.preventDefault()
                       }
-                      handleEnterAddSuboption(e)
                     }}
                   />
                 </InputWrapper>
@@ -395,10 +392,14 @@ const ProductExtraOptionDetailsUI = (props) => {
                     }
                     ref={register()}
                     onKeyPress={(e) => {
+                      const code = e.keyCode || e.which
+                      if (code === 13) {
+                        e.preventDefault()
+                        return false
+                      }
                       if (!/^[0-9.]$/.test(e.key)) {
                         e.preventDefault()
                       }
-                      handleEnterAddSuboption(e)
                     }}
                   />
                 </InputWrapper>

package/src/components/Stores/ProductExtraSuboption/index.js

@@ -214,6 +214,13 @@ export const ProductExtraSuboption = (props) => {
                   onChange(e.target.vaue)
                   handleChangeInput(e)
                 }}
+                onKeyDown={(e) => {
+                  const code = e.keyCode || e.which
+                  if (code === 13) {
+                    e.preventDefault()
+                    return false
+                  }
+                }}
               />
             )}
             defaultValue={subOption.name}
@@ -236,6 +243,11 @@ export const ProductExtraSuboption = (props) => {
                   handleChangeInput(e)
                 }}
                 onKeyPress={(e) => {
+                  const code = e.keyCode || e.which
+                  if (code === 13) {
+                    e.preventDefault()
+                    return false
+                  }
                   if (!/^[0-9.]$/.test(e.key)) {
                     e.preventDefault()
                   }
@@ -260,6 +272,11 @@ export const ProductExtraSuboption = (props) => {
                     handleChangeInput(e)
                   }}
                   onKeyPress={(e) => {
+                    const code = e.keyCode || e.which
+                    if (code === 13) {
+                      e.preventDefault()
+                      return false
+                    }
                     if (!/^[0-9.]$/.test(e.key)) {
                       e.preventDefault()
                     }
@@ -284,6 +301,11 @@ export const ProductExtraSuboption = (props) => {
                     handleChangeInput(e)
                   }}
                   onKeyPress={(e) => {
+                    const code = e.keyCode || e.which
+                    if (code === 13) {
+                      e.preventDefault()
+                      return false
+                    }
                     if (!/^[0-9.]$/.test(e.key)) {
                       e.preventDefault()
                     }