ordering-ui-react-native 0.22.83 → 0.22.84

package/package.json

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

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

@@ -428,19 +428,15 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
             {action === 'accept' && (
               <View style={{ height: 300, justifyContent: 'center' }}>
                 <Timer onPress={() => openTimerIOnput()}>
-                  <View>
-                    <OText weight="600" size={55}>
-                      {hour}
-                    </OText>
-                    <OText style={{ marginLeft: 10 }}>{t('HOURS', 'Hours')}</OText>
-                  </View>
-                  {hour.length > 0 && <OText size={55} style={{ marginBottom: 30 }}>:</OText>}
-                  <View>
-                    <OText weight="600" size={55}>
-                      {min}
-                    </OText>
-                    <OText style={{ marginLeft: 10 }}>{t('MINUTES', 'Minutes')}</OText>
-                  </View>
+                  <OText weight="600" size={55}>
+                    {hour}
+                  </OText>
+                  {hour.length > 0 && <OText size={55} style={{ marginBottom: 10 }}>:</OText>}
+                  <OText weight="600" size={55}>
+                    {min}
+                  </OText>
+                  {time?.length > 2 && <OText style={{ position: 'absolute', bottom: 60, left: 55 }}>{t('HOURS', 'Hours')}</OText>}
+                  <OText style={{ position: 'absolute', bottom: 60, right: time?.length > 2 ? 55 : 95 }}>{t('MINUTES', 'Minutes')}</OText>
                 </Timer>
               </View>
             )}

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

@@ -10,6 +10,7 @@ export const TopActions = styled.View`
 `
 
 export const Timer = styled.TouchableOpacity`
+  position: relative;
   padding: 40px;
   justify-content: center;
   flex-direction: row;

package/themes/business/src/components/OrderDetails/Business.tsx

@@ -78,7 +78,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [printerSettings, setPrinterSettings] = useState<any>('')
   const [autoPrintEnabled, setAutoPrintEnabled] = useState<boolean>(false)
 
-  const orderToComplete = [4, 7, 14, 20, 21]
+  const orderToComplete = [4, 20, 21]
+  const orderToReady = [7, 14]
 
   if (order?.status === 7 || order?.status === 4) {
     if (drivers?.length > 0 && drivers) {
@@ -341,6 +342,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const handleCloseModal = () => {
+    readMessages && readMessages()
+    loadMessages && loadMessages()
     setOpenModalForBusiness(false);
   };
 
@@ -485,6 +488,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             handleArrowBack={handleArrowBack}
             isCustomView={props.isCustomView}
             messages={messages}
+            messagesReadList={messagesReadList}
           />
           <OrderDetailsContainer
             keyboardShouldPersistTaps="handled"
@@ -633,7 +637,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             </>
             <View style={{ height: 30 }} />
           </OrderDetailsContainer>
-
           {order &&
             Object.keys(order).length > 0 &&
             getOrderStatus(order?.status, t)?.value ===
@@ -650,7 +653,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 widthButton={'45%'}
               />
             )}
-          {order?.status === 7 && (
+          {orderToReady.includes(order?.status) && (
             <FloatingButton
               btnText={t('READY_FOR_PICKUP', 'Ready for pickup')}
               colorTxt1={theme.colors.primary}

package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx

@@ -24,7 +24,8 @@ import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityI
 import {
   useLanguage,
   useUtils,
-  useConfig
+  useConfig,
+  useSession
 } from 'ordering-components/native';
 
 interface OrderHeader {
@@ -38,6 +39,7 @@ interface OrderHeader {
   handleCopyClipboard?: any
   isCustomView?: any
   messages?: any
+  messagesReadList?: any
 }
 
 export const OrderHeaderComponent = (props: OrderHeader) => {
@@ -51,13 +53,18 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
     handleViewSummaryOrder,
     handleCopyClipboard,
     messages,
+    messagesReadList
   } = props
   const theme = useTheme();
   const [, t] = useLanguage();
   const [configState] = useConfig()
+  const [{ user }] = useSession()
   const [{ parseDate, parsePrice }] = useUtils();
   const paymethodsLength = order?.payment_events?.filter((item: any) => item.event === 'payment')?.length
   const showExternalId = configState?.configs?.change_order_id?.value === '1'
+  const messagesReadIds = messagesReadList?.map((message: any) => message?.order_message_id)
+
+  const filteredMessages = messagesReadList?.length > 0 ? messages?.messages?.filter((message: any) => !messagesReadIds?.includes(message?.id)) : messages?.messages
 
   const styles = StyleSheet.create({
     icons: {
@@ -196,7 +203,7 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
                 onClick={() => handleOpenMapView()}
               />
               <Messages>
-                {messages?.messages?.filter((message: any) => !message?.read)?.length > 0 && <Dot />}
+                {filteredMessages?.filter((message: any) => message?.author_id !== user?.id && !message?.read)?.length > 0 && <Dot />}
                 <OIconButton
                   icon={theme.images.general.messages}
                   iconStyle={{