ordering-ui-react-native 0.15.85 → 0.15.86-release

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { View, StyleSheet, BackHandler, Platform, Linking } from 'react-native';
+import { View, StyleSheet, BackHandler, Platform, Linking, RefreshControl } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 import { _setStoreData } from '../../providers/StoreUtil';
 import {
@@ -30,7 +30,8 @@ import {
   OrderDriver,
   Map,
   Divider,
-  OrderAction
+  OrderAction,
+  PlaceSpotWrapper
 } from './styles';
 import { OButton, OIcon, OModal, OText } from '../shared';
 import { ProductItemAccordion } from '../ProductItemAccordion';
@@ -42,7 +43,9 @@ import { OSRow } from '../OrderSummary/styles';
 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';
+import { PlaceSpot } from '../PlaceSpot'
 export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const {
     navigation,
@@ -53,7 +56,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     driverLocation,
     onNavigationRedirect,
     reorderState,
-    handleReorder
+    handleReorder,
+    getOrder
   } = props;
 
   const theme = useTheme();
@@ -82,8 +86,14 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       justifyContent: 'flex-start',
       paddingLeft: 0,
       height: 30,
-      width: 40,
+      width: 30,
+      marginTop: Platform.OS === 'ios' ? 0 : 30
     },
+    linkWrapper: {
+      display: 'flex',
+      alignItems: 'center',
+      flexDirection: 'row'
+    }
   });
 
   const [, t] = useLanguage();
@@ -92,9 +102,12 @@ 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 [refreshing] = useState(false);
   const { order, businessData } = props.order;
   const mapValidStatuses = [9, 19, 23]
