ordering-ui-react-native 0.16.48 → 0.16.51

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

@@ -1,6 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import Geolocation from '@react-native-community/geolocation'
+import { IOScrollView } from 'react-native-intersection-observer'
 import { getTrackingStatus, requestTrackingPermission } from 'react-native-tracking-transparency'
 import {
 	View,
@@ -162,7 +163,6 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		const hasMore = !(
 			paginationProps.totalPages === paginationProps.currentPage
 		);
-
 		if (y + PIXELS_TO_SCROLL > height && !businessesList.loading && hasMore) {
 			getBusinesses();
 		}
@@ -352,13 +352,14 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 					onCancel={() => handleChangeSearch('')}
 					placeholder={t('SEARCH', 'Search')}
 					height={50}
-					isDisabled={!businessTypes}
+					isDisabled={!businessTypes || configs?.advanced_business_search_enabled?.value === '1'}
 					inputContainerStyles={styles.inputContainerStyles}
 					containerStyles={{
 						marginHorizontal: 40,
 						marginTop: 20
 					}}
 					inputStyle={{ ...styles.searchInput, ...Platform.OS === 'ios' ? { paddingBottom: 6 } : { paddingBottom: 4 } }}
+					onPress={() => { configs?.advanced_business_search_enabled?.value === '1' && navigation.navigate('BusinessSearch', { businessTypes }) }}
 					onSubmitEditing={() => { configs?.advanced_business_search_enabled?.value === '1' && navigation.navigate('BusinessSearch', { businessTypes, defaultTerm: searchValue }) }}
 				/>
 			)}
@@ -429,29 +430,32 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 						)}
 					/>
 				)}
