ordering-ui-react-native 0.15.21 → 0.15.22-release

package/themes/kiosk/src/components/shared/OCard.tsx

@@ -1,110 +1,144 @@
 import React from 'react';
-import { TextStyle, ViewStyle, Platform } from 'react-native';
+import { TextStyle, ImageBackground, StyleSheet } from 'react-native';
 import { useTheme } from 'styled-components/native';
+import FastImage from 'react-native-fast-image'
 
-import styled from 'styled-components/native';
-import OImage from './OImage';
+import styled, { css } from 'styled-components/native';
 import OText from './OText';
 
 const CardContainer = styled.TouchableOpacity`
-	width: 21%;
-	margin: 10px 20px;
-	overflow: hidden;
+	position: relative;
+  flex-direction: column;
+  border-radius: 10px;
+  position: relative;
+  margin: 0 30px 30px 0;
+  align-self: flex-start;
 `
 
-const CardBody = styled.View`
-	padding: 4%;
+const WrapPrice = styled.View`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-top: 10px;
 `
 
-const CardBadge = styled.Text`
-	padding: 2% 4%;
-	position: absolute;
-	background-color: ${(props: any) => props.theme.theme.colors.primary};
-	z-index: 100;
-	border-radius: 5px;
-	color: #fff;
-	font-weight: bold;
-	margin: 10px 0;
+const WrapImage = styled.View`
+  width: 100%;
+  height: 120px;
+`
+
+const WrapContent = styled.View`
+  display: flex;
+  flex-direction: column;
+	${(props: any) => props.isCentered && css`
+		align-items: center;
+	`}
 `
 
 const OCard = (props: Props): React.ReactElement => {
 	const theme = useTheme()
 
+	const styles = StyleSheet.create({
+    textStyle: {
+      marginTop: 10
+    },
+    image: {
+      width: '100%',
+      height: '100%',
+			borderBottomLeftRadius: 0,
+			borderBottomRightRadius: 0,
+    }
+  })
+
 	return (
 		<CardContainer
-		 style={{...props.style}}
-		 onPress={props?.onPress}
-		 disabled={!props?.onPress}
-     activeOpacity={1}
-		>
-			{props?.badgeText && (
-				<CardBadge>
-					{props?.badgeText}
-				</CardBadge>
-			)}
-			<OImage
-				source={props.image}
-				height={120}
-				resizeMode="cover"
-				borderRadius={16}
-			/>
-			<CardBody>
-				<OText
-					mLeft={0}
-					size={18}
-					numberOfLines={2}
-					mBottom={8}
-					style={{...props?.titleStyle}}
-				>
-					{props.title}
-				</OText>
-
-				{props?.description && (
-					<OText
-						color={theme.colors.mediumGray}
-						numberOfLines={3}
-						mBottom={8}
-						style={{...props?.descriptionStyle}}
-					>
-						{props.description}
-					</OText>
+			activeOpacity={1}
+      style={props.style}
+      onPress={props?.onPress}
+			disabled={!props?.onPress}
+    >
+      <WrapImage>
+				{props.isUri ? (
+					<FastImage
+						style={[styles.image, props.style]}
+						source={{
+							uri: props.image?.uri,
+							priority: FastImage.priority.normal,
+							// cache:FastImage.cacheControl.web
+						}}
+						resizeMode={FastImage.resizeMode.cover}
+					/>
+				) : (
+					<ImageBackground
+						style={[styles.image, props.style]}
+						source={props.image}
+						imageStyle={{
+							borderBottomLeftRadius: 0,
+							borderBottomRightRadius: 0,
+							borderRadius: 10
+						}}
+						resizeMode='cover'
+					/>
 				)}
-				
-				{props?.price && (
-					<OText>
-						<OText
-							color={theme.colors.primary}
-							weight="bold"
-						>
-							{props.price}
-						</OText>
-
-						<OText
-							color={theme.colors.mediumGray}
-							size={12}
-							style={{textDecorationLine: 'line-through', textDecorationStyle: 'solid'}}
-						>
-							{props?.prevPrice ? `  ${props?.prevPrice}  ` : ''}
-						</OText>
-					</OText>
-				)}
-
-			</CardBody>
-		</CardContainer>
-	);
+      </WrapImage>
+      <WrapContent isCentered={props.isCentered}>
+        <OText
+          size={18}
+          numberOfLines={1}
+          ellipsizeMode='tail'
+          style={styles.textStyle}
+        >
+          {props.title}
+        </OText>
+        {!!props?.description && (
+          <OText
+            color={theme.colors.mediumGray}
+            size={18}
+            numberOfLines={3}
+            ellipsizeMode='tail'
+            style={styles.textStyle}
+          >
+            {props?.description}
+          </OText>
+        )}
+        <WrapPrice>
+          <OText
+            size={18}
+          >
+            {props.price}
+          </OText>
+          {props?.prevPrice && (
+            <OText
+              size={18}
+              color={theme.colors.mediumGray}
+              style={{
+                textDecorationLine: 'line-through',
+                textDecorationStyle: 'solid',
+                marginLeft: 20,
+              }}
+            >
+              {props?.prevPrice}
+            </OText>
+          )}
+        </WrapPrice>
+      </WrapContent>
+    </CardContainer>
+	)
 }
 
 interface Props {
 	badgeText?: string;
+	isUri?: boolean;
 	onPress?(): void;
-	image: string | { uri: string };
+	image: any;
+	isCentered?: any;
 	title: string;
 	titleStyle?: TextStyle;
 	description?: string;
 	descriptionStyle?: TextStyle;
 	price?: string;
 	prevPrice?: string;
-	style?: ViewStyle;
+	style?: any;
 }
 
 export default OCard;

package/themes/kiosk/src/types/index.d.ts

@@ -472,6 +472,8 @@ export interface Cart {
   delivery_price_with_discount: number;
   total: number;
   clearInactivityTimeout: any;
+  taxes: Array<any>;
+  fees: Array<any>;
 }
 
 export interface NoNetworkParams {

package/themes/original/index.tsx

@@ -7,11 +7,15 @@ import { SignupForm } from './src/components/SignupForm';
 import { ActiveOrders } from './src/components/ActiveOrders';
 import { AddressList } from './src/components/AddressList';
 import { AppleLogin } from './src/components/AppleLogin';
+import { BusinessBasicInformation } from './src/components/BusinessBasicInformation';
+import { BusinessProductsCategories } from './src/components/BusinessProductsCategories';
+import { BusinessProductsList } from './src/components/BusinessProductsList';
 import { BusinessesListing } from './src/components/BusinessesListing';
 import { BusinessProductsListing } from './src/components/BusinessProductsListing';
 import { CartContent } from './src/components/CartContent';
 import { BusinessCart } from './src/components/BusinessCart';
 import { Checkout } from './src/components/Checkout';
+import { FloatingButton } from './src/components/FloatingButton';
 import { ForgotPasswordForm } from './src/components/ForgotPasswordForm';
 import { MomentOption } from './src/components/MomentOption';
 import { OrdersOption } from './src/components/OrdersOption';
@@ -33,12 +37,88 @@ import { HelpOrder } from './src/components/HelpOrder';
 import { NetworkError } from './src/components/NetworkError';
 import { NotFoundSource } from './src/components/NotFoundSource';
 import { OrderTypeSelector } from './src/components/OrderTypeSelector';
+import { SearchBar } from './src/components/SearchBar';
 import { Wallets } from './src/components/Wallets';
 import { PaymentOptionWallet } from './src/components/PaymentOptionWallet';
 import { ProductForm } from './src/components/ProductForm';
 import { UpsellingProducts } from './src/components/UpsellingProducts';
 import { UserVerification } from './src/components/UserVerification';
 import { BusinessListingSearch } from './src/components/BusinessListingSearch';
+import { LastOrders } from './src/components/LastOrders';
+import NavBar from './src/components/NavBar';
+import { BusinessTypeFilter } from './src/components/BusinessTypeFilter';
+import { BusinessController } from './src/components/BusinessController';
+import { BusinessFeaturedController } from './src/components/BusinessFeaturedController';
+import { HighestRatedBusinesses } from './src/components/HighestRatedBusinesses';
+import { PaymentOptions } from './src/components/PaymentOptions';
+import { DriverTips } from './src/components/DriverTips';
+import { UserDetails } from './src/components/UserDetails';
+import { OrderSummary } from './src/components/OrderSummary';
+import { CartStoresListing } from './src/components/CartStoresListing';
+import { PaymentOptionsWebView } from '../../src/components/PaymentOptionsWebView';
+import { GoogleMap } from './src/components/GoogleMap';
+import { SingleProductCard } from './src/components/SingleProductCard';
+import { UpsellingRedirect } from './src/components/BusinessProductsListing/UpsellingRedirect';
+import { ProductItemAccordion } from './src/components/ProductItemAccordion';
+import { BusinessItemAccordion } from './src/components/BusinessItemAccordion';
+import { CouponControl } from './src/components/CouponControl';
+import { TaxInformation } from './src/components/TaxInformation';
+import { PlaceSpot } from './src/components/PlaceSpot';
+import { Cart } from './src/components/Cart';
+import { LanguageSelector } from './src/components/LanguageSelector';
+import { PhoneInputNumber } from './src/components/PhoneInputNumber'
+import { FacebookLogin } from './src/components/FacebookLogin';
+import { VerifyPhone } from './src/components/VerifyPhone';
+import { GoogleLogin } from './src/components/GoogleLogin';
+import { PreviousOrders } from './src/components/PreviousOrders';
+import { PaymentOptionCash } from './src/components/PaymentOptionCash';
+import { StripeElementsForm } from './src/components/StripeElementsForm';
+import { StripeCardsList } from './src/components/StripeCardsList';
+import { ProductIngredient } from './src/components/ProductIngredient';
+import { ProductOption } from './src/components/ProductOption';
+import { ProductOptionSubOption } from './src/components/ProductOptionSubOption';
+import { Sessions } from './src/components/Sessions';
+import { SingleProductReview } from './src/components/SingleProductReview';
+import { LogoutButton } from './src/components/LogoutButton';
+import { UserFormDetailsUI } from './src/components/UserFormDetails';
+import { WalletTransactionItem } from './src/components/WalletTransactionItem';
+import { Promotions } from './src/components/Promotions'
+import { USER_TYPE, ORDER_TYPES } from './src/config/constants'
+
+import { OSBill, OSTable, OSCoupon, OSTotal, OSRow } from './src/components/OrderSummary/styles';
+
+import { FormInput, FormSide, ButtonsWrapper, LoginWith, OTab, OTabs } from './src/components/LoginForm/styles';
+import { OSItem, OSItemContent, OSItemActions } from './src/components/PaymentOptionStripe/styles';
+
+import Alert from './src/providers/AlertProvider'
+
+import {
+	LoginParams,
+	ProfileParams,
+	AddressListParams,
+	AddressFormParams,
+	SignupParams,
+	PhoneInputParams,
+	LanguageSelectorParams,
+	BusinessesListingParams,
+	HighestRatedBusinessesParams,
+	BusinessTypeFilterParams,
+	BusinessControllerParams,
+	BusinessProductsListingParams,
+	BusinessBasicInformationParams,
+	BusinessProductsCategoriesParams,
+	BusinessProductsListParams,
+	SingleProductCardParams,
+	BusinessInformationParams,
+	BusinessReviewsParams,
+	SearchBarParams,
+	NotFoundSourceParams,
+	OrdersOptionParams,
+	ActiveOrdersParams,
+	PreviousOrdersParams,
+	OrderDetailsParams,
+	ReviewDriverParams
+} from './src/types';
 
 import { Toast } from './src/components/shared/OToast';
 import {
@@ -55,10 +135,13 @@ import {
 	OAlert,
 	OModal,
 	OBottomPopup,
+	HeaderTitle
 } from './src/components/shared';
 
 import { Container } from './src/layouts/Container';
 import { SafeAreaContainer } from './src/layouts/SafeAreaContainer';
+import { FloatingBottomContainer } from './src/layouts/FloatingBottomContainer';
+
 import {
 	_retrieveStoreData,
 	_setStoreData,
@@ -94,7 +177,7 @@ export {
 	BusinessMenuList,
 	UserProfile,
 	MessageListing,
-  Messages,
+	Messages,
 	Help,
 	HelpAccountAndPayment,
 	HelpGuide,
@@ -108,6 +191,97 @@ export {
 	UpsellingProducts,
 	UserVerification,
 	BusinessListingSearch,
+	BusinessBasicInformation,
+	BusinessProductsCategories,
+	BusinessProductsList,
+	FloatingButton,
+	SearchBar,
+	LastOrders,
+	BusinessTypeFilter,
+	BusinessController,
+	BusinessFeaturedController,
+	HighestRatedBusinesses,
+	PaymentOptions,
+	DriverTips,
+	UserDetails,
+	OrderSummary,
+	CartStoresListing,
+	PaymentOptionsWebView,
+	GoogleMap,
+	SingleProductCard,
+	UpsellingRedirect,
+	ProductItemAccordion,
+	BusinessItemAccordion,
+	CouponControl,
+	TaxInformation,
+	PlaceSpot,
+	Cart,
+	LanguageSelector,
+	PhoneInputNumber,
+	FacebookLogin,
+	VerifyPhone,
+	GoogleLogin,
+	PreviousOrders,
+	PaymentOptionCash,
+	StripeElementsForm,
+	StripeCardsList,
+	ProductIngredient,
+	ProductOption,
+	ProductOptionSubOption,
+	Sessions,
+	SingleProductReview,
+	LogoutButton,
+	UserFormDetailsUI,
+	WalletTransactionItem,
+	Promotions,
+	ORDER_TYPES,
+	USER_TYPE,
+
+	OSBill,
+	OSTable,
+	OSCoupon,
+	OSTotal,
+	OSRow,
+
+	FormInput,
+	FormSide,
+	ButtonsWrapper,
+	LoginWith,
+	OTab,
+	OTabs,
+
+	OSItem,
+	OSItemContent,
+	OSItemActions,
+
+	Alert,
+
+	//Types
+	LoginParams,
+	ProfileParams,
+	AddressListParams,
+	AddressFormParams,
+	SignupParams,
+	PhoneInputParams,
+	LanguageSelectorParams,
+	BusinessesListingParams,
+	HighestRatedBusinessesParams,
+	BusinessTypeFilterParams,
+	BusinessControllerParams,
+	BusinessProductsListingParams,
+	BusinessBasicInformationParams,
+	BusinessProductsCategoriesParams,
+	BusinessProductsListParams,
+	SingleProductCardParams,
+	BusinessInformationParams,
+	BusinessReviewsParams,
+	SearchBarParams,
+	NotFoundSourceParams,
+	OrdersOptionParams,
+	ActiveOrdersParams,
+	PreviousOrdersParams,
+	OrderDetailsParams,
+	ReviewDriverParams,
 
 	// OComponents
 	Toast,
@@ -124,10 +298,13 @@ export {
 	OAlert,
 	OModal,
 	OBottomPopup,
+	HeaderTitle,
 
 	// layout
 	Container,
 	SafeAreaContainer,
+	FloatingBottomContainer,
+	NavBar,
 
 	// utils
 	_retrieveStoreData,

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

@@ -108,6 +108,9 @@ const AddressFormUI = (props: AddressFormParams) => {
 			top: 12,
 			zIndex: 1002,
 		},
+		wrapperNavbar: Platform.OS === 'ios'
+			? {  paddingVertical: 0, paddingHorizontal: 40 }
+			: {  paddingVertical: 20, paddingHorizontal: 40 }
 	});
 
 	const [, t] = useLanguage();
@@ -500,16 +503,18 @@ const AddressFormUI = (props: AddressFormParams) => {
 			keyboardShouldPersistTaps='always'
 			listViewDisplayed={false}
 		>
-			<NavBar
-				title={t('WHERE_DO_WE_DELIVERY', 'Where do we delivery?')}
-				titleAlign={'center'}
-				onActionLeft={goToBack}
-				showCall={false}
-				paddingTop={20}
-				btnStyle={{ paddingLeft: 40 }}
-				titleStyle={{ fontSize: 14 }}
-				titleWrapStyle={{ paddingHorizontal: 0 }}
-			/>
+			<View style={styles.wrapperNavbar}>
+				<NavBar
+					title={t('WHERE_DO_WE_DELIVERY', 'Where do we delivery?')}
+					titleAlign={'center'}
+					onActionLeft={goToBack}
+					showCall={false}
+					btnStyle={{ paddingLeft: 0 }}
+					style={{ marginTop: Platform.OS === 'ios' ? 0 : 30 }}
+					titleWrapStyle={{ paddingHorizontal: 0 }}
+					titleStyle={{ marginRight: 0, marginLeft: 0 }}
+				/>
+			</View>
 			<TouchableWithoutFeedback onPress={Keyboard.dismiss}>
 				<AddressFormContainer style={{ height: 600, overflow: 'scroll' }}>
 					<View>

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

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react'
 import { AddressList as AddressListController, useLanguage, useOrder, useSession } from 'ordering-components/native'
 import { AddressListContainer, AddressItem } from './styles'
-import { StyleSheet, View } from 'react-native'
+import { Platform, RefreshControl, StyleSheet, View } from 'react-native'
 import { OButton, OText, OAlert, OModal, OIcon } from '../shared'
 import { Container } from '../../layouts/Container'
 import { AddressListParams } from '../../types'
@@ -27,7 +27,8 @@ const AddressListUI = (props: AddressListParams) => {
 		actionStatus,
 		isFromBusinesses,
 		isFromProductsList,
-		afterSignup
+		afterSignup,
+		loadAddresses
 	} = props
 
 	const theme = useTheme();
@@ -35,6 +36,7 @@ const AddressListUI = (props: AddressListParams) => {
 	const [orderState] = useOrder()
 	const [, t] = useLanguage()
 	const [{ auth }] = useSession()
+	const [refreshing] = useState(false);
 
 	const [isProfile, setIsProfile] = useState(isFromProfile || route?.params?.isFromProfile);
 
@@ -121,6 +123,12 @@ const AddressListUI = (props: AddressListParams) => {
 		})
 	}
 
+	const handleOnRefresh = () => {
+		if (!addressList.loading) {
+			loadAddresses();
+		}
+	}
+
 	const goToBack = () => navigation?.canGoBack() && navigation.goBack()
 	const onNavigationRedirect = (route: string, params?: any) => navigation.navigate(route, params)
 
@@ -135,22 +143,26 @@ const AddressListUI = (props: AddressListParams) => {
 	}, [])
 
 	return (
-		<Container noPadding>
+		<Container 
+			noPadding
+			refreshControl={
+				<RefreshControl
+					refreshing={refreshing}
+					onRefresh={() => handleOnRefresh()}
+				/>
+			}
+		>
+			{isProfile && (
+				<NavBar
+					title={t('SAVED_PLACES', 'My saved places')}
+					titleAlign={'center'}
+					onActionLeft={goToBack}
+					showCall={false}
+					style={{ paddingHorizontal: 40, paddingVertical: Platform.OS === 'ios' ? 0 : 20, marginTop: Platform.OS === 'ios' ? 0 : 30 }}
+				/>
+			)}
 			{(!addressList.loading || (isFromProductsList || isFromBusinesses || isFromProfile || isProfile)) && (
 				<AddressListContainer>
-					{isProfile && (
-						<NavBar
-							title={t('MY_SAVED_PLACES', 'My saved places')}
-							titleAlign={'center'}
-							onActionLeft={() => goToBack()}
-							showCall={false}
-							btnStyle={{ paddingLeft: 0 }}
-							paddingTop={0}
-							isVertical
-							titleWrapStyle={{ paddingHorizontal: 0 }}
-							titleStyle={{ marginLeft: 0, marginRight: 0 }}
-						/>
-					)}
 					{
 						route &&
 						(
@@ -167,12 +179,12 @@ const AddressListUI = (props: AddressListParams) => {
 								showCall={false}
 								btnStyle={{ paddingLeft: 0 }}
 								paddingTop={0}
-								style={{ flexDirection: 'column', alignItems: 'flex-start' }}
+								style={{ marginTop: Platform.OS === 'ios' ? 0 : 40 }}
 								titleWrapStyle={{ paddingHorizontal: 0 }}
 								titleStyle={{ marginLeft: 0, marginRight: 0 }}
 							/>
 						)}
-					{addressList.loading && (
+					{addressList.loading && addressList?.addresses?.length === 0 && (
 						<>
 							{[...Array(5)].map((item, i) => (
 								<Placeholder key={i} style={{ paddingVertical: 20 }} Animation={Fade}>
@@ -261,6 +273,32 @@ const AddressListUI = (props: AddressListParams) => {
 					)}
 					{!addressList.loading && !addressList.error && (
 						<>
+							{addressList?.addresses?.length === 0 && (
+								<View
+									style={{
+										flexDirection: 'column',
+										paddingHorizontal: 10,
+										paddingTop: 20
+									}}
+								>
+									<OText
+										size={24}
+										lineHeight={36}
+										weight={Platform.OS === 'ios' ? '600' : 'bold'}
+										style={{
+											textAlign: 'center',
+											marginRight: 40,
+											color: theme.colors.textNormal,
+											paddingHorizontal: 0,
+											width: '100%',
+											marginLeft: 0
+										}}
+									>
+										{t('ADDRESS_LIST', 'Address List')}
+									</OText>
+								</View>
+							)}
+
 							<OButton
 								text={t('ADD_NEW_ADDRESS', 'Add new Address')}
 								imgRightSrc=''