+  const placeSpotTypes = [3, 4, 5]
 
   const walletName: any = {
     cash: {
@@ -332,7 +345,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const getIncludedTaxes = () => {
-    if (order?.taxes?.length === 0) {
+    if (order?.taxes?.length === 0 || !order?.taxes) {
       return order.tax_type === 1 ? order?.summary?.tax ?? 0 : 0
     } else {
       return order?.taxes.reduce((taxIncluded: number, tax: any) => {
@@ -363,39 +376,39 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     )
   }
 
-  const RenderGoogleMap = () => {
-    const driverLocationString = typeof order?.driver?.location?.location === 'string' && order?.driver?.location?.location?.split(',').map((l : string) => l.replace(/[^-.0-9]/g, ''))
-    const parsedLocations = locations.map(location => typeof location?.location === 'string' ? {
-      ...location,
-      lat: parseFloat(location?.location?.split(',')[0].replace(/[^-.0-9]/g, '')),
-      lng: parseFloat(location?.location?.split(',')[1].replace(/[^-.0-9]/g, ''))
-    } : location)
+  const handleTriggerReview = () => {
+    setIsOrderHistory(false);
+    (
+      parseInt(order?.status) === 1 ||
+      parseInt(order?.status) === 11 ||
+      parseInt(order?.status) === 15
+    ) && !order.review && !isReviewed && handleClickOrderReview(order)
+  }
 
-    return (
-      <GoogleMap
-        location={typeof order?.driver?.location?.location === 'string'
-          ? {
-            lat: parseFloat(driverLocationString[0]),
-            lng: parseFloat(driverLocationString[1]),
-          } : order?.driver?.location
-        }
-        locations={parsedLocations}
-        readOnly
-      />
-    )
+  
+  const resfreshOrder = () => {
+    getOrder()
   }
 
   useEffect(() => {
+    const _businessId = 'businessId:' + businessData?.id
     if (reorderState?.error) {
-      const _businessId = 'businessId:' + businessData?.id
-      const _uuid = carts[_businessId]?.uuid
-      if (_uuid) {
-        _setStoreData('remove-cartId', JSON.stringify(_uuid))
+      if (businessData?.id) {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
         navigation.navigate('Business', { store: businessData?.slug })
       }
     }
-    if (!reorderState?.error && reorderState?.result?.uuid) {
-      onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+    if (!reorderState?.error && reorderState.loading === false && businessData?.id) {
+      const products = carts?.[_businessId]?.products
+      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 })
+      } else {
+        _setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+        products?.length !== order?.products.length && _setStoreData('already-removed', JSON.stringify('removed'))
+        navigation.navigate('Business', { store: businessData?.slug })
+      }
     }
   }, [reorderState])
 
@@ -427,15 +440,32 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
     },
   ];
+  const driverLocationString = typeof order?.driver?.location?.location === 'string' && order?.driver?.location?.location?.split(',').map((l: string) => l.replace(/[^-.0-9]/g, ''))
+  const parsedLocations = locations.map(location => typeof location?.location === 'string' ? {
+    ...location,
+    lat: parseFloat(location?.location?.split(',')[0].replace(/[^-.0-9]/g, '')),
+    lng: parseFloat(location?.location?.split(',')[1].replace(/[^-.0-9]/g, ''))
+  } : location)
 
   useEffect(() => {
     if (driverLocation) {
-      locations[0] = driverLocation;
+      parsedLocations[0] = {
+        ...locations[0],
+        ...driverLocation
+      }
     }
   }, [driverLocation]);
 
   return (
-    <OrderDetailsContainer keyboardShouldPersistTaps="handled">
+    <OrderDetailsContainer 
+      keyboardShouldPersistTaps="handled"
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={() => resfreshOrder()}
+        />
+      }
+    >
       {(!order || Object.keys(order).length === 0) && (
         <Placeholder style={{ marginTop: 30 }}>
           <Header>
@@ -491,49 +521,62 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       {order && Object.keys(order).length > 0 && (
         <>
           <Header>
-            <OButton
-              imgLeftSrc={theme.images.general.arrow_left}
-              imgRightSrc={null}
-              style={styles.btnBackArrow}
-              onClick={() => handleArrowBack()}
-              imgLeftStyle={{ tintColor: theme.colors.disabled }}
+            <NavBar
+              title={`${t('ORDER', 'Order')} #${order?.id}`}
+              titleAlign={'center'}
+              onActionLeft={handleArrowBack}
+              showCall={false}
+              btnStyle={{ paddingLeft: 0 }}
+              style={{ marginTop: Platform.OS === 'ios' ? 0 : 20 }}
+              titleWrapStyle={{ paddingHorizontal: 0 }}
+              titleStyle={{ marginRight: 0, marginLeft: 0 }}
+              subTitle={<OText size={12} lineHeight={18} color={theme.colors.textNormal}>
+                {order?.delivery_datetime_utc
+                  ? parseDate(order?.delivery_datetime_utc)
+                  : parseDate(order?.delivery_datetime, { utc: false })}
+              </OText>}
             />
             <OrderInfo>
               <OrderData>
-                <OText
-                  size={20}
-                  lineHeight={30}
-                  weight={'600'}
-                  color={theme.colors.textNormal}>
-                  {t('ORDER', 'Order')} #{order?.id}
-                </OText>
-                <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
-                  {order?.delivery_datetime_utc
-                    ? parseDate(order?.delivery_datetime_utc)
-                    : parseDate(order?.delivery_datetime, { utc: false })}
-                </OText>
-                {
-                  (
-                    parseInt(order?.status) === 1 ||
-                    parseInt(order?.status) === 11 ||
-                    parseInt(order?.status) === 15
-                  ) && !order.review && !isReviewed && (
-                    <TouchableOpacity
-                      activeOpacity={0.7}
-                      style={{ marginTop: 6 }}
-                      onPress={() => handleClickOrderReview(order)}
+                <View style={styles.linkWrapper}>
+                  {
+                    (
+                      parseInt(order?.status) === 1 ||
+                      parseInt(order?.status) === 11 ||
+                      parseInt(order?.status) === 15
+                    ) && !order.review && !isReviewed && (
+                      <TouchableOpacity
+                        activeOpacity={0.7}
+                        style={{ marginTop: 6, marginRight: 10 }}
+                        onPress={() => handleClickOrderReview(order)}
+                      >
+                        <OText
+                          size={10}
+                          lineHeight={15}
+                          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' }}
                     >
-                      <OText
-                        size={10}
-                        lineHeight={15}
-                        color={theme.colors.textSecondary}
-                        style={{ textDecorationLine: 'underline' }}
-                      >
-                        {t('REVIEW_YOUR_ORDER', 'Review your order')}
-                      </OText>
-                    </TouchableOpacity>
-                  )}
+                      {t('VIEW_DETAILS', 'View Details')}
+                    </OText>
+                  </TouchableOpacity>
+                </View>
+
                 <StaturBar>
                   <LinearGradient
                     start={{ x: 0.0, y: 0.0 }}
@@ -640,6 +683,18 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 </OText>
               </View>
             </OrderBusiness>
+            
+            {placeSpotTypes.includes(order?.delivery_type) && (
+              <PlaceSpotWrapper>
+                <PlaceSpot
+                  isInputMode
+                  cart={order}
+                  spotNumberDefault={order?.spot_number}
+                  vehicleDefault={order?.vehicle}
+                />
+              </PlaceSpotWrapper>
+            )}
+
             <View
               style={{
                 height: 8,
@@ -673,13 +728,15 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     mBottom={2}>
                     {order?.customer?.address}
                   </OText>
-                  <OText
-                    size={12}
-                    lineHeight={18}
-                    color={theme.colors.textNormal}
-                    mBottom={2}>
-                    {order?.customer?.cellphone}
-                  </OText>
+                  {(!!order?.customer?.cellphone) && (
+                    <OText
+                      size={12}
+                      lineHeight={18}
+                      color={theme.colors.textNormal}
+                      mBottom={2}>
+                      {`${!!order?.customer?.country_phone_code ? '+' + order?.customer?.country_phone_code : ''} ${order?.customer?.cellphone}`}
+                    </OText>
+                  )}
                 </InfoBlock>
               </Customer>
               {order?.delivery_option !== undefined && order?.delivery_type === 1 && (
@@ -692,7 +749,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   </OText>
                 </View>
               )}
-              {order?.comment && (
+              {!!order?.comment && (
                 <View style={{ marginTop: 15 }}>
                   <OText size={16} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>
                     {t('COMMENT', 'Comment')}
@@ -704,7 +761,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 <>
                   {order?.driver?.location && mapValidStatuses.includes(parseInt(order?.status)) && (
                     <Map>
-                      <RenderGoogleMap />
+                     <GoogleMap
+                        location={typeof order?.driver?.location?.location === 'string'
+                          ? {
+                            lat: parseFloat(driverLocationString[0]),
+                            lng: parseFloat(driverLocationString[1]),
+                          } : driverLocation ?? order?.driver?.location
+                        }
+                        locations={parsedLocations}
+                        readOnly
+                      />
                     </Map>
                   )}
                 </>
@@ -1028,7 +1094,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                           )}
                         </View>
                         <OText>
-                          -{parsePrice(event.amount)}
+                          -{parsePrice(event.amount, { isTruncable: true })}
                         </OText>
                       </View>
                     ))}
@@ -1050,6 +1116,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/OrderDetails/styles.tsx

@@ -5,7 +5,6 @@ export const OrderDetailsContainer = styled.ScrollView`
 `
 
 export const NavBack = styled.TouchableOpacity`
-
 `
 
 
@@ -127,4 +126,8 @@ export const Divider = styled.View`
 `
 export const OrderAction = styled.View`
   flex-direction: row;
-`
+`
+
+export const PlaceSpotWrapper = styled.View`
+  padding-horizontal: 40px;
+`

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

@@ -0,0 +1,73 @@
+import React from 'react'
+import { OText } from '../shared'
+import { useLanguage } from 'ordering-components/native'
+import { useTheme } from 'styled-components/native'
+import { SingleProductCard } from '../SingleProductCard'
+import { OrderItAgainParams } from '../../types'
+import { ScrollView, Dimensions } from 'react-native'
+import moment from 'moment';
+import {
+  Container,
+  ProductWrapper
+} from './styles'
+
+export const OrderItAgain = (props: OrderItAgainParams) => {
+  const {
+    onProductClick,
+    productList,
+    businessId,
+    categoryState,
+    currentCart,
+    handleUpdateProducts,
+    navigation,
+    searchValue
+  } = props
+
+  const [, t] = useLanguage()
+  const theme = useTheme()
+  const { width } = Dimensions.get('window');
+  const productsFilterd = productList?.length > 0 && productList?.sort((a: any, b:any) => moment(b?.last_ordered_date).valueOf() - moment(a?.last_ordered_date).valueOf()).filter((product : any) => product?.name?.toLowerCase()?.includes(searchValue?.toLowerCase()))
+  return (
+    <Container hide={productsFilterd?.length === 0}>
+      <OText
+        size={16}
+        lineHeight={24}
+        color={theme.colors.textNormal}
+        style={{
+          fontWeight: '600',
+          marginBottom: 6
+        }}
+      >
+        {t('ORDER_IT_AGAIN', 'Order it again')}
+      </OText>
+      <OText
+        size={12}
+        lineHeight={18}
+        color={theme.colors.disabled}
+      >
+        {t('ORDER_IT_AGAIN_DESC', 'Quickly add items from your past orders.')}
+      </OText>
+      <ScrollView
+        horizontal
+        showsVerticalScrollIndicator={false}
+        showsHorizontalScrollIndicator={false}
+      >
+        {productsFilterd.map((product: any, i: number) => (
+          <ProductWrapper key={'prod_' + product.id + `_${i}`} style={{ width: width - 120, }}>
+            <SingleProductCard
+              isSoldOut={product.inventoried && !product.quantity}
+              product={product}
+              businessId={businessId}
+              categoryState={categoryState}
+              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}
+              isPreviously
+            />
+          </ProductWrapper>
+        ))}
+      </ScrollView>
+    </Container>
+  )
+}

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

@@ -0,0 +1,10 @@
+import styled from 'styled-components/native'
+
+export const Container = styled.View`
+  margin-top: 20px;
+`
+
+export const ProductWrapper = styled.View`
+  margin-right: 20px;
+  padding-top: 30px;
+`

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

@@ -33,6 +33,7 @@ const OrderProgressUI = (props: any) => {
   const [{ optimizeImage, parseDate, parseTime }] = useUtils()
   const [lastOrder, setLastOrder] = useState<any>(null)
   const imageFails = theme.images.general.emptyActiveOrders
+  const [initialLoaded, setInitialLoaded] = useState(false)
 
   const styles = StyleSheet.create({
     main: {
@@ -135,16 +136,21 @@ const OrderProgressUI = (props: any) => {
     }
   }, [isFocused])
 
+  useEffect(() => {
+    if (orderList.loading || initialLoaded) return
+    setInitialLoaded(true)
+  }, [orderList.loading, initialLoaded])
+
   return (
     <>
-      {orderList?.loading && (
+      {(orderList?.loading && !initialLoaded) && (
         <Placeholder Animation={Fade} height={Platform.OS === 'ios' ? 147.5 : 158}>
           <PlaceholderLine height={60} style={{ borderRadius: 8, marginBottom: 10 }} />
           <PlaceholderLine height={20} style={{ marginBottom: 10 }} />
           <PlaceholderLine height={40} style={{ borderRadius: 8, marginBottom: 10 }} />
         </Placeholder>
       )}
-      {!orderList?.loading && orderList?.orders?.length > 0 && lastOrder && (
+      {(!orderList?.loading || initialLoaded) && orderList?.orders?.length > 0 && lastOrder && (
         <View style={styles.main}>
           <OrderInfoWrapper style={{ flex: 1 }}>
             <View style={styles.logoWrapper}>

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

@@ -26,7 +26,6 @@ import AntIcon from 'react-native-vector-icons/AntDesign'
 import { TaxInformation } from '../TaxInformation';
 import { TouchableOpacity } from 'react-native';
 import { OAlert } from '../../../../../src/components/shared'
-import { PlaceSpot } from '../PlaceSpot'
 
 const OrderSummaryUI = (props: any) => {
   const {
@@ -50,9 +49,7 @@ const OrderSummaryUI = (props: any) => {
   const [validationFields] = useValidationFields();
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null, type: '' })
   const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
-  const [openPlaceModal, setOpenPlaceModal] = useState(false)
   const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled;
-  const placeSpotTypes = [3, 4]
 
   const handleDeleteClick = (product: any) => {
     removeProduct(product, cart)
@@ -71,7 +68,7 @@ const OrderSummaryUI = (props: any) => {
   }
 
   const getIncludedTaxes = () => {
-    if (cart?.taxes === null) {
+    if (cart?.taxes === null || !cart?.taxes) {
       return cart.business.tax_type === 1 ? cart?.tax : 0
     } else {
       return cart?.taxes.reduce((taxIncluded: number, tax: any) => {
@@ -299,29 +296,11 @@ const OrderSummaryUI = (props: any) => {
                       {t('TOTAL', 'Total')}
                     </OText>
                     <OText size={14} style={{ fontWeight: 'bold' }} >
-                      {parsePrice(cart?.total >= 0 ? cart?.total : 0)}
+                      {parsePrice(cart?.balance >= 0 ? cart?.balance : 0)}
                     </OText>
                   </OSTable>
                 </View>
               )}
-              {placeSpotTypes.includes(orderState?.options?.type) && (
-                <OSTable style={{ marginTop: 15 }}>
-                  <OText size={14} lineHeight={21} weight={'600'}>
-                    {t('SPOT', 'Spot')}: {cart?.place?.name || t('NO_SELECTED', 'No selected')}
-                  </OText>
-                  <TouchableOpacity onPress={() => setOpenPlaceModal(true)}>
-                    <OText
-                      size={14}
-                      lineHeight={21}
-                      weight={'600'}
-                      color={theme.colors.primary}
-                      style={{ textDecorationLine: 'underline' }}
-                    >
-                      {t('EDIT', 'Edit')}
-                    </OText>
-                  </TouchableOpacity>
-                </OSTable>
-              )}
               {cart?.status !== 2 && (
                 <OSTable>
                   <View style={{ width: '100%', marginTop: 20 }}>
@@ -370,18 +349,6 @@ const OrderSummaryUI = (props: any) => {
               products={cart?.products}
             />
           </OModal>
-          <OModal
-            open={openPlaceModal}
-            title={t('CHOOSE_YOUR_SPOT', 'Choose your spot')}
-            onClose={() => setOpenPlaceModal(false)}
-            entireModal
-          >
-            <PlaceSpot
-              cart={cart}
-              isOpenPlaceSpot={openPlaceModal}
-              setOpenPlaceModal={setOpenPlaceModal}
-            />
-          </OModal>
           <OAlert
             open={confirm.open}
             title={confirm.title}