-				{businessesList.businesses?.map(
-					(business: any, i: number) => (
-						<BusinessController
-							key={`${business.id}_` + i}
-							business={business}
-							isBusinessOpen={business.open}
-							handleCustomClick={handleBusinessClick}
-							orderType={orderState?.options?.type}
-							navigation={navigation}
-							businessHeader={business?.header}
-							businessFeatured={business?.featured}
-							businessLogo={business?.logo}
-							businessReviews={business?.reviews}
-							businessDeliveryPrice={business?.delivery_price}
-							businessDeliveryTime={business?.delivery_time}
-							businessPickupTime={business?.pickup_time}
-							businessDistance={business?.distance}
-							handleUpdateBusinessList={handleUpdateBusinessList}
-							favoriteIds={favoriteIds}
-							setFavoriteIds={setFavoriteIds}
-						/>
-					)
-				)}
+				<IOScrollView>
+					{businessesList.businesses?.map(
+						(business: any, i: number) => (
+							<BusinessController
+								key={`${business.id}_` + i}
+								enableIntersection
+								business={business}
+								isBusinessOpen={business.open}
+								handleCustomClick={handleBusinessClick}
+								orderType={orderState?.options?.type}
+								navigation={navigation}
+								businessHeader={business?.header}
+								businessFeatured={business?.featured}
+								businessLogo={business?.logo}
+								businessReviews={business?.reviews}
+								businessDeliveryPrice={business?.delivery_price}
+								businessDeliveryTime={business?.delivery_time}
+								businessPickupTime={business?.pickup_time}
+								businessDistance={business?.distance}
+								handleUpdateBusinessList={handleUpdateBusinessList}
+								favoriteIds={favoriteIds}
+								setFavoriteIds={setFavoriteIds}
+							/>
+						)
+					)}
+				</IOScrollView>
 				{businessesList.loading && (
 					<>
 						{[

package/themes/original/src/components/OrderDetails/OrderHistory.tsx

@@ -0,0 +1,167 @@
+import React from 'react'
+import { useTheme } from 'styled-components/native'
+import { ScrollView, StyleSheet, View } from 'react-native'
+import { useLanguage, useUtils } from 'ordering-components/native'
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'
+import { OText, OButton } from '../shared'
+
+export const OrderHistory = (props: any) => {
+  const {
+    order,
+    messages,
+    enableReview,
+    onClose,
+    handleTriggerReview
+  } = props
+
+  const [, t] = useLanguage()
+  const [{ parseDate }] = useUtils()
+  const theme = useTheme()
+
+  const styles = StyleSheet.create({
+    historyItem: {
+      display: 'flex',
+      alignItems: 'center',
+      flexDirection: 'row',
+      borderBottomWidth: 1,
+      borderColor: theme.colors.border
+    },
+    detailWrapper: {
+      marginLeft: 20,
+      paddingHorizontal: 13,
+      paddingVertical: 16
+    },
+    container: {
+      paddingHorizontal: 40,
+      paddingVertical: 15
+    }
+  });
+
+  const ORDER_STATUS: any = {
+    0: 'ORDER_STATUS_PENDING',
+    1: 'ORDERS_COMPLETED',
+    2: 'ORDER_REJECTED',
+    3: 'ORDER_STATUS_IN_BUSINESS',
+    4: 'ORDER_READY',
+    5: 'ORDER_REJECTED_RESTAURANT',
+    6: 'ORDER_STATUS_CANCELLEDBYDRIVER',
+    7: 'ORDER_STATUS_ACCEPTEDBYRESTAURANT',
+    8: 'ORDER_CONFIRMED_ACCEPTED_BY_DRIVER',
+    9: 'ORDER_PICKUP_COMPLETED_BY_DRIVER',
+    10: 'ORDER_PICKUP_FAILED_BY_DRIVER',
+    11: 'ORDER_DELIVERY_COMPLETED_BY_DRIVER',
+    12: 'ORDER_DELIVERY_FAILED_BY_DRIVER',
+    13: 'PREORDER',
+    14: 'ORDER_NOT_READY',
+    15: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
+    16: 'ORDER_STATUS_CANCELLED_BY_CUSTOMER',
+    17: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
+    18: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
+    19: 'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
+    20: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
+    21: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
+    22: 'ORDER_LOOKING_FOR_DRIVER',
+      23: 'ORDER_DRIVER_ON_WAY'
+  }
+
+  const getLogisticTagStatus = (status: any) => {
+    switch (status) {
+      case 0:
+        return t('PENDING', 'Pending')
+      case 1:
+        return t('IN_PROGRESS', 'In Progress')
+      case 2:
+        return t('IN_QUEUE', 'In Queue')
+      case 3:
+        return t('EXPIRED', 'Logistic expired')
+      case 4:
+        return t('RESOLVED', 'Resolved')
+      default:
+        return status
+    }
+  }
+
+  const handleReview = () => {
+    if (enableReview) handleTriggerReview()
+    else onClose()
+  }
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <OText size={20} style={{ alignSelf: 'center', textAlign: 'center' }} mBottom={10}>
+        {t('DETAILS_OF_ORDER', 'Details of Order_NUMBER_').replace('_NUMBER_', ` # ${order?.id}`)}
+      </OText>
+      {!messages?.loading && order && (
+        <View style={styles.historyItem}>
+          <MaterialCommunityIcons
+            name="checkbox-marked-circle"
+            size={20}
+            color={theme.colors.primary}
+          />
+          <View style={styles.detailWrapper}>
+            <OText
+              size={14}
+              weight='bold'
+              numberOfLines={1}
+              ellipsizeMode='tail'
+            >
+              {t('ORDER_PLACED', 'Order placed')} {' '}
+              {t('VIA', 'Via')}{' '}
+              {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+            </OText>
+            <OText size={12}>{parseDate(order?.created_at, { outputFormat: 'MMM DD, hh:mm A' })}</OText>
+          </View>
+        </View>
+      )}
+      {messages && messages?.messages.map((message: any, i: number) => message.type === 1 && (
+        <View
+          style={styles.historyItem}
+          key={i}
+        >
+          <MaterialCommunityIcons
+            name="checkbox-marked-circle"
+            size={20}
+            color={theme.colors.primary}
+          />
+          <View style={styles.detailWrapper}>
+            {message.change?.attribute !== 'driver_id' ? (
+              <OText
+                size={14}
+                weight='bold'
+                numberOfLines={1}
+                ellipsizeMode='tail'
+              >
+                {message.change?.attribute === 'logistic_status'
+                  ? getLogisticTagStatus(parseInt(message.change.new, 10))
+                  : t(ORDER_STATUS[parseInt(message.change.new, 10)])
+                }
+              </OText>
+            ) : (
+              <OText
+                size={14}
+                weight='bold'
+                numberOfLines={1}
+                ellipsizeMode='tail'
+              >
+                {message.change.new
+                  ? (`${message.driver?.name} ${!!message.driver?.lastname ? message.driver.lastname : ''} ${t('WAS_ASSIGNED_AS_DRIVER', 'Was assigned as driver')}`)
+                  : t('DRIVER_UNASSIGNED', 'Driver unassigned')}
+              </OText>
+            )}
+            <OText size={12}>{parseDate(message?.created_at, { outputFormat: 'MMM DD, hh:mm A' })}</OText>
+          </View>
+        </View>
+      ))}
+      <OButton
+        text={enableReview ? t('REVIEW_ORDER', 'Review order') : t('CONTINUE', 'Continue')}
+        textStyle={{ fontSize: 14, color: theme.colors.white }}
+        imgRightSrc={theme.images.general.arrow_right}
+        imgRightStyle={{ tintColor: theme.colors.white, right: 5, margin: 5 }}
+        borderColor='transparent'
+        bgColor={theme.colors.primary}
+        style={{ borderRadius: 7.6, borderWidth: 1, height: 44, shadowOpacity: 0, marginBottom: 30, marginTop: 20 }}
+        onClick={() => handleReview()}
+      />
+    </ScrollView>
+  )
+}

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

@@ -43,6 +43,7 @@ import AntIcon from 'react-native-vector-icons/AntDesign'
 import { TaxInformation } from '../TaxInformation';
 import { Placeholder, PlaceholderLine } from 'rn-placeholder';
 import NavBar from '../NavBar'
+import { OrderHistory } from './OrderHistory';
 export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const {
     navigation,
@@ -85,6 +86,11 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       width: 30,
       marginTop: Platform.OS === 'ios' ? 0 : 30
     },
+    linkWrapper: {
+      display: 'flex',
+      alignItems: 'center',
+      flexDirection: 'row'
+    }
   });
 
   const [, t] = useLanguage();
@@ -93,6 +99,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [{ carts }] = useOrder()
 
   const [isReviewed, setIsReviewed] = useState(false)
+  const [isOrderHistory, setIsOrderHistory] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
   const { order, businessData } = props.order;
   const mapValidStatuses = [9, 19, 23]
@@ -366,6 +373,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     )
   }
 
