ordering-ui-react-native 0.16.63 → 0.16.66

package/package.json

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

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

@@ -46,7 +46,7 @@ export const BusinessBasicInformation = (
 	const [openBusinessReviews, setOpenBusinessReviews] = useState(false);
 	const [businessInformationObtained, setBusinessInformationObtained] = useState(false)
 	const [businessReviewsObtained, setBusinessReviewsObtainedbtained] = useState(false)
-	const isChewLayout = theme?.layouts?.business_view?.components?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = orderingTheme?.theme?.business_view?.components?.header?.components?.layout?.type === 'chew'
 	const showLogo = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.logo?.hidden
 	
 	const styles = StyleSheet.create({

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

@@ -129,7 +129,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
               onProductClick={() => onProductClick(product)}
               productAddedToCartLength={currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
               handleUpdateProducts={handleUpdateProducts}
-							navigation={navigation}
+              navigation={navigation}
             />
           ))
       }

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

@@ -75,9 +75,9 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const [{ configs }] = useConfig()
 	const isPreOrder = configs?.preorder_status_enabled?.value === '1'
 
-	const isChewLayout = theme?.layouts?.business_view?.components?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = orderingTheme?.theme?.business_view?.components?.header?.components?.layout?.type === 'chew'
 	const showLogo = !orderingTheme?.theme?.business_view?.components?.header?.components?.business?.components?.logo?.hidden
-	const showBusinessNearCity = !theme?.layouts?.business_view?.components?.near_business?.hidden
+	const hideBusinessNearCity = orderingTheme?.theme?.business_view?.components?.near_business?.hidden
 
 	const styles = StyleSheet.create({
 		mainContainer: {
@@ -277,7 +277,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 							</WrapSearchBar>
 						)}
 					</TopHeader>
-					{showBusinessNearCity && businessState?.business?.city_id && (
+					{!hideBusinessNearCity && businessState?.business?.city_id && (
 						<NearBusiness>
 							<BusinessesListing
 								logosLayout

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

@@ -80,8 +80,8 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	const appState = useRef(AppState.currentState)
 	const searchBarRef = useRef<any>()
 	const [appStateVisible, setAppStateVisible] = useState(appState.current);
-	const isChewLayout = theme?.layouts?.header?.components?.layout?.type === 'chew'
-	const showCities = !orderingTheme?.theme?.business_listing_view?.components?.cities?.hidden
+	const isChewLayout = orderingTheme?.theme?.header?.components?.layout?.type === 'chew'
+	const hideCities = orderingTheme?.theme?.business_listing_view?.components?.cities?.hidden
 	const [refreshing] = useState(false);
 	const styles = StyleSheet.create({
 		container: {
@@ -216,7 +216,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		}
 	}
 
-	const handleChangeCity = (cityId : number | null) => {
+	const handleChangeCity = (cityId: number | null) => {
 		changeCityFilter(orderState?.options?.city_id === cityId ? null : cityId)
 		setIsOpenCities(false)
 	}
@@ -485,7 +485,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 				/>
 			)}
 
-			{showCities && (
+			{!hideCities && (
 				<View style={{ marginTop: 10 }}>
 					<OButton
 						onClick={() => setIsOpenCities(true)}

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

@@ -1,6 +1,6 @@
 
 import React, { useState, useEffect } from 'react'
-import { useOrder, useSession, useLanguage } from 'ordering-components/native';
+import { useOrder, useSession, useLanguage, useOrderingTheme } from 'ordering-components/native';
 
 import { useTheme } from 'styled-components/native'
 import { BusinessesListing as OriginalBusinessListing } from './Layout/Original'
@@ -11,7 +11,8 @@ import { ReviewTrigger } from '../ReviewTrigger';
 export const BusinessesListing = (props: any) => {
   const { logosLayout } = props
   const theme = useTheme()
-  const layout = theme?.layouts?.business_listing_view?.components?.layout?.type || 'original'
+  const [orderingTheme] = useOrderingTheme()
+  const layout = orderingTheme?.theme?.business_listing_view?.components?.layout?.type || 'original'
   const [, t] = useLanguage();
   const [{ auth }] = useSession()
   const [, { getLastOrderHasNoReview }] = useOrder();
@@ -96,4 +97,4 @@ export const BusinessesListing = (props: any) => {
       )}
     </>
   )
-}
+}

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

@@ -8,7 +8,7 @@ import {
   useValidationFields,
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
-import { CContainer, CheckoutAction, Divider } from './styles';
+import { CContainer, CheckoutAction, Divider, DriverTipsContainer } from './styles';
 
 import { OSBill, OSTable, OSCoupon, OSTotal, OSRow } from '../OrderSummary/styles';
 
@@ -25,6 +25,7 @@ import { TaxInformation } from '../TaxInformation';
 import { CartStoresListing } from '../CartStoresListing';
 import { OAlert } from '../../../../../src/components/shared'
 import { PlaceSpot } from '../PlaceSpot'
+import { DriverTips } from '../DriverTips'
 
 const CartUI = (props: any) => {
   const {
@@ -66,6 +67,10 @@ const CartUI = (props: any) => {
   const businessId = business?.business_id ?? null
   const placeSpotTypes = [4]
 
+  const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
+    ? JSON.parse(configs?.driver_tip_options?.value) || []
+    : configs?.driver_tip_options?.value || []
+
   const momentFormatted = !orderState?.option?.moment
     ? t('RIGHT_NOW', 'Right Now')
     : parseDate(orderState?.option?.moment, { outputFormat: 'YYYY-MM-DD HH:mm' })
@@ -355,6 +360,32 @@ const CartUI = (props: any) => {
               </OSTable>
             )}
 
+            {isMultiCheckout &&
+              cart &&
+              cart?.valid &&
+              orderState?.options?.type === 1 &&
+              cart?.status !== 2 &&
+              validationFields?.fields?.checkout?.driver_tip?.enabled &&
+              driverTipsOptions && driverTipsOptions?.length > 0 &&
+              (
+								<DriverTipsContainer>
+									<OText size={14} lineHeight={20} color={theme.colors.textNormal}>
+										{t('DRIVER_TIPS', 'Driver Tips')}
+									</OText>
+									<DriverTips
+										uuid={cart?.uuid}
+										businessId={cart?.business_id}
+										driverTipsOptions={driverTipsOptions}
+										isFixedPrice={parseInt(configs?.driver_tip_type?.value, 10) === 1 || !!parseInt(configs?.driver_tip_use_custom?.value, 10)}
+										isDriverTipUseCustom={!!parseInt(configs?.driver_tip_use_custom?.value, 10)}
+										driverTip={parseInt(configs?.driver_tip_type?.value, 10) === 1 || !!parseInt(configs?.driver_tip_use_custom?.value, 10)
+											? cart?.driver_tip
+											: cart?.driver_tip_rate}
+										useOrderContext
+									/>
+								</DriverTipsContainer>
+              )}
+
             <OSTotal>
               <OSTable style={{ marginTop: 15 }}>
                 <OText size={14} lineHeight={21} weight={'600'}>

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

@@ -33,3 +33,7 @@ export const Divider = styled.View`
   margin-top: 5px;
   margin-bottom: 10px;
 `
+
+export const DriverTipsContainer = styled.View`
+  padding: 5px 0;
+`

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

@@ -1093,6 +1093,7 @@ export const ProductOptionsUI = (props: any) => {
 export const ProductForm = (props: any) => {
 	const productOptionsProps = {
 		...props,
+		productCart: { quantity: props?.product?.minimum_per_order || 1 },
 		UIComponent: ProductOptionsUI,
 	};
 

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

@@ -5,6 +5,7 @@ import {
 	useOrder,
 	useUtils,
 	useSession,
+	useOrderingTheme,
 	SingleProductCard as SingleProductCardController
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
@@ -39,7 +40,8 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 	} = props;
 
 	const theme = useTheme();
-	const showAddButton = !theme?.layouts?.business_view?.components?.products?.components?.add_to_cart_button?.hidden
+	const [orderingTheme] = useOrderingTheme()
+	const hideAddButton = orderingTheme?.theme?.business_view?.components?.products?.components?.add_to_cart_button?.hidden
 
 	const styles = StyleSheet.create({
 		container: {
@@ -132,7 +134,7 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 		<InView style={{ minHeight: 200 }} triggerOnce={true} onChange={(inView: boolean) => setIsIntersectionObserver(true)}>
 			{isIntersectionObserver ? (
 				<CardContainer
-					showAddButton={showAddButton}
+					showAddButton={!hideAddButton}
 					style={[
 						styles.container,
 						(isSoldOut || maxProductQuantity <= 0) && styles.soldOutBackgroundStyle,
@@ -202,7 +204,7 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 									</OText>
 								</RibbonBox>
 							)}
-							{product?.images ? (
+							{product?.images && (
 								<FastImage
 									style={styles.productStyle}
 									source={{
@@ -211,15 +213,6 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 									}}
 									resizeMode={FastImage.resizeMode.cover}
 								/>
-							) : (
-								<FastImage
-									style={styles.productStyle}
-									source={{
-										uri: Image.resolveAssetSource(theme.images.dummies.product).uri,
-										priority: FastImage.priority.normal,
-									}}
-									resizeMode={FastImage.resizeMode.cover}
-								/>
 							)}
 						</LogoWrapper>
 
@@ -231,7 +224,7 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 							</SoldOut>
 						)}
 					</View>
-					{showAddButton && (
+					{!hideAddButton && (
 						<OButton
 							onClick={() => onProductClick?.(product)}
 							style={{