ordering-ui-react-native 0.16.59 → 0.16.62

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

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import {
   SingleOrderCard as SingleOrderCardController,
   useUtils,
+  useOrder,
   useLanguage
 } from 'ordering-components/native';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
@@ -9,6 +10,7 @@ import { useTheme } from 'styled-components/native';
 import { OIcon, OText, OButton } from '../shared';
 import IconAntDesign from 'react-native-vector-icons/AntDesign'
 import { SingleOrderCardParams } from '../../types';
+import { OAlert } from '../../../../../src/components/shared'
 
 import {
   Container,
@@ -32,14 +34,18 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
     onNavigationRedirect,
     pastOrders,
     isMessageView,
-    handleClickOrder
+    handleClickOrder,
+    handleRemoveCart,
+    cartState
   } = props;
 
   const [{ parsePrice, optimizeImage, parseDate }] = useUtils();
   const [, t] = useLanguage();
+  const [{ carts }] = useOrder()
   const theme = useTheme();
 
   const [reorderSelected, setReorderSelected] = useState<number | null>(null);
+  const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
 
   const allowedOrderStatus = [1, 2, 5, 6, 10, 11, 12];
 
@@ -97,9 +103,21 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
     }
   });
 
-  const handleReorderClick = (id: number) => {
-    setReorderSelected(id);
-    handleReorder && handleReorder(id);
+  const handleReorderClick = (order: any) => {
+    if (carts[`businessId:${order?.business_id}`] && carts[`businessId:${order?.business_id}`]?.products?.length > 0) {
+      setConfirm({
+        open: true,
+        content: [t('QUESTION_DELETE_PRODUCTS_FROM_CART', 'Are you sure that you want to delete all products from cart?')],
+        title: t('ORDER', 'Order'),
+        handleOnAccept: async () => {
+          handleRemoveCart()
+          setConfirm({ ...confirm, open: false })
+        }
+      })
+    } else {
+      setReorderSelected(order?.id);
+      handleReorder && handleReorder(order?.id);
+    }
   };
 
   const handleClickOrderReview = (order: any) => {
@@ -135,134 +153,151 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
     handleFavoriteOrder && handleFavoriteOrder(!order?.favorite)
   };
 
+  const handleOriginalReorder = () => {
+    setConfirm({ ...confirm, open: false, title: null })
+    setReorderSelected(order?.id);
+    handleReorder && handleReorder(order?.id);
+  }
+
   return (
-    <Container
-      onPress={() => handleClickViewOrder(order?.uuid)}
-      activeOpacity={0.7}
-    >
-      <InnerContainer>
-        {!!order.business?.logo && (
-          <Logo style={styles.logoWrapper}>
-            <OIcon
-              url={optimizeImage(order.business?.logo, 'h_300,c_limit')}
-              style={styles.logo}
-            />
-          </Logo>
-        )}
-        <CardInfoWrapper>
-          <ContentHeader>
-            <View style={{ flex: 1 }}>
-              <OText size={12} lineHeight={18} weight={'600'} numberOfLines={1} ellipsizeMode={'tail'}>
-                {order.business?.name}
-              </OText>
-            </View>
-            {!!!pastOrders && (
-              <>
-                {isMessageView ? (
-                  <>
-                    {order?.unread_count > 0 && (
-                      <UnreadMessageCounter>
-                        <OText size={12} color={theme.colors.primary} lineHeight={18} >
-                          {order?.unread_count}
+    <>
+      <Container
+        onPress={() => handleClickViewOrder(order?.uuid)}
+        activeOpacity={0.7}
+      >
+        <InnerContainer>
+          {!!order.business?.logo && (
+            <Logo style={styles.logoWrapper}>
+              <OIcon
+                url={optimizeImage(order.business?.logo, 'h_300,c_limit')}
+                style={styles.logo}
+              />
+            </Logo>
+          )}
+          <CardInfoWrapper>
+            <ContentHeader>
+              <View style={{ flex: 1 }}>
+                <OText size={12} lineHeight={18} weight={'600'} numberOfLines={1} ellipsizeMode={'tail'}>
+                  {order.business?.name}
+                </OText>
+              </View>
+              {!!!pastOrders && (
+                <>
+                  {isMessageView ? (
+                    <>
+                      {order?.unread_count > 0 && (
+                        <UnreadMessageCounter>
+                          <OText size={12} color={theme.colors.primary} lineHeight={18} >
+                            {order?.unread_count}
+                          </OText>
+                        </UnreadMessageCounter>
+                      )}
+                    </>
+                  ) : (
+                    <Price>
+                      <OText size={12} lineHeight={18}>
+                        {parsePrice(order?.summary?.total || order?.total)}
+                      </OText>
+                    </Price>
+                  )}
+                </>
+              )}
+              {!!pastOrders && (
+                <ButtonWrapper>
+                  {allowedOrderStatus.includes(parseInt(order?.status)) &&
+                    !order.review && (
+                      <TouchableOpacity
+                        onPress={() => handleClickOrderReview(order)}
+                        style={styles.reviewButton}>
+                        <OText size={10} color={theme.colors.primary} numberOfLines={1}>
+                          {t('REVIEW', 'Review')}
                         </OText>
-                      </UnreadMessageCounter>
+                      </TouchableOpacity>
                     )}
-                  </>
-                ) : (
-                  <Price>
-                    <OText size={12} lineHeight={18}>
-                      {parsePrice(order?.summary?.total || order?.total)}
-                    </OText>
-                  </Price>
-                )}
-              </>
-            )}
-            {!!pastOrders && (
-              <ButtonWrapper>
-                {allowedOrderStatus.includes(parseInt(order?.status)) &&
-                  !order.review && (
-                    <TouchableOpacity
-                      onPress={() => handleClickOrderReview(order)}
-                      style={styles.reviewButton}>
-                      <OText size={10} color={theme.colors.primary} numberOfLines={1}>
-                        {t('REVIEW', 'Review')}
+                  {order.cart && (
+                    <OButton
+                      text={t('REORDER', 'Reorder')}
+                      imgRightSrc={''}
+                      textStyle={styles.buttonText}
+                      style={
+                        ((reorderLoading && order.id === reorderSelected) || cartState?.loading)
+                          ? styles.reorderLoading
+                          : styles.reorderbutton
+                      }
+                      onClick={() => handleReorderClick(order)}
+                      isLoading={(reorderLoading && order.id === reorderSelected) || cartState?.loading}
+                    />
+                  )}
+                </ButtonWrapper>
+              )}
+            </ContentHeader>
+            <ContentFooter>
+              <View style={{ flex: 1 }}>
+                <View style={styles.infoText}>
+                  {!!!pastOrders && (
+                    <>
+                      <OText
+                        size={10}
+                        space
+                        color={theme.colors.textSecondary}
+                        style={{ marginVertical: 3 }}
+                        lineHeight={15}
+                        numberOfLines={1}
+                      >
+                        {t('ORDER_NO', 'Order No') + '.'}
                       </OText>
-                    </TouchableOpacity>
+                      <OText
+                        size={10}
+                        color={theme.colors.textSecondary}
+                        style={{ marginVertical: 3 }}
+                        lineHeight={15}
+                        numberOfLines={1}
+                      >
+                        {order.id + ` \u2022 `}
+                      </OText>
+                    </>
                   )}
-                {order.cart && (
-                  <OButton
-                    text={t('REORDER', 'Reorder')}
-                    imgRightSrc={''}
-                    textStyle={styles.buttonText}
-                    style={
-                      reorderLoading && order.id === reorderSelected
-                        ? styles.reorderLoading
-                        : styles.reorderbutton
-                    }
-                    onClick={() => handleReorderClick(order.id)}
-                    isLoading={reorderLoading && order.id === reorderSelected}
-                  />
-                )}
-              </ButtonWrapper>
-            )}
-          </ContentHeader>
-          <ContentFooter>
-            <View style={{ flex: 1 }}>
-              <View style={styles.infoText}>
-                {!!!pastOrders && (
-                  <>
-                    <OText
-                      size={10}
-                      space
-                      color={theme.colors.textSecondary}
-                      style={{ marginVertical: 3 }}
-                      lineHeight={15}
-                      numberOfLines={1}
-                    >
-                      {t('ORDER_NO', 'Order No') + '.'}
-                    </OText>
-                    <OText
-                      size={10}
-                      color={theme.colors.textSecondary}
-                      style={{ marginVertical: 3 }}
-                      lineHeight={15}
-                      numberOfLines={1}
-                    >
-                      {order.id + ` \u2022 `}
-                    </OText>
-                  </>
-                )}
+                  <OText
+                    size={10}
+                    lineHeight={15}
+                    color={theme.colors.textSecondary}
+                    style={{ marginVertical: 3 }}
+                    numberOfLines={1}>
+                    {order?.delivery_datetime_utc ? parseDate(order?.delivery_datetime_utc) : parseDate(order?.delivery_datetime, { utc: false })}
+                  </OText>
+                </View>
                 <OText
+                  color={theme.colors.primary}
                   size={10}
                   lineHeight={15}
-                  color={theme.colors.textSecondary}
-                  style={{ marginVertical: 3 }}
                   numberOfLines={1}>
-                  {order?.delivery_datetime_utc ? parseDate(order?.delivery_datetime_utc) : parseDate(order?.delivery_datetime, { utc: false })}
+                  {getOrderStatus(order.status)?.value}
                 </OText>
               </View>
-              <OText
-                color={theme.colors.primary}
-                size={10}
-                lineHeight={15}
-                numberOfLines={1}>
-                {getOrderStatus(order.status)?.value}
-              </OText>
-            </View>
-            <TouchableOpacity
-              onPress={handleChangeFavorite}
-              style={{ marginTop: 5 }}
-            >
-              <IconAntDesign
-                name={order?.favorite ? 'heart' : 'hearto'}
-                color={theme.colors.danger5}
-                size={16}
-              />
-            </TouchableOpacity>
-          </ContentFooter>
-        </CardInfoWrapper>
-      </InnerContainer>
-    </Container>
+              <TouchableOpacity
+                onPress={handleChangeFavorite}
+                style={{ marginTop: 5 }}
+              >
+                <IconAntDesign
+                  name={order?.favorite ? 'heart' : 'hearto'}
+                  color={theme.colors.danger5}
+                  size={16}
+                />
+              </TouchableOpacity>
+            </ContentFooter>
+          </CardInfoWrapper>
+        </InnerContainer>
+      </Container>
+      <OAlert
+        open={confirm.open}
+        title={confirm.title}
+        content={confirm.content}
+        onAccept={confirm.handleOnAccept}
+        onCancel={() => handleOriginalReorder()}
+        onClose={() => handleOriginalReorder()}
+      />
+    </>
+
   )
 }
 

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

@@ -4,6 +4,7 @@ import {
 	useConfig,
 	useOrder,
 	useUtils,
+	useSession,
 	SingleProductCard as SingleProductCardController
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
@@ -32,7 +33,9 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 		productAddedToCartLength,
 		style,
 		handleFavoriteProduct,
-		enableIntersection
+		enableIntersection,
+		navigation,
+		businessId
 	} = props;
 
 	const theme = useTheme();
@@ -86,9 +89,9 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 		}
 	});
 
-
 	const [, t] = useLanguage();
 	const [stateConfig] = useConfig();
+	const [{ auth }] = useSession()
 	const [{ parsePrice, optimizeImage }] = useUtils();
 	const [orderState] = useOrder()
 	const [isIntersectionObserver, setIsIntersectionObserver] = useState(!enableIntersection)
@@ -118,7 +121,11 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 	);
 
 	const handleChangeFavorite = () => {
-		handleFavoriteProduct && handleFavoriteProduct(!product?.favorite)
+		if (auth) {
+			handleFavoriteProduct && handleFavoriteProduct(!product?.favorite)
+		} else {
+			navigation && navigation.navigate('Login');
+		}
 	}
 
 	return (
@@ -148,7 +155,7 @@ const SinguleProductCardUI = React.memo((props: SingleProductCardParams) => {
 									weight={'500'}
 									numberOfLines={1}
 									ellipsizeMode="tail"
-									style={styles.line18}>
+									style={{ ...styles.line18, flex: 1 }}>
 									{product?.name}
 								</OText>
 								<TouchableOpacity

package/themes/original/src/components/shared/OBottomPopup.tsx

@@ -49,10 +49,11 @@ const OBottomPopup = (props: Props) => {
 					<View style={{ paddingTop: top, paddingBottom: bottom }}>
 						<View style={styles.modalTitleStyle}>
 							{closeIcon && (
-								<TouchableOpacity onPress={onClose} style={styles.closeIconStyle}>
+								<TouchableOpacity onPress={() => onClose()} style={styles.closeIconStyle}>
 									<OIcon
 										src={closeIcon}
-										width={30}
+										width={20}
+										height={20}
 									/>
 								</TouchableOpacity>
 							)}
@@ -93,7 +94,8 @@ const styles = StyleSheet.create({
 	closeIconStyle: {
 		position: 'absolute',
 		left: 25,
-		top: 22.5
+		top: 25,
+		zIndex: 100
 	},
 	modalTitleStyle: {
 		position: 'relative',

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

@@ -169,6 +169,7 @@ export interface BusinessesListingParams {
 	priceLevelSelected?: any;
 	handleChangePriceLevel?: any;
 	businessTypeSelected?: any;
+	logosLayout?: boolean;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
@@ -287,7 +288,8 @@ export interface BusinessProductsListParams {
 	onClickCategory?: any,
 	lazyLoadProductsRecommended?: boolean,
 	isFiltMode?: boolean,
-	handleUpdateProducts?: any
+	handleUpdateProducts?: any,
+	navigation?: any;
 }
 export interface SingleProductCardParams {
 	businessId: any;
@@ -300,6 +302,7 @@ export interface SingleProductCardParams {
 	handleFavoriteProduct?: any;
 	handleUpdateProducts?: any;
 	enableIntersection?: boolean;
+	navigation?: any;
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -549,7 +552,9 @@ export interface OrderTypeSelectParams {
 	defaultValue?: number;
 	configTypes?: Array<any>;
 	orderTypes: Array<any>;
-	setOrderTypeValue?: (value: number) => any
+	setOrderTypeValue?: (value: number) => any,
+	isChewLayout?: boolean;
+	chewOrderTypes?: any;
 }
 export interface UpsellingProductsParams {
 	isCustomMode?: boolean;
@@ -692,7 +697,9 @@ export interface SingleOrderCardParams {
 	onNavigationRedirect?: (route: string, params?: any) => {},
 	pastOrders: any,
 	isMessageView?: any,
-	handleClickOrder: (value: any) => {}
+	handleClickOrder: (value: any) => {},
+	handleRemoveCart: () => {},
+	cartState: any
 }
 
 export interface PreviousBusinessOrderedParams {