ordering-ui-admin-external 1.13.2 → 1.13.4

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

@@ -80,7 +80,7 @@ var DateTypeSelector = function DateTypeSelector(props) {
   var _handleChangeFromDate = function _handleChangeFromDate(date) {
     setStartDate(date);
     if (date !== null) {
-      handleChangeFromDate((0, _dayjs.default)(date).format('YYYY-MM-DD'));
+      handleChangeFromDate((0, _dayjs.default)(date).format('YYYY-MM-DD 00:00:00'));
     } else {
       handleChangeFromDate(null);
     }
@@ -88,7 +88,7 @@ var DateTypeSelector = function DateTypeSelector(props) {
   var _handleChangeEndDate = function _handleChangeEndDate(date) {
     setEndDate(date);
     if (date !== null) {
-      handleChangeEndDate((0, _dayjs.default)(date).format('YYYY-MM-DD'));
+      handleChangeEndDate((0, _dayjs.default)(date).format('YYYY-MM-DD 23:59:59'));
     } else {
       handleChangeEndDate(null);
     }

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

@@ -180,6 +180,10 @@ var BusinessProductAddFormUI = function BusinessProductAddFormUI(props) {
     });
   };
   var handleChangeSelect = function handleChangeSelect(value) {
+    setCurPreorderTime({
+      hour: '0',
+      minute: '0'
+    });
     if (value === 'custom') {
       setIsCustom(true);
       handleChangeItem({
@@ -187,10 +191,6 @@ var BusinessProductAddFormUI = function BusinessProductAddFormUI(props) {
       });
       return;
     }
-    setCurPreorderTime({
-      hour: '0',
-      minute: '0'
-    });
     setIsCustom(false);
     handleChangeItem({
       duration: value

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

@@ -163,6 +163,7 @@ var BusinessServiceProfessionalsUI = function BusinessServiceProfessionalsUI(pro
     handleDeleteUser: handleDeleteUser
   })) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, openDetail && /*#__PURE__*/_react.default.createElement(_Shared.Modal, {
     width: "760px",
+    hideCloseDefault: true,
     open: openDetail,
     onClose: function onClose() {
       return handleCloseDetail();

package/_modules/components/Users/OccupationSelector/index.js

@@ -47,7 +47,7 @@ var OccupationSelectorUI = function OccupationSelectorUI(props) {
     return result;
   };
   (0, _react.useEffect)(function () {
-    if (!occupations.length) return;
+    if (!(occupations !== null && occupations !== void 0 && occupations.length)) return;
     var _occupationList = occupations.filter(function (item) {
       return item.name.toLocaleLowerCase().includes(searchValue.toLocaleLowerCase());
     }).map(function (occupation) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.13.2",
+  "version": "1.13.4",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {

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

@@ -61,7 +61,7 @@ export const DateTypeSelector = (props) => {
   const _handleChangeFromDate = (date) => {
     setStartDate(date)
     if (date !== null) {
-      handleChangeFromDate(dayjs(date).format('YYYY-MM-DD'))
+      handleChangeFromDate(dayjs(date).format('YYYY-MM-DD 00:00:00'))
     } else {
       handleChangeFromDate(null)
     }
@@ -70,7 +70,7 @@ export const DateTypeSelector = (props) => {
   const _handleChangeEndDate = (date) => {
     setEndDate(date)
     if (date !== null) {
-      handleChangeEndDate(dayjs(date).format('YYYY-MM-DD'))
+      handleChangeEndDate(dayjs(date).format('YYYY-MM-DD 23:59:59'))
     } else {
       handleChangeEndDate(null)
     }

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

@@ -147,12 +147,12 @@ const BusinessProductAddFormUI = (props) => {
   }
 
   const handleChangeSelect = (value) => {
+    setCurPreorderTime({ hour: '0', minute: '0' })
     if (value === 'custom') {
       setIsCustom(true)
       handleChangeItem({ duration: null })
       return
     }
-    setCurPreorderTime({ hour: '0', minute: '0' })
     setIsCustom(false)
     handleChangeItem({ duration: value })
   }

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

@@ -200,6 +200,7 @@ const BusinessServiceProfessionalsUI = (props) => {
           {openDetail && (
             <Modal
               width='760px'
+              hideCloseDefault
               open={openDetail}
               onClose={() => handleCloseDetail()}
             >

package/src/components/Users/OccupationSelector/index.js

@@ -25,7 +25,7 @@ const OccupationSelectorUI = (props) => {
   }
 
   useEffect(() => {
-    if (!occupations.length) return
+    if (!occupations?.length) return
     const _occupationList = occupations.filter(item => item.name.toLocaleLowerCase().includes(searchValue.toLocaleLowerCase())).map(occupation => {
       return {
         value: occupation.id,