ordering-ui-react-native 0.16.5-release → 0.16.6-release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.16.5-release",
+  "version": "0.16.6-release",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

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

@@ -35,8 +35,8 @@ const DriverTipsUI = (props: any) => {
 	const theme = useTheme();
 
 	const style = StyleSheet.create({
-		circle: {
-			borderRadius: 30
+		semicircle: {
+			borderRadius: 8
 		},
 		inputStyle: {
 			flex: 1,
@@ -75,10 +75,10 @@ const DriverTipsUI = (props: any) => {
 						onPress={() => handlerChangeOption(option)}
 					>
 						<DTCard
-							style={style.circle}
+							style={style.semicircle}
 							isActive={option === optionSelected}
 						>
-							<OText size={12} numberOfLines={1} color={option === optionSelected ? '#FFF' : theme.colors.textSecondary}>
+							<OText size={12} numberOfLines={2} color={option === optionSelected ? '#FFF' : theme.colors.textSecondary}>
 								{`${isFixedPrice ? parsePrice(option) : `${option}%`}`}
 							</OText>
 						</DTCard>

package/themes/original/src/components/DriverTips/styles.tsx

@@ -26,11 +26,12 @@ export const DTCard = styled.View`
   text-transform: capitalize;
   min-height: 55px;
   min-width: 55px;
-  max-width: 55px;
+  max-width: 80px;
   max-height: 55px;
   margin-right: 10px;
   margin-left: 10px;
   margin-top: 10px;
+  padding-horizontal: 10px;
 
   ${(props: any) => props.isActive && css`
     background-color: ${(props: any) => props.theme.colors.primary};

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

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
-import { View, StyleSheet, RefreshControl } from 'react-native';
+import { View, StyleSheet, RefreshControl, Platform } from 'react-native';
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 import { OrdersOption } from '../OrdersOption'
-import { HeaderTitle, OText } from '../shared'
+import { HeaderTitle, OButton, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
 import { Tab } from './styles'
 import { useTheme } from 'styled-components/native';
@@ -11,6 +12,7 @@ import { Container } from '../../layouts/Container';
 
 export const MyOrders = (props: any) => {
   const {
+    navigation,
     hideOrders,
     businessesSearchList
   } = props
@@ -33,6 +35,9 @@ export const MyOrders = (props: any) => {
     { key: 'business', value: t('BUSINESS', 'Business') },
     { key: 'products', value: t('PRODUCTS', 'Products') }
   ]
+  const isChewLayout = theme?.business_view?.components?.header?.components?.layout?.type === 'chew'
+
+  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
 
   const handleOnRefresh = () => {
     setRefreshOrders(true);
@@ -67,7 +72,47 @@ export const MyOrders = (props: any) => {
         onRefresh={() => handleOnRefresh()}
       />
     }>
-      {!hideOrders && (
+      {isChewLayout && (
+        <View style={{
+          width: '100%',
+          display: 'flex',
+          flexDirection: 'row',
+          alignItems: 'center',
+          paddingHorizontal: 40
+        }}>
+          <OText
+              size={24}
+              style={{
+                marginTop: Platform.OS === 'android' ? 50 : 30,
+                paddingHorizontal: 20,
+                textTransform: 'capitalize'
+              }}
+            >
+              <OButton
+                imgLeftStyle={{ width: 18 }}
+                imgRightSrc={null}
+                style={{
+                  borderWidth: 0,
+                  width: 26,
+                  height: 26,
+                  backgroundColor: '#FFF',
+                  borderColor: '#FFF',
+                  shadowColor: '#FFF',
+                  paddingLeft: 0,
+                  paddingRight: 0,
+                }}
+                onClick={goToBack}
+                icon={AntDesignIcon}
+                iconProps={{
+                  name: 'arrowleft',
+                  size: 26
+                }}
+              />
+              {t('MY_ORDERS', 'My Orders')}
+            </OText>
+        </View>
+      )}
+      {!hideOrders && !isChewLayout && (
         <HeaderTitle text={t('MY_ORDERS', 'My Orders')} />
       )}
       {!allEmpty && (

package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/index.tsx

@@ -12,7 +12,7 @@ import {
 } from 'react-native';
 import { PreviousBusinessOrderedParams } from '../../../types';
 
-const BusinessControllerList = ({ businesses, onBusinessClick, navigation, orderState, style }: any) => {
+const BusinessControllerList = ({ businesses, onBusinessClick, navigation, orderState, handleCustomUpdate, style }: any) => {
   return (
     <>
       {businesses?.result?.map((business: any, i: number) => (
@@ -31,6 +31,7 @@ const BusinessControllerList = ({ businesses, onBusinessClick, navigation, order
           businessDeliveryTime={business?.delivery_time}
           businessPickupTime={business?.pickup_time}
           businessDistance={business?.distance}
+          handleCustomUpdate={handleCustomUpdate}
           style={style}
         />
       ))}
@@ -92,6 +93,7 @@ export const PreviousBusinessOrdered = (props: PreviousBusinessOrderedParams) =>
     businesses,
     onNavigationRedirect,
     isBusinessesSearchList,
+    handleUpdateBusinesses,
   } = props
 
   const [orderState] = useOrder()
@@ -117,6 +119,7 @@ export const PreviousBusinessOrdered = (props: PreviousBusinessOrderedParams) =>
               orderState={orderState}
               navigation={navigation}
               businesses={businesses}
+              handleCustomUpdate={handleUpdateBusinesses}
             />
           )}
         </>
@@ -130,6 +133,7 @@ export const PreviousBusinessOrdered = (props: PreviousBusinessOrderedParams) =>
               orderState={orderState}
               navigation={navigation}
               businesses={businesses}
+              handleCustomUpdate={handleUpdateBusinesses}
             />
           )}
         </ListWrapper>

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

@@ -49,7 +49,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		BusinessControllerSkeletons,
 		businesses,
 		businessPaginationProps,
-		handleUpdateProducts
+		handleUpdateProducts,
+		handleUpdateBusinesses
 	} = props
 
 	const theme = useTheme();
@@ -228,6 +229,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 					onNavigationRedirect={onNavigationRedirect}
 					isBusinessesSearchList={!!businessesSearchList}
 					businesses={businesses}
+					handleUpdateBusinesses={handleUpdateBusinesses}
 				/>
 			)}
 

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

@@ -17,7 +17,7 @@ import { LanguageSelector } from '../LanguageSelector'
 import MessageCircle from 'react-native-vector-icons/AntDesign'
 import Ionicons from 'react-native-vector-icons/Ionicons'
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons'
-import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'
+import FontAwesome from 'react-native-vector-icons/FontAwesome'
 import FastImage from 'react-native-fast-image'
 import { OAlert } from '../../../../../src/components/shared'
 
@@ -111,6 +111,7 @@ const ProfileListUI = (props: ProfileParams) => {
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (configs?.wallet_cash_enabled?.value === '1' || configs?.wallet_credit_point_enabled?.value === '1')
 	const IsPromotionsEnabled = configs?.advanced_offers_module?.value === '1' || configs?.advanced_offers_module?.value === true
+	const isChewLayout = theme?.business_view?.components?.header?.components?.layout?.type === 'chew'
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}
@@ -199,6 +200,12 @@ const ProfileListUI = (props: ProfileParams) => {
 						<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>
+					{isChewLayout && (
+						<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 && (
 						<ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 							<Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />

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

@@ -216,6 +216,7 @@ export interface BusinessControllerParams {
 	setFavoriteIds?: any;
 	handleUpdateBusinessList?: any;
 	enableIntersection?: boolean;
+	handleCustomUpdate?: (businessId: number, changes: any) => {};
 }
 export interface BusinessProductsListingParams {
 	navigation?: any;
@@ -362,6 +363,7 @@ export interface OrdersOptionParams {
 	setRefreshOrders?: (value: boolean) => void,
 	handleUpdateOrderList?: (orderId: number, changes: any) => {},
 	handleUpdateProducts?: (productId: number, changes: any) => {},
+	handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 	isBusiness?: boolean,
 	isProducts?: boolean,
 	businessOrderIds?: any,
@@ -726,6 +728,7 @@ export interface PreviousBusinessOrderedParams {
 	isBusinessesSearchList?: any,
 	businessLoading?: boolean,
 	businesses?: any
+  handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 }
 
 export interface ServiceFormParams {