ordering-ui-react-native 0.12.62 → 0.12.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.12.62",
+  "version": "0.12.66",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",
@@ -69,6 +69,7 @@
     "react-native-background-timer": "^2.4.1",
     "react-native-bootsplash": "^3.2.3",
     "react-native-calendar-picker": "^7.1.2",
+    "react-native-calendar-strip": "^2.2.5",
     "react-native-country-picker-modal": "^2.0.0",
     "react-native-credit-card-input": "^0.4.1",
     "react-native-document-picker": "^5.2.0",

package/src/components/BusinessProductsListing/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { View, TouchableOpacity, StyleSheet } from 'react-native'
+import { View, TouchableOpacity, StyleSheet, Platform } from 'react-native'
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
 import {
   BusinessAndProductList,
@@ -325,6 +325,7 @@ const styles = StyleSheet.create({
 export const BusinessProductsListing = (props: BusinessProductsListingParams) => {
   const businessProductslistingProps = {
     ...props,
+    isForceSearch: Platform.OS === 'ios',
     UIComponent: BusinessProductsListingUI
   }
   return (

package/src/components/Messages/index.tsx

@@ -67,10 +67,10 @@ const MessagesUI = (props: MessagesParams) => {
   const theme = useTheme();
 
   const quickMessageList = [
-    { key: 'driver_message_1', text: t('DRIVER_MESSAGE_1', 'driver_message_1') },
-    { key: 'driver_message_2', text: t('DRIVER_MESSAGE_2', 'driver_message_2') },
-    { key: 'driver_message_3', text: t('DRIVER_MESSAGE_3', 'driver_message_3') },
-    { key: 'driver_message_4', text: t('DRIVER_MESSAGE_4', 'driver_message_4') }
+    { key: 'customer_message_1', text: t('CUSTOMER_MESSAGE_1', 'customer_message_1') },
+    { key: 'customer_message_2', text: t('CUSTOMER_MESSAGE_2', 'customer_message_2') },
+    { key: 'customer_message_3', text: t('CUSTOMER_MESSAGE_3', 'customer_message_3') },
+    { key: 'customer_message_4', text: t('CUSTOMER_MESSAGE_4', 'customer_message_4') }
   ]
 
   const [formattedMessages, setFormattedMessages] = useState<Array<any>>([])

package/src/components/OrderCreating/index.tsx

@@ -86,7 +86,7 @@ export const OrderCreating = (props: any) => {
     if (business?.address) {
       AsyncStorage.setItem(
         'business-address',
-        JSON.stringify(business?.address)
+        business?.address
       );
       setAddress(business?.address)
     }
@@ -97,7 +97,6 @@ export const OrderCreating = (props: any) => {
       if (isOrderDetail) {
         try {
           const value = await AsyncStorage.getItem('business-address');
-          value != null ? JSON.parse(value) : null;
           setAddress(value)
         } catch {
           console.log('err')

package/src/components/OrderDetails/index.tsx

@@ -105,7 +105,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [openModalForDriver, setOpenModalForDriver] = useState(false)
   const [unreadAlert, setUnreadAlert] = useState({ business: false, driver: false })
   const [isReviewed, setIsReviewed] = useState(false)
-  const [openOrderCreating, setOpenOrderCreating] = useState(true)
+  const [openOrderCreating, setOpenOrderCreating] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null })
   const { order, loading, businessData, error } = props.order
   const isTaxIncluded = order?.tax_type === 1
@@ -245,6 +245,12 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }, [loading])
 
+  useEffect(() => {
+    AsyncStorage.getItem('business-address', (err, result) => {
+      if (result !== null) setOpenOrderCreating(true)
+    })
+  }, [])
+
   return (
     <OrderDetailsContainer keyboardShouldPersistTaps='handled'>
       {order && order?.id && !error && !loading && (

package/src/navigators/HomeNavigator.tsx

@@ -21,7 +21,6 @@ import HelpOrder from '../pages/HelpOrder'
 import HelpGuide from '../pages/HelpGuide'
 import HelpAccountAndPayment from '../pages/HelpAccountAndPayment'
 import Splash from '../pages/Splash';
-
 const Stack = createStackNavigator();
 
 const HomeNavigator = (e : any) => {

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

@@ -66,14 +66,22 @@ const ChatUI = (props: MessagesParams) => {
   const [, t] = useLanguage();
   const [, { showToast }] = useToast();
   const theme = useTheme();
+  const [messageList, setMessageList] = useState<any>([])
 
-  const quickMessageList = [
+  const storeMessageList: any = [
     { key: 'store_message_1', text: t('STORE_MESSAGE_1', 'store_message_1') },
     { key: 'store_message_2', text: t('STORE_MESSAGE_2', 'store_message_2') },
     { key: 'store_message_3', text: t('STORE_MESSAGE_3', 'store_message_3') },
     { key: 'store_message_4', text: t('STORE_MESSAGE_4', 'store_message_4') }
   ]
 
+  const driverMessageList: any = [
+    { key: 'driver_message_1', text: t('DRIVER_MESSAGE_1', 'driver_message_1') },
+    { key: 'driver_message_2', text: t('DRIVER_MESSAGE_2', 'driver_message_2') },
+    { key: 'driver_message_3', text: t('DRIVER_MESSAGE_3', 'driver_message_3') },
+    { key: 'driver_message_4', text: t('DRIVER_MESSAGE_4', 'driver_message_4') }
+  ]
+
   const handleClickQuickMessage = (text: string) => {
     setMessage && setMessage(`${message}${text}`)
   }
@@ -464,6 +472,12 @@ const ChatUI = (props: MessagesParams) => {
     );
   };
 
+  useEffect(() => {
+    if (user.level === 2) setMessageList(storeMessageList)
+    else if (user.level === 4) setMessageList(driverMessageList)
+    else setMessageList([])
+  }, [user])
+
   useEffect(() => {
     let newMessages: Array<any> = [];
     const console = (
@@ -754,21 +768,22 @@ const ChatUI = (props: MessagesParams) => {
         horizontal
         showsHorizontalScrollIndicator={false}
       >
-        {quickMessageList.map((quickMessage, i) => (
-          <OButton
-            key={i}
-            text={quickMessage.text}
-            bgColor='#E9ECEF'
-            borderColor='#E9ECEF'
-            imgRightSrc={null}
-            textStyle={{
-              fontSize: 11,
-              lineHeight: 16,
-              color: '#414954'
-            }}
-            style={{ ...styles.editButton }}
-            onClick={() => handleClickQuickMessage(quickMessage.text)}
-          />
+        {messageList.map((quickMessage: any, i: number) => (
+          <React.Fragment key={i}>
+            <OButton
+              text={quickMessage.text}
+              bgColor='#E9ECEF'
+              borderColor='#E9ECEF'
+              imgRightSrc={null}
+              textStyle={{
+                fontSize: 11,
+                lineHeight: 16,
+                color: '#414954'
+              }}
+              style={{ ...styles.editButton }}
+              onClick={() => handleClickQuickMessage(quickMessage.text)}
+            />
+          </React.Fragment>
         ))}
       </QuickMessageContainer>
     </View>