ordering-ui-react-native 0.17.73-release → 0.17.74-release

package/src/navigators/RootNavigator.tsx

@@ -1,269 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Platform } from 'react-native'
-import { createStackNavigator } from '@react-navigation/stack';
-import { useOrder, useSession, useConfig } from 'ordering-components/native';
-import dayjs from 'dayjs'
-import utc from 'dayjs/plugin/utc'
-import isSameOrAfter from 'dayjs/plugin/isSameOrAfter'
-import OneSignal from 'react-native-onesignal';
-import NetInfo from '@react-native-community/netinfo'
-
-dayjs.extend(isSameOrAfter)
-dayjs.extend(utc)
-
-import Login from '../pages/Login';
-import Signup from '../pages/Signup';
-import Forgot from '../pages/ForgotPassword';
-import Home from '../pages/Home';
-import IntroductoryTutorial from '../pages/IntroductoryTutorial';
-import AddressForm from '../pages/AddressForm';
-import MomentOption from '../pages/MomentOption';
-import Splash from '../pages/Splash';
-import BusinessList from '../pages/BusinessesListing';
-import BusinessProductsList from '../pages/BusinessProductsList';
-import NotFound from '../pages/NotFound'
-import HomeNavigator from './HomeNavigator';
-import settings from '../config.json';
-import NetworkError from '../pages/NetworkError';
-
-import * as RootNavigation from '../navigators/NavigationRef';
-import { _retrieveStoreData, _setStoreData } from '../providers/StoreUtil';
-
-const Stack = createStackNavigator();
-const RootNavigator = () => {
-  const [orderId, setOrderId] = useState(null)
-  const [{ auth, loading: sessionLoading }] = useSession();
-  const [orderStatus, { changeMoment }] = useOrder();
-  const [{ configs, loading: configsLoading }] = useConfig();
-  const [loaded, setLoaded] = useState(false);
-  const [productLogin, setProductLogin] = useState({})
-  const [oneSignalState, setOneSignalState] = useState<any>({
-    notification_app: settings.notification_app
-  });
-  const [ isTutorial, setTutorial] = useState(true)
-  const [isPushLoading, setIsPushLoading] = useState({ loading: true })
-  const [connectionState, setConnectionState] = useState<{
-    connection_status: boolean;
-  } | null>(null);
-
-  const validDate = (date : any) => {
-    if (!date) return
-    const _date = dayjs(date, 'YYYY-MM-DD HH:mm').isSameOrAfter(dayjs(), 'day')
-      ? dayjs(date).format('YYYY-MM-DD HH:mm')
-      : dayjs().format('YYYY-MM-DD HH:mm')
-    return _date
-  };
-
-  const oneSignalSetup = async () => {
-    setIsPushLoading({ loading: true });
-    OneSignal.setLogLevel(6, 0);
-
-    OneSignal.setAppId(configs?.onesignal_orderingapp_id?.value);
-
-    if (Platform.OS === 'ios') {
-      OneSignal.promptForPushNotificationsWithUserResponse((response : any) => {
-        console.log('Prompt response:', response);
-      });
-    }
-
-    OneSignal.setNotificationOpenedHandler(({ notification }: any) => {
-      if(notification?.additionalData?.order_uuid) {
-        setOrderId(notification?.additionalData?.order_uuid)
-      }
-    });
-
-    OneSignal.addSubscriptionObserver((event: any) => {
-      setOneSignalState({ ...oneSignalState, notification_token: event?.to?.userId });
-    });
-
-    const deviceState: any = await OneSignal.getDeviceState();
-
-    if (!deviceState?.isSubscribed) {
-      OneSignal.addTrigger("prompt_ios", "true");
-    }
-
-    OneSignal.disablePush(false);
-
-    const data = {
-      ...oneSignalState,
-      notification_token: deviceState?.userId,
-      notification_app: settings.notification_app
-    }
-    setOneSignalState(data);
-    setIsPushLoading({ loading: false });
-  };
-  useEffect(() => {
-    if (!loaded && !orderStatus.loading && !isPushLoading.loading) {
-      setLoaded(true)
-    }
-  }, [orderStatus, isPushLoading])
-
-  useEffect(() => {
-    if (orderId && loaded && auth) {
-      RootNavigation.navigate('OrderDetails', {
-        orderId: orderId,
-        isFromRoot: true
-      });
-
-      setOrderId(null)
-    }
-  }, [loaded, orderId])
-
-  useEffect(() => {
-    const setTutorialLocal = async () => {
-      const data = await _retrieveStoreData('isTutorial');
-      if(data === false){
-        setTutorial(false)
-      }
-    }
-    setTutorialLocal();
-  }, [isTutorial])
-
-  useEffect(() => {
-    if (!sessionLoading && !isPushLoading.loading && !auth) {
-      setLoaded(!auth)
-    }
-  }, [sessionLoading, isPushLoading])
-
-  useEffect(() => {
-    const _currentDate = dayjs.utc(validDate(orderStatus.options?.moment)).local()
-    if (!_currentDate) {
-      return
-    }
-    const selected = dayjs(_currentDate, 'YYYY-MM-DD HH:mm')
-    const now = dayjs()
-    const secondsDiff = selected.diff(now, 'seconds')
-    const checkTime = setTimeout(() => {
-      changeMoment(null)
-    }, secondsDiff * 1000)
-
-    return () => {
-      clearTimeout(checkTime)
-    }
-  }, [orderStatus.options?.moment])
-
-  useEffect(() => {
-    if (configsLoading) return
-    if (configs?.onesignal_orderingapp_id?.value) {
-      oneSignalSetup();
-    }
-    if (!!!configs?.onesignal_orderingapp_id?.value) {
-      setIsPushLoading({ loading: false });
-    }
-  }, [configsLoading]);
-
-  let netInfoSuscription : any = null
-  useEffect(() => {
-    netInfoSuscription = NetInfo.addEventListener(handleConnectivityChange);
-
-    return () => {
-      netInfoSuscription && netInfoSuscription()
-    }
-  }, []);
-
-  const handleConnectivityChange = (state : any) => {
-    setConnectionState({ connection_status: state.isConnected });
-  };
-
-  return (
-    <Stack.Navigator>
-      {
-        !loaded && (
-          <Stack.Screen
-            name="Splash"
-            component={Splash}
-            options={{ headerShown: false }}
-          />
-        )
-      }
-      {
-        loaded && connectionState?.connection_status && (
-          <>
-            {!auth ? (
-              <>
-                { isTutorial ? (
-                  <Stack.Screen
-                    name="IntroductoryTutorial"
-                    component={IntroductoryTutorial}
-                    options={{ headerShown: false }}
-                    initialParams={{ setTutorial }}
-                  />):(
-                  <Stack.Screen
-                    name="Home"
-                    component={Home}
-                    options={{ headerShown: false }}
-                  />)}
-                <Stack.Screen
-                  name="Login"
-                  component={Login}
-                  options={{ headerShown: false }}
-                  listeners={{
-                    state: (e: any) => {
-                      setProductLogin(e.data.state.routes.find((object: any) => object?.params?.product)?.params?.product)
-                    }
-                  }}
-                  initialParams={{ notification_state: oneSignalState }}
-                />
-                <Stack.Screen
-                  name="Signup"
-                  component={Signup}
-                  options={{ headerShown: false }}
-                  initialParams={{ notification_state: oneSignalState }}
-                />
-                <Stack.Screen
-                  name="Forgot"
-                  component={Forgot}
-                  options={{ headerShown: false }}
-                />
-                <Stack.Screen
-                  name="AddressForm"
-                  component={AddressForm}
-                  options={{ headerShown: false }}
-                />
-                <Stack.Screen
-                  name='BusinessList'
-                  component={BusinessList}
-                  options={{ headerShown: false }}
-                />
-                <Stack.Screen
-                  name='Business'
-                  component={BusinessProductsList}
-                  options={{ headerShown: false }}
-                  initialParams={{ setProductLogin }}
-                />
-                <Stack.Screen
-                  name='MomentOption'
-                  component={MomentOption}
-                  options={{ headerShown: false }}
-                />
-              </>
-            ) : (
-              <>
-                <Stack.Screen
-                  name='MyAccount'
-                  component={HomeNavigator}
-                  options={{ headerShown: false }}
-                  initialParams={{ productLogin }}
-                />
-              </>
-            )}
-          </>
-        )
-      }
-      {connectionState?.connection_status === false ? (
-        <Stack.Screen
-          name='NetworkError'
-          component={NetworkError}
-          options={{ headerShown: false }}
-        />
-      ) : (
-        <Stack.Screen
-          name='NotFound'
-          component={NotFound}
-          options={{ headerShown: false }}
-        />
-      )}
-    </Stack.Navigator>
-  );
-};
-export default RootNavigator;

