ordering-ui-react-native 0.21.50 → 0.21.51

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

@@ -19,7 +19,7 @@ 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, RefreshControl } from 'react-native'
+import { View, StyleSheet, ScrollView, RefreshControl, Platform } from 'react-native'
 import { PromotionParams } from '../../types'
 import { Container } from '../../layouts/Container'
 
@@ -98,8 +98,6 @@ const PromotionsUI = (props: PromotionParams) => {
 
   return (
     <Container
-      noPadding
-      pt={20}
       refreshControl={
         <RefreshControl
           refreshing={refreshing}
@@ -112,7 +110,9 @@ const PromotionsUI = (props: PromotionParams) => {
         titleAlign={'center'}
         onActionLeft={() => navigation.goBack()}
         showCall={false}
-        style={{ paddingVertical: 0, marginLeft: 20 }}
+        paddingTop={Platform.OS === 'ios' ? 20 : 10}
+        style={{ paddingVertical: 0 }}
+        btnStyle={{ paddingLeft: 0 }}
       />
       <PromotionsContainer>
         <SearchBarContainer>

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

@@ -2,8 +2,6 @@ import styled, { css } from 'styled-components/native'
 
 export const PromotionsContainer = styled.View`
   width: 100%;
-  padding-left: 40px;
-	padding-right: 40px;
 `
 
 export const WrapperSingleOffer = styled.View`

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

@@ -1,7 +1,7 @@
 import styled from 'styled-components/native'
 
 export const ReviewDriverContainer = styled.ScrollView`
-  padding: 20px 40px;
+  padding: 20px;
   margin-bottom: 100px;
 `
 

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

@@ -1,7 +1,7 @@
 import styled from 'styled-components/native'
 
 export const ReviewOrderContainer = styled.ScrollView`
-  padding: 20px 40px;
+  padding: 20px;
   margin-bottom: 100px;
 `
 

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

@@ -1,7 +1,7 @@
 import styled from 'styled-components/native'
 
 export const ReviewProductsContainer = styled.ScrollView`
-  padding: 20px 40px;
+  padding: 20px;
   margin-bottom: 100px;
 `
 

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

@@ -116,7 +116,7 @@ const ServiceFormUI = (props: ServiceFormParams) => {
       marginHorizontal: 0
     },
     professionalList: {
-      paddingHorizontal: 40,
+      paddingHorizontal: 20,
       paddingVertical: 30,
     }
   })

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

@@ -11,7 +11,7 @@ export const ProfessionalPhoto = styled.ImageBackground`
 `;
 
 export const InfoWrapper = styled.View`
-  padding-horizontal: 40px;
+  padding-horizontal: 20px;
   margin-vertical: 30px;
 `
 
@@ -22,7 +22,7 @@ export const Divider = styled.View`
 `
 
 export const ProfessionalWrapper = styled.View`
-  padding-horizontal: 40px;
+  padding-horizontal: 20px;
   margin-top: 30px;
 `
 
@@ -41,10 +41,10 @@ export const ButtonWrapper = styled.View`
   align-items: center;
   flex-direction: row;
   padding-vertical: 13px;
-  padding-horizontal: 40px;
+  padding-horizontal: 20px;
   margin-top: 30px;
   margin-bottom: 40px;
   width: 100%;
   border-top-width: 1px;
   border-top-color: ${(props: any) => props.theme.colors.backgroundGray200};
-`
+`

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

@@ -55,7 +55,7 @@ const StripeElementsFormUI = (props: any) => {
 	const styles = StyleSheet.create({
 		container: {
 			width: '100%',
-			paddingHorizontal: 40,
+			paddingHorizontal: 20,
 			justifyContent: 'space-between',
 			paddingBottom: 12
 		},

package/themes/original/src/components/UpsellingProducts/UpsellingContent.tsx

@@ -0,0 +1,170 @@
+import React, { useState } from 'react'
+import { Platform, StyleSheet, View } from 'react-native'
+import {
+    useLanguage,
+    useOrder,
+    useConfig
+} from 'ordering-components/native'
+import { useTheme } from 'styled-components/native';
+import { OText, OButton } from '../shared'
+import {
+    CartList,
+    CartDivider,
+    TopActionsHeader,
+    TopHeader
+} from './styles'
+import { OrderSummary } from '../OrderSummary';
+import { Cart } from '../Cart';
+import { ScrollView } from 'react-native-gesture-handler';
+import IconAntDesign from 'react-native-vector-icons/AntDesign';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { UpsellingLayout } from './UpsellingLayout';
+
+export const UpsellingContent = (props : any) => {
+    const {
+        onGoBack,
+        handleUpsellingPage,
+        onNavigationRedirect,
+        cart,
+        productsList
+    } = props
+
+    const theme = useTheme();
+
+    const [{ carts }] = useOrder()
+    const [{ configs }] = useConfig()
+    const [, t] = useLanguage()
+    const { bottom } = useSafeAreaInsets()
+    const [isCartsLoading, setIsCartsLoading] = useState(false)
+    const [showTitle, setShowTitle] = useState(false)
+
+    const isMultiCheckout = configs?.checkout_multi_business_enabled?.value === '1'
+    const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+    const showCartList = isChewLayout
+    const commentDelayTime = isChewLayout ? 500 : null
+
+    const cartList = (carts && Object.values(carts).filter((_cart: any) => _cart?.products?.length > 0 && _cart.uuid !== cart?.uuid)) || []
+    
+    const styles = StyleSheet.create({
+        closeUpsellingButton: {
+            borderRadius: 7.6,
+            borderColor: theme.colors.primary,
+            backgroundColor: theme.colors.primary,
+            borderWidth: 1,
+            alignSelf: 'center',
+            height: 44,
+            shadowOpacity: 0,
+            width: '80%',
+        },
+        cancelBtn: {
+            paddingHorizontal: 18,
+            borderWidth: 1,
+            borderRadius: 7.6,
+            borderColor: theme.colors.textSecondary,
+            height: 38
+        },
+        headerItem: {
+            flexDirection: 'row',
+            alignItems: 'center',
+            marginVertical: 2,
+            marginHorizontal: 20,
+        },
+        btnBackArrow: {
+            borderWidth: 0,
+            width: 26,
+            height: 26,
+            backgroundColor: theme.colors.clear,
+            borderColor: theme.colors.clear,
+            shadowColor: theme.colors.clear,
+            paddingLeft: 0,
+            paddingRight: 0,
+            marginLeft: 20,
+            marginBottom: 10
+        },
+        wrapperNavbar: {
+            paddingHorizontal: 20,
+            paddingTop: 0,
+        }
+    })
+
+
+    const handleScroll = ({ nativeEvent: { contentOffset } }: any) => {
+        setShowTitle(contentOffset.y > 30)
+    }
+
+    return (
+        <>
+            <View style={styles.wrapperNavbar}>
+                <TopHeader>
+                    <>
+                        <TopActionsHeader onPress={() => onGoBack()}>
+                            <IconAntDesign
+                                name='arrowleft'
+                                size={26}
+                            />
+                        </TopActionsHeader>
+                        {showTitle && (
+                            <OText
+                                size={16}
+                                style={{ flex: 1, textAlign: 'center', right: 15 }}
+                                weight={Platform.OS === 'ios' ? '600' : 'bold'}
+                                numberOfLines={2}
+                                ellipsizeMode='tail'
+                            >
+                                {t('WANT_SOMETHING_ELSE', 'Do you want something else?')}
+                            </OText>
+                        )}
+                    </>
+                </TopHeader>
+            </View>
+            <ScrollView style={{ marginTop: 10, marginBottom: props.isPage ? 40 : bottom + (Platform.OS == 'ios' ? 96 : 130) }} showsVerticalScrollIndicator={false} onScroll={handleScroll}>
+                {productsList.length > 0 &&
+                    <View style={{ paddingHorizontal: 40, overflow: 'visible' }}>
+                        <OText size={16} lineHeight={24} weight={'500'}>{t('WANT_SOMETHING_ELSE', 'Do you want something else?')}</OText>
+                        <UpsellingLayout {...props} />
+                    </View>
+                }
+                <View style={{ paddingHorizontal: 40 }}>
+                    <OText size={20} lineHeight={30} weight={600} style={{ marginTop: 10, marginBottom: 17 }}>{t('YOUR_CART', 'Your cart')}</OText>
+                    <OrderSummary
+                        cart={cart}
+                        commentDelayTime={commentDelayTime}
+                        isCartPending={cart?.status === 2}
+                        onNavigationRedirect={onNavigationRedirect}
+                    />
+                </View>
+                {showCartList && cartList.map((cart: any, i: number) => (
+                    <CartList key={i}>
+                        <Cart
+                            isFromUpselling
+                            cart={cart}
+                            cartuuid={cart.uuid}
+                            hideUpselling
+                            singleBusiness={props.singleBusiness}
+                            isFranchiseApp={props.isFranchiseApp}
+                            isCartsLoading={isCartsLoading}
+                            setIsCartsLoading={setIsCartsLoading}
+                            isMultiCheckout={isMultiCheckout}
+                            onNavigationRedirect={props.onNavigationRedirect}
+                        />
+                        <CartDivider />
+                    </CartList>
+                ))}
+            </ScrollView>
+            <View
+                style={{
+                    alignItems: 'center',
+                    bottom: props.isPage ? Platform.OS === 'ios' ? 0 : 20 : Platform.OS === 'ios' ? bottom + 59 : bottom + 125
+                }}
+            >
+                <OButton
+                    imgRightSrc=''
+                    text={t('CHECKOUT', 'Checkout')}
+                    style={{ ...styles.closeUpsellingButton }}
+                    textStyle={{ color: theme.colors.white, fontSize: 14 }}
+                    onClick={() => handleUpsellingPage(cart)}
+                />
+            </View>
+        </>
+    )
+}

package/themes/original/src/components/UpsellingProducts/UpsellingLayout.tsx

@@ -0,0 +1,86 @@
+import React from 'react'
+import { Platform, StyleSheet, View } from 'react-native'
+import {
+    useUtils,
+    useLanguage
+} from 'ordering-components/native'
+import {
+    Container,
+    UpsellingContainer,
+    Item,
+    Details,
+    AddButton,
+} from './styles'
+import { OIcon, OText } from '../shared'
+import { useTheme } from 'styled-components/native';
+
+export const UpsellingLayout = (props : any) => {
+    const {
+        upsellingProducts,
+        productsList,
+        onNavigationRedirect,
+        business
+    } = props
+    const theme = useTheme()
+    const [{ parsePrice }] = useUtils()
+    const [, t] = useLanguage()
+
+    const styles = StyleSheet.create({
+        imageStyle: {
+            width: 73,
+            height: 73,
+            resizeMode: 'cover',
+            borderRadius: 7.6,
+        },
+    })
+
+    const handleFormProduct = (product: any) => {
+        onNavigationRedirect && onNavigationRedirect('ProductDetails', {
+            product: product,
+            businessId: product?.api?.businessId,
+            businessSlug: business.slug,
+        })
+    }
+
+
+    return (
+        <>
+            <Container>
+                <UpsellingContainer
+                    horizontal
+                    showsHorizontalScrollIndicator={false}
+                    contentContainerStyle={{ paddingHorizontal: Platform.OS === 'ios' ? 40 : 0 }}
+                >
+                    {
+                        !upsellingProducts.loading && (
+                            <>
+                                {
+                                    !upsellingProducts.error ? productsList.map((product: any, i: number) => (
+                                        <Item key={`${product.id}_${i}`}>
+                                            <View style={{ flexBasis: '57%' }}>
+                                                <Details>
+                                                    <OText size={12} lineHeight={18} numberOfLines={1} ellipsizeMode='tail'>{product.name}</OText>
+                                                    <OText size={12} lineHeight={18} color={theme.colors.textNormal}>{parsePrice(product.price)}</OText>
+                                                </Details>
+                                                <AddButton onPress={() => handleFormProduct(product)}>
+                                                    <OText size={10} color={theme.colors.primary}>{t('ADD', 'Add')}</OText>
+                                                </AddButton>
+                                            </View>
+                                            <View>
+                                                <OIcon url={product?.images || theme?.images?.dummies?.product} style={styles.imageStyle} />
+                                            </View>
+                                        </Item>
+                                    )) : (
+                                        <OText>
+                                            {upsellingProducts.message}
+                                        </OText>
+                                    )
+                                }
+                            </>
+                        )
+                    }
+                </UpsellingContainer>
+            </Container>
+        </>
+    )
+}

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

@@ -1,116 +1,41 @@
-import React, { useState, useEffect } from 'react'
-import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native'
+import React, { useEffect } from 'react'
 import {
   UpsellingPage as UpsellingPageController,
-  useUtils,
-  useLanguage,
   useOrder,
-  useConfig
 } from 'ordering-components/native'
-import { useTheme } from 'styled-components/native';
-import { OText, OIcon, OBottomPopup, OButton } from '../shared'
+import { OBottomPopup } from '../shared'
 import { UpsellingProductsParams } from '../../types'
-import {
-  Container,
-  UpsellingContainer,
-  Item,
-  Details,
-  AddButton,
-  CartList,
-  CartDivider
-} from './styles'
-import { OrderSummary } from '../OrderSummary';
-import { Cart } from '../Cart';
-import { ScrollView } from 'react-native-gesture-handler';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
+
+import { UpsellingLayout } from './UpsellingLayout';
+import { UpsellingContent } from './UpsellingContent';
 
 const UpsellingProductsUI = (props: UpsellingProductsParams) => {
   const {
     isCustomMode,
     upsellingProducts,
-    business,
     handleUpsellingPage,
     openUpselling,
     canOpenUpselling,
     setCanOpenUpselling,
-    isFromCart,
-    onNavigationRedirect,
-    onGoBack
+    isFromCart
   } = props
 
-  const theme = useTheme();
-
-  const styles = StyleSheet.create({
-    imageStyle: {
-      width: 73,
-      height: 73,
-      resizeMode: 'cover',
-      borderRadius: 7.6,
-    },
-    closeUpsellingButton: {
-      borderRadius: 7.6,
-      borderColor: theme.colors.primary,
-      backgroundColor: theme.colors.primary,
-      borderWidth: 1,
-      alignSelf: 'center',
-      height: 44,
-      shadowOpacity: 0,
-      width: '80%',
-    },
-    cancelBtn: {
-      paddingHorizontal: 18,
-      borderWidth: 1,
-      borderRadius: 7.6,
-      borderColor: theme.colors.textSecondary,
-      height: 38
-    },
-    headerItem: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      marginVertical: 2,
-      marginHorizontal: 20,
-    },
-    btnBackArrow: {
-      borderWidth: 0,
-      width: 26,
-      height: 26,
-      backgroundColor: theme.colors.clear,
-      borderColor: theme.colors.clear,
-      shadowColor: theme.colors.clear,
-      paddingLeft: 0,
-      paddingRight: 0,
-      marginLeft: 20,
-      marginBottom: 10
-    },
-  })
-
   const [{ carts }] = useOrder()
-  const [{ parsePrice }] = useUtils()
-  const [{ configs }] = useConfig()
-  const [, t] = useLanguage()
-  const { bottom } = useSafeAreaInsets()
-  const [isCartsLoading, setIsCartsLoading] = useState(false)
-
-  const isMultiCheckout = configs?.checkout_multi_business_enabled?.value === '1'
-  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
-  const showCartList = isChewLayout
-  const commentDelayTime = isChewLayout ? 500 : null
 
   const cart = carts?.[`businessId:${props.businessId}`] ?? {}
-  const cartList = (carts && Object.values(carts).filter((_cart: any) => _cart?.products?.length > 0 && _cart.uuid !== cart?.uuid)) || []
   const cartProducts = cart?.products?.length
-    ? cart?.products.map((product: any) => product.id)
-    : []
+  ? cart?.products.map((product: any) => product.id)
+  : []
 
   const productsList = !upsellingProducts.loading && !upsellingProducts.error
-    ? upsellingProducts?.products?.length
+  ? upsellingProducts?.products?.length
       ? upsellingProducts?.products.filter((product: any) => !cartProducts.includes(product.id))
       : (props?.products ?? []).filter((product: any) => !cartProducts.includes(product.id)) ?? []
-    : []
+  : []
 
   useEffect(() => {
     if (!isCustomMode && !props.products) {
-      if (!upsellingProducts.loading) {
+      if (!upsellingProducts?.loading) {
         if (upsellingProducts?.products?.length && !isFromCart) {
           setCanOpenUpselling && setCanOpenUpselling(true)
         } else {
@@ -118,125 +43,16 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
         }
       }
     }
-  }, [upsellingProducts.loading, upsellingProducts?.products.length])
-
-  const handleFormProduct = (product: any) => {
-    onNavigationRedirect && onNavigationRedirect('ProductDetails', {
-      product: product,
-      businessId: product?.api?.businessId,
-      businessSlug: business.slug,
-    })
-  }
-
-  const UpsellingLayout = () => {
-    return (
-      <Container>
-        <UpsellingContainer
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          contentContainerStyle={{ paddingHorizontal: Platform.OS === 'ios' ? 40 : 0 }}
-        >
-          {
-            !upsellingProducts.loading && (
-              <>
-                {
-                  !upsellingProducts.error ? productsList.map((product: any, i: number) => (
-                    <Item key={`${product.id}_${i}`}>
-                      <View style={{ flexBasis: '57%' }}>
-                        <Details>
-                          <OText size={12} lineHeight={18} numberOfLines={1} ellipsizeMode='tail'>{product.name}</OText>
-                          <OText size={12} lineHeight={18} color={theme.colors.textNormal}>{parsePrice(product.price)}</OText>
-                        </Details>
-                        <AddButton onPress={() => handleFormProduct(product)}>
-                          <OText size={10} color={theme.colors.primary}>{t('ADD', 'Add')}</OText>
-                        </AddButton>
-                      </View>
-                      <View>
-                        <OIcon url={product?.images || theme?.images?.dummies?.product} style={styles.imageStyle} />
-                      </View>
-                    </Item>
-                  )) : (
-                    <OText>
-                      {upsellingProducts.message}
-                    </OText>
-                  )
-                }
-              </>
-            )
-          }
-        </UpsellingContainer>
-      </Container>
-    )
-  }
-
-  const UpsellingContent = () => {
-    return (
-      <>
-        <View style={{ ...styles.headerItem, flex: 1, marginTop: Platform.OS == 'ios' ? 35 : 14 }}>
-          <TouchableOpacity onPress={() => onGoBack()} style={styles.btnBackArrow}>
-            <OIcon src={theme.images.general.arrow_left} color={theme.colors.textNormal} />
-          </TouchableOpacity>
-        </View>
-        <ScrollView style={{ marginTop: 10, marginBottom: props.isPage ? 40 : bottom + (Platform.OS == 'ios' ? 96 : 130) }} showsVerticalScrollIndicator={false}>
-          {productsList.length > 0 &&
-            <View style={{ paddingHorizontal: 40, overflow: 'visible' }}>
-              <OText size={16} lineHeight={24} weight={'500'}>{t('WANT_SOMETHING_ELSE', 'Do you want something else?')}</OText>
-              <UpsellingLayout />
-            </View>
-          }
-          <View style={{ paddingHorizontal: 40 }}>
-            <OText size={20} lineHeight={30} weight={600} style={{ marginTop: 10, marginBottom: 17 }}>{t('YOUR_CART', 'Your cart')}</OText>
-            <OrderSummary
-              cart={cart}
-              commentDelayTime={commentDelayTime}
-              isCartPending={cart?.status === 2}
-              onNavigationRedirect={onNavigationRedirect}
-            />
-          </View>
-          {showCartList && cartList.map((cart: any, i: number) => (
-            <CartList key={i}>
-              <Cart
-                isFromUpselling
-                cart={cart}
-                cartuuid={cart.uuid}
-                hideUpselling
-                singleBusiness={props.singleBusiness}
-                isFranchiseApp={props.isFranchiseApp}
-                isCartsLoading={isCartsLoading}
-                setIsCartsLoading={setIsCartsLoading}
-                isMultiCheckout={isMultiCheckout}
-                onNavigationRedirect={props.onNavigationRedirect}
-              />
-              <CartDivider />
-            </CartList>
-          ))}
-        </ScrollView>
-        <View
-          style={{
-            alignItems: 'center',
-            bottom: props.isPage ? Platform.OS === 'ios' ? 0 : 20 : Platform.OS === 'ios' ? bottom + 59 : bottom + 125
-          }}
-        >
-          <OButton
-            imgRightSrc=''
-            text={t('CHECKOUT', 'Checkout')}
-            style={{ ...styles.closeUpsellingButton }}
-            textStyle={{ color: theme.colors.white, fontSize: 14 }}
-            onClick={() => handleUpsellingPage(cart)}
-          />
-        </View>
-      </>
-    )
-  }
+  }, [upsellingProducts?.loading, upsellingProducts?.products?.length])
 
   return (
     <>
       {isCustomMode ? (
-        <UpsellingLayout />
+        <UpsellingLayout {...props} productsList={productsList} />
       ) : (
         <>
           {props.isPage ? (
-            <UpsellingContent />
+            <UpsellingContent {...props} cart={cart} productsList={productsList} />
           ) : (
             canOpenUpselling && (
               <OBottomPopup
@@ -245,7 +61,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
                 onClose={() => handleUpsellingPage(cart)}
                 isStatusBar
               >
-                <UpsellingContent />
+                <UpsellingContent {...props} productsList={productsList} />
               </OBottomPopup>
             )
           )}

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

@@ -59,3 +59,22 @@ export const CartDivider = styled.View`
   background-color:  ${(props: any) => props.theme.colors.backgroundGray100};
   margin: 20px -40px 0;
 `
+
+
+export const TopActionsHeader = styled.TouchableOpacity`
+	height: 60px;
+	justify-content: center;
+  min-width: 30px;
+  padding-right: 15px;
+`;
+
+export const TopHeader = styled.View`
+  width: 100%;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  z-index: 1;
+  height: 60px;
+  min-height: 60px;
+`
+