ordering-ui-external 14.1.6 → 14.1.8

package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/OrdersSection/index.js

@@ -32,7 +32,7 @@ export const OrdersSection = (props) => {
             horizontal
             isBusinessesPage
             onRedirectPage={onRedirectPage}
-            titleContent={t('CARTS', 'Carts')}
+            titleContent={t('OPEN_CARTS', 'Open carts')}
             businessesIds={businessesIds}
             customArray={
               getCustomArray(orderState.carts)?.filter(cart => cart.products.length > 0)

package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js

@@ -418,7 +418,7 @@ const BusinessesListingUI = (props) => {
         </HightestRatedWrapper>
       )}
 
-      {(((configs && configs?.business_listing_categories !== false) || !isCustomLayout) && !isAllCategoriesHidden) && (
+      {(((configs && configs?.business_listing_categories !== false) || !isCustomLayout) && !isAllCategoriesHidden && !isCustomerMode) && (
         <BusinessTypeFilter
           images={props.images}
           businessTypes={props.businessTypes}
@@ -430,7 +430,7 @@ const BusinessesListingUI = (props) => {
         <SearchContainer>
           {isCustomLayout && (
             <BusinessesTitle isCustomerMode={isCustomerMode}>
-              {t('BUSINESSES', 'Businesses')}
+              {isCustomerMode ? t('SELECT_THE_BUSINESS', 'Select the business') : t('BUSINESSES', 'businesses')}
             </BusinessesTitle>
           )}
           <WrapperSearch isCustomLayout={isCustomLayout} isCustomerMode={isCustomerMode}>

package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/styles.js

@@ -261,7 +261,7 @@ export const Title = styled.h2`
   font-weight: 600;
   font-size: 24px;
   color: ${props => props.theme?.colors.headingColor};
-  margin: 0px 20px 5px 20px;
+  margin: 20px 20px 5px 20px;
 `
 
 export const TypesWrapper = styled.div`

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

@@ -692,7 +692,7 @@ const CheckoutUI = (props) => {
                 `${t('MAXIMUM_SUBTOTAL_ORDER', 'Maximum subtotal order')}: ${parsePrice(cart?.maximum)}`
               ) : (!cart?.valid_minimum && !(cart?.discount_type === 1 && cart?.discount_rate === 100)) ? (
                 `${t('MINIMUN_SUBTOTAL_ORDER', 'Minimum subtotal order:')} ${parsePrice(cart?.minimum)}`
-              ) : placing ? t('PLACING', 'Placing') : t('PLACE_ORDER', 'Place Order')}
+              ) : placing ? t('PLACING_ORDER', 'Placing order') : t('PLACE_ORDER', 'Place Order')}
             </Button>
           </WrapperPlaceOrderButton>
         )}

package/src/themes/five/src/components/Messages/MapMessages.js

@@ -7,7 +7,6 @@ export const MapMessages = (props) => {
     order,
     filterSpecialStatus,
     handleModalImage,
-    hideLogBookMessages,
     getLevel,
     business,
     driver,
@@ -22,7 +21,7 @@ export const MapMessages = (props) => {
   const [messagesToShow, setMessagesToShow] = useState(props.messagesToShow)
 
   useEffect(() => {
-    if ((!props.messages?.messages?.length && !props.messagesToShow?.messages?.length) || !hideLogBookMessages) return
+    if (!props.messages?.messages?.length && !props.messagesToShow?.messages?.length) return
     const messages_ = {
       ...props.messages,
       messages: props.messages?.messages?.filter(msg => msg.type !== 1 && msg.type !== 0)

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

@@ -4,8 +4,7 @@ import {
   Messages as MessagesController,
   useUtils,
   useLanguage,
-  useEvent,
-  useConfig
+  useEvent
 } from 'ordering-components-external'
 import { useForm } from 'react-hook-form'
 import IosSend from '@meronex/icons/ios/IosSend'
@@ -83,7 +82,6 @@ const MessagesUI = (props) => {
   } = props
 
   const theme = useTheme()
-  const [{ configs }] = useConfig()
   const [, t] = useLanguage()
   const { handleSubmit, register, errors, setValue } = useForm()
   const [alertState, setAlertState] = useState({ open: false, content: [] })
@@ -95,8 +93,6 @@ const MessagesUI = (props) => {
   const previousStatus = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17]
   const chatDisabled = previousStatus.includes(order?.status)
 
-  const hideLogBookMessages = configs?.order_logbook_enabled?.value === '0'
-
   const quickMessageList = [
     { key: 'message_1', text: t('CUSTOMER_MESSAGE_1', 'Lorem ipsum 1') },
     { key: 'message_2', text: t('CUSTOMER_MESSAGE_2', 'Lorem ipsum 2') },
@@ -480,28 +476,25 @@ const MessagesUI = (props) => {
             {
               !messages?.loading && order && (
                 <MessageContentWrapper>
-                  {!hideLogBookMessages && (
-                    <>
-                      <MessageCreatedDate>
-                        <span>{parseDate(order.created_at, { outputFormat: 'MMM DD, YYYY' })}</span>
-                      </MessageCreatedDate>
-                      <MessageConsole>
-                        <BubbleConsole>
-                          {t('ORDER_PLACED_FOR', 'Order placed for')} {' '}
-                          <strong>{parseDate(order.created_at)}</strong> {' '}
-                          {t('VIA', 'Via')}{' '}
-                          <strong>
-                            {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
-                          </strong>{' '}
-                          <TimeofSent>{parseTime(order.created_at)}</TimeofSent>
-                        </BubbleConsole>
-                      </MessageConsole>
-                    </>
-                  )}
+                  <>
+                    <MessageCreatedDate>
+                      <span>{parseDate(order.created_at, { outputFormat: 'MMM DD, YYYY' })}</span>
+                    </MessageCreatedDate>
+                    <MessageConsole>
+                      <BubbleConsole>
+                        {t('ORDER_PLACED_FOR', 'Order placed for')} {' '}
+                        <strong>{parseDate(order.created_at)}</strong> {' '}
+                        {t('VIA', 'Via')}{' '}
+                        <strong>
+                          {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+                        </strong>{' '}
+                        <TimeofSent>{parseTime(order.created_at)}</TimeofSent>
+                      </BubbleConsole>
+                    </MessageConsole>
+                  </>
                   <MapMessages
                     messages={messagesToShow?.messages?.length ? messagesToShow : messages}
                     messagesToShow={messagesToShow}
-                    hideLogBookMessages={hideLogBookMessages}
                     order={order}
                     filterSpecialStatus={filterSpecialStatus}
                     handleModalImage={handleModalImage}

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

@@ -7,7 +7,7 @@ export const OptionTitle = styled.div`
   h1{
     text-transform: capitalize;
     font-size: 18px;
-    margin: 18px 0;
+    margin: 0;
   }
 
   @media (min-width: 768px){

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

@@ -68,7 +68,7 @@ export const Container = styled.div`
 
   @media(min-width: 993px){
     ${({ isBusinessesPage }) => isBusinessesPage && css`
-      margin: 30px 20px;
+      margin: 20px;
       width: calc(33% - 40px);
     `}
   }

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

@@ -12,7 +12,8 @@ import {
   TitleContainer,
   CountryFlag,
   PhoneContainer,
-  SkeletonsContainer
+  SkeletonsContainer,
+  ChangeCustomerText
 } from './styles'
 import MdClose from '@meronex/icons/md/MdClose'
 import PhoneInput from 'react-phone-number-input'
@@ -177,13 +178,7 @@ const UserDetailsUI = (props) => {
               {!isModal && (
                 <h1>{t('CUSTOMER_DETAILS', 'Customer Details')}</h1>
               )}
-              {cartStatus !== 2 && (
-                !isEdit ? (
-                  <span onClick={() => toggleIsEdit()}>{t('CHANGE_USER_DETAILS', 'Change customer details')}</span>
-                ) : (
-                  <FcCancel className='cancel' onClick={() => toggleEditState()} />
-                )
-              )}
+              {cartStatus !== 2 && isEdit && <FcCancel className='cancel' onClick={() => toggleEditState()} />}
             </Header>
           )}
 
@@ -211,6 +206,11 @@ const UserDetailsUI = (props) => {
                   </p>
                 </PhoneContainer>
               )}
+              <ChangeCustomerText>
+                {cartStatus !== 2 && (
+                  <span onClick={() => toggleIsEdit()}>{t('CHANGE_USER_DETAILS', 'Change customer details')}</span>
+                )}
+              </ChangeCustomerText>
             </UserData>
           ) : (
             <SideForm>

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

@@ -27,15 +27,6 @@ export const Header = styled.div`
     cursor: pointer;
   }
 
-  span {
-    font-size: 13px;
-    color: ${props => props.theme.colors.primary};
-    cursor: pointer;
-    user-select: none;
-    &:hover {
-        text-decoration: underline;
-      }
-  }
 `
 
 export const SideForm = styled.div`
@@ -114,8 +105,24 @@ export const PhoneContainer = styled.div`
   display: flex;
   align-items: center;
   height: 30px;
+  p {
+    margin: 1rem 0;
+  }
 `
 
 export const SkeletonsContainer = styled.div`
   margin-top: 25px;
 `
+
+export const ChangeCustomerText = styled.div`
+
+  span {
+    font-size: 13px;
+    color: ${props => props.theme.colors.primary};
+    cursor: pointer;
+    user-select: none;
+    &:hover {
+        text-decoration: underline;
+      }
+  }
+`