package/src/pages/Account.tsx

@@ -1,34 +0,0 @@
-import React from 'react'
-import styled from 'styled-components/native';
-import { Platform } from 'react-native';
-import { Container } from '../layouts/Container'
-import { Account as AccountController } from '../components/Account'
-
-const KeyboardView = styled.KeyboardAvoidingView`
-  flex-grow: 1;
-`;
-interface Props {
-  navigation: any;
-  route: any;
-}
-
-const Account = (props: Props) => {
-  const accountProps = {
-    ...props,
-    useSessionUser: true,
-    useValidationFields: true
-  }
-
-  return (
-    <KeyboardView
-      enabled
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-    >
-      <Container>
-        <AccountController {...accountProps} />
-      </Container>
-    </KeyboardView>
-  )
-}
-
-export default Account

package/src/pages/AddressForm.tsx

@@ -1,62 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import styled from 'styled-components/native'
-import { Platform } from 'react-native';
-import { AddressForm as AddressFormController } from '../components/AddressForm'
-import { SafeAreaContainer } from '../layouts/SafeAreaContainer'
-import { _retrieveStoreData } from '../providers/StoreUtil';
-
-const KeyboardView = styled.KeyboardAvoidingView`
-  flex-grow: 1;
-  flex-shrink: 1;
-`;
-
-const AddressForm = ({ navigation, route }: any) => {
-  const AddressFormProps = {
-    navigation,
-    route,
-    address: route?.params?.address,
-    addressId: route?.params?.address?.id,
-    isEditing: route?.params?.isEditing,
-    addressesList: route?.params?.addressList,
-    onSaveAddress: route?.params?.onSaveAddress,
-    isSelectedAfterAdd: true,
-    isGuestUser: route?.params?.isGuestUser,
-    isFromBusinesses: route?.params?.isFromBusinesses,
-    isFromProductsList: route?.params?.isFromProductsList,
-    isFromCheckout: route?.params?.isFromCheckout,
-    hasAddressDefault: route?.params?.hasAddressDefault,
-    afterSignup: route?.params?.afterSignup,
-    businessId: route.params?.businessId,
-    categoryId: route.params?.categoryId,
-    productId: route.params?.productId,
-    store: route.params?.store
-  }
-
-  const [isGuestFromStore, setIsGuestFromStore] = useState(false)
-
-  const getDataFromStorage = async () => {
-    const value = await _retrieveStoreData('isGuestUser');
-    setIsGuestFromStore(value);
-  }
-
-  useEffect(() => {
-    getDataFromStorage()
-  }, [])
-
-  return (
-    <SafeAreaContainer>
-      <KeyboardView
-        enabled
-        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      >
-        <AddressFormController
-          { ...AddressFormProps }
-          isGuestFromStore={isGuestFromStore}
-          useValidationFileds
-        />
-      </KeyboardView>
-    </SafeAreaContainer>
-  )
-}
-
-export default AddressForm

