ordering-ui-react-native 0.17.85 → 0.17.87

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

@@ -50,7 +50,18 @@ const ProfileListUI = (props: ProfileParams) => {
 	const theme = useTheme();
 
 	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
-
+	const hideProfileImage = theme?.profile?.components?.picture?.hidden
+	const hideOrders = theme?.profile?.components?.orders?.hidden
+	const hideProfile = theme?.profile?.components?.profile?.hidden
+	const hideWallet = theme?.profile?.components?.wallet?.hidden
+	const hideMessages = theme?.bar_menu?.components?.messages?.hidden
+	const hideHelp = theme?.bar_menu?.components?.help?.hidden
+	const hideFavorites = theme?.bar_menu?.components?.favortes?.hidden
+	const hideSession = theme?.bar_menu?.components?.sessions?.hidden
+	const hidePromotions = theme?.bar_menu?.components?.promotions?.hidden
+	const hideAddressList = theme?.profile?.components?.address_list?.hidden
+	const showLanguages = !theme?.profile?.components?.languages?.hidden
+	const showNotifications = !theme?.profile?.components?.notification_settings?.hidden
 	const langPickerStyle = StyleSheet.create({
 		inputAndroid: {
 			color: theme.colors.textNormal,
@@ -166,7 +177,7 @@ const ProfileListUI = (props: ProfileParams) => {
 	return (
 		<View style={{ flex: 1, height: height - top - bottom, paddingTop: 20 }}>
 			<CenterView style={styles.pagePadding}>
-				{user?.photo && (
+				{user?.photo && !hideProfileImage && (
 					<View style={styles.photo}>
 						<FastImage
 							style={{ height: 60, width: 60, borderRadius: 8 }}
@@ -180,76 +191,94 @@ const ProfileListUI = (props: ProfileParams) => {
 				)}
 				<View style={{ flexBasis: '70%' }}>
 					<OText size={20} lineHeight={30} weight={Platform.OS === 'ios' ? '500' : 'bold'} color={theme.colors.textNormal}>{user?.name} {user?.lastname}</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>
+					{!hideProfile && (
+						<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>
+					)}
 				</View>
 			</CenterView>
 			<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginVertical: 32 }} />
 			<Spinner visible={notificationsGroup?.loading} />
 			<ListWrap style={{ ...styles.pagePadding }}>
 				<Actions>
-					<ListItem onPress={() => onRedirect('AddressList', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SAVED_PLACES', 'My saved places')}</OText>
-					</ListItem>
-					<ListItem onPress={() => onRedirect('Messages', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
-					</ListItem>
-					<ListItem onPress={() => onRedirect('MyOrders', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<FontAwesome name='list-alt' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MY_ORDERS', 'My Orders')}</OText>
-					</ListItem>
-					{isWalletEnabled && (
+					{!hideAddressList && (
+						<ListItem onPress={() => onRedirect('AddressList', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SAVED_PLACES', 'My saved places')}</OText>
+						</ListItem>
+					)}
+					{!hideMessages && (
+						<ListItem onPress={() => onRedirect('Messages', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
+						</ListItem>
+					)}
+					{!hideOrders && (
+						<ListItem onPress={() => onRedirect('MyOrders', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<FontAwesome name='list-alt' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MY_ORDERS', 'My Orders')}</OText>
+						</ListItem>
+					)}
+					{isWalletEnabled && !hideWallet && (
 						<ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 							<Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
 							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
 						</ListItem>
 					)}
-					{IsPromotionsEnabled && (
+					{IsPromotionsEnabled && !hidePromotions && (
 						<ListItem onPress={() => onRedirect('Promotions', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 							<MaterialIcons name='local-offer' style={styles.messageIconStyle} color={theme.colors.textNormal} />
 							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('PROMOTIONS', 'Promotions')}</OText>
 						</ListItem>
 					)}
-					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
-						<OIcon src={theme.images.general.ic_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', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<NotificationBadge style={{ borderRadius: 100 / 2 }} />
-						<Ionicons name='notifications-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('NOTIFICATIONS', 'Notifications')}
-						</OText>
-						<NotificationsWrapper>
-							<ToggleSwitch
-								isOn={user && (!!user?.settings?.notification?.newsletter ||
-									!!user?.settings?.sms?.newsletter ||
-									!!user?.settings?.email?.newsletter)}
-								onColor={theme.colors.primary}
-								size="small"
-								disabled={notificationsGroup?.loading}
-								offColor={theme.colors.disabled}
-								animationSpeed={400}
-								onToggle={() => handleChangePromotions(!(user && (!!user?.settings?.notification?.newsletter ||
-									!!user?.settings?.sms?.newsletter ||
-									!!user?.settings?.email?.newsletter)))}
-							/>
-						</NotificationsWrapper>
-					</ListItem>
-					<ListItem onPress={() => navigation.navigate('Sessions')} activeOpacity={0.7}>
-						<Ionicons name='md-list-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SESSIONS', 'Sessions')}</OText>
-					</ListItem>
-					<ListItem onPress={() => navigation.navigate('Favorite')} activeOpacity={0.7}>
-						<Ionicons name='heart-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('FAVORITES', 'Favorites')}</OText>
-					</ListItem>
+					{!hideHelp && (
+						<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
+							<OIcon src={theme.images.general.ic_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>
+					)}
+					{!showNotifications && (
+						<ListItem onPress={() => navigation.navigate('Notifications', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<NotificationBadge style={{ borderRadius: 100 / 2 }} />
+							<Ionicons name='notifications-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('NOTIFICATIONS', 'Notifications')}
+							</OText>
+							<NotificationsWrapper>
+								<ToggleSwitch
+									isOn={user && (!!user?.settings?.notification?.newsletter ||
+										!!user?.settings?.sms?.newsletter ||
+										!!user?.settings?.email?.newsletter)}
+									onColor={theme.colors.primary}
+									size="small"
+									disabled={notificationsGroup?.loading}
+									offColor={theme.colors.disabled}
+									animationSpeed={400}
+									onToggle={() => handleChangePromotions(!(user && (!!user?.settings?.notification?.newsletter ||
+										!!user?.settings?.sms?.newsletter ||
+										!!user?.settings?.email?.newsletter)))}
+								/>
+							</NotificationsWrapper>
+						</ListItem>
+					)}
+					{!hideSession && (
+						<ListItem onPress={() => navigation.navigate('Sessions')} activeOpacity={0.7}>
+							<Ionicons name='md-list-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SESSIONS', 'Sessions')}</OText>
+						</ListItem>
+					)}
+					{!hideFavorites && (
+						<ListItem onPress={() => navigation.navigate('Favorite')} activeOpacity={0.7}>
+							<Ionicons name='heart-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('FAVORITES', 'Favorites')}</OText>
+						</ListItem>
+					)}
 				</Actions>
 
 				<Actions>
-					<LanguageSelector iconColor={theme.colors.textNormal} pickerStyle={langPickerStyle} />
+					{!showLanguages && (
+						<LanguageSelector iconColor={theme.colors.textNormal} pickerStyle={langPickerStyle} />
+					)}
 					<View style={{ height: 17 }} />
 					<LogoutButton color={theme.colors.textNormal} text={t('LOGOUT', 'Logout')} />
 					<View style={{ height: 17 }} />

package/themes/original/src/components/shared/OButton.tsx

@@ -12,6 +12,7 @@ import {
 import * as React from 'react';
 import styled, { useTheme } from 'styled-components/native';
 import { OIcon } from './';
+import { css } from 'styled-components';
 
 const StyledButton = styled.View<Props>`
 	background-color: ${(props: any) => props.theme.colors.primary};
@@ -26,6 +27,9 @@ const StyledButton = styled.View<Props>`
 	padding-left: 20px;
 	padding-right: 20px;
 	position: relative;
+	${(props : any) => props?.theme?.general?.components?.buttons?.borderRadius && css`
+      border-radius: ${props?.theme?.general?.components?.buttons?.borderRadius};
+  `}
 `
 const StyledButtonDisabled = styled(StyledButton)`
 	background-color: ${(props: any) => props.theme.colors.disabled};
@@ -120,7 +124,7 @@ const OButton = (props: Props): React.ReactElement => {
 					<props.icon {...props.iconProps} />
 				) : null}
 				{props.imgLeftSrc ? (
-					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} />
+					<OIcon style={props.imgLeftStyle} src={props.imgLeftSrc} color={theme.colors.textNormal} />
 				) : null}
 				{props.text ? (
 					<StyledText style={props.textStyle}>{props.text}</StyledText>

package/themes/original/src/components/shared/OInput.tsx

@@ -3,7 +3,7 @@ import { ImageSourcePropType, ImageStyle, ViewStyle, TextInputProps, TextStyle }
 import styled from 'styled-components/native';
 import OIcon from './OIcon';
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
-import { useTheme } from 'styled-components/native';
+import { useTheme, css } from 'styled-components/native';
 
 const Input = styled.TextInput`
   flex-grow: 1;
@@ -53,6 +53,9 @@ const Wrapper = styled.Pressable`
 	align-items: center;
 	justify-content: center;
 	width: 100%;
+	${(props: any) => props.theme?.general?.components?.inputs?.borderRadius && css`
+      border-radius: ${props?.theme?.general?.components?.inputs?.borderRadius};
+  `}
 `;
 
 const OInput = (props: Props): React.ReactElement => {
@@ -100,7 +103,10 @@ const OInput = (props: Props): React.ReactElement => {
 				ref={(e: any) => {
 					props.forwardRef && (props.forwardRef.current = e)
 				}}
-				style={props?.inputStyle}
+				style={{
+					color: theme?.general?.components?.inputs?.color,
+					...props?.inputStyle
+				}}
 				onFocus={() => setInputFocused(true)}
 				onBlur={() => setInputFocused(false)}
 			/>

package/themes/original/src/types/index.tsx

@@ -318,6 +318,7 @@ export interface SingleProductCardParams {
 	navigation?: any;
 	isPreviously?: any;
 	isProductId?: any;
+	viewString?: string; 
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -594,6 +595,8 @@ export interface UpsellingProductsParams {
 	products?: any;
 	onNavigationRedirect?: any;
 	onGoBack?: any;
+	singleBusiness?: any;
+	isFranchiseApp?: any;
 }
 
 export interface GoogleMapsParams {

package/themes/original/src/utils/index.tsx

@@ -355,6 +355,17 @@ export const priceList = [
   { level: '5', content: '$$$$$' }
 ]
 
+export const getLogisticTag = (status: any) => {
+  const keyList: any = {
+    0: t('PENDING', 'Pending'),
+    1: t('IN_PROGRESS', 'In progress'),
+    2: t('IN_QUEUE', 'In queue'),
+    3: t('EXPIRED', 'Expired'),
+    4: t('RESOLVED', 'Resolved'),
+  }
+  return keyList[status] ? keyList[status] : t('UNKNOWN', 'Unknown')
+}
+
 export const getOrderStatus = (s: string) => {
   const status = parseInt(s);
   const orderStatus = [