ordering-ui-react-native 0.11.24 → 0.11.28

package/package.json

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

package/src/components/BusinessTypeFilter/index.tsx

@@ -1,14 +1,14 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { StyleSheet, View, ScrollView, TouchableOpacity, Dimensions } from 'react-native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
 import { BusinessTypeFilter as BusinessTypeFilterController, useLanguage } from 'ordering-components/native'
 
 import { BusinessCategoriesTitle, BusinessCategories, Category, BCContainer } from './styles'
-import { OIcon, OText } from '../shared'
+import { OIcon, OText, OModal } from '../shared'
 import { BusinessTypeFilterParams } from '../../types'
 import { useTheme } from 'styled-components/native'
+import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 
-import Carousel from 'react-native-snap-carousel';
 const windowWidth = Dimensions.get('window').width;
 
 export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
@@ -20,122 +20,172 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 
   const theme = useTheme();
   const [, t] = useLanguage();
+  const [isOpenAllCategories, setIsOpenAllCategories] = useState(false)
 
-  const renderTypes = ({ item }: any) => {
+  const styles = StyleSheet.create({
+    icons: {
+      padding: 10
+    },
+    logo: {
+      width: isOpenAllCategories ? windowWidth / 3 - 27 : windowWidth / 4 - 20,
+      height: isOpenAllCategories ? windowWidth / 3 - 27 : windowWidth / 4 - 20,
+      marginBottom: 15,
+      borderRadius: 8,
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
+    categoryStyle: {
+      width: isOpenAllCategories ? windowWidth / 3 - 27 : windowWidth / 4 - 20,
+      height: 150,
+      flexDirection: 'column',
+      justifyContent: 'center',
+      alignItems: 'center',
+      marginHorizontal: isOpenAllCategories ? 10 : 0,
+      marginBottom: isOpenAllCategories ? 40 : 0
+    },
+    allCategoriesContainer : {
+      paddingHorizontal: 10,
+      paddingVertical: 30
+    },
+    allCategoriesWrapper: {
+      flexDirection: 'row',
+      flexWrap: 'wrap',
+    }
+  })
+
+  const RenderTypes = ({ item }: any ) => {
     return (
       <TouchableOpacity
-        key={item.id}
-        onPress={() => handleChangeBusinessType(item.id)}
+        style={styles.categoryStyle}
+        onPress={() => {
+          handleChangeBusinessType(item.id)
+          isOpenAllCategories && setIsOpenAllCategories(false)
+        }}
       >
-        <Category>
-          {item.image ? (
-            <OIcon
-              url={item.image}
-              style={styles.logo}
-            />
-          ) : (
-            <OIcon
-              src={theme.images.categories.all}
-              style={styles.logo}
-            />
-          )}
-          <OText
-            style={{ textAlign: 'center' }}
-            size={20}
-            color={currentTypeSelected === item.id ? theme.colors.primary : theme.colors.textSecondary}
-            numberOfLines={1}
-            ellipsizeMode='tail'
-          >
-            {t(`BUSINESS_TYPE_${item.name.replace(/\s/g, '_').toUpperCase()}`, item.name)}
-          </OText>
-        </Category>
+        {item.image ? (
+          <OIcon
+            url={item.image}
+            style={styles.logo}
+          />
+        ) : (
+          <OIcon
+            src={theme.images.categories.all}
+            style={styles.logo}
+          />
+        )}
+        <OText
+          style={{ textAlign: 'center' }}
+          size={14}
+          color={currentTypeSelected === item.id ? theme.colors.primary : theme.colors.textSecondary}
+          numberOfLines={1}
+          ellipsizeMode='tail'
+        >
+          {t(`BUSINESS_TYPE_${item.name.replace(/\s/g, '_').toUpperCase()}`, item.name)}
+        </OText>
       </TouchableOpacity>
     )
   }
 
-  let _carousel: Carousel<any> | null;
-
-  const typeSelectedIndex = typesState?.types?.length > 0
-    ? typesState?.types.findIndex((type: any) => type.id === (currentTypeSelected ?? 0))
-    : 0
-
   return (
-    <BCContainer>
-      {typesState?.loading && (
-        <View>
-          <Placeholder
-            style={{ marginVertical: 10 }}
-            Animation={Fade}
-          >
-            <ScrollView
-              horizontal
-              showsVerticalScrollIndicator={false}
-              showsHorizontalScrollIndicator={false}
+    <>
+      <BCContainer>
+        {typesState?.loading && (
+          <View>
+            <Placeholder
+              style={{ marginVertical: 10 }}
+              Animation={Fade}
             >
-              {[...Array(4)].map((_, i) => (
-                <View key={i} style={{ width: 80, borderRadius: 10, marginRight: 15 }}>
-                  <PlaceholderLine
-                    height={80}
-                    noMargin
-                  />
-                </View>
+              <ScrollView
+                horizontal
+                showsVerticalScrollIndicator={false}
+                showsHorizontalScrollIndicator={false}
+              >
+                {[...Array(4)].map((_, i) => (
+                  <View key={i} style={{ width: 80, borderRadius: 8, marginRight: 15 }}>
+                    <PlaceholderLine
+                      height={80}
+                      noMargin
+                    />
+                  </View>
+                ))}
+              </ScrollView>
+            </Placeholder>
+          </View>
+        )}
+        {!typesState?.loading && !typesState?.error && typesState?.types && typesState?.types.length > 0 && (
+          <>
+            <BusinessCategoriesTitle>
+              <OText
+                size={16}
+                color={theme.colors.textSecondary}
+              >
+                {t('BUSINESS_CATEGORIES', 'Business Categories')}
+              </OText>
+            </BusinessCategoriesTitle>
+            <BusinessCategories>
+              {typesState?.types.slice(0, 3).map((type: any) => (
+                <RenderTypes
+                  key={type.id}
+                  item={type}
+                />
               ))}
-            </ScrollView>
-          </Placeholder>
-        </View>
-      )}
-      {!typesState?.loading && !typesState?.error && typesState?.types && typesState?.types.length > 0 && (
-        <>
-          <BusinessCategoriesTitle>
-            <OText
-              size={16}
-              color={theme.colors.textSecondary}
-            >
-              {t('BUSINESS_CATEGORIES', 'Business Categories')}
-            </OText>
-          </BusinessCategoriesTitle>
-          <BusinessCategories>
-            <Carousel
-              keyExtractor={(item: any) => item.name}
-              ref={(c: any) => { _carousel = c }}
-              data={typesState?.types || []}
-              renderItem={renderTypes}
-              sliderWidth={windowWidth}
-              itemWidth={100}
-              alwaysBounceHorizontal
-              layout={'default'}
-              slideStyle={{
-                width: 100,
-                marginRight: 15,
-              }}
-              activeSlideOffset={15}
-              inactiveSlideScale={1}
-              snapToAlignment="start"
-              activeSlideAlignment="start"
-              inactiveSlideOpacity={1}
-              firstItem={typeSelectedIndex ?? 0}
-            />
-          </BusinessCategories>
-        </>
-      )}
-    </BCContainer>
+              {typesState?.types.length > 3 && (
+                <TouchableOpacity
+                    style={styles.categoryStyle}
+                    onPress={() => setIsOpenAllCategories(true)}
+                  >
+                    <View
+                      style={{ ...styles.logo, backgroundColor: theme.colors.lightGray }}
+                    >
+                      <MaterialIcon
+                        name='dots-horizontal'
+                        size={32}
+                        color={theme.colors.black}
+                      />
+                    </View>
+                    <OText
+                      style={{ textAlign: 'center' }}
+                      size={14}
+                      color={theme.colors.textSecondary}
+                      numberOfLines={1}
+                      ellipsizeMode='tail'
+                    >
+                      {t('SEE_ALL', 'See all')}
+                    </OText>
+                  </TouchableOpacity>
+              )}
+            </BusinessCategories>
+          </>
+        )}
+      </BCContainer>
+      <OModal
+        open={isOpenAllCategories}
+        onClose={() => setIsOpenAllCategories(false)}
+        entireModal
+      >
+        <ScrollView style={styles.allCategoriesContainer}>
+          <OText
+            size={20}
+            mBottom={30}
+            color={theme.colors.textSecondary}
+            style={{ paddingHorizontal: 10 }}
+          >
+            {t('ALL_CATEGORIES', 'All categories')}
+          </OText>
+          <View style={styles.allCategoriesWrapper}>
+            {typesState?.types.map((type: any) => (
+              <RenderTypes
+                key={type.id}
+                item={type}
+              />
+            ))}
+          </View>
+        </ScrollView>
+      </OModal>
+    </>
   )
 }
 
-const styles = StyleSheet.create({
-  icons: {
-    padding: 10
-  },
-  logo: {
-    width: 75,
-    height: 75,
-    marginBottom: 15,
-    borderRadius: 25,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-})
-
 export const BusinessTypeFilter = (props: BusinessTypeFilterParams) => {
   const businessTypeFilterProps = {
     ...props,

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -75,6 +75,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const showFloatButtonsPickUp: any = {
     8: true,
     3: true,
+    4: true,
+    18: true
   };
 
   const showFloatButtonsAcceptOrReject: any = {
@@ -278,7 +280,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             showsVerticalScrollIndicator={false}>
             <>
               <OrderContentComponent order={order} />
-              {order?.status === 8 && order?.delivery_type === 1 && (
+              {(order?.status === 8 || order?.status === 18) && order?.delivery_type === 1 && (
                 <Pickup>
                   <OButton
                     style={styles.btnPickUp}
@@ -380,7 +382,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               widthButton={'45%'}
             />
           )}
-          {order?.status === 9 && (
+          {(order?.status === 9 || order?.status === 19) && (
             <>
               <FloatingButton
                 disabled={loading}

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

@@ -490,25 +490,25 @@ export const OrdersOption = (props: OrdersOptionParams) => {
       {
         key: 0,
         text: t('PENDING', 'Pending'),
-        tags: [0, 13],
+        tags: props?.orderGroupStatusCustom?.inProgress ?? [0, 13],
         title: 'pending'
       },
       {
         key: 1,
         text: t('IN_PROGRESS', 'In Progress'),
-        tags: [3, 4, 7, 8, 9, 14, 18, 19, 20, 21],
+        tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21],
         title: 'inProgress',
       },
       {
         key: 2,
         text: t('COMPLETED', 'Completed'),
-        tags: [1, 11, 15],
+        tags: props?.orderGroupStatusCustom?.completed ?? [1, 11, 15],
         title: 'completed',
       },
       {
         key: 3,
         text: t('CANCELLED', 'Cancelled'),
-        tags: [2, 5, 6, 10, 12, 16, 17],
+        tags: props?.orderGroupStatusCustom?.cancelled ?? [2, 5, 6, 10, 12, 16, 17],
         title: 'cancelled',
       },
     ]

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

@@ -276,6 +276,12 @@ export interface OrdersOptionParams {
   setOrdersGroup?: any;
   setCurrentFilters?: any;
   handleClickOrder?: any;
+  orderGroupStatusCustom?: {
+    pending?: Array<number>;
+    inProgress?: Array<number>;
+    completed?: Array<number>;
+    cancelled?: Array<number>;
+  };
 }
 export interface ActiveOrdersParams {
   orders?: any;

package/themes/doordash/src/components/BusinessTypeFilter/index.tsx

@@ -1,13 +1,15 @@
-import React from 'react'
+import React, { useState } from 'react'
 import { StyleSheet, FlatList, View, ScrollView, TouchableOpacity } from 'react-native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
 import { BusinessTypeFilter as BusinessTypeFilterController, useLanguage } from 'ordering-components/native'
 
-import { BusinessCategoriesTitle, BusinessCategories, Category, BCContainer } from './styles'
+import { BusinessCategories, Category, BCContainer } from './styles'
 import { OIcon, OText } from '../shared'
+import { OModal } from '../../../../../src/components/shared'
 import { useTheme } from 'styled-components/native'
 import { BusinessTypeFilterParams } from '../../types'
 import { useWindowDimensions } from 'react-native'
+import MaterialIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 
 export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 	const {
@@ -18,103 +20,169 @@ export const BusinessTypeFilterUI = (props: BusinessTypeFilterParams) => {
 
 	const theme = useTheme();
 	const [, t] = useLanguage();
-	const { width } = useWindowDimensions();
+	const { width, height } = useWindowDimensions();
+  const [isOpenAllCategories, setIsOpenAllCategories] = useState(false)
 
-	const renderTypes = ({ item }: any) => {
+	const styles = StyleSheet.create({
+		icons: {
+			padding: 10
+		},
+		logo: {
+      width: isOpenAllCategories ? width / 3 - 27 : width / 4 - 30,
+      height: isOpenAllCategories ? width / 3 - 27 : width / 4 - 30,
+      marginBottom: 15,
+      borderRadius: 8,
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
+		categoryStyle: {
+      width: isOpenAllCategories ? width / 3 - 27 : width / 4 - 30,
+      height: 120,
+      flexDirection: 'column',
+      justifyContent: 'center',
+      alignItems: 'center',
+      marginHorizontal: isOpenAllCategories ? 10 : 0,
+      marginBottom: isOpenAllCategories ? 40 : 0
+    },
+		allCategoriesContainer : {
+      paddingHorizontal: 10,
+      paddingVertical: 30,
+			height: height,
+			backgroundColor: 'white',
+			flex: 1
+    },
+    allCategoriesWrapper: {
+      flexDirection: 'row',
+      flexWrap: 'wrap',
+    }
+	})
+
+	const RenderTypes = ({ item }: any) => {
 		return (
 			<TouchableOpacity
 				key={item.id}
-				onPress={() => handleChangeBusinessType(item.id)}
+				style={styles.categoryStyle}
+				onPress={() => {
+					handleChangeBusinessType(item.id)
+          isOpenAllCategories && setIsOpenAllCategories(false)
+				}}
 			>
-				<Category>
-					{item.image ? (
-						<OIcon
-							url={item.image}
-							style={styles.logo}
-						/>
-					) : (
-						<OIcon
-							src={theme.images.categories.all}
-							style={styles.logo}
-						/>
-					)}
-					<OText
-						style={{ textAlign: 'center' }}
-						size={12}
-						weight={'400'}
-						color={currentTypeSelected === item.id ? theme.colors.textPrimary : theme.colors.textSecondary}
-					>
-						{t(`BUSINESS_TYPE_${item.name.replace(/\s/g, '_').toUpperCase()}`, item.name)}
-					</OText>
-				</Category>
+				{item.image ? (
+					<OIcon
+						url={item.image}
+						style={styles.logo}
+					/>
+				) : (
+					<OIcon
+						src={theme.images.categories.all}
+						style={styles.logo}
+					/>
+				)}
+				<OText
+					style={{ textAlign: 'center' }}
+					size={12}
+					weight={'400'}
+					color={currentTypeSelected === item.id ? theme.colors.textPrimary : theme.colors.textSecondary}
+					numberOfLines={1}
+				>
+					{t(`BUSINESS_TYPE_${item.name.replace(/\s/g, '_').toUpperCase()}`, item.name)}
+				</OText>
 			</TouchableOpacity>
 		)
 	}
 
 	return (
-		<BCContainer style={{ marginStart: -40, width: width }}>
-			{typesState?.loading && (
-				<View>
-					<Placeholder
-						style={{ marginVertical: 10 }}
-						Animation={Fade}
-					>
-						<ScrollView
-							horizontal
-							showsVerticalScrollIndicator={false}
-							showsHorizontalScrollIndicator={false}
+		<>
+			<BCContainer>
+				{typesState?.loading && (
+					<View>
+						<Placeholder
+							style={{ marginVertical: 10 }}
+							Animation={Fade}
 						>
-							{[...Array(4)].map((_, i) => (
-								<View key={i} style={{ width: 80, borderRadius: 10, marginRight: 15 }}>
-									<PlaceholderLine
-										height={80}
-										noMargin
-									/>
-								</View>
+							<ScrollView
+								horizontal
+								showsVerticalScrollIndicator={false}
+								showsHorizontalScrollIndicator={false}
+							>
+								{[...Array(4)].map((_, i) => (
+									<View key={i} style={{ width: 80, borderRadius: 8, marginRight: 15 }}>
+										<PlaceholderLine
+											height={80}
+											noMargin
+										/>
+									</View>
+								))}
+							</ScrollView>
+						</Placeholder>
+					</View>
+				)}
+				{!typesState?.loading && !typesState?.error && typesState?.types && typesState?.types.length > 0 && (
+					<>
+						<BusinessCategories>
+							{typesState?.types.slice(0, 3).map((type: any) => (
+								<RenderTypes
+									key={type.id}
+									item={type}
+								/>
 							))}
-						</ScrollView>
-					</Placeholder>
-				</View>
-			)}
-			{!typesState?.loading && !typesState?.error && typesState?.types && typesState?.types.length > 0 && (
-				<>
-					{/* <BusinessCategoriesTitle>
-						<OText
-							size={16}
-							color={theme.colors.textSecondary}
-						>
-							{t('BUSINESS_CATEGORIES', 'Business Categories')}
-						</OText>
-					</BusinessCategoriesTitle> */}
-					<BusinessCategories>
-						<FlatList
-							horizontal
-							showsHorizontalScrollIndicator={false}
-							data={typesState?.types}
-							renderItem={renderTypes}
-							keyExtractor={type => type.name}
-							contentContainerStyle={{ paddingHorizontal: 40 }}
-						/>
-					</BusinessCategories>
-				</>
-			)}
-		</BCContainer>
+							{typesState?.types.length > 3 && (
+								<TouchableOpacity
+									style={styles.categoryStyle}
+									onPress={() => setIsOpenAllCategories(true)}
+								>
+									<View
+										style={{ ...styles.logo, backgroundColor: theme.colors.lightGray }}
+									>
+										<MaterialIcon
+											name='dots-horizontal'
+											size={32}
+											color={theme.colors.black}
+										/>
+									</View>
+									<OText
+										style={{ textAlign: 'center' }}
+										size={12}
+										color={theme.colors.textSecondary}
+										numberOfLines={1}
+										ellipsizeMode='tail'
+									>
+										{t('SEE_ALL', 'See All')}
+									</OText>
+								</TouchableOpacity>
+							)}
+						</BusinessCategories>
+					</>
+				)}
+			</BCContainer>
+			<OModal
+        open={isOpenAllCategories}
+        onClose={() => setIsOpenAllCategories(false)}
+        entireModal
+      >
+        <ScrollView style={styles.allCategoriesContainer}>
+          <OText
+            size={20}
+            mBottom={30}
+            color={theme.colors.textSecondary}
+            style={{ paddingHorizontal: 10 }}
+          >
+            {t('ALL_CATEGORIES', 'All categories')}
+          </OText>
+          <View style={styles.allCategoriesWrapper}>
+            {typesState?.types.map((type: any) => (
+              <RenderTypes
+                key={type.id}
+                item={type}
+              />
+            ))}
+          </View>
+        </ScrollView>
+      </OModal>
+		</>
 	)
 }
 
-const styles = StyleSheet.create({
-	icons: {
-		padding: 10
-	},
-	logo: {
-		width: 52,
-		height: 52,
-		marginBottom: 7,
-		justifyContent: 'center',
-		alignItems: 'center',
-	},
-})
-
 export const BusinessTypeFilter = (props: BusinessTypeFilterParams) => {
 	const businessTypeFilterProps = {
 		...props,

package/themes/doordash/src/components/BusinessTypeFilter/styles.tsx

@@ -5,7 +5,6 @@ export const BCContainer = styled.View`
   width: 100%;
   justify-content: flex-start;
   text-align: center;
-  min-height: 140px;
 `
 
 export const BusinessCategoriesTitle = styled.View`
@@ -19,7 +18,7 @@ export const BusinessCategories = styled.View`
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  margin: 30px 0px;
+  margin: 10px 0px;
   width: 100%;
 `
 export const Category = styled.View`