+  const handleTriggerReview = () => {
+    setIsOrderHistory(false);
+    (
+      parseInt(order?.status) === 1 ||
+      parseInt(order?.status) === 11 ||
+      parseInt(order?.status) === 15
+    ) && !order.review && !isReviewed && handleClickOrderReview(order)
+  }
 
   useEffect(() => {
     const _businessId = 'businessId:' + businessData?.id
@@ -377,7 +392,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
     if (!reorderState?.error && reorderState.loading === false && businessData?.id) {
       const products = carts?.[_businessId]?.products
-      const available = products.every((product: any) => product.valid === true)
+      const available = products?.every((product: any) => product.valid === true)
 
       if (available && reorderState?.result?.uuid && (products?.length === order?.products.length)) {
         onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
@@ -507,7 +522,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             />
             <OrderInfo>
               <OrderData>
-                {
+                <View style={styles.linkWrapper}>
+                  {
                   (
                     parseInt(order?.status) === 1 ||
                     parseInt(order?.status) === 11 ||
@@ -515,20 +531,36 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   ) && !order.review && !isReviewed && (
                     <TouchableOpacity
                       activeOpacity={0.7}
-                      style={{ marginTop: 6 }}
+                      style={{ marginTop: 6, marginRight: 10 }}
                       onPress={() => handleClickOrderReview(order)}
-
                     >
                       <OText
                         size={10}
                         lineHeight={15}
-                        color={theme.colors.textSecondary}
+                        color={theme.colors.primary}
                         style={{ textDecorationLine: 'underline' }}
                       >
                         {t('REVIEW_YOUR_ORDER', 'Review your order')}
                       </OText>
                     </TouchableOpacity>
                   )}
+                    <TouchableOpacity
+                      activeOpacity={0.7}
+                      style={{ marginTop: 6 }}
+                      onPress={() => setIsOrderHistory(true)}
+
+                    >
+                      <OText
+                        size={10}
+                        lineHeight={15}
+                        color={theme.colors.primary}
+                        style={{ textDecorationLine: 'underline', textTransform: 'capitalize' }}
+                      >
+                        {t('VIEW_DETAILS', 'View Details')}
+                      </OText>
+                    </TouchableOpacity>
+                </View>
+
                 <StaturBar>
                   <LinearGradient
                     start={{ x: 0.0, y: 0.0 }}
@@ -1056,6 +1088,23 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           products={order?.products}
         />
       </OModal>
+      <OModal
+        open={isOrderHistory}
+        onClose={() => setIsOrderHistory(false)}
+        entireModal
+      >
+        <OrderHistory
+          order={order}
+          messages={messages}
+          enableReview={(
+            parseInt(order?.status) === 1 ||
+            parseInt(order?.status) === 11 ||
+            parseInt(order?.status) === 15
+          ) && !order.review && !isReviewed}
+          onClose={() => setIsOrderHistory(false)}
+          handleTriggerReview={handleTriggerReview}
+        />
+      </OModal>
     </OrderDetailsContainer>
   );
 };

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

@@ -98,11 +98,18 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 	}
 
 	const onProductClick = (product: any) => {
-		if (product?.product_id && product?.category_id && product?.businessId) {
+		if (product?.product_id && product?.category_id && product?.businessId &&
+			product?.business.slug && product?.business.header && product?.business.logo) {
 			onNavigationRedirect('ProductDetails', {
-				productId: product?.product_id,
-				categoryId: product?.category_id,
+				isRedirect: 'business',
 				businessId: product?.businessId,
+				categoryId: product?.category_id,
+				productId: product?.product_id,
+				business: {
+					store: product?.business.slug,
+					header: product?.business.header,
+					logo: product?.business.logo,
+				}
 			})
 		} else {
 			showToast(ToastType.Error, t('ERROR_FAILED_REDIRECT_IDS', 'Failed to redirect product for ids'))