ordering-ui-react-native 0.16.50 → 0.16.53

package/themes/original/src/components/BusinessesListing/index.tsx

@@ -1,42 +1,91 @@
 
 import React, { useState, useEffect } from 'react'
-import { useOrder, useSession } from 'ordering-components/native';
+import { useOrder, useSession, useLanguage } from 'ordering-components/native';
 
 import { useTheme } from 'styled-components/native'
 import { BusinessesListing as OriginalBusinessListing } from './Layout/Original'
 import { BusinessesListing as AppointmentBusinessListing } from './Layout/Appointment'
+import { OBottomPopup } from '../shared';
+import { ReviewOrderModal, ReviewProductsModal, ReviewDriverModal } from '../Reviews'
 
 export const BusinessesListing = (props: any) => {
   const theme = useTheme()
-  const layout = theme?.layout?.businessListing?.layout?.type || 'original'
+	const layout = theme?.layouts?.business_listing_view?.components?.layout?.type || 'original'
+  const [, t] = useLanguage();
   const [{ auth }] = useSession()
   const [, { getLastOrderHasNoReview }] = useOrder();
-  const [, setIsReviewed] = useState(false)
-  const handleOrderReview = (order: any) => {
-    props?.navigation && props.navigation.navigate(
-      'ReviewOrder',
-      {
-        order: {
-          id: order?.id,
-          business_id: order?.business_id,
-          business_name: order?.business?.name,
-          delivery_datetime: order?.delivery_datetime,
-          logo: order.business?.logo,
-          driver: order?.driver,
-          products: order?.products,
-          review: order?.review,
-          user_review: order?.user_review
-        },
-        setIsReviewed
-      }
-    )
-  }
+
+  const [lastOrderReview, setLastOrderReview] = useState({
+    isReviewOpen: false,
+    order: {
+      id: 0,
+      business_id: 0,
+      business_name: '',
+      delivery_datetime: '',
+      logo: '',
+      driver: null,
+      products: [],
+      review: null,
+      user_review: null
+    },
+    reviewStatus: { order: false, product: false, driver: false },
+    reviewed: { isOrderReviewed: false, isProductReviewed: false, isDriverReviewed: false }
+  })
 
   const _getLastOrderHasNoReview = async () => {
     const lastOrderHasNoReview = await getLastOrderHasNoReview()
     lastOrderHasNoReview && handleOrderReview(lastOrderHasNoReview)
   }
 
+  const handleOrderReview = (order: any) => {
+    setLastOrderReview({
+      isReviewOpen: true,
+      order: {
+        id: order?.id,
+        business_id: order?.business_id,
+        business_name: order?.business?.name,
+        delivery_datetime: order?.delivery_datetime,
+        logo: order.business?.logo,
+        driver: order?.driver,
+        products: order?.products,
+        review: order?.review,
+        user_review: order?.user_review
+      },
+      reviewStatus: { order: true, product: false, driver: false },
+      reviewed: { isOrderReviewed: false, isProductReviewed: false, isDriverReviewed: false }
+    })
+  }
+
+  const handleCloseReivew = () => {
+    setLastOrderReview({
+      ...lastOrderReview,
+      isReviewOpen: false,
+      reviewStatus: { order: false, product: false, driver: false }
+    })
+  }
+
+  const setIsReviewed = (reviewType: string) => {
+    const _reviewStatus = { ...lastOrderReview?.reviewed }
+    setLastOrderReview({
+      ...lastOrderReview,
+      reviewed: { ..._reviewStatus, [reviewType]: true }
+    })
+  }
+
+  const closeReviewOrder = () => {
+    if (!lastOrderReview?.reviewed?.isProductReviewed) setLastOrderReview({ ...lastOrderReview, reviewStatus: { order: false, product: true, driver: false } })
+    else if (lastOrderReview?.order?.driver && !lastOrderReview?.order?.user_review && !lastOrderReview?.reviewed?.isDriverReviewed) setLastOrderReview({ ...lastOrderReview, reviewStatus: { order: false, product: false, driver: true } })
+    else handleCloseReivew()
+  }
+
+  const closeReviewProduct = () => {
+    if (lastOrderReview?.order?.driver && !lastOrderReview?.order?.user_review && !lastOrderReview?.reviewed?.isDriverReviewed) setLastOrderReview({ ...lastOrderReview, reviewStatus: { order: false, product: false, driver: true } })
+    else {
+      setIsReviewed('isDriverReviewed')
+      handleCloseReivew()
+    }
+  }
+
   useEffect(() => {
     auth && _getLastOrderHasNoReview()
   }, [auth])
@@ -45,6 +94,32 @@ export const BusinessesListing = (props: any) => {
     <>
       {(layout === 'original') && <OriginalBusinessListing {...props} />}
       {(layout === 'appointment') && <AppointmentBusinessListing {...props} />}
+
+      {lastOrderReview?.isReviewOpen && (
+        <OBottomPopup
+          open={lastOrderReview?.isReviewOpen}
+          onClose={handleCloseReivew}
+          title={lastOrderReview?.order
+            ? (lastOrderReview?.reviewStatus?.order
+              ? t('HEY', 'Hey! ') + t('HOW_WAS_YOUR_ORDER', 'How was your order?')
+              : (lastOrderReview?.reviewStatus?.product
+                ? t('REVIEW_PRODUCT', 'Review Product')
+                : t('REVIEW_DRIVER', 'Review Driver')))
+            : t('LOADING', 'Loading...')}
+          bottomContainerStyle={{ height: 'auto' }}
+          titleStyle={{ textAlign: 'center' }}
+          closeIcon={theme.images.general.close}
+        >
+          {
+            lastOrderReview?.reviewStatus?.order
+              ? <ReviewOrderModal order={lastOrderReview?.order} closeReviewOrder={closeReviewOrder} skipReview={handleCloseReivew} setIsReviewed={() => setIsReviewed('isOrderReviewed')} />
+              : (lastOrderReview?.reviewStatus?.product
+                ? <ReviewProductsModal order={lastOrderReview?.order} closeReviewProduct={closeReviewProduct} setIsProductReviewed={() => setIsReviewed('isProductReviewed')} />
+                : <ReviewDriverModal order={lastOrderReview?.order} closeReviewDriver={handleCloseReivew} setIsDriverReviewed={() => setIsReviewed('isDriverReviewed')} />)
+          }
+
+        </OBottomPopup>
+      )}
     </>
   )
-}
+}

