ordering-ui-external 1.0.1 → 1.1.2

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

@@ -4,9 +4,8 @@ import {
   Pencil,
   Trash
 } from 'react-bootstrap-icons'
-import { useUtils, useLanguage, useOrder } from 'ordering-components-external'
+import { useUtils, useLanguage, useOrder, useOrderingTheme } from 'ordering-components-external'
 import { useWindowSize } from '../../../../../hooks/useWindowSize'
-
 import {
   AccordionSection,
   Accordion,
@@ -39,13 +38,15 @@ export const ProductItemAccordion = (props) => {
     offsetDisabled,
     onDeleteProduct,
     onEditProduct,
-    isCheckout
+    isCheckout,
+    isStore,
+    isConfirmationPage
   } = props
   const [, t] = useLanguage()
   const [orderState] = useOrder()
   const [{ parsePrice }] = useUtils()
   const windowSize = useWindowSize()
-
+  const [orderingTheme] = useOrderingTheme()
   const [setActive, setActiveState] = useState('')
   const [setHeight, setHeightState] = useState('0px')
   const [setRotate, setRotateState] = useState('accordion__icon')
@@ -55,6 +56,9 @@ export const ProductItemAccordion = (props) => {
   const productActionsEdit = useRef(null)
   const productActionsDelete = useRef(null)
 
+  const viewString = isConfirmationPage ? 'confirmation' : isStore ? 'business_view' : 'header'
+  const showProductImage = !orderingTheme?.theme?.[viewString]?.components?.cart?.components?.products?.components?.image?.hidden
+
   const productInfo = () => {
     if (isCartProduct) {
       const ingredients = JSON.parse(JSON.stringify(Object.values(product.ingredients ?? {})))
@@ -113,7 +117,7 @@ export const ProductItemAccordion = (props) => {
           onClick={(e) => toggleAccordion(e)}
         >
           <ProductInfo className='info'>
-            {product?.images && (
+            {product?.images && showProductImage && (
               <WrapperProductImage>
                 <ProductImage bgimage={product?.images} />
               </WrapperProductImage>

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

@@ -35,7 +35,7 @@ const ProductOptionUI = (props) => {
         </React.Fragment>))}
       {props.beforeComponents?.map((BeforeComponent, i) => (
         <BeforeComponent key={i} {...props} />))}
-      <Container>
+      <Container id={`id_${option?.id}`}>
         <WrapHeader>
           <TitleContainer>
             {option.image && option.image !== '-' && (

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

@@ -20,13 +20,17 @@ export const TitleContainer = styled.div`
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;
-  width: 70%;
+  width: 60%;
   display: flex;
   align-items: center;  
 
   *:first-child {
     margin-right: 8px;
   }
+
+  @media (min-width: 576px) {
+    width: 70%;
+  }
 `
 
 export const Title = styled.h3`

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

@@ -64,6 +64,7 @@ export const Divider = styled.div`
 
 export const ScheduleWrapper = styled.div`
   margin-top: 30px;
+  margin-bottom: 15px;
 
   > div {
     padding: 0px;

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

@@ -0,0 +1,253 @@
+import React, { useState, useEffect } from 'react'
+import { useForm } from 'react-hook-form'
+import { useLanguage, useUtils, ReviewDriver as ReviewDriverController } from 'ordering-components-external'
+import MdClose from '@meronex/icons/md/MdClose'
+import FaUserAlt from '@meronex/icons/fa/FaUserAlt'
+
+import { Alert } from '../Confirm'
+import { TextArea } from '../../styles/Inputs'
+import { Button } from '../../styles/Buttons'
+import { useTheme } from 'styled-components'
+
+import {
+  ReviewDriverContainer,
+  Comments,
+  ActionBtnWrapper,
+  DriverPhoto,
+  WrapperDriverPhoto,
+  ReviewsProgressWrapper,
+  ReviewsProgressContent,
+  ReviewsProgressBar,
+  ReviewsMarkPoint,
+  LogoAndReviewWrapper,
+  CommentsList,
+  DriverInfoBlock,
+  CommentButton
+} from './styles'
+import { reviewCommentList } from '../../../../../utils'
+
+const ReviewDriverUI = (props) => {
+  const {
+    dirverReviews,
+    order,
+    formState,
+    setDriverReviews,
+    closeReviewDriver,
+    setIsDriverReviewed,
+    handleSendDriverReview
+  } = props
+
+  const theme = useTheme()
+  const [, t] = useLanguage()
+  const [{ optimizeImage }] = useUtils()
+  const { handleSubmit, errors } = useForm()
+  const [comments, setComments] = useState([])
+  const [extraComment, setExtraComment] = useState('')
+  const [alertState, setAlertState] = useState({ open: false, content: [], success: false })
+
+  const commentsList = reviewCommentList('driver')
+
+  const qualificationList = [
+    { key: 1, text: t('TERRIBLE', 'Terrible'), middleNode: false, left: 0, right: 'initial' },
+    { key: 2, text: t('BAD', 'Bad'), middleNode: true, left: '25%', right: '75%' },
+    { key: 3, text: t('OKAY', 'Okay'), middleNode: true, left: '50%', right: '50%' },
+    { key: 4, text: t('GOOD', 'Good'), middleNode: true, left: '75%', right: '25%' },
+    { key: 5, text: t('GREAT', 'Great'), middleNode: false, left: 'initial', right: 0 }
+  ]
+
+  const handleChangeReviews = (index) => {
+    if (index) setDriverReviews({ ...dirverReviews, qualification: index, comment: '' })
+    setComments([])
+  }
+
+  const onSubmit = values => {
+    if (dirverReviews?.qualification === 0) {
+      setAlertState({
+        open: true,
+        content: [`${t('REVIEW_QUALIFICATION_REQUIRED', 'Review qualification is required')}`]
+      })
+      return
+    }
+    setAlertState({ ...alertState, success: true })
+    handleSendDriverReview()
+  }
+
+  const handleChangeComment = (commentItem) => {
+    const found = comments.find((comment) => comment?.key === commentItem.key)
+    if (found) {
+      const _comments = comments.filter((comment) => comment?.key !== commentItem.key)
+      setComments(_comments)
+    } else {
+      setComments([...comments, commentItem])
+    }
+  }
+
+  const closeAlert = () => {
+    setAlertState({
+      open: false,
+      content: []
+    })
+  }
+
+  const isSelectedComment = (commentKey) => {
+    const found = comments.find((comment) => comment?.key === commentKey)
+    return found
+  }
+
+  useEffect(() => {
+    if (!formState.loading && formState.result?.error) {
+      setAlertState({
+        open: true,
+        success: false,
+        content: formState.result?.result || [t('ERROR', 'Error')]
+      })
+    }
+    if (!formState.loading && !formState.result?.error && alertState.success) {
+      setIsDriverReviewed && setIsDriverReviewed(true)
+      closeReviewDriver && closeReviewDriver()
+    }
+  }, [formState])
+
+  useEffect(() => {
+    if (Object.keys(errors).length > 0) {
+      setAlertState({
+        open: true,
+        success: false,
+        content: Object.values(errors).map(error => error.message)
+      })
+    }
+  }, [errors])
+
+  useEffect(() => {
+    let _comments = ''
+    if (comments.length > 0) {
+      comments.map(comment => (_comments += comment.content + '. '))
+    }
+    const _comment = _comments + extraComment
+    setDriverReviews({ ...dirverReviews, comment: _comment })
+  }, [comments, extraComment])
+
+  return (
+    <>
+      {props.beforeElements?.map((BeforeElement, i) => (
+        <React.Fragment key={i}>
+          {BeforeElement}
+        </React.Fragment>))}
+      {props.beforeComponents?.map((BeforeComponent, i) => (
+        <BeforeComponent key={i} {...props} />))}
+      <>
+        <LogoAndReviewWrapper>
+          <WrapperDriverPhoto>
+            {(order?.driver?.photo) ? (
+              <DriverPhoto bgimage={optimizeImage(order?.driver?.photo, 'h_200,c_limit')} />
+            ) : <FaUserAlt />}
+          </WrapperDriverPhoto>
+          {
+            order?.driver?.name && (
+              <DriverInfoBlock>{order?.driver?.name}</DriverInfoBlock>
+            )
+          }
+          <ReviewsProgressWrapper>
+            <p>{t('HOW_WAS_YOUR_DRIVER', 'How was your driver?')}</p>
+            <ReviewsProgressContent>
+              <ReviewsProgressBar style={{ width: `${(dirverReviews?.qualification === 0 ? 0 : (dirverReviews?.qualification - 1) / 4) * 100}%` }} />
+              {
+                qualificationList?.map(qualification => (
+                  <ReviewsMarkPoint
+                    key={qualification?.key}
+                    style={{
+                      left: theme.rtl ? (qualification?.middleNode ? 'initial' : qualification?.right) : qualification?.left,
+                      right: theme?.rtl ? qualification?.left : (qualification?.middleNode ? 'initial' : qualification?.right)
+                    }}
+                    active={dirverReviews?.qualification === qualification?.key}
+                    pass={dirverReviews?.qualification >= qualification?.key}
+                    className={qualification?.middleNode ? 'mark-point' : ''}
+                    onClick={() => handleChangeReviews(qualification?.key)}
+                  >
+                    <span>{qualification?.text}<span /></span>
+                  </ReviewsMarkPoint>
+                ))
+              }
+            </ReviewsProgressContent>
+          </ReviewsProgressWrapper>
+          <CommentsList>
+            <p>{commentsList[dirverReviews?.qualification || 1]?.title}</p>
+            {
+              commentsList[dirverReviews?.qualification || 1]?.list?.map((commentItem, i) => (
+                <CommentButton
+                  key={i}
+                  active={isSelectedComment(commentItem.key)}
+                  onClick={() => handleChangeComment(commentItem)}
+                  initialIcon
+                >
+                  {commentItem.content}
+                  {
+                    isSelectedComment(commentItem.key) && <MdClose />
+                  }
+                </CommentButton>
+              ))
+            }
+          </CommentsList>
+        </LogoAndReviewWrapper>
+        <ReviewDriverContainer onSubmit={handleSubmit(onSubmit)}>
+          <Comments>
+            <p>{t('DO_YOU_WANT_TO_ADD_SOMETHING', 'Do you want to add something?')}</p>
+            <TextArea
+              name='comment'
+              value={extraComment}
+              onChange={(e) => setExtraComment(e.target.value)}
+              autoComplete='off'
+            />
+          </Comments>
+          {
+            props.afterMidElements?.map((MidElement, i) => (
+              <React.Fragment key={i}>
+                {MidElement}
+              </React.Fragment>))
+          }
+          {
+            props.afterMidComponents?.map((MidComponent, i) => (
+              <MidComponent key={i} {...props} />))
+          }
+          <ActionBtnWrapper>
+            <Button
+              color={!formState.loading ? 'primary' : 'secondary'}
+              type='submit'
+              disabled={formState.loading}
+              className='review-sent'
+            >
+              {!formState.loading ? (
+                t('SEND_REVIEW', 'Send review')
+              ) : t('LOADING', 'Loading')}
+            </Button>
+          </ActionBtnWrapper>
+          <Alert
+            title={t('DRIVER_REVIEW', 'Driver Review')}
+            content={alertState.content}
+            acceptText={t('ACCEPT', 'Accept')}
+            open={alertState.open}
+            onClose={() => closeAlert()}
+            onAccept={() => closeAlert()}
+            closeOnBackdrop={false}
+          />
+        </ReviewDriverContainer>
+      </>
+      {props.afterComponents?.map((AfterComponent, i) => (
+        <AfterComponent key={i} {...props} />))}
+      {props.afterElements?.map((AfterElement, i) => (
+        <React.Fragment key={i}>
+          {AfterElement}
+        </React.Fragment>))}
+    </>
+  )
+}
+
+export const ReviewDriver = (props) => {
+  const reviewDriverProps = {
+    ...props,
+    UIComponent: ReviewDriverUI,
+    isToast: true
+  }
+
+  return <ReviewDriverController {...reviewDriverProps} />
+}

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

@@ -0,0 +1,233 @@
+import React from 'react'
+import styled, { css } from 'styled-components'
+import { Button } from '../../styles/Buttons'
+
+export const ReviewDriverContainer = styled.form`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+`
+
+export const Comments = styled.div`
+  display: flex;
+  width: 100%;
+  flex-direction: column;
+  margin-top: 10px;
+
+  p {
+    margin-top: 0;
+    margin-bottom: 10px;
+    font-size: 15px;
+    color: ${props => props.theme?.colors.darkTextColor};
+  }
+
+  textarea {
+    min-height: 104px;
+  }
+`
+export const ActionBtnWrapper = styled.div`
+  margin-top: 30px;
+  width: 100%;
+
+  button {
+    font-size: 14px;
+    padding: 6px 20px;
+    width: 100%;
+  }
+`
+
+const DriverPhotoStyled = styled.div`
+  display: flex;
+  width: 124px;
+  height: 124px;
+  box-sizing: border-box;
+  position: relative;
+  background-repeat: no-repeat, repeat;
+  background-size: cover;
+  object-fit: cover;
+  background-position: center;
+  min-height: 124px;
+  border-radius: 7.6px;
+
+  @media (min-width: 481px){
+    width: 100%;
+    height: 100%;
+    min-height: 124px;
+  }
+`
+
+export const DriverPhoto = (props) => {
+  const style = {}
+  if (props.bgimage) {
+    style.backgroundImage = `url(${props.bgimage})`
+  }
+
+  return (
+    <DriverPhotoStyled {...props} style={style}>
+      {props.children}
+    </DriverPhotoStyled>
+  )
+}
+
+export const WrapperDriverPhoto = styled.div`
+  align-self: center;
+  width: 124px;
+  height: 124px;
+  min-height: 124px;
+  max-width: 124px;
+  box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.1);
+  border-radius: 7.6px;
+
+  svg {
+    width: 124px;
+    height: 124px;
+  }
+`
+
+export const ReviewsProgressWrapper = styled.div`
+  width: 100%;
+  margin-top: 50px;
+  margin-bottom: 35px;
+
+  p {
+    margin-top: 0;
+    margin-bottom: 17px;
+    font-size: 15px;
+    color: ${props => props.theme?.colors.darkTextColor};
+  }
+`
+
+export const ReviewsProgressContent = styled.div`
+  background: #E9ECEF;
+  border-radius: 50px;
+  width: 100%;
+  height: 6px;
+  position: relative;
+  margin-bottom: 30px;
+`
+
+export const ReviewsProgressBar = styled.div`
+  height: 6px;
+  border-radius: 50px;
+  background: #344050;
+  transition: all 0.2s linear;
+`
+
+export const ReviewsMarkPoint = styled.div`
+  position: absolute;
+  top: 15px;
+  font-size: 12px;
+  color: #CED4DA;
+  cursor: pointer;
+
+  ${({ active }) => active && css`
+    > span {
+      color: #344050;
+    }
+  `}
+
+  &.mark-point {
+    span {
+      position: relative;
+      margin-left: -50%;
+      ${props => props.theme?.rtl && css`
+        margin-right: -50%;
+        margin-left: 0;
+      `}
+
+      > span {
+        position: absolute;
+        height: 6px;
+        top: -15px;
+        width: 2px;
+        background: #CED4DA;
+        transition: all 0.3s;
+      }
+    }
+  }
+
+  ${({ pass }) => pass && css`
+    span {
+      > span {
+        background: transparent !important;
+      }
+    }
+  `}
+`
+
+export const LogoAndReviewWrapper = styled.div`
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+`
+
+export const CommentsList = styled.div`
+  p {
+    margin-top: 0;
+    margin-bottom: 10px;
+    font-size: 15px;
+    color: ${props => props.theme?.colors.darkTextColor};
+  }
+
+  button {
+    border-radius: 50px;
+    margin-bottom: 18px;
+    margin-right: 40px;
+  
+    ${props => props.theme?.rtl && css`
+      margin-left: 40px;
+      margin-right: 0;
+    `}
+
+    svg {
+      vertical-align: middle;
+      margin-left: 5px;
+
+      ${props => props.theme?.rtl && css`
+        margin-right: 5px;
+        margin-left: 0;
+      `}
+    }
+  }
+`
+
+export const DriverInfoBlock = styled.p`
+  margin-top: 16px;
+  margin-bottom: 0;
+  font-size: 14px;
+  text-align: center;
+  color: #344050;
+`
+
+export const CommentButton = styled(Button)`
+  border-radius: 50px;
+  margin-bottom: 18px;
+  margin-right: 18px;
+  font-size: 13px;
+  color: #414954;
+  background: #E9ECEF;
+  border: 1px solid #E9ECEF;
+  transition: all 0.3s linear;
+
+  ${props => props.theme?.rtl && css`
+    margin-left: 18px;
+    margin-right: 0;
+  `}
+
+  svg {
+    vertical-align: middle;
+    margin-left: 5px;
+
+    ${props => props.theme?.rtl && css`
+      margin-right: 5px;
+      margin-left: 0;
+    `}
+  }
+
+  ${({ active }) => active && css`
+    background: ${props => props.theme?.colors.primary};
+    border: 1px solid ${props => props.theme?.colors.primary};
+    color: white;
+  `}
+`