ordering-ui-react-native 0.15.47 → 0.15.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.15.47",
+  "version": "0.15.50",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",
@@ -99,6 +99,7 @@
     "react-native-picker-select": "^8.0.4",
     "react-native-print": "^0.9.0",
     "react-native-reanimated": "^1.13.1",
+    "react-native-recaptcha-that-works": "^1.2.0",
     "react-native-restart": "^0.0.22",
     "react-native-safe-area-context": "^3.1.8",
     "react-native-screens": "^2.11.0",

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

@@ -102,12 +102,13 @@ export const PreviousOrders = (props: any) => {
   const getDelayMinutes = (order: any) => {
     // targetMin = delivery_datetime  + eta_time - now()
     const offset = 300
-    const cdtToutc = parseDate(moment(order?.delivery_datetime).add(offset, 'minutes'))
+    const cdtToutc = moment(order?.delivery_datetime).add(offset, 'minutes').format('YYYY-MM-DD HH:mm:ss')
     const _delivery = order?.delivery_datetime_utc
       ? parseDate(order?.delivery_datetime_utc)
       : parseDate(cdtToutc)
     const _eta = order?.eta_time
-    return moment(_delivery, 'YYYY-MM-DD hh:mm A').add(_eta, 'minutes').diff(moment().utc(), 'minutes')
+    const diffTimeAsSeconds = moment(_delivery, 'YYYY-MM-DD hh:mm A').add(_eta, 'minutes').diff(moment().utc(), 'seconds')
+    return Math.ceil(diffTimeAsSeconds / 60)
   }
 
   const displayDelayedTime = (order: any) => {
@@ -128,9 +129,10 @@ export const PreviousOrders = (props: any) => {
     return finalTaget
   }
 
-  const getStatusClassName = (minutes: any) => {
-    if (isNaN(Number(minutes))) return 0
-    return minutes > 0 ? 'in_time' : minutes === 0 ? 'at_risk' : 'delayed'
+  const getStatusClassName = (minutes: number) => {
+    if (isNaN(Number(minutes))) return 'in_time'
+    const delayTime = configState?.configs?.order_deadlines_delayed_time?.value
+    return minutes > 0 ? 'in_time' : Math.abs(minutes) <= delayTime ? 'at_risk' : 'delayed'
   }
 
   useEffect(() => {

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

@@ -4,6 +4,7 @@ import Spinner from 'react-native-loading-spinner-overlay';
 import { useForm, Controller } from 'react-hook-form';
 import { PhoneInputNumber } from '../PhoneInputNumber';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import Recaptcha from 'react-native-recaptcha-that-works'
 
 import {
 	LoginForm as LoginFormController,
@@ -18,7 +19,6 @@ import { FacebookLogin } from '../FacebookLogin';
 import { VerifyPhone } from '../../../../../src/components/VerifyPhone';
 import { OModal } from '../../../../../src/components/shared';
 
-
 import {
 	Container,
 	ButtonsWrapper,
@@ -32,6 +32,7 @@ import {
 	LineSeparator,
 	SkeletonWrapper,
 	TabBtn,
+  RecaptchaButton
 } from './styles';
 
 import NavBar from '../NavBar';
@@ -60,7 +61,9 @@ const LoginFormUI = (props: LoginParams) => {
 		handleSendVerifyCode,
 		handleCheckPhoneCode,
 		onNavigationRedirect,
-		notificationState
+		notificationState,
+		handleReCaptcha,
+		enableReCaptcha
 	} = props;
 
 	const [, { showToast }] = useToast();
@@ -79,6 +82,8 @@ const LoginFormUI = (props: LoginParams) => {
 			cellphone: null,
 		},
 	});
+	const [recaptchaConfig, setRecaptchaConfig] = useState<any>({})
+	const [recaptchaVerified, setRecaptchaVerified] = useState(false)
 
 	const theme = useTheme();
 
@@ -100,10 +105,15 @@ const LoginFormUI = (props: LoginParams) => {
 			flexGrow: 1,
 			marginBottom: 7,
 		},
+		recaptchaIcon: {
+		width: 100,
+		height: 100,
+		}
 	});
 
 	const emailRef = useRef<any>({});
 	const passwordRef = useRef<any>({});
+  	const recaptchaRef = useRef<any>({});
 
 	const handleChangeTab = (val: string) => {
 		props.handleChangeTab(val);
@@ -156,6 +166,33 @@ const LoginFormUI = (props: LoginParams) => {
 		onChange(value.toLowerCase().replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''));
 	};
 
+  	const handleOpenRecaptcha = () => {
+		setRecaptchaVerified(false)
+	  	if (!recaptchaConfig?.siteKey) {
+			showToast(ToastType.Error, t('NO_RECAPTCHA_SITE_KEY', 'The config doesn\'t have recaptcha site key'));
+			return
+		}
+		if (!recaptchaConfig?.baseUrl) {
+			showToast(ToastType.Error, t('NO_RECAPTCHA_BASE_URL', 'The config doesn\'t have recaptcha base url'));
+			return
+		}
+		recaptchaRef.current.open()
+  	}
+
+	const onRecaptchaVerify = (token: any) => {
+		setRecaptchaVerified(true)
+		handleReCaptcha(token)
+	}
+
+	useEffect(() => {
+		if (configs && Object.keys(configs).length > 0 && enableReCaptcha) {
+			setRecaptchaConfig({
+				siteKey: configs?.security_recaptcha_site_key?.value || null,
+				baseUrl: configs?.security_recaptcha_base_url?.value || null
+			})
+		}
+	}, [configs, enableReCaptcha])
+
 	useEffect(() => {
 		if (!formState.loading && formState.result?.error) {
 			formState.result?.result &&
@@ -399,6 +436,39 @@ const LoginFormUI = (props: LoginParams) => {
 								</OText>
 							</TouchableOpacity>
 						)}
+
+						{enableReCaptcha && (
+							<>
+								<TouchableOpacity
+									onPress={handleOpenRecaptcha}
+								>
+									<RecaptchaButton>
+										{recaptchaVerified ? (
+											<MaterialCommunityIcons
+												name="checkbox-marked"
+												size={26}
+												color={theme.colors.primary}
+											/>
+										) : (
+											<MaterialCommunityIcons
+												name="checkbox-blank-outline"
+												size={26}
+												color={theme.colors.mediumGray}
+											/>
+										)}
+										<OText size={14} mLeft={8}>{t('VERIFY_ReCAPTCHA', 'Verify reCAPTCHA')}</OText>
+									</RecaptchaButton>
+								</TouchableOpacity>
+								<Recaptcha
+									ref={recaptchaRef}
+									siteKey={recaptchaConfig?.siteKey}
+									baseUrl={recaptchaConfig?.baseUrl}
+									onVerify={onRecaptchaVerify}
+									onExpire={() => setRecaptchaVerified(false)}
+								/>
+							</>
+						)}
+
 						<OButton
 							onClick={handleSubmit(onSubmit)}
 							text={loginButtonText}
@@ -559,6 +629,7 @@ const LoginFormUI = (props: LoginParams) => {
 export const LoginForm = (props: any) => {
 	const loginProps = {
 		...props,
+    isRecaptchaEnable: true,
 		UIComponent: LoginFormUI,
 	};
 	return <LoginFormController {...loginProps} />;

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

@@ -36,7 +36,7 @@ export const LoginWith = styled.View`
   width: 100%;
   align-items: flex-start;
   border-bottom-width: 1px;
-  border-bottom-color: ${(props: any) => props.theme.colors.border}
+  border-bottom-color: ${(props: any) => props.theme.colors.border};
 `;
 
 export const FormInput = styled.View`
@@ -80,3 +80,8 @@ export const LineSeparator = styled.View`
 export const SkeletonWrapper = styled.View`
   width: 90%;
 `
+export const RecaptchaButton = styled.View`
+  flex-direction: row;
+  align-items: center;
+  margin-bottom: 10px;
+`

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

@@ -188,7 +188,7 @@ const OrderProgressUI = (props: any) => {
               <ProgressBar style={{ width: getOrderStatus(lastOrder.status)?.percentage ? `${getOrderStatus(lastOrder.status)?.percentage}%` : '0%' }} />
             </ProgressContentWrapper>
             <ProgressTextWrapper>
-              <OText size={12}>{getOrderStatus(lastOrder.status)?.value}</OText>
+              <OText size={12} style={{ width: '50%' }}>{getOrderStatus(lastOrder.status)?.value}</OText>
               <TimeWrapper>
                 <OText size={11}>{t('ESTIMATED_DELIVERY', 'Estimated delivery')}</OText>
                 <OText size={11}>

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

@@ -20,6 +20,7 @@ export const ProgressTextWrapper = styled.View`
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
+  width: 100%;
 `
 
 export const OrderInfoWrapper = styled.View`

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

@@ -0,0 +1,232 @@
+import React, { useState } from 'react'
+import { PromotionsController, useLanguage, useUtils, useEvent } from 'ordering-components/native'
+import {
+    PromotionsContainer,
+    SingleOfferContainer,
+    OfferInformation,
+    SearchBarContainer,
+    SingleBusinessOffer,
+    AvailableBusinesses,
+    OfferData,
+    Code,
+    BusinessInfo
+} from './styles'
+import { SearchBar } from '../SearchBar'
+import NavBar from '../NavBar'
+import { useTheme } from 'styled-components/native';
+import { OButton, OIcon, OModal, OText } from '../shared'
+import { Placeholder, PlaceholderLine } from 'rn-placeholder'
+import { NotFoundSource } from '../NotFoundSource'
+import { View, StyleSheet, ScrollView } from 'react-native'
+import FastImage from 'react-native-fast-image'
+import { PromotionParams } from '../../types'
+const PromotionsUI = (props : PromotionParams) => {
+    const {
+        navigation,
+        offersState,
+        handleSearchValue,
+        searchValue,
+        offerSelected,
+        setOfferSelected
+    } = props
+
+    const theme = useTheme();
+
+    const styles = StyleSheet.create({
+        productStyle: {
+            width: 75,
+            height: 75,
+            borderRadius: 7.6
+        },
+        buttonStyle: {
+            width: 55,
+            height: 25,
+            paddingLeft: 0,
+            paddingRight: 0
+        },
+        offerTitle: {
+            fontSize: 12
+        },
+        offerDescription: {
+            color: '#909BA9',
+            fontSize: 10
+        },
+        offerExtraInfo: {
+            fontSize: 10
+        },
+        modalButtonStyle: {
+            width: 100,
+            height: 35,
+            paddingLeft: 0,
+            paddingRight: 0,
+            borderRadius: 7.6
+        }
+    });
+
+    const [, t] = useLanguage()
+    const [{ parseDate, parsePrice, optimizeImage }] = useUtils()
+    const [events] = useEvent()
+    const [openModal, setOpenModal] = useState(false)
+
+    const handleClickOffer = (offer : any) => {
+        setOpenModal(true)
+        setOfferSelected(offer)
+    }
+
+    const handleBusinessClick = (business : any) => {
+        events.emit('go_to_page', { page: 'business', params: { store: business.slug } })
+    }
+
+    const filteredOffers = offersState?.offers?.filter((offer : any) => offer.name.toLowerCase().includes(searchValue.toLowerCase()))
+
+    const targetString = offerSelected?.target === 1
+        ? t('SUBTOTAL', 'Subtotal')
+        : offerSelected?.target === 2
+            ? t('DELIVERY_FEE', 'Delivery fee')
+            : t('SERVICE_FEE', 'Service fee')
+
+    return (
+        <PromotionsContainer>
+            <NavBar
+                onActionLeft={() => navigation.goBack()}
+                btnStyle={{ paddingLeft: 0 }}
+                paddingTop={20}
+                style={{ paddingBottom: 0, flexDirection: 'column', alignItems: 'flex-start' }}
+                title={t('PROMOTIONS', 'Promotions')}
+                titleAlign={'center'}
+                titleStyle={{ fontSize: 16, marginRight: 0, marginLeft: 0, marginBottom: 10 }}
+                titleWrapStyle={{ paddingHorizontal: 0 }}
+            />
+            <SearchBarContainer>
+                <SearchBar
+                    placeholder={t('SEARCH_OFFERS', 'Search offers')}
+                    onSearch={handleSearchValue}
+                />
+            </SearchBarContainer>
+
+            {offersState?.loading && (
+                <>
+                    {[...Array(5).keys()].map((key, i) => (
+                        <Placeholder key={i} style={{ flexDirection: 'row', marginBottom: 20 }}>
+                            <PlaceholderLine height={10} width={45} />
+                            <PlaceholderLine height={10} width={60} />
+                            <PlaceholderLine height={10} width={75} />
+                        </Placeholder>
+                    ))}
+                </>
+            )}
+            {((!offersState?.loading && filteredOffers?.length === 0) || offersState?.error) && (
+                <NotFoundSource
+                    content={offersState?.error || t('NOT_FOUND_OFFERS', 'Not found offers')}
+                />
+            )}
+            <ScrollView>
+                {!offersState?.loading && offersState.offers?.length > 0 && filteredOffers?.map((offer : any) => (
+                    <SingleOfferContainer key={offer.id}>
+                        <OfferInformation>
+                            <OText style={styles.offerTitle}>{offer?.name}</OText>
+                            {offer?.description && (
+                                <OText style={styles.offerDescription}>{offer?.description}</OText>
+                            )}
+                            <OText style={styles.offerExtraInfo}>
+                                {t('EXPIRES', 'Expires')} {parseDate(offer?.end, { outputFormat: 'MMM DD, YYYY' })}
+                            </OText>
+                            <AvailableBusinesses>
+                                <OText style={styles.offerExtraInfo}>{t('APPLY_FOR', 'Apply for')}:</OText>
+                                {offer.businesses.map((business: any, i: number) => (
+                                    <OText style={styles.offerExtraInfo} key={business?.id}>{' '}{business?.name}{i + 1 < offer.businesses?.length ? ',' : ''}</OText>
+                                ))}
+                            </AvailableBusinesses>
+                        </OfferInformation>
+                        <OButton
+                            onClick={() => handleClickOffer(offer)}
+                            text={t('VIEW', 'View')}
+                            style={styles.buttonStyle}
+                            textStyle={{ fontSize: 10, color: '#fff', flexWrap: 'nowrap' }}
+                        />
+                    </SingleOfferContainer>
+                ))}
+            </ScrollView>
+            <OModal
+                open={openModal}
+                onClose={() => setOpenModal(false)}
+                entireModal
+
+                title={``}
+            >
+                <View style={{ padding: 20 }}>
+                    <OText style={{ alignSelf: 'center', fontWeight: '700' }} mBottom={20}>
+                        {offerSelected?.name} / {t('VALUE_OF_OFFER', 'Value of offer')}: {offerSelected?.rate_type === 1 ? `${offerSelected?.rate}%` : `${parsePrice(offerSelected?.rate)}`}
+                    </OText>
+                    <OfferData>
+                        {offerSelected?.type === 2 && (
+                            <Code>
+                                <OText>{t('YOUR_CODE', 'Your code')}</OText>
+                                <OText color={theme.colors.primary}>{offerSelected.coupon}</OText>
+                            </Code>
+                        )}
+                        <OText>{t('APPLIES_TO', 'Applies to')}: {targetString}</OText>
+                        {offerSelected?.auto && (
+                            <OText>{t('OFFER_AUTOMATIC', 'This offer applies automatic')}</OText>
+                        )}
+                        {offerSelected?.minimum && (
+                            <OText>{t('MINIMUM_PURCHASE_FOR_OFFER', 'Minimum purshase for use this offer')}: {parsePrice(offerSelected?.minimum)}</OText>
+                        )}
+                        {offerSelected?.max_discount && (
+                            <OText>{t('MAX_DISCOUNT_ALLOWED', 'Max discount allowed')}: {parsePrice(offerSelected?.max_discount)}</OText>
+                        )}
+                        {offerSelected?.description && (
+                            <OText>{offerSelected?.description}</OText>
+                        )}
+                    </OfferData>
+                    <OText style={{ marginTop: 10, marginBottom: 10 }}>
+                        {t('AVAILABLE_BUSINESSES_FOR_OFFER', 'Available businesses for this offer')}:
+                    </OText>
+                    <ScrollView style={{height: '75%'}}>
+                        {offerSelected?.businesses?.map((business : any) => {
+                            return (
+                                <SingleBusinessOffer key={business.id}>
+                                    {business?.logo ? (
+                                        <FastImage
+                                            style={styles.productStyle}
+                                            source={{
+                                                uri: optimizeImage(business?.logo, 'h_250,c_limit'),
+                                                priority: FastImage.priority.normal,
+                                            }}
+                                            resizeMode={FastImage.resizeMode.cover}
+                                        />
+                                    ) : (
+                                        <OIcon
+                                            src={theme?.images?.dummies?.product}
+                                            style={styles.productStyle}
+                                        />
+                                    )}
+                                    <BusinessInfo>
+                                        <OText>{business.name}</OText>
+                                        <OButton
+                                            onClick={() => handleBusinessClick(business)}
+                                            text={t('GO_TO_BUSINESSS', 'Go to business')}
+                                            style={styles.modalButtonStyle}
+                                            textStyle={{ fontSize: 10, color: '#fff' }}
+                                        />
+                                    </BusinessInfo>
+                                </SingleBusinessOffer>
+                            )
+                        })}
+                    </ScrollView>
+                </View>
+            </OModal>
+        </PromotionsContainer>
+    )
+}
+
+export const Promotions = (props : PromotionParams) => {
+    const PromotionsProps = {
+        ...props,
+        UIComponent: PromotionsUI
+    }
+
+    return (
+        <PromotionsController {...PromotionsProps} />
+    )
+}

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

@@ -0,0 +1,80 @@
+import styled, { css } from 'styled-components/native'
+
+export const PromotionsContainer = styled.View`
+  width: 100%;
+`
+
+export const SingleOfferContainer = styled.View`
+  flex-direction: row;
+  width: 100%;
+  height: 80px;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px;
+
+`
+
+export const OfferInformation = styled.View`
+  justify-content: space-between;
+  max-width: 75%;
+`
+
+export const SearchBarContainer = styled.View`
+  display: flex;
+  width: 100%;
+  justify-content: flex-start;
+  margin-bottom: 20px;
+  .search-bar {
+    justify-content: flex-start;
+    input {
+      width: 100%;
+    }
+  }
+  .clear {
+    right: 0;
+  }
+`
+
+export const SingleBusinessOffer = styled.View`
+  flex-direction: row;
+`
+
+export const AvailableBusinesses = styled.View`
+  flex-direction: row;
+  overflow: hidden;
+`
+
+export const OfferData = styled.View`
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  p{
+    color: #909BA9;
+    margin: 3px;
+    font-size: 14px;
+  }
+`
+
+export const Code = styled.View`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-bottom: 10px;
+`
+
+export const ValueOfOffer = styled.View`
+  p{
+    font-size: 16px;
+  }
+  span{
+    font-size: 20px;
+  }
+`
+
+export const BusinessInfo = styled.View`
+  flex: 1;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin-left: 10px;
+`

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

@@ -16,6 +16,7 @@ import { LogoutButton } from '../LogoutButton'
 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 FastImage from 'react-native-fast-image'
 
 import {
@@ -101,7 +102,7 @@ const ProfileListUI = (props: ProfileParams) => {
 	const { top, bottom } = useSafeAreaInsets();
 
 	const isWalletEnabled = configs?.wallet_enabled?.value === '1' && (configs?.wallet_cash_enabled?.value === '1' || configs?.wallet_credit_point_enabled?.value === '1')
-
+	const IsPromotionsEnabled = configs?.advanced_offers_module === '1' || configs?.advanced_offers_module === 'true'
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}
@@ -178,6 +179,12 @@ const ProfileListUI = (props: ProfileParams) => {
 							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
 						</ListItem>
 					)}
+					{IsPromotionsEnabled && (
+						<ListItem onPress={() => onRedirect('Promotions', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+							<MaterialIcons name='local-offer' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+							<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('PROMOTIONS', 'Promotions')}</OText>
+						</ListItem>
+					)}
 					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.ic_help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>

package/themes/original/src/components/shared/HeaderTitle.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { Platform } from 'react-native';
 import OText from './OText';
 
 const HeaderTitle = (props: any) => {
@@ -7,7 +8,7 @@ const HeaderTitle = (props: any) => {
     <OText
       size={24}
       style={style ?? {
-        marginTop: 30,
+        marginTop: Platform.OS === 'android' ? 50 : 30,
         paddingHorizontal: 40,
         textTransform: 'capitalize'
       }}

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

@@ -17,6 +17,8 @@ export interface LoginParams {
 	handleSendVerifyCode?: any;
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
+	handleReCaptcha?: any;
+    enableReCaptcha?: any;
 }
 export interface ProfileParams {
 	navigation?: any;
@@ -566,3 +568,12 @@ export interface PlaceSpotParams {
 	getPlacesList?: any,
 	setOpenPlaceModal?: any
 }
+
+export interface PromotionParams {
+	navigation: any,
+    offersState: any,
+    handleSearchValue: any,
+    searchValue: string,
+    offerSelected: any,
+    setOfferSelected: any,
+}