package/src/pages/AddressList.tsx

@@ -1,24 +0,0 @@
-import React from 'react'
-import { AddressList as AddressListController } from '../components/AddressList'
-import { useSession } from 'ordering-components/native'
-
-const AddressList = ({ route, navigation }: any) => {
-  const [{ user }] = useSession()
-  const addressListProps = {
-    navigation,
-    route,
-    userId: user?.id,
-    isGoBack: route?.params?.isGoBack,
-    isFromBusinesses: route?.params?.isFromBusinesses,
-    isFromProductsList: route?.params?.isFromProductsList,
-    isFromCheckout: route?.params?.isFromCheckout,
-    isFromProfile: route?.params?.isFromProfile,
-    afterSignup: route?.params?.afterSignup
-  }
-
-  return (
-    <AddressListController {...addressListProps} />
-  )
-}
-
-export default AddressList

package/src/pages/BusinessProductsList.tsx

@@ -1,81 +0,0 @@
-import React from 'react'
-import { useApi } from 'ordering-components/native'
-import { BusinessProductsListing as BusinessProductsListController } from '../components/BusinessProductsListing'
-import styled from 'styled-components/native'
-import { useTheme } from 'styled-components/native'
-
-const BusinessProductsList = (props: any) => {
-  const theme = useTheme()
-  const [ordering] = useApi()
-
-  const store = props.route.params?.store || props.route.params?.productLogin?.slug
-  const header = props.route.params?.header
-  const logo = props.route.params?.logo
-  const product = props.route.params?.productLogin
-  const businessId = props.route.params?.businessId
-  const categoryId = props.route.params?.categoryId
-  const productId = props.route.params?.productId
-
-  const businessProductsProps = {
-    ...props,
-    ordering,
-    isSearchByName: true,
-    isSearchByDescription: true,
-    slug: store,
-    businessProps: [
-      'id',
-      'name',
-      'header',
-      'logo',
-      'name',
-      'open',
-      'about',
-      'description',
-      'ribbon',
-      'address',
-      'location',
-      'schedule',
-      'service_fee',
-      'delivery_price',
-      'distance',
-      'delivery_time',
-      'gallery',
-      'pickup_time',
-      'reviews',
-      'featured',
-      'offers',
-      'food',
-      'laundry',
-      'alcohol',
-      'groceries',
-      'slug',
-      'products',
-      'zones',
-      'timezone'
-    ],
-    handleSearchRedirect: () => {
-      props.navigation.navigate('BusinessList')
-    },
-    onProductRedirect: ({ slug, category, product }: any) => {},
-    onCheckoutRedirect: (cartUuid: any) => {},
-    logo,
-    header,
-    product,
-    productId,
-    categoryId,
-    businessId
-  }
-
-  const BusinessProductsListView = styled.SafeAreaView`
-    flex: 1;
-    background-color: ${theme.colors.backgroundPage};
-  `
-
-  return (
-    <BusinessProductsListView>
-      <BusinessProductsListController {...businessProductsProps} />
-    </BusinessProductsListView>
-  )
-}
-
-export default BusinessProductsList

