ordering-ui-react-native 0.14.30 → 0.14.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.14.30",
+  "version": "0.14.33",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/src/components/LogoutButton/index.tsx

@@ -5,6 +5,7 @@ import { _retrieveStoreData, _clearStoreData } from '../../providers/StoreUtil';
 
 import { OIcon, OText } from '../shared';
 import { useTheme } from 'styled-components/native';
+import { GoogleSignin } from '@react-native-google-signin/google-signin';
 
 const LogoutButtonUI = (props: any) => {
   const { handleLogoutClick, formState } = props
@@ -19,6 +20,19 @@ const LogoutButtonUI = (props: any) => {
     if (res) {
       _clearStoreData({ excludedKeys: ['isTutorial'] })
     }
+    logoutWithGoogle()
+  }
+
+  const logoutWithGoogle = async () => {
+    const isSignedIn = await GoogleSignin.isSignedIn()
+    if (isSignedIn) {
+      try {
+        await GoogleSignin.revokeAccess();
+        await GoogleSignin.signOut();
+      } catch (error: any) {
+        showToast(ToastType.Error, error.message)
+      }
+    }
   }
 
   useEffect(() => {

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

@@ -82,7 +82,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
       paddingBottom: 15,
       borderBottomWidth: 1,
       borderColor: theme.colors.backgroundGray200,
-      height: 90
+      height: 100
     },
     calendarHeaderContainer: {
       flex: 1,
@@ -400,6 +400,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
                 iconStyle={{borderWidth: 1}}
                 selectedDate={selectDate}
                 datesWhitelist={datesWhitelist}
+                dayContainerStyle={{height: 40}}
                 disabledDateNameStyle={styles.disabledDateName}
                 disabledDateNumberStyle={styles.disabledDateNumber}
                 disabledDateOpacity={0.6}

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

@@ -49,7 +49,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
             product={product}
             businessId={businessId}
             onProductClick={() => onProductClick(product)}
-            productAddedToCart={currentCart?.products?.find((Cproduct: any) => Cproduct.id === product.id)}
+            productAddedToCartLength={currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
           />
         ))}
 
@@ -72,7 +72,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                       product={product}
                       businessId={businessId}
                       onProductClick={onProductClick}
-                      productAddedToCart={currentCart?.products?.find((Cproduct: any) => Cproduct.id === product.id)}
+                      productAddedToCartLength={currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                     />
                   ),
               )}
@@ -117,7 +117,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                           businessId={businessId}
                           product={product}
                           onProductClick={onProductClick}
-                          productAddedToCart={currentCart?.products?.find((Cproduct: any) => Cproduct.id === product.id)}
+                          productAddedToCartLength={currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
                         />
                       ))}
                     </>

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

@@ -44,7 +44,7 @@ const DriverTipsUI = (props: any) => {
 			borderWidth: 1,
 			borderColor: theme.colors.inputDisabled,
 			marginRight: 10,
-			height: 44
+			height: 50
 		}
 	})
 
