ordering-ui-react-native 0.22.75 → 0.22.76-release

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

@@ -1,11 +1,8 @@
 import React from 'react';
-import { useLanguage } from 'ordering-components/native';
 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';
-
-const [languageState, t] = useLanguage();
 const theme = useTheme()
 
 export const flatArray = (arr: any) => [].concat(...arr)
@@ -19,8 +16,7 @@ export const orderTypeList = ['delivery', 'pickup', 'eatin', 'curbside', 'drivet
  * Function to return the traduction depending of a key 't'
  * @param {string} key for traduction
  */
-export const getTraduction = (key: string) => {
-  const [, t] = useLanguage()
+export const getTraduction = (key: string, t: any) => {
   const keyList: any = {
     // Add the key and traduction that you need below
     ERROR_ORDER_WITHOUT_CART: 'The order was placed without a cart',
@@ -130,32 +126,34 @@ export const monthsEnum: any = {
   Dec: 'MONTHSHORT12',
 }
 
-export const locale = {
-  name: languageState?.language?.code?.slice(0, 2),
-  config: {
-    months: [
-      t('MONTH1', 'January'),
-      t('MONTH2', 'February'),
-      t('MONTH3', 'March'),
-      t('MONTH4', 'April'),
-      t('MONTH5', 'May'),
-      t('MONTH6', 'June'),
-      t('MONTH7', 'July'),
-      t('MONTH8', 'August'),
-      t('MONTH9', 'September'),
-      t('MONTH10', 'October'),
-      t('MONTH11', 'November'),
-      t('MONTH12', 'December')
-    ],
-    weekdaysShort: [
-      t('DAYSHORT7', 'Sun'),
-      t('DAYSHORT1', 'Mon'),
-      t('DAYSHORT2', 'Tue'),
-      t('DAYSHORT3', 'Wed'),
-      t('DAYSHORT4', 'Thu'),
-      t('DAYSHORT5', 'Fri'),
-      t('DAYSHORT6', 'Sat')
-    ],
+export const locale = (languageState: any, t: any) => {
+  return {
+    name: languageState?.language?.code?.slice(0, 2),
+    config: {
+      months: [
+        t('MONTH1', 'January'),
+        t('MONTH2', 'February'),
+        t('MONTH3', 'March'),
+        t('MONTH4', 'April'),
+        t('MONTH5', 'May'),
+        t('MONTH6', 'June'),
+        t('MONTH7', 'July'),
+        t('MONTH8', 'August'),
+        t('MONTH9', 'September'),
+        t('MONTH10', 'October'),
+        t('MONTH11', 'November'),
+        t('MONTH12', 'December')
+      ],
+      weekdaysShort: [
+        t('DAYSHORT7', 'Sun'),
+        t('DAYSHORT1', 'Mon'),
+        t('DAYSHORT2', 'Tue'),
+        t('DAYSHORT3', 'Wed'),
+        t('DAYSHORT4', 'Thu'),
+        t('DAYSHORT5', 'Fri'),
+        t('DAYSHORT6', 'Sat')
+      ],
+    }
   }
 };
 
@@ -365,7 +363,7 @@ export const priceList = [
   { level: '5', content: '$$$$$' }
 ]
 
-export const getLogisticTag = (status: any) => {
+export const getLogisticTag = (status: any, t: any) => {
   const keyList: any = {
     0: t('PENDING', 'Pending'),
     1: t('IN_PROGRESS', 'In progress'),
@@ -376,7 +374,7 @@ export const getLogisticTag = (status: any) => {
   return keyList[status] ? keyList[status] : t('UNKNOWN', 'Unknown')
 }
 
-export const getOrderStatus = (s: string) => {
+export const getOrderStatus = (s: string, t: any) => {
   const status = parseInt(s);
   const orderStatus = [
     {
@@ -567,6 +565,24 @@ export const getOrderStatus = (s: string) => {
       slug: 'ORDER_DRIVER_ON_WAY',
       percentage: 0.8,
       image: theme.images.order.status8
+    },
+    {
+      key: 24,
+      value: t('ORDER_DRIVER_WAITING_FOR_ORDER', 'Driver waiting for order'),
+      slug: 'ORDER_DRIVER_WAITING_FOR_ORDER',
+      percentage: 0.25
+    },
+    {
+      key: 25,
+      value: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company'),
+      slug: 'ORDER_ACCEPTED_BY_DRIVER_COMPANY',
+      percentage: 0.25
+    },
+    {
+      key: 26,
+      value: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer'),
+      slug: 'ORDER_DRIVER_ARRIVED_CUSTOMER',
+      percentage: 0.8
     }
   ];
 
@@ -575,7 +591,7 @@ export const getOrderStatus = (s: string) => {
   return objectStatus && objectStatus;
 }
 
-export const getOrderStatuPickUp = (s: any) => {
+export const getOrderStatuPickUp = (s: any, t: any) => {
   const status = parseInt(s);
   const orderStatus = [
     {

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/themes/original/src/components/HelpAccountAndPayment/index.tsx

@@ -1,62 +0,0 @@
-import React from 'react'
-import { Platform } from 'react-native'
-import { useLanguage } from 'ordering-components/native'
-import { HelpAccountAndPaymentParams } from '../../types'
-import { OText, OButton, OIcon } from '../shared'
-import { useTheme } from 'styled-components/native'
-import { StyleSheet, TouchableOpacity } from 'react-native'
-import AntDesignIcon from 'react-native-vector-icons/AntDesign'
-
-import {
-  Content,
-  Container
-} from './styles'
-import NavBar from '../NavBar'
-
-export const HelpAccountAndPayment = (props: HelpAccountAndPaymentParams) => {
-  const {
-    navigation
-  } = props
-  const [, t] = useLanguage()
-  const theme = useTheme()
-
-  const styles = StyleSheet.create({
-    imageStyle: {
-      width: '100%',
-      height: 300,
-      marginVertical: 20
-    },
-  })
-
-  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
-
-  return (
-    <Container>
-      <NavBar
-        title={t('ACCOUNT_PAYMENT_OPTIONS', 'Account and Payment Options')}
-        onActionLeft={goToBack}
-        btnStyle={{ paddingLeft: 0 }}
-        showCall={false}
-      />
-      <Content>
-        <OText mBottom={20}>
-          -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vel in congue nisl, nisi. Mauris, condimentum auctor sed cras cursus arcu pellentesque.
-        </OText>
-        <OText mBottom={20}>
-          -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vel in congue nisl, nisi. Mauris, condimentum auctor sed cras cursus arcu pellentesque.
-        </OText>
-        <OText mBottom={20}>
-          -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vel in congue nisl, nisi. Mauris, condimentum auctor sed cras cursus arcu pellentesque.
-        </OText>
-        <OText>
-          -Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vel in congue nisl, nisi. Mauris, condimentum auctor sed cras cursus arcu pellentesque.
-        </OText>
-        <OIcon
-          src={theme.images.general.help}
-          style={styles.imageStyle}
-          cover
-        />
-      </Content>
-    </Container>
-  )
-}

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

@@ -1,12 +0,0 @@
-import styled from 'styled-components/native'
-
-export const Content = styled.View`
-  padding-vertical: 20px;
-  margin-bottom: 20px;
-`
-
-export const Container = styled.ScrollView`
-    position: relative;
-    flex: 1;
-    margin: 10px 0;
-`

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

@@ -1,68 +0,0 @@
-import React from 'react'
-import { useLanguage } from 'ordering-components/native'
-import { HelpGuideParams } from '../../types'
-import { OText, OIcon } from '../shared'
-import { useTheme } from 'styled-components/native'
-import { Platform, StyleSheet } from 'react-native'
-import NavBar from '../NavBar'
-import {
-  Content,
-  Container
-} from './styles'
-
-export const HelpGuide = (props: HelpGuideParams) => {
-  const {
-    navigation
-  } = props
-  const [, t] = useLanguage()
-  const theme = useTheme()
-
-  const styles = StyleSheet.create({
-    btnBackArrow: {
-      borderWidth: 0,
-      backgroundColor: theme.colors.white,
-      borderColor: theme.colors.white,
-      shadowColor: theme.colors.white,
-      display: 'flex',
-      justifyContent: 'flex-start',
-      paddingLeft: 0,
-    },
-    imageStyle: {
-      width: '100%',
-      height: 120,
-      marginVertical: 20
-    },
-  })
-
-  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
-
-  return (
-    <Container pdng={Platform.OS === 'ios' ? '10px' : '0px'}>
-      <NavBar
-        title={t('GUIDE_TO_ORDERING', 'Guide to Ordering')}
-        onActionLeft={goToBack}
-        btnStyle={{ paddingLeft: 0 }}
-        showCall={false}
-      />
-      <Content>
-        <OText mBottom={15}>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Blandit mauris varius faucibus varius condimentum morbi pretium mus. Aliquam bibendum erat venenatis feugiat sed.
-        </OText>
-        <OText mBottom={15}>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Blandit mauris varius faucibus varius condimentum morbi pretium mus. Aliquam bibendum erat venenatis feugiat sed.
-        </OText>
-        <OText mBottom={15}>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Blandit mauris varius faucibus varius condimentum morbi pretium mus. Aliquam bibendum erat venenatis feugiat sed.
-        </OText>
-        <OText>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Blandit mauris varius faucibus varius condimentum morbi pretium mus. Aliquam bibendum erat venenatis feugiat sed.
-        </OText>
-        <OIcon
-          src={theme.images.general.help}
-          style={styles.imageStyle}
-          cover
-        />
-      </Content>
-    </Container>
-  )
-}

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

@@ -1,12 +0,0 @@
-import styled from 'styled-components/native'
-
-export const Content = styled.View`
-  padding-vertical: 20px;
-  margin-bottom: 20px;
-`
-export const Container = styled.ScrollView`
-    position: relative;
-    flex: 1;
-    margin: 10px 0;
-    padding-top: ${(props: any) => props.pdng}
-`

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

@@ -1,71 +0,0 @@
-import React from 'react'
-import { useLanguage } from 'ordering-components/native'
-import { HelpOrderParams } from '../../types'
-import { OText, OIcon } from '../shared'
-import { useTheme } from 'styled-components/native'
-import { StyleSheet } from 'react-native'
-import { WebView } from 'react-native-webview'
-import NavBar from '../NavBar'
-
-import {
-  Content,
-  Container
-} from './styles'
-
-export const HelpOrder = (props: HelpOrderParams) => {
-  const {
-    navigation
-  } = props
-  const [, t] = useLanguage()
-  const theme = useTheme()
-
-  const styles = StyleSheet.create({
-    imageStyle: {
-      width: '100%',
-      height: 120
-    },
-    videoStyle: {
-      height: 200,
-      marginVertical: 20
-    }
-  })
-
-  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
-
-  return (
-    <Container>
-      <NavBar
-        title={t('HELP_WITH_ORDER', 'Help with an order')}
-        onActionLeft={goToBack}
-        btnStyle={{ paddingLeft: 0 }}
-        showCall={false}
-      />
-      <Content>
-        <OText mBottom={20}>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vel in congue nisl, nisi. Mauris, condimentum auctor sed cras cursus arcu pellentesque. Sed tempus et, cursus ultricies nisl nisl, in eros.
-          Velit sollicitudin vestibulum massa porttitor sit sed vestibulum turpis.
-          Id id adipiscing sit bibendum aliquet at suspendisse. Posuere felis nec non pulvinar in.
-        </OText>
-        <OIcon
-          src={theme.images.general.help}
-          style={styles.imageStyle}
-          cover
-        />
-        <OText style={{ marginVertical: 20 }}>
-          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vel in congue nisl, nisi. Mauris, condimentum auctor sed cras cursus arcu pellentesque. Sed tempus et, cursus ultricies nisl nisl, in eros.
-          Velit sollicitudin vestibulum massa porttitor sit sed vestibulum turpis.
-          Id id adipiscing sit bibendum aliquet at suspendisse. Posuere felis nec non pulvinar in.
-        </OText>
-        <WebView
-          allowsFullscreenVideo
-          allowsInlineMediaPlayback
-          mediaPlaybackRequiresUserAction
-          cacheEnabled={false}
-          cacheMode='LOAD_NO_CACHE'
-          source={{ uri: 'https://www.youtube-nocookie.com/embed/Bi8WLLRzZ1g' }}
-          style={styles.videoStyle}
-        />
-      </Content>
-    </Container>
-  )
-}

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

@@ -1,13 +0,0 @@
-import styled from 'styled-components/native'
-
-export const Content = styled.View`
-  padding-vertical: 20px;
-  margin-bottom: 20px;
-`
-
-export const Container = styled.ScrollView`
-    position: relative;
-    flex: 1;
-    margin: 10px 0;
-`
-