package/themes/original/src/components/GoogleMap/index.tsx

@@ -32,6 +32,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
     latitudeDelta: 0.0010,
     longitudeDelta: 0.0010 * ASPECT_RATIO
   })
+  const [MARKERS, SETMARKERS] = useState(locations)
   let mapRef = useRef<any>(null)
   const googleMapsApiKey = configState?.configs?.google_maps_api_key?.value
 
@@ -41,12 +42,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
     ERROR_NOT_FOUND_ADDRESS: 'Sorry, we couldn\'t find an address',
     ERROR_MAX_LIMIT_LOCATION: `Sorry, You can only set the position to ${maxLimitLocation}m`
   }
-  const MARKERS = locations && locations.map((location: { lat: number, lng: number }) => {
-    return {
-      latitude: location.lat,
-      longitude: location.lng
-    }
-  })
+
   const geocodePosition = (pos: { latitude: number, longitude: number }) => {
     Geocoder.from({
       latitude: pos.latitude,
@@ -147,7 +143,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
   }
 
   const fitAllMarkers = () => {
-    mapRef.current.fitToCoordinates(MARKERS, {
+    mapRef.current.fitToCoordinates(MARKERS?.map(location => ({ latitude: location.lat, longitude: location.lng })), {
       edgePadding: { top: 80, right: 80, bottom: 80, left: 80 },
       animated: true,
     });
@@ -170,6 +166,9 @@ export const GoogleMap = (props: GoogleMapsParams) => {
         fitAllMarkers()
       }
     }, 1000)
+    if (locations) {
+      SETMARKERS(locations)
+    }
     return () => clearInterval(interval)
   }, [locations])
 
@@ -189,16 +188,16 @@ export const GoogleMap = (props: GoogleMapsParams) => {
       >
         {locations ? (
           <>
-            {MARKERS && MARKERS.map((location: { latitude: number, longitude: number }, i: number) => (
+            {MARKERS && MARKERS.map((location: { lat: number, lng: number }, i: number) => (
               <React.Fragment key={i}>
                 {
                   <Marker
                     zIndex={i}
-                    coordinate={location}
-                    title={locations[i]?.title}
+                    coordinate={{ latitude: location.lat ?? 0, longitude: location.lng ?? 0 }}
+                    title={MARKERS[i]?.title}
                   >
                     <View>
-                      <OIcon url={locations[i].icon} width={50} height={50} />
+                      <OIcon url={MARKERS[i].icon} width={50} height={50} />
                     </View>
                   </Marker>
                 }

package/themes/original/src/components/Reviews/ReviewDriver/index.tsx

@@ -0,0 +1,301 @@
+import React, { useState, useEffect } from 'react'
+import { useLanguage, useToast, ToastType, ReviewDriver as ReviewDriverController } from 'ordering-components/native'
+import { StyleSheet, View, I18nManager, TouchableOpacity } from 'react-native'
+import { ReviewDriverParams } from '../../../types'
+import { useTheme } from 'styled-components/native'
+import { useForm, Controller } from 'react-hook-form'
+import { OText, OIcon, OButton, OInput } from '../../shared'
+import LinearGradient from 'react-native-linear-gradient'
+import { FloatingBottomContainer } from '../../../layouts/FloatingBottomContainer'
+import Spinner from 'react-native-loading-spinner-overlay'
+
+import { reviewCommentList } from '../../../../../../src/utils'
+
+import {
+  ReviewDriverContainer,
+  DriverPhotoContainer,
+  FormReviews,
+  RatingBarContainer,
+  RatingTextContainer,
+  CommentsButtonGroup,
+  ActionContainer,
+} from './styles'
+
+const ReviewDriverUI = (props: ReviewDriverParams) => {
+  const {
+    order,
+    navigation,
+    formState,
+    dirverReviews,
+    setDriverReviews,
+    handleSendDriverReview,
+    closeReviewDriver
+  } = props
+
+  const [, t] = useLanguage()
+  const theme = useTheme()
+  const { handleSubmit, control, errors } = useForm()
+  const [, { showToast }] = useToast()
+
+  const [isDriverReviewed, setIsDriverReviewed] = useState(false)
+
+  const styles = StyleSheet.create({
+    photoWrapper: {
+      shadowColor: theme.colors.black,
+      shadowRadius: 3,
+      shadowOffset: { width: 1, height: 4 },
+      elevation: 3,
+      borderRadius: 8,
+      shadowOpacity: 0.1,
+      overflow: 'hidden'
+    },
+    inputTextArea: {
+      borderColor: theme.colors.lightGray,
+      borderRadius: 8,
+      marginTop: 10,
+      marginBottom: 40,
+      height: 100,
+      alignItems: 'flex-start'
+    },
+    statusBar: {
+      transform: [{ scaleX: I18nManager.isRTL ? -1 : 1 }],
+      height: 10,
+      borderRadius: 5,
+      marginTop: 5
+    },
+    ratingItemContainer: {
+      position: 'absolute',
+      top: -20
+    },
+    ratingItem: {
+      left: '-50%',
+      flexDirection: 'column',
+      alignItems: 'center'
+    },
+    ratingLineStyle: {
+      height: 10,
+      width: 1,
+      marginBottom: 10,
+      backgroundColor: theme.colors.dusk
+    }
+  })
+
+  const [comments, setComments] = useState<Array<any>>([])
+  const [extraComment, setExtraComment] = useState('')
+  const [alertState, setAlertState] = useState<{ open: boolean, content: Array<any>, success?: boolean }>({ open: false, content: [], success: false })
+
+  const qualificationList = [
+    { key: 1, text: t('TERRIBLE', 'Terrible'), percent: 0, parentStyle: { left: '0%' }, isInnerStyle: false, pointerColor: false },
+    { key: 2, text: t('BAD', 'Bad'), percent: 0.25, parentStyle: { left: '25%' }, isInnerStyle: true, pointerColor: true },
+    { key: 3, text: t('OKAY', 'Okay'), percent: 0.5, parentStyle: { left: '50%' }, isInnerStyle: true, pointerColor: true },
+    { key: 4, text: t('GOOD', 'Good'), percent: 0.75, parentStyle: { left: '75%' }, isInnerStyle: true, pointerColor: true },
+    { key: 5, text: t('GREAT', 'Great'), percent: 1, parentStyle: { right: '0%' }, isInnerStyle: false, pointerColor: false }
+  ]
+
+  const commentsList = reviewCommentList('driver')
+
+  const onSubmit = () => {
+    if (dirverReviews?.qualification === 0) {
+      setAlertState({
+        open: true,
+        content: dirverReviews?.qualification === 0 ? [`${t('REVIEW_QUALIFICATION_REQUIRED', 'Review qualification is required')}`] : []
+      })
+      return
+    }
+    handleSendDriverReview()
+    setAlertState({ ...alertState, success: true })
+  }
+
+  const isSelectedComment = (commentKey: number) => {
+    const found = comments.find((comment: any) => comment?.key === commentKey)
+    return found
+  }
+
+  const handleChangeComment = (commentItem: any) => {
+    const found = comments.find((comment: any) => comment?.key === commentItem.key)
+    if (found) {
+      const _comments = comments.filter((comment: any) => comment?.key !== commentItem.key)
+      setComments(_comments)
+    } else {
+      setComments([...comments, commentItem])
+    }
+  }
+
+  const handleChangeQualification = (qualification: number) => {
+    if (qualification) setDriverReviews({ ...dirverReviews, qualification: qualification, comment: '' })
+    setComments([])
+  }
+
+  const handleSendReviewClick = () => {
+    (!order?.user_review && !isDriverReviewed) && onSubmit()
+  }
+
+  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) {
+      // Convert all errors in one string to show in toast provider
+      const list = Object.values(errors);
+      let stringError = '';
+      list.map((item: any, i: number) => {
+        stringError +=
+          i + 1 === list.length ? `- ${item.message}` : `- ${item.message}\n`;
+      });
+      showToast(ToastType.Error, stringError);
+    }
+  }, [errors])
+
+  useEffect(() => {
+    if (alertState.open) {
+      alertState.content && showToast(
+        ToastType.Error,
+        alertState.content
+      )
+    }
+  }, [alertState.content])
+
+  useEffect(() => {
+    let _comments = ''
+    if (comments.length > 0) {
+      comments.map((comment: any) => (_comments += comment.content + '. '))
+    }
+    const _comment = _comments + extraComment
+    setDriverReviews({ ...dirverReviews, comment: _comment })
+  }, [comments, extraComment])
+
+  return (
+    <>
+      <ReviewDriverContainer>
+        <DriverPhotoContainer>
+          <View
+            style={{
+              ...styles.photoWrapper,
+              backgroundColor: theme.colors.white,
+              padding: !order?.driver?.photo ? 5 : 0
+            }}
+          >
+            <OIcon
+              url={order?.driver?.photo}
+              src={!order?.driver?.photo && theme.images.general.user}
+              cover={order?.driver?.photo ? true : false}
+              width={80}
+              height={80}
+            />
+          </View>
+          <OText weight={500} style={{ marginVertical: 10 }} color={theme.colors.textNormal}>{order?.driver?.name} {order?.driver?.lastname}</OText>
+        </DriverPhotoContainer>
+
+        <View style={{ flex: 1, justifyContent: 'flex-end' }}>
+          <FormReviews>
+            <OText mBottom={13} color={theme.colors.textNormal}>{t('HOW_WAS_YOUR_DRIVER', 'How was your driver?')}</OText>
+            <RatingBarContainer>
+              <LinearGradient
+                start={{ x: 0.0, y: 0.0 }}
+                end={{ x: qualificationList[dirverReviews?.qualification - 1]?.percent || 0, y: 0 }}
+                locations={[.9999, .9999]}
+                colors={[theme.colors.primary, theme.colors.backgroundGray200]}
+                style={styles.statusBar}
+              />
+              <RatingTextContainer>
+                {qualificationList.map((qualification: any) => (
+                  <View
+                    key={qualification.key}
+                    style={{ ...qualification.parentStyle, ...styles.ratingItemContainer }}
+                  >
+                    <TouchableOpacity
+                      style={qualification.isInnerStyle && styles.ratingItem}
+                      onPress={() => handleChangeQualification(qualification.key)}
+                    >
+                      <View
+                        style={{
+                          ...styles.ratingLineStyle,
+                          backgroundColor: (qualification.pointerColor && !(dirverReviews?.qualification >= qualification.key)) ? theme.colors.dusk : 'transparent'
+                        }}
+                      />
+                      <OText size={12} color={dirverReviews?.qualification === qualification.key ? theme.colors.black : theme.colors.lightGray}>{qualification.text}</OText>
+                    </TouchableOpacity>
+                  </View>
+                ))}
+              </RatingTextContainer>
+            </RatingBarContainer>
+
+            <OText style={{ marginTop: 30 }} color={theme.colors.textNormal}>
+              {commentsList[dirverReviews?.qualification || 1]?.title}
+            </OText>
+            <CommentsButtonGroup>
+              {commentsList[dirverReviews?.qualification || 1]?.list?.map(commentItem => (
+                <OButton
+                  key={commentItem.key}
+                  text={commentItem.content}
+                  bgColor={isSelectedComment(commentItem.key) ? theme.colors.primary : theme.colors.backgroundGray200}
+                  borderColor={isSelectedComment(commentItem.key) ? theme.colors.primary : theme.colors.backgroundGray200}
+                  textStyle={{
+                    color: isSelectedComment(commentItem.key) ? theme.colors.white : theme.colors.textNormal,
+                    fontSize: 13,
+                    paddingRight: isSelectedComment(commentItem.key) ? 15 : 0
+                  }}
+                  style={{ height: 35, paddingLeft: 5, paddingRight: 5, marginHorizontal: 3, marginVertical: 10 }}
+                  imgRightSrc={isSelectedComment(commentItem.key) ? theme.images.general.close : null}
+                  imgRightStyle={{ tintColor: theme.colors.white, right: 5, margin: 5 }}
+                  onClick={() => handleChangeComment(commentItem)}
+                />
+              ))}
+            </CommentsButtonGroup>
+
+            <OText style={{ marginTop: 30 }} color={theme.colors.textNormal}>{t('REVIEW_COMMENT_QUESTION', 'Do you want to add something?')}</OText>
+            <Controller
+              control={control}
+              defaultValue=''
+              name='comments'
+              render={({ onChange }: any) => (
+                <OInput
+                  name='comments'
+                  onChange={(val: any) => {
+                    onChange(val)
+                    setExtraComment(val.target.value)
+                  }}
+                  style={styles.inputTextArea}
+                  multiline
+                />
+              )}
+            />
+          </FormReviews>
+        </View>
+      </ReviewDriverContainer>
+      <Spinner visible={formState.loading} />
+      <FloatingBottomContainer>
+        <ActionContainer>
+          <OButton
+            textStyle={{ color: theme.colors.white, paddingRight: 10 }}
+            text={t('SEND_REVIEW', 'Send Review')}
+            style={{ borderRadius: 8 }}
+            imgRightStyle={{ tintColor: theme.colors.white, right: 5, margin: 5 }}
+            isDisabled={dirverReviews?.qualification < 1 || dirverReviews?.comment.length < 1}
+            onClick={handleSubmit(handleSendReviewClick)}
+          />
+        </ActionContainer>
+      </FloatingBottomContainer>
+    </>
+  )
+}
+
+export const ReviewDriver = (props: any) => {
+  const reviewDriverProps = {
+    ...props,
+    UIComponent: ReviewDriverUI,
+    isToast: true
+  }
+  return <ReviewDriverController {...reviewDriverProps} />
+}

package/themes/original/src/components/Reviews/ReviewDriver/styles.tsx

@@ -0,0 +1,39 @@
+import styled from 'styled-components/native'
+
+export const ReviewDriverContainer = styled.ScrollView`
+  padding: 20px 40px;
+  margin-bottom: 100px;
+  max-height: 400px;
+`
+
+export const DriverPhotoContainer = styled.View`
+  margin-vertical: 5px;
+  flex-direction: column;
+  align-items: center;
+`
+
+export const FormReviews = styled.View`
+  flex: 1;
+  height: 100%;
+  margin-top: 30px;
+`
+
+export const RatingBarContainer = styled.View`
+  margin-top: 10px;
+  margin-bottom: 25px;
+`
+
+export const RatingTextContainer = styled.View`
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 10px;
+`
+export const CommentsButtonGroup = styled.View`
+  flex-direction: row;
+  flex-wrap: wrap;
+`
+
+export const ActionContainer = styled.View`
+  padding: 3px 30px;
+`