ordering-ui-external 2.5.9 → 2.6.0

package/src/themes/five/src/components/OrderContextUI/index.js

@@ -29,6 +29,7 @@ export const OrderContextUI = (props) => {
   const userCustomer = JSON.parse(window.localStorage.getItem('user-customer'))
 
   const configTypes = configState?.configs?.order_types_allowed?.value.split('|').map(value => Number(value)) || []
+  const isPreOrderSetting = configState?.configs?.preorder_status_enabled?.value === '1'
 
   const handleTogglePopover = (type) => {
     setOpenPopover({
@@ -67,7 +68,7 @@ export const OrderContextUI = (props) => {
 
   return (
     <>
-      <Container isBusinessList={isBusinessList} hero={props.hideHero} >
+      <Container isBusinessList={isBusinessList} hero={props.hideHero} isCheckOut={isCheckOut}>
         <AddressMenu
           onClick={() => handleClickAddress()}
           isCheckOut={isCheckOut}
@@ -79,14 +80,16 @@ export const OrderContextUI = (props) => {
           <ItemInline>
             <OrderTypeSelectorHeader configTypes={configTypes} />
           </ItemInline>
-          <ItemInline>
-            <MomentPopover
-              open={openPopover.moment}
-              onClick={() => handleTogglePopover('moment')}
-              onClose={() => handleClosePopover('moment')}
-              isBanner
-            />
-          </ItemInline>
+          {isPreOrderSetting && (
+            <ItemInline>
+              <MomentPopover
+                open={openPopover.moment}
+                onClick={() => handleTogglePopover('moment')}
+                onClose={() => handleClosePopover('moment')}
+                isBanner
+              />
+            </ItemInline>
+          )}
         </FeatureItems>
       </Container>
       <Modal

package/src/themes/five/src/components/OrderContextUI/styles.js

@@ -6,7 +6,7 @@ export const Container = styled.div`
     padding: 0 15px;
     box-sizing: border-box;
   `}
-  ${({ hero }) => hero && css`
+  ${({ hero, isCheckOut }) => !(hero || isCheckOut) && css`
     position: absolute;
     top: 10%;
   `}

package/src/themes/five/src/components/OrderProgress/index.js

@@ -47,7 +47,7 @@ const OrderProgressUI = (props) => {
 
   useEffect(() => {
     if (orderList?.orders.length > 0) {
-      const sortedOrders = orderList.orders.sort((a, b) => a.id > b.id ? -1 : 1)
+      const sortedOrders = orderList.orders.filter(order => !!order?.business).sort((a, b) => a.id > b.id ? -1 : 1)
       const orderInProgress = sortedOrders.find(({ status }) => (statusToShow.includes(status)))
 
       let _lastOrder = null

package/src/themes/five/src/components/SidebarMenu/index.js

@@ -475,7 +475,10 @@ export const SidebarMenu = (props) => {
           {!auth && (
             <>
               <MenuLink
-                onClick={() => handleOpenLoginSignUp('login')}
+                onClick={() => {
+                  handleOpenLoginSignUp('login')
+                  actionSidebar(false)
+                }}
               >
                 <WrappContent>
                   <MenuLinkIcon
@@ -499,7 +502,10 @@ export const SidebarMenu = (props) => {
               </MenuLink>
               {!isHideSignup && (
                 <MenuLink
-                  onClick={() => handleOpenLoginSignUp('signup')}
+                  onClick={() => {
+                    handleOpenLoginSignUp('signup')
+                    actionSidebar(false)
+                  }}
                 >
                   <WrappContent>
                     <MenuLinkIcon