ordering-ui-react-native 0.12.21 → 0.12.25

package/themes/single-business/src/components/SignupForm/index.tsx

@@ -82,7 +82,6 @@ const SignupFormUI = (props: SignupParams) => {
 			display: 'flex',
 			flexDirection: 'row',
 			justifyContent: 'space-between',
-			marginBottom: 30,
 		},
 		line: {
 			height: 1,
@@ -539,6 +538,21 @@ const SignupFormUI = (props: SignupParams) => {
 					)}
 				</FormInput>
 
+        {
+          onNavigationRedirect && loginButtonText && (
+            <View style={style.wrappText}>
+              <OText size={14} style={{ marginRight: 5 }}>
+                {t('MOBILE_FRONT_ALREADY_HAVE_AN_ACCOUNT', 'Already have an account?')}
+              </OText>
+              <Pressable onPress={() => onNavigationRedirect('Login')}>
+                <OText size={14} color={theme.colors.primary}>
+                  {loginButtonText}
+                </OText>
+              </Pressable>
+            </View>
+          )
+        }
+
 				<View
 					style={{
 						flexDirection: 'row',
@@ -578,21 +592,6 @@ const SignupFormUI = (props: SignupParams) => {
 					</SocialButtons>
 				</ButtonsWrapper>
 
-				{/* {
-          onNavigationRedirect && loginButtonText && (
-            <View style={style.wrappText}>
-              <OText size={18} style={{ marginRight: 5 }}>
-                {t('MOBILE_FRONT_ALREADY_HAVE_AN_ACCOUNT', 'Already have an account?')}
-              </OText>
-              <Pressable onPress={() => onNavigationRedirect('Login')}>
-                <OText size={18} color={theme.colors.primary}>
-                  {loginButtonText}
-                </OText>
-              </Pressable>
-            </View>
-          )
-        } */}
-
 				{/* {
           configs && Object.keys(configs).length > 0 && (
             (configs?.facebook_login?.value === 'true' ||

package/themes/single-business/src/components/UserProfile/index.tsx

@@ -123,6 +123,12 @@ const ProfileListUI = (props: ProfileParams) => {
 		onNavigationRedirect: (route: string, params: any) => props.navigation.navigate(route, params)
 	}
 
+  const getName = () => {
+    return user?.lastname
+      ? `${user?.name} ${user?.lastname}`
+      : user?.name
+  }
+
 	return (
 		<View style={{ flex: 1, height: height - top - bottom - 62 }}>
 			<OText size={24} color={theme.colors.textNormal} lineHeight={36} weight={Platform.OS === 'ios' ? '600' : 'bold'} style={{ marginTop: 14, marginBottom: 24, ...styles.pagePadding }}>{t('PROFILE', 'Profile')}</OText>
@@ -136,7 +142,7 @@ const ProfileListUI = (props: ProfileParams) => {
 					/>
 				</View>
 				<View style={{ flexBasis: '70%' }}>
-					<OText size={20} lineHeight={30} weight={Platform.OS === 'ios' ? '500' : 'bold'} color={theme.colors.textNormal}>{`${user?.name} ${user?.lastname}`}</OText>
+					<OText size={20} lineHeight={30} weight={Platform.OS === 'ios' ? '500' : 'bold'} color={theme.colors.textNormal}>{getName()}</OText>
 					<TouchableOpacity onPress={() => navigation.navigate('ProfileForm', { ...detailProps })}>
 						<OText size={12} lineHeight={18} color={theme.colors.primary} style={{ textDecorationLine: 'underline' }}>{t('VIEW_ACCOUNT', 'View account')}</OText>
 					</TouchableOpacity>
@@ -154,10 +160,10 @@ const ProfileListUI = (props: ProfileParams) => {
 						<OIcon src={theme.images.general.help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>
 					</ListItem>
-					<ListItem onPress={() => navigation.navigate('Notifications', {})} activeOpacity={0.7}>
+					{/* <ListItem onPress={() => navigation.navigate('Notifications', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.bell} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('NOTIFICATIONS', ' Notifications')}</OText>
-					</ListItem>
+					</ListItem> */}
 				</Actions>
 
 				<Actions>

package/themes/single-business/src/types/index.tsx

@@ -162,6 +162,7 @@ export interface BusinessProductsListingParams {
 	errorQuantityProducts?: boolean;
 	header?: any;
 	logo?: any;
+	getNextProducts?: any;
 	productModal?: any;
 	handleChangeCategory: (value: any) => {};
 	setProductLogin?: () => {};
@@ -183,6 +184,12 @@ export interface BusinessProductsCategoriesParams {
 	categorySelected: any;
 	featured: boolean;
 	loading?: any;
+	scrollViewRef?: any;
+	productListLayout?: any;
+	categoriesLayout?: any;
+	selectedCategoryId?: any;
+	setSelectedCategoryId?: any;
+	lazyLoadProductsRecommended?: any;
 }
 export interface BusinessProductsListParams {
 	errors?: any;
@@ -198,6 +205,8 @@ export interface BusinessProductsListParams {
 	isBusinessLoading?: any,
 	errorQuantityProducts?: boolean,
 	handleCancelSearch?: () => void
+	categoriesLayout?: any
+	setCategoriesLayout?: any
 }
 export interface SingleProductCardParams {
 	businessId: any,

package/themes/single-business/src/utils/index.tsx

@@ -219,4 +219,35 @@ export const getOrderStatus = (status: number) => {
     default:
       return status
   }
-}
+}
+
+export const getTextOrderStatus = (s: string, t: any) => {
+  const status = parseInt(s)
+  const orderStatus = [
+    { key: 0, value: t('PENDING', 'Pending') },
+    { key: 1, value: t('COMPLETED', 'Completed') },
+    { key: 2, value: t('REJECTED', 'Rejected') },
+    { key: 3, value: t('DRIVER_IN_BUSINESS', 'Driver in business') },
+    { key: 4, value: t('PREPARATION_COMPLETED', 'Preparation Completed') },
+    { key: 5, value: t('REJECTED_BY_BUSINESS', 'Rejected by business') },
+    { key: 6, value: t('REJECTED_BY_DRIVER', 'Rejected by Driver') },
+    { key: 7, value: t('ACCEPTED_BY_BUSINESS', 'Accepted by business') },
+    { key: 8, value: t('ACCEPTED_BY_DRIVER', 'Accepted by driver') },
+    { key: 9, value: t('PICK_UP_COMPLETED_BY_DRIVER', 'Pick up completed by driver') },
+    { key: 10, value: t('PICK_UP_FAILED_BY_DRIVER', 'Pick up Failed by driver') },
+    { key: 11, value: t('DELIVERY_COMPLETED_BY_DRIVER', 'Delivery completed by driver') },
+    { key: 12, value: t('DELIVERY_FAILED_BY_DRIVER', 'Delivery Failed by driver') },
+    { key: 13, value: t('PREORDER', 'PreOrder') },
+    { key: 14, value: t('ORDER_NOT_READY', 'Order not ready') },
+    { key: 15, value: t('ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', 'Order picked up completed by customer') },
+    { key: 16, value: t('CANCELLED_BY_CUSTOMER', 'Cancelled by customer') },
+    { key: 17, value: t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', 'Order not picked up by customer') },
+    { key: 18, value: t('DRIVER_ALMOST_ARRIVED_TO_BUSINESS', 'Driver almost arrived to business') },
+    { key: 19, value: t('DRIVER_ALMOST_ARRIVED_TO_CUSTOMER', 'Driver almost arrived to customer') },
+    { key: 20, value: t('ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', 'Customer almost arrived to business') },
+    { key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', 'Customer arrived to business') }
+  ]
+
+  const objectStatus = orderStatus.find((o) => o.key === status)
+  return objectStatus && objectStatus
+}

package/themes/uber-eats/src/components/Messages/index.tsx

@@ -5,9 +5,9 @@ import { useTheme } from 'styled-components/native';
 import { GiftedChat, Actions, InputToolbar, Composer, Send, Bubble, MessageImage } from 'react-native-gifted-chat'
 import { USER_TYPE } from '../../config/constants'
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
-import { OIcon, OIconButton, OText } from '../shared'
+import { OIcon, OIconButton, OText, OButton } from '../shared'
 import { TouchableOpacity, ActivityIndicator, StyleSheet, View, Platform, Keyboard,I18nManager } from 'react-native'
-import { Header, TitleHeader, Wrapper } from './styles'
+import { Header, TitleHeader, Wrapper, QuickMessageContainer } from './styles'
 import { MessagesParams } from '../../types'
 
 const ImageDummy = require('../../assets/images/image.png')
@@ -63,6 +63,17 @@ const MessagesUI = (props: MessagesParams) => {
   const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
   const chatDisabled = previousStatus.includes(order?.status)
 
+  const quickMessageList = [
+    { key: 'customer_message_1', text: t('CUSTOMER_MESSAGE_1', 'customer_message_1') },
+    { key: 'customer_message_2', text: t('CUSTOMER_MESSAGE_2', 'customer_message_2') },
+    { key: 'customer_message_3', text: t('CUSTOMER_MESSAGE_3', 'customer_message_3') },
+    { key: 'customer_message_4', text: t('CUSTOMER_MESSAGE_4', 'customer_message_4') }
+  ]
+
+  const handleClickQuickMessage = (text: string) => {
+    setMessage && setMessage(`${message}${text}`)
+  }
+
   const onChangeMessage = (val: string) => {
     setMessage && setMessage(val)
   }
@@ -185,13 +196,48 @@ const MessagesUI = (props: MessagesParams) => {
     )
   }
 
+  const renderAccessory = () => {
+    return (
+      <QuickMessageContainer
+        style={{
+          marginLeft: 10,
+          marginBottom: 10
+        }}
+        contentContainerStyle={{
+          alignItems: 'center',
+        }}
+        horizontal
+        showsHorizontalScrollIndicator={false}
+      >
+        {quickMessageList.map((quickMessage, i) => (
+          <OButton
+            key={i}
+            text={quickMessage.text}
+            bgColor='#E9ECEF'
+            borderColor='#E9ECEF'
+            imgRightSrc={null}
+            textStyle={{
+              fontSize: 11,
+              lineHeight: 16,
+              color: '#414954'
+            }}
+            style={{ ...styles.editButton }}
+            onClick={() => handleClickQuickMessage(quickMessage.text)}
+          />
+        ))}
+      </QuickMessageContainer>
+    )
+  }
+
   const renderInputToolbar = (props : any) => (
     <InputToolbar
       {...props}
       containerStyle={{
-        padding: Platform.OS === 'ios' && isKeyboardShow ? 0 : 10
+        padding: Platform.OS === 'ios' && isKeyboardShow ? 0 : 10,
+        flexDirection: 'column-reverse'
       }}
       primaryStyle={{ alignItems: 'center', justifyContent: 'flex-start' }}
+      renderAccessory={() => renderAccessory()}
     />
   )
 
@@ -328,7 +374,7 @@ const MessagesUI = (props: MessagesParams) => {
           renderMessageImage={renderMessageImage}
           scrollToBottomComponent={() => renderScrollToBottomComponent()}
           messagesContainerStyle={{
-            paddingBottom: 20
+            paddingBottom: 55
           }}
           isLoadingEarlier={messages.loading}
           renderLoading={() => <ActivityIndicator size="small" color="#000" />}
@@ -354,6 +400,15 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
     marginHorizontal: 4
+  },
+  editButton : {
+    borderRadius: 50,
+    backgroundColor: '#E9ECEF',
+    marginRight: 10,
+    height: 24,
+    borderWidth: 1,
+    paddingLeft: 0,
+    paddingRight: 0
   }
 })
 

package/themes/uber-eats/src/components/Messages/styles.tsx

@@ -19,3 +19,5 @@ export const TitleHeader = styled.View`
   align-items: flex-start;
   max-width: 85%;
 `
+
+export const QuickMessageContainer = styled.ScrollView``