ordering-ui-react-native 0.14.57 → 0.14.60

package/package.json

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

package/src/components/Checkout/index.tsx

@@ -205,7 +205,7 @@ const CheckoutUI = (props: any) => {
   const onMessage = (e: any) => {
     if (e?.nativeEvent?.data && e?.nativeEvent?.data !== 'undefined') {
       let payment = JSON.parse(e.nativeEvent.data);
-
+      setOpenOrderCreating(true)
       if (payment === 'api error') {
         setShowGateway({ closedByUser: true, open: false })
         setProg(true);

package/themes/business/src/components/PreviousOrders/index.tsx

@@ -1,9 +1,12 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 import { useTheme } from 'styled-components/native';
+import moment from 'moment'
 import { useLanguage, useUtils } from 'ordering-components/native';
 import { OButton, OIcon, OText } from '../shared';
-import { Card, Logo, Information, MyOrderOptions, NotificationIcon, AcceptOrRejectOrder } from './styles';
+import {
+  Card, Logo, Information, MyOrderOptions, NotificationIcon, AcceptOrRejectOrder, Timestatus
+} from './styles';
 import EntypoIcon from 'react-native-vector-icons/Entypo'
 
 export const PreviousOrders = (props: any) => {
@@ -18,6 +21,7 @@ export const PreviousOrders = (props: any) => {
   const [, t] = useLanguage();
   const [{ parseDate, optimizeImage }] = useUtils();
   const theme = useTheme();
+  const [currentTime, setCurrentTime] = useState()
 
   const handlePressOrder = (order: any) => {
     if (order?.locked && isLogisticOrder) return
@@ -39,17 +43,15 @@ export const PreviousOrders = (props: any) => {
       height: 75,
     },
     logo: {
-      width: 78,
-      height: 78,
-      borderRadius: 25,
-      shadowColor: 'rgba(0.0, 0.0, 0.0, 0.5)',
+      borderRadius: 10,
+      shadowColor: "#000",
       shadowOffset: {
         width: 0,
-        height: 1.5,
+        height: 1,
       },
-      shadowOpacity: 0.21,
-      shadowRadius: 5,
-      elevation: 7,
+      shadowOpacity: 0.20,
+      shadowRadius: 1.41,
+      elevation: 2,
       justifyContent: 'center',
       alignItems: 'center',
       marginLeft: 3,
@@ -67,11 +69,10 @@ export const PreviousOrders = (props: any) => {
       fontFamily: 'Poppins',
       fontStyle: 'normal',
       fontWeight: 'normal',
-      fontSize: 15,
-      color: theme.colors.unselectText,
+      fontSize: 12,
     },
     orderType: {
-      fontSize: 15,
+      fontSize: 12,
       fontFamily: 'Poppins',
       fontStyle: 'normal',
       fontWeight: 'normal',
@@ -79,6 +80,32 @@ export const PreviousOrders = (props: any) => {
     },
   });
 
+  const getDelayTime = (order: any) => {
+    // targetMin = delivery_datetime  + eta_time - now()
+    const _delivery = order?.delivery_datetime_utc
+    const _eta = order?.eta_time
+    const tagetedMin = moment(_delivery).add(_eta, 'minutes').diff(moment().utc(), 'minutes')
+    let day = Math.floor(tagetedMin / 1440)
+    const restMinOfTargetedMin = tagetedMin - 1440 * day
+    let restHours: any = Math.floor(restMinOfTargetedMin / 60)
+    let restMins: any = restMinOfTargetedMin - 60 * restHours
+
+    if (order?.time_status === 'in_time' || order?.time_status === 'at_risk') day = Math.abs(day)
+    if (restHours < 10) restHours = ('0' + restHours)
+    if (restMins < 10) restMins = ('0' + restMins)
+    const finalTaget = day + 'day  ' + restHours + ':' + restMins
+    return finalTaget
+  }
+
+  useEffect(() => {
+    const interval = setInterval(() => {
+      const date:any = Date.now()
+      setCurrentTime(date)
+    }, 60000)
+
+    return () => clearInterval(interval)
+  }, [])
+
   let hash: any = {};
 
   return (
@@ -103,6 +130,7 @@ export const PreviousOrders = (props: any) => {
                   activeOpacity={1}
                 >
                   <Card key={order.id}>
+                    <Timestatus style={{backgroundColor: order?.time_status === 'in_time' ? '#00D27A' : order?.time_status === 'at_risk' ? '#FFC700' : order?.time_status === 'delayed' ? '#E63757' : '' }}/>
                     {
                       order.business?.logo && (
                         <Logo style={styles.logo}>
@@ -135,16 +163,20 @@ export const PreviousOrders = (props: any) => {
                           />
                         </NotificationIcon>
                       )}
-                      <OText
-                        style={styles.date}
-                        numberOfLines={1}
-                        adjustsFontSizeToFit
-                        size={20}>
-                        {(order?.order_group_id && order?.order_group && isLogisticOrder ? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}` : (t('INVOICE_ORDER_NO', 'Order No.') + order.id)) + ' · '}
-                        {order?.delivery_datetime_utc
-                          ? parseDate(order?.delivery_datetime_utc)
-                          : parseDate(order?.delivery_datetime, { utc: false })}
-                      </OText>
+                      <View style={{flexDirection: 'row'}}>
+                        <OText
+                          style={styles.date}
+                          color={theme.colors.unselectText}
+                          numberOfLines={1}
+                          adjustsFontSizeToFit
+                        >
+                          {(order?.order_group_id && order?.order_group && isLogisticOrder ? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}` : (t('NO', 'Order No.') + order.id)) + ' · '}
+                          {order?.delivery_datetime_utc
+                            ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'MM/DD/YY · HH:mm a' })
+                            : parseDate(order?.delivery_datetime, { utc: false })}{' · '}
+                        </OText>
+                        <OText style={styles.date} color={order?.time_status === 'in_time' ? '#00D27A' : order?.time_status === 'at_risk' ? '#FFC700' : order?.time_status === 'delayed' ? '#E63757' : '' } >{getDelayTime(order)}</OText>
+                      </View>
                       {!isLogisticOrder && (
                         <MyOrderOptions>
                           <OText

package/themes/business/src/components/PreviousOrders/styles.tsx

@@ -1,4 +1,4 @@
-import styled from 'styled-components/native';
+import styled, { css } from 'styled-components/native';
 
 export const Card = styled.View`
   flex: 1;
@@ -35,4 +35,16 @@ export const AcceptOrRejectOrder = styled.View`
   justify-content: space-between;
   flex: 1;
   margin: 10px;
+`
+export const Timestatus = styled.View`
+  position: relative;;
+  width: 4px;
+  height: 65px;
+  border-radius: 20px;
+  top: 5px;
+  margin-right: 5px; 
+  ${(props: any) => props.theme?.rtl && css`
+    left: unset;
+    right: -5px;
+ `}
 `

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

@@ -350,7 +350,11 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 						</OrderTimeWrapper>
 					)}
 				</View>
+				<Spinner visible={momentState.isLoading === 1} />
 			</Container>
+			<View style={{ position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 40, backgroundColor: 'white', width: '100%' }}>
+				<OButton onClick={handleChangeMoment} isDisabled={!selectedTime} text={t('CONTINUE', 'Continue')} style={{ borderRadius: 7.6, height: 44, shadowOpacity: 0 }} textStyle={{ color: 'white', fontSize: 14 }} showNextIcon />
+			</View>
 		</>
 	);
 };

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

@@ -159,12 +159,6 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
           </TopActions>
         </TopBar>
         <ScrollView style={{ 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
@@ -173,6 +167,12 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
               onNavigationRedirect={onNavigationRedirect}
             />
           </View>
+		  {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>
+          }
         </ScrollView>
         <View
           style={{