ordering-ui-react-native 0.21.0 → 0.21.1-release

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

@@ -147,6 +147,7 @@ export interface PhoneInputParams {
 	isDisabled?: any;
 	isStartValidation?: any;
 	changeCountry?: any;
+	updateStateWithSubmit?: boolean
 }
 
 export interface LanguageSelectorParams {
@@ -256,6 +257,7 @@ export interface BusinessProductsListingParams {
 	onBusinessClick?: any;
 	onNavigationRedirect?: any;
 	businessSingleId?: number | string
+	fromMulti?: boolean
 }
 export interface BusinessBasicInformationParams {
 	navigation?: any;
@@ -392,6 +394,7 @@ export interface OrdersOptionParams {
 	BusinessControllerSkeletons?: any,
 	businessPaginationProps?: any,
 	businesses?: any
+	businessId?: any;
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -435,6 +438,7 @@ export interface OrderDetailsParams {
 	onNavigationRedirect?: any,
 	reorderState?: any,
 	handleReorder?: any,
+	hideViaText?: boolean,
 }
 export interface ProductItemAccordionParams {
 	key?: any;
@@ -579,7 +583,7 @@ export interface BusinessPreorderParams {
 	handleBusinessClick: (value: any) => {};
 	getActualSchedule?: any;
 	cateringPreorder?: boolean;
-	preorderLeadTime?: number 
+	preorderLeadTime?: number
 }
 export interface BusinessMenuListParams {
 	menu: any;
@@ -630,7 +634,9 @@ export interface GoogleMapsParams {
 	locations?: Array<any>,
 	setSaveLocation?: (val: boolean) => void,
 	handleToggleMap?: () => void,
-	isIntGeoCoder: boolean
+	isIntGeoCoder: boolean,
+	businessZones?: any
+	delta?: number
 }
 
 export interface HelpParams {
@@ -728,6 +734,8 @@ export interface otpParams {
 	pinCount: number;
 	otpError: any,
 	setOtpError: any
+	isCheckingCode: boolean
+	setCheckingCode: (value: boolean) => void
 }
 
 export interface FavoriteParams {

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

@@ -4,6 +4,7 @@ import FontAwesome from 'react-native-vector-icons/FontAwesome';
 import { CODES } from 'ordering-components/native'
 import { ORDER_TYPES } from '../config/constants';
 import { useTheme } from 'styled-components/native';
+import ReactNativeHapticFeedback from "react-native-haptic-feedback";
 
 const [languageState, t] = useLanguage();
 const theme = useTheme()
@@ -575,6 +576,119 @@ export const getOrderStatus = (s: string) => {
   return objectStatus && objectStatus;
 }
 
+export const getOrderStatuPickUp = (s: any) => {
+  const status = parseInt(s);
+  const orderStatus = [
+    {
+      key: 0,
+      value: t('PENDING', 'Pending'),
+      slug: 'PENDING',
+      percentage: 0.1,
+      image: theme.images.order.status0,
+    },
+    {
+      key: 1,
+      value: t('COMPLETED', 'Completed'),
+      slug: 'COMPLETED',
+      percentage: 1,
+      image: theme.images.order.status1,
+    },
+    {
+      key: 2,
+      value: t('REJECTED', 'Rejected'),
+      slug: 'REJECTED',
+      percentage: 0,
+      image: theme.images.order.status2,
+    },
+    {
+      key: 4,
+      value: t('PREPARATION_COMPLETED', 'Preparation Completed'),
+      slug: 'PREPARATION_COMPLETED',
+      percentage: 0.5,
+      image: theme.images.order.status4,
+    },
+    {
+      key: 5,
+      value: t('REJECTED_BY_BUSINESS', 'Rejected by business'),
+      slug: 'REJECTED_BY_BUSINESS',
+      percentage: 0,
+      image: theme.images.order.status5,
+    },
+    {
+      key: 7,
+      value: t('ACCEPTED_BY_BUSINESS', 'Accepted by business'),
+      slug: 'ACCEPTED_BY_BUSINESS',
+      percentage: 0.3,
+      image: theme.images.order.status7,
+    },
+    {
+      key: 13,
+      value: t('PREORDER', 'PreOrder'),
+      slug: 'PREORDER',
+      percentage: 0,
+      image: theme.images.order.status13,
+    },
+    {
+      key: 14,
+      value: t('ORDER_NOT_READY', 'Order not ready'),
+      slug: 'ORDER_NOT_READY',
+      percentage: 0.3,
+      image: theme.images.order.status13,
+    },
+    {
+      key: 15,
+      value: t(
+        'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
+        'Order picked up completed by customer',
+      ),
+      slug: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
+      percentage: 1,
+      image: theme.images.order.status1,
+    },
+    {
+      key: 16,
+      value: t('CANCELLED_BY_CUSTOMER', 'Cancelled by customer'),
+      slug: 'CANCELLED_BY_CUSTOMER',
+      percentage: 0,
+      image: theme.images.order.status2,
+    },
+    {
+      key: 17,
+      value: t(
+        'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
+        'Order not picked up by customer',
+      ),
+      slug: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
+      percentage: 0,
+      image: theme.images.order.status2,
+    },
+    {
+      key: 20,
+      value: t(
+        'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
+        'Customer almost arrived to business',
+      ),
+      slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
+      percentage: 0.7,
+      image: theme.images.order.status7,
+    },
+    {
+      key: 21,
+      value: t(
+        'ORDER_CUSTOMER_ARRIVED_BUSINESS',
+        'Customer arrived to business',
+      ),
+      slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
+      percentage: 0.9,
+      image: theme.images.order.status7,
+    }
+  ];
+
+  const objectStatus = orderStatus.find((o) => o.key === status);
+
+  return objectStatus && objectStatus;
+}
+
 /**
  * Function to get brightness of color.
  */
@@ -612,3 +726,13 @@ export const lightenDarkenColor = (color: any) => {
     return false
   }
 }
+
+export const vibrateApp = (impact ?: string) => {
+  const options = {
+    enableVibrateFallback: true,
+    ignoreAndroidSystemSettings: false
+  };
+
+  ReactNativeHapticFeedback.trigger(impact || "impactLight", options);
+
+}

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

@@ -144,7 +144,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
         {isFarAway && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
         <View style={styles.wrapperOrderOptions}>

package/src/navigators/BottomNavigator.tsx

@@ -1,117 +0,0 @@
-import React from 'react'
-import { View, Platform, PlatformIOSStatic } from 'react-native'
-import { useOrder } from 'ordering-components/native'
-import { createMaterialBottomTabNavigator } from '@react-navigation/material-bottom-tabs'
-import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
-import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
-import styled from 'styled-components/native'
-
-import { OText } from '../components/shared'
-import BusinessList from '../pages/BusinessesListing'
-import MyOrders from '../pages/MyOrders'
-import CartList from '../pages/CartList'
-import Profile from '../pages/Profile'
-import { useTheme } from 'styled-components/native'
-
-const CartsLenght = styled.View`
-  width: 25px;
-  height: 25px;
-  background-color: ${(props: any) => props.theme.colors.primary};
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  position: absolute;
-  right: 0;
-`
-
-const Tab = createMaterialBottomTabNavigator();
-
-const BottomNavigator = () => {
-  const theme = useTheme()
-  const [{ carts }] = useOrder()
-  const cartsList = (carts && Object.values(carts).filter((cart: any) => cart.products.length > 0)) || []
-  const isIos = Platform.OS === 'ios'
-  const platformIOS = Platform as PlatformIOSStatic
-  const androidStyles = isIos
-    ? platformIOS.isPad
-      ? { paddingBottom: 30 }
-      : {}
-    : {height: 40, position: 'relative', bottom: 15}
-  return (
-    <Tab.Navigator
-      initialRouteName="BusinessList"
-      activeColor={theme.colors.primary}
-      barStyle={{ backgroundColor: theme.colors.white, ...androidStyles }}
-      labeled={false}
-      inactiveColor={theme.colors.disabled}
-    >
-      <Tab.Screen
-        name="BusinessList"
-        component={BusinessList}
-        options={{
-          tabBarIcon:
-            ({ color }: any) => (
-              <View style={{ width: 50, height: 50, justifyContent: !isIos ? 'flex-start' : 'space-evenly', position: 'relative', bottom: !isIos ? 10 : 0  }}>
-                <MaterialCommunityIcon name='home' size={46} color={color} />
-              </View>
-            )
-        }}
-      />
-      <Tab.Screen
-        name="MyOrders"
-        component={MyOrders}
-        options={
-          {
-            tabBarIcon:
-              ({ color }: any) => (
-                <View style={{ width: 50, height: 50, justifyContent: !isIos ? 'flex-start' : 'space-evenly', position: 'relative', bottom: !isIos ? 10 : 0 }}>
-                  <MaterialIcon name='format-list-bulleted' size={46} color={color} />
-                </View>
-              ),
-          }}
-      />
-      <Tab.Screen
-        name="Cart"
-        component={CartList}
-        options={{
-          tabBarIcon:
-            ({ color }: any) => (
-              <View style={{
-                  width: 50,
-                  height: 50,
-                  justifyContent: !isIos ? 'flex-start' : 'space-evenly',
-                  position: 'relative',
-                  bottom: !isIos ? 10 : 0
-                }}
-              >
-                <MaterialIcon name='shopping-basket' size={46} color={color} />
-                {cartsList.length > 0 && (
-                  <CartsLenght style={{ borderRadius: 100 / 2 }}>
-                    <OText
-                      color={theme.colors.white}
-                    >
-                      {cartsList.length}
-                    </OText>
-                  </CartsLenght>
-                )}
-              </View>
-            )
-        }}
-      />
-      <Tab.Screen
-        name="Profile"
-        component={Profile}
-        options={{
-          tabBarIcon:
-            ({ color }: any) => (
-              <View style={{ width: 50, height: 50, justifyContent: !isIos ? 'flex-start' : 'space-evenly', position: 'relative', bottom: !isIos ? 10 : 0  }}>
-                <MaterialIcon name='person' size={46} color={color} />
-              </View>
-            )
-        }}
-      />
-    </Tab.Navigator>
-  );
-}
-
-export default BottomNavigator

package/src/navigators/CheckoutNavigator.tsx

@@ -1,66 +0,0 @@
-import React from 'react';
-import { createStackNavigator } from "@react-navigation/stack";
-
-import AddressList from '../pages/AddressList'
-import AddressForm from '../pages/AddressForm'
-import CartList from '../pages/CartList'
-import CheckoutPage from '../pages/Checkout';
-import BusinessProductsList from '../pages/BusinessProductsList';
-import MultiCheckout from '../pages/MultiCheckout';
-
-const Stack = createStackNavigator();
-
-const CheckoutNavigator = (props: any) => {
-  const {
-    navigation,
-    route
-  } = props;
-
-  const cartUuid = route?.params?.cartUuid
-
-  const checkoutProps = {
-    navigation,
-    route,
-    cartUuid: route?.params?.cartUuid
-  }
-
-  return (
-    <Stack.Navigator>
-      {!cartUuid && (
-        <Stack.Screen
-          name="Cart"
-          component={CartList}
-          options={{ headerShown: false }}
-        />
-      )}
-      <Stack.Screen
-        name="CheckoutPage"
-        children={() => <CheckoutPage {...checkoutProps} />}
-        options={{ headerShown: false }}
-        />
-      <Stack.Screen
-        name="Business"
-        component={BusinessProductsList}
-        options={{ headerShown: false }}
-      />
-      <Stack.Screen
-        name="AddressList"
-        component={AddressList}
-        options={{ headerShown: false }}
-        initialParams={{isFromCheckout: true}}
-      />
-      <Stack.Screen
-        name="AddressForm"
-        component={AddressForm}
-        options={{ headerShown: false }}
-      />
-      <Stack.Screen
-        name="MultiCheckout"
-        children={() => <MultiCheckout {...checkoutProps} />}
-        options={{ headerShown: false }}
-      />
-    </Stack.Navigator>
-  );
-}
-
-export default CheckoutNavigator;

package/src/navigators/HomeNavigator.tsx

@@ -1,202 +0,0 @@
-import * as React from 'react';
-import { AppState } from 'react-native'
-import { createStackNavigator } from "@react-navigation/stack";
-import { useSession, useOrder, useWebsocket } from 'ordering-components/native';
-import BottomNavigator from '../navigators/BottomNavigator';
-import RootNavigator from '../navigators/RootNavigator';
-import CheckoutNavigator from '../navigators/CheckoutNavigator';
-import BackgroundTimer from 'react-native-background-timer';
-
-import AddressList from '../pages/AddressList';
-import AddressForm from '../pages/AddressForm';
-import OrderDetails from '../pages/OrderDetails';
-import BusinessProductsList from '../pages/BusinessProductsList';
-import ReviewOrder from '../pages/ReviewOrder'
-import ReviewProducts from '../pages/ReviewProducts';
-import ReviewDriver from '../pages/ReviewDriver'
-import MomentOption from '../pages/MomentOption'
-import Account from '../pages/Account'
-import Help from '../pages/Help'
-import HelpOrder from '../pages/HelpOrder'
-import HelpGuide from '../pages/HelpGuide'
-import HelpAccountAndPayment from '../pages/HelpAccountAndPayment'
-import Sessions from '../pages/Sessions';
-import Splash from '../pages/Splash';
-import ProductDetails from '../pages/ProductDetails';
-import MultiOrdersDetails from '../pages/MultiOrdersDetails';
-const Stack = createStackNavigator();
-
-const HomeNavigator = (e : any) => {
-  const [orderState] = useOrder();
-  const [{ auth, user }] = useSession();
-  const socket = useWebsocket();
-
-  const appState = React.useRef(AppState.currentState);
-  let interval: any
-
-  const _handleAppStateChange = (nextAppState: any) => {
-    if (appState.current.match(/inactive|background/) && nextAppState === 'active') {
-      BackgroundTimer.clearInterval(interval)
-    }else{
-      interval = BackgroundTimer.setInterval(()=>{
-        const ordersRoom = user?.level === 0 ? 'orders' : `orders_${user?.id}`
-        socket.join(ordersRoom)
-      }, 5000)
-      appState.current = nextAppState;
-    }
-  }
-
-  React.useEffect (() => {
-    AppState.addEventListener('change', _handleAppStateChange);
-    return () => {
-      AppState.removeEventListener('change', _handleAppStateChange);
-    };
-  },[])
-
-  return (
-    <Stack.Navigator>
-      {!orderState.loading || (orderState?.options?.user_id && orderState.loading) || orderState?.options?.address?.location ? (
-        <>
-          {auth ? (
-            <>
-              {Object.keys(orderState?.carts).length === 0 && !orderState?.options?.address?.location && !orderState.loading ? (
-                <>
-                  <Stack.Screen
-                    name="AddressListInitial"
-                    component={AddressList}
-                    options={{ headerShown: false }}
-                    initialParams={{ afterSignup: true }}
-                  />
-                  <Stack.Screen
-                    name="AddressFormInitial"
-                    component={AddressForm}
-                    options={{ headerShown: false }}
-                    initialParams={{ afterSignup: true }}
-                  />
-                </>
-              ) : (
-                <>
-                  {!!Object.keys(e?.route?.params?.productLogin || {})?.length && (
-                    <Stack.Screen
-                      name="BusinessAfterLogin"
-                      component={BusinessProductsList}
-                      options={{headerShown: false}}
-                      initialParams={{productLogin: e?.route?.params?.productLogin}}
-                    />
-                  )}
-                  <Stack.Screen
-                    name='BottomTab'
-                    component={BottomNavigator}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="CheckoutNavigator"
-                    component={CheckoutNavigator}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="OrderDetails"
-                    component={OrderDetails}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="Business"
-                    component={BusinessProductsList}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="ProductDetails"
-                    component={ProductDetails}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="ReviewOrder"
-                    component={ReviewOrder}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="ReviewProducts"
-                    component={ReviewProducts}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="ReviewDriver"
-                    component={ReviewDriver}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name='MomentOption'
-                    component={MomentOption}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="AddressList"
-                    component={AddressList}
-                    options={{ headerShown: false }}
-                    initialParams={{ afterSignup: false }}
-                  />
-                  <Stack.Screen
-                    name="AddressForm"
-                    component={AddressForm}
-                    options={{ headerShown: false }}
-                    initialParams={{ afterSignup: false }}
-                  />
-                  <Stack.Screen
-                    name="Account"
-                    component={Account}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="Help"
-                    component={Help}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="HelpOrder"
-                    component={HelpOrder}
-                    options={{ headerShown: false }}
-                  />
-                   <Stack.Screen
-                    name="HelpGuide"
-                    component={HelpGuide}
-                    options={{ headerShown: false }}
-                  />
-                   <Stack.Screen
-                    name="HelpAccountAndPayment"
-                    component={HelpAccountAndPayment}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="Sessions"
-                    component={Sessions}
-                    options={{ headerShown: false }}
-                  />
-                  <Stack.Screen
-                    name="MultiOrdersDetails"
-                    component={MultiOrdersDetails}
-                    options={{ headerShown: false }}
-                  />
-                </>
-              )}
-            </>
-          )
-            : (
-              <Stack.Screen
-                name='root'
-                component={RootNavigator}
-                options={{ headerShown: false }}
-              />
-            )}
-        </>
-      ) : (
-        <Stack.Screen
-          name="Splash"
-          component={Splash}
-          options={{ headerShown: false }}
-        />
-      )}
-    </Stack.Navigator>
-  );
-}
-
-export default HomeNavigator;

package/src/navigators/NavigationRef.tsx

@@ -1,7 +0,0 @@
-import * as React from 'react';
-
-export const navigationRef: any = React.createRef();
-
-export const navigate = (name: string, params: any) => {
-  navigationRef.current?.navigate(name, params);
-}