package/src/pages/BusinessesListing.tsx

@@ -1,43 +0,0 @@
-import React, { useEffect } from 'react'
-import { BusinessesListing as BusinessListingController } from '../components/BusinessesListing'
-import styled from 'styled-components/native'
-import { useTheme } from 'styled-components/native'
-
-const BusinessesListing = (props: any) => {
-  const theme = useTheme()
-  const businessId = props.route.params?.businessId
-  const categoryId = props.route.params?.categoryId
-  const productId = props.route.params?.productId
-  const store = props.route.params?.store
-
-  useEffect(() => {
-    if (store) {
-      props.navigation.navigate('Business', { store, businessId, categoryId, productId })
-      return
-    }
-  }, [businessId, categoryId, productId, store])
-
-  const BusinessesListingProps = {
-    ...props,
-    navigation: props?.navigation,
-    isSearchByName: true,
-    isSearchByDescription: true,
-    propsToFetch: ['id', 'name', 'header', 'logo', 'ribbon', 'location', 'schedule', 'open', 'delivery_price', 'distance', 'delivery_time', 'pickup_time', 'reviews', 'featured', 'offers', 'food', 'laundry', 'alcohol', 'groceries', 'slug'],
-    onBusinessClick: (business: any) => {
-      props.navigation.navigate('Business', { store: store || business.slug, header: business.header, logo: business.logo })
-    }
-  }
-
-  const BusinessListView = styled.SafeAreaView`
-    flex: 1;
-    background-color: ${theme.colors.backgroundPage};
-  `
-
-  return (
-    <BusinessListView>
-      <BusinessListingController {...BusinessesListingProps} />
-    </BusinessListView>
-  )
-}
-
-export default BusinessesListing

package/src/pages/CartList.tsx

@@ -1,49 +0,0 @@
-import * as React from 'react';
-import { useFocusEffect } from '@react-navigation/native'
-import styled from 'styled-components/native';
-import { useOrder } from 'ordering-components/native';
-import { Platform } from 'react-native';
-import { CartContent } from '../components/CartContent';
-import { Container } from '../layouts/Container'
-
-const KeyboardView = styled.KeyboardAvoidingView`
-  flex-grow: 1;
-`;
-
-interface Props {
-  navigation: any;
-  route: any;
-}
-
-const CartList = (props: Props) => {
-  const [{ carts }, { refreshOrderOptions }] = useOrder();
-  const cartsList = (carts && Object.values(carts).filter((cart: any) => cart.products.length > 0)) || []
-
-  useFocusEffect(
-    React.useCallback(() => {
-      refreshOrderOptions()
-    }, [props.navigation])
-  )
-
-  const cartProps = {
-    ...props,
-    carts: cartsList,
-    isOrderStateCarts: !!carts,
-    onNavigationRedirect: (route: string, params: any) => props.navigation.navigate(route, params)
-  }
-
-  return (
-    <>
-      <KeyboardView
-        enabled
-        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      >
-        <Container>
-          <CartContent {...cartProps} />
-        </Container>
-      </KeyboardView>
-    </>
-  );
-};
-
-export default CartList;

package/src/pages/Checkout.tsx