@@ -63,7 +63,7 @@ const DriverTipsUI = (props: any) => {
 	return (
 		<DTContainer>
 			<DTWrapperTips>
-				{driverTipsOptions.map((option: any, i: number) => (
+				{driverTipsOptions.map((option: any, i: number) => (				
 					<TouchableOpacity
 						key={i}
 						onPress={() => handlerChangeOption(option)}
@@ -72,7 +72,7 @@ const DriverTipsUI = (props: any) => {
 							style={style.circle}
 							isActive={option === optionSelected}
 						>
-							<OText size={13} color={option === optionSelected ? '#FFF' : theme.colors.textSecondary}>
+							<OText size={12} numberOfLines={1} color={option === optionSelected ? '#FFF' : theme.colors.textSecondary}>
 								{`${isFixedPrice ? parsePrice(option) : `${option}%`}`}
 							</OText>
 						</DTCard>

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

@@ -15,7 +15,7 @@ export const DTWrapperTips = styled.View`
   width: 100%;
   justify-content: space-evenly;
   align-items: center;
-  flex-wrap: nowrap;
+  flex-wrap: wrap;
 `
 
 export const DTCard = styled.View`
@@ -24,10 +24,10 @@ export const DTCard = styled.View`
   align-items: center;
   border: 1px solid ${(props: any) => props.isActive ? props.theme.colors.primary : props.theme.colors.border};
   text-transform: capitalize;
-  min-height: 48px;
-  min-width: 48px;
-  max-width: 48px;
-  max-height: 48px;
+  min-height: 55px;
+  min-width: 55px;
+  max-width: 55px;
+  max-height: 55px;
   margin-right: 10px;
   margin-left: 10px;
   margin-top: 10px;

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

@@ -423,17 +423,6 @@ export const ProductOptionsUI = (props: any) => {
 												</OText>
 											)}
 										</View>
-										<View style={{ flexDirection: 'row', marginBottom: 10 }}>
-											<OText size={16} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={theme.colors.primary}>{productCart.price ? parsePrice(productCart.price) : ''}</OText>
-											{product?.offer_price && (
-												<OText style={{    fontSize: 14,
-													color: '#808080',
-													textDecorationLine: 'line-through',
-													marginLeft: 7,
-													marginRight: 7
-												}}>{parsePrice(product?.offer_price)}</OText>
-											)}
-										</View>
 										{((product?.sku && product?.sku !== '-1' && product?.sku !== '1') || (product?.estimated_person)) && (
 											<OText size={14} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={'#909BA9'} mBottom={7}>
 												{
@@ -449,11 +438,20 @@ export const ProductOptionsUI = (props: any) => {
 											</OText>
 										)}
 										{isHaveWeight ? (
-											<OText size={16} lineHeight={24} color={theme.colors.textNormal}>{parsePrice(pricePerWeightUnit)} / {product?.weight_unit}</OText>
+											<OText size={16} lineHeight={24} color={theme.colors.primary}>{parsePrice(pricePerWeightUnit)} / {product?.weight_unit}</OText>
 										) : (
-											<OText size={16} lineHeight={24} color={theme.colors.textNormal}>
-												{productCart.price ? parsePrice(productCart.price) : ''}
-											</OText>
+											<View style={{ flexDirection: 'row', marginBottom: 10 }}>
+												<OText size={16} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={theme.colors.primary}>{productCart.price ? parsePrice(productCart.price) : ''}</OText>
+												{product?.offer_price && (
+													<OText style={{
+														fontSize: 14,
+														color: '#808080',
+														textDecorationLine: 'line-through',
+														marginLeft: 7,
+														marginRight: 7
+													}}>{parsePrice(product?.offer_price)}</OText>
+												)}
+											</View>
 										)}
 									</>
 								)}

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

@@ -212,8 +212,8 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 				</View>
 				{((isCartProduct && !isCartPending && product?.valid_menu && !product?.valid_quantity) ||
 					(!product?.valid_menu && isCartProduct && !isCartPending)) && (
-						<View style={{ alignItems: 'flex-end', width: '100%' }}>
-							<OText size={14} color={theme.colors.red} style={{ textAlign: 'right', bottom: 20 }}>
+						<View style={{ alignItems: 'flex-end', width: '100%', }}>
+							<OText size={14} color={theme.colors.red} style={{ textAlign: 'right', marginTop: 5 }}>
 								{t('NOT_AVAILABLE', 'Not available')}
 							</OText>
 						</View>

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

@@ -13,7 +13,7 @@ import { OText, OIcon } from '../shared';
 import FastImage from 'react-native-fast-image'
 
 export const SingleProductCard = (props: SingleProductCardParams) => {
-	const { businessId, product, isSoldOut, onProductClick, productAddedToCart } = props;
+	const { businessId, product, isSoldOut, onProductClick, productAddedToCartLength } = props;
 
 	const theme = useTheme();
 
@@ -90,7 +90,6 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
 		maxCartProductConfig,
 		maxCartProductInventory,
 	);
-
 	return (
 		<CardContainer
 			style={[
@@ -98,11 +97,11 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
 				(isSoldOut || maxProductQuantity <= 0) && styles.soldOutBackgroundStyle,
 			]}
 			onPress={() => onProductClick?.(product)}>
-				{productAddedToCart && productAddedToCart?.quantity > 0 && (
+				{productAddedToCartLength > 0 && (
 					<QuantityContainer style={[styles.quantityContainer, {
 						transform: [{ translateX: 10 }, { translateY: -10 }],
 					}]}>
-						<OText color={theme.colors.white}>{productAddedToCart?.quantity}</OText>
+						<OText size={12} color={theme.colors.white}>{productAddedToCartLength.toString()}</OText>
 					</QuantityContainer>
 				)}
 			<CardInfo>

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

@@ -24,4 +24,6 @@ export const SoldOut = styled.View`
 
 export const QuantityContainer = styled.View`
   background: ${({ theme } : any) => theme.colors.primary};
-`
+  align-items: center;
+  justify-content: center;
+`

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

@@ -221,7 +221,7 @@ export interface SingleProductCardParams {
 	product: any;
 	isSoldOut: boolean;
 	onProductClick: any;
-	productAddedToCart?: any
+	productAddedToCartLength: number
 }
 export interface BusinessInformationParams {
 	navigation?: any,