ordering-ui-react-native 0.18.94 → 0.18.96

package/package.json

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

package/themes/kiosk/src/components/Intro/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { StyleSheet, View, RefreshControl, ScrollView, Pressable } from 'react-native';
+import { StyleSheet, View, Pressable, TouchableOpacity } from 'react-native';
 import { useLanguage } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 
@@ -9,6 +9,7 @@ import OButton from '../../components/shared/OButton';
 import { LanguageSelector } from '../../components/LanguageSelector';
 import { LogoutPopup } from '../../components/LogoutPopup';
 import { PORTRAIT, LANDSCAPE, useDeviceOrientation } from "../../../../../src/hooks/DeviceOrientation";
+import { OIcon } from '../../components/shared';
 
 const Intro = (props: any): React.ReactElement => {
   const { navigation } = props;
@@ -41,6 +42,19 @@ const Intro = (props: any): React.ReactElement => {
     //     />
     //   }
     // >
+    <>
+      <View style={{ position: 'absolute', top: 25, right: 20, zIndex: 1000 }}>
+        <TouchableOpacity
+          onPress={() => setShowLogoutPopup(true)}
+        >
+          <OIcon
+            src={theme.images.general.menulogout}
+            width={24}
+            height={24}
+            color={theme.colors.disabledContrast}
+          />
+        </TouchableOpacity>
+      </View>
       <Pressable onPress={goBusiness}>
         <View style={{ height: orientationState?.dimensions?.height }}>
           {orientationState.orientation === PORTRAIT ? (
@@ -134,6 +148,7 @@ const Intro = (props: any): React.ReactElement => {
           />
         </View>
       </Pressable>
+    </>
     // </ScrollView>
   );
 };

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

@@ -146,7 +146,7 @@ export const BusinessBasicInformation = (
 	}
 
 	const getBusinessType = () => {
-		if (Object.keys(business).length <= 0) return t('GENERAL', 'General');
+		if (Object.keys(business || {}).length <= 0) return t('GENERAL', 'General');
 		const _types: any = [];
 		types.forEach(
 			(type) =>

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

@@ -42,7 +42,6 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 		navigation,
 		isBusinessOpen,
 		style,
-		isCustomLayout,
 		businessHeader,
 		businessFeatured,
 		businessLogo,
@@ -76,7 +75,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 	const hideBusinessHeader = theme?.business_listing_view?.components?.business?.components?.header?.hidden
 	const hideBusinessFavoriteBadge = theme?.business_listing_view?.components?.business?.components?.featured_badge?.hidden
 
-	const textSize = isCustomLayout ? 12 : 10
+	const textSize = 12
 	const cardHeight = windowHeight * 0.3
 
 	const styles = StyleSheet.create({
@@ -214,7 +213,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 					<BusinessHero>
 						{!hideBusinessHeader && (
 							<FastImage
-								style={{ height: isCustomLayout ? cardHeight * 0.66 : 120 }}
+								style={{ height: cardHeight * 0.66 }}
 								source={(businessHeader || business?.header || typeof theme.images.dummies.businessHeader === 'string') ? {
 									uri: optimizeImage(businessHeader || business?.header || theme.images.dummies.businessHeader, 'h_500,c_limit'),
 									priority: FastImage.priority.normal,
@@ -227,7 +226,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 								<FontAwesomeIcon name="crown" size={26} color="gold" />
 							</View>
 						)}
-						{(!isCustomLayout) && !hideBusinessOffer && (
+						{!hideBusinessOffer && (
 							getBusinessOffer((business?.offers)) &&
 							<OfferBox
 								isClosed={!isBusinessOpen && (configState?.configs?.preorder_status_enabled?.value === '1')}
@@ -257,7 +256,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 						</BusinessState>
 					</BusinessHero>
 					<BusinessContent>
-						<BusinessInfo style={isCustomLayout && { position: 'absolute', bottom: 85, left: 15 }}>
+						<BusinessInfo style={{ position: 'absolute', bottom: 85, left: 15 }}>
 							{!hideBusinessLogo && (
 								<BusinessLogo style={styles.businessLogo}>
 									<FastImage
@@ -270,38 +269,15 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 									/>
 								</BusinessLogo>
 							)}
-							{!isCustomLayout && (!hideBusinessFavorite || !hideBusinessReviews) && (
-								<ReviewAndFavorite>
-									{(businessReviews?.reviews?.total > 0 ?? business?.reviews?.total > 0) && !hideBusinessReviews && (
-										<Reviews>
-											<OIcon src={theme.images.general.star} width={12} style={styles.starIcon} />
-											<OText size={10} style={{ lineHeight: 15 }}>
-												{parseNumber(businessReviews?.reviews?.total ?? business?.reviews?.total, { separator: '.' })}
-											</OText>
-										</Reviews>
-									)}
-									{!hideBusinessFavorite && (
-										<LottieAnimation
-											type='favorite'
-											onClick={handleChangeFavorite}
-											initialValue={business?.favorite ? 0.5 : 0}
-											toValue={business?.favorite ? 0 : 0.5}
-											disableAnimation={!auth}
-											iconProps={{ color: theme.colors.danger5, size: 18 }}
-											isActive={business?.favorite}
-										/>
-									)}
-								</ReviewAndFavorite>
-							)}
 						</BusinessInfo>
-						<View style={isCustomLayout && { width: '100%', flexDirection: 'row', justifyContent: 'space-between', marginTop: 5 }}>
+						<View style={{ width: '100%', flexDirection: 'row', justifyContent: 'space-between', marginTop: 5 }}>
 							<OText
 								size={textSize + 2}
 								style={{ lineHeight: 18, marginBottom: 6 }}
 								weight={'500'}>
 								{business?.name}
 							</OText>
-							{isCustomLayout && (!hideBusinessFavorite || !hideBusinessReviews) && (
+							{(!hideBusinessFavorite || !hideBusinessReviews) && (
 								<ReviewAndFavorite>
 									{(businessReviews?.reviews?.total > 0 ?? business?.reviews?.total > 0) && !hideBusinessReviews && (
 										<Reviews>
@@ -325,7 +301,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 								</ReviewAndFavorite>
 							)}
 						</View>
-						<OText size={textSize} style={{ lineHeight: 15, marginBottom: 3 }} numberOfLines={isCustomLayout ? 1 : 2}>
+						<OText size={textSize} style={{ lineHeight: 15, marginBottom: 3 }} numberOfLines={1}>
 							{business?.address}
 						</OText>
 						<Metadata>

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

@@ -691,8 +691,8 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
         <ServiceForm
           navigation={navigation}
           product={currentProduct}
-          businessSlug={business.slug}
-          businessId={business.id}
+          businessSlug={business?.slug}
+          businessId={business?.id}
           professionalList={business?.professionals}
           professionalSelected={professionalSelected}
           handleChangeProfessional={handleChangeProfessionalSelected}

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -605,7 +605,6 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 						<BusinessController
 							key={`${business.id}_` + i}
 							enableIntersection
-							isCustomLayout={isChewLayout}
 							business={business}
 							isBusinessOpen={business.open}
 							handleCustomClick={handleBusinessClick}

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

@@ -108,14 +108,14 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	/* const toggleAccordion = () => {
 		if ((!product?.valid_menu && isCartProduct)) return
 		if (isActive) {
-		  Animated.timing(setHeight.height, {
+			Animated.timing(setHeight.height, {
 			 toValue: 100,
 			 duration: 500,
 			 easing: Easing.linear,
 			 useNativeDriver: false,
-		  }).start()
+			}).start()
 		} else {
-		  setHeightState({height: new Animated.Value(0)})
+			setHeightState({height: new Animated.Value(0)})
 		}
 	 }*/
 
@@ -136,7 +136,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 	}
 
 	/*useEffect(() => {
-	  toggleAccordion()
+		toggleAccordion()
 	}, [isActive])*/
 
 	const productOptions = getProductMax && [...Array(getProductMax(product) + 1),].map((_: any, opt: number) => {
@@ -289,7 +289,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 							)}
 							{productInfo().options.length > 0 && (
 								<ProductOptionsList>
-									{productInfo().options.map((option: any, i: number) => (
+									{productInfo().options.sort((a: any, b: any) => a.rank - b.rank).map((option: any, i: number) => (
 										<ProductOption key={option.id + i}>
 											<OText size={10} color={theme.colors.textSecondary}>{option.name}</OText>
 											{option.suboptions.map((suboption: any) => (