@@ -1,101 +0,0 @@
-import React from 'react';
-import { Platform } from 'react-native';
-import { Checkout } from '../components/Checkout';
-
-import { initStripe, useConfirmPayment  } from '@stripe/stripe-react-native';
-import styled from 'styled-components/native';
-
-import { useOrder, useLanguage, ToastType, useToast } from 'ordering-components/native';
-
-const stripePaymentOptions = ['stripe', 'stripe_direct', 'stripe_connect', 'google_pay', 'apple_pay'];
-
-const KeyboardView = styled.KeyboardAvoidingView`
-  flex: 1;
-`;
-
-export const CheckoutPage = (props: any) => {
-  const [, { showToast }] = useToast();
-  const [, t] = useLanguage();
-  const [orderState, { confirmCart, changeMoment }] = useOrder();
-  const { confirmPayment, loading: confirmPaymentLoading } = useConfirmPayment();
-  const checkoutProps = {
-    ...props,
-    cartUuid: props?.cartUuid || props.route?.params?.cartUuid,
-    businessLogo: props.route?.params?.businessLogo,
-    businessName: props.route?.params?.businessName,
-    cartTotal: props.route?.params?.cartTotal,
-    stripePaymentOptions,
-    onPlaceOrderClick: async (data: any, paymethod: any, cart: any) => {
-      if (cart?.order?.uuid) {
-        if (orderState?.options?.moment) {
-          changeMoment(null);
-        }
-        props.navigation.navigate('OrderDetails', { orderId: cart.order?.uuid, isFromCheckout: true });
-        return
-      }
-
-      if (cart?.status === 2 && stripePaymentOptions.includes(paymethod?.gateway)) {
-        const clientSecret = cart?.paymethod_data?.result?.client_secret;
-        const paymentMethodId = paymethod?.gateway === 'stripe_connect'
-          ? cart.paymethod_data?.result?.payment_method_id
-          : cart.paymethod_data?.data?.source_id
-        const stripeAccountId = paymethod?.paymethod?.credentials?.user;
-        const publicKey = paymethod?.paymethod?.credentials?.publishable;
-
-        try {
-          const stripeParams = stripeAccountId
-            ? { publishableKey: publicKey, stripeAccountId: stripeAccountId}
-            : { publishableKey: publicKey };
-          initStripe(stripeParams);
-        } catch (error: any) {
-          showToast(ToastType.Error, error?.toString() || error.message)
-        }
-
-        try {
-          const { paymentIntent, error } = await confirmPayment(clientSecret, {
-            type: 'Card',
-            paymentMethodId
-          });
-
-          if (error) {
-            showToast(ToastType.Error, error.message)
-          }
-
-          props.handleIsRedirect && props.handleIsRedirect(true);
-          try {
-            const confirmCartRes = await confirmCart(cart?.uuid)
-            if (confirmCartRes.error) {
-              showToast(ToastType.Error, confirmCartRes.error.message)
-            }
-            if (confirmCartRes.result.order?.uuid) {
-              props.navigation.navigate('OrderDetails', { orderId: confirmCartRes.result.order.uuid, isFromCheckout: true })
-              return
-            }
-          } catch (error: any) {
-            showToast(ToastType.Error, error?.toString() || error.message)
-          }
-          return
-        } catch (error: any) {
-          const e = error?.message?.toLowerCase() === 'failed'
-            ? t('FAILED_PAYMENT', 'The payment has failed')
-            : error?.toString() || error.message
-          showToast(ToastType.Error, e)
-        }
-      }
-    },
-    onNavigationRedirect: (page: string, params: any) => {
-      if (!page) return
-      props.navigation.navigate(page, params);
-    }
-  }
-  return (
-    <KeyboardView
-      enabled
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-    >
-      <Checkout {...checkoutProps} />
-    </KeyboardView>
-  )
-}
-
-export default CheckoutPage;

package/src/pages/ForgotPassword.tsx

@@ -1,24 +0,0 @@
-import React from 'react';
-import { Platform } from 'react-native';
-import styled from 'styled-components/native';
-import { ForgotPasswordForm } from '../components/ForgotPasswordForm';
-import { Container } from '../layouts/Container';
-
-const KeyboardView = styled.KeyboardAvoidingView`
-  flex: 1;
-`;
-
-export const ForgotPassword = (props: any) => {
-  return (
-    <KeyboardView
-      enabled
-      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-    >
-      <Container>
-        <ForgotPasswordForm {...props} />
-      </Container>
-    </KeyboardView>
-  )
-}
-
-export default ForgotPassword;