ordering-ui-react-native 0.17.4-release → 0.17.5-release

package/package.json

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

package/src/components/StripeMethodForm/index.tsx

@@ -6,6 +6,7 @@ import { Platform, View } from 'react-native';
 import { StripeMethodFormParams } from '../../types';
 import Spinner from 'react-native-loading-spinner-overlay';
 import { android_app_id } from '../../config.json'
+
 export const StripeMethodForm = (props: StripeMethodFormParams) => {
   const {
     cart,
@@ -96,21 +97,12 @@ export const StripeMethodForm = (props: StripeMethodFormParams) => {
     }
 
     const { error, paymentMethod } = await presentApplePay({
-      cartItems: cart?.products?.map((product: any) => ({ label: product?.name, amount: product?.price?.toString?.() })),
+      cartItems: [{
+        label: t('CART', 'Cart'),
+        amount: cart?.balance?.toString() ?? cart?.total?.toString?.()
+      }],
       country: 'US',
       currency: configs?.stripe_currency?.value ?? 'USD',
-      shippingMethods: [
-        {
-          amount: cart?.balance?.toString() ?? cart?.total?.toString?.(),
-          identifier: 'standard',
-          label: 'Courier',
-          detail: 'Delivery',
-          type: 'final',
-        },
-      ],
-
-      requiredShippingAddressFields: ['emailAddress', 'phoneNumber'],
-      requiredBillingContactFields: ['phoneNumber', 'name'],
     });
     if (error) {
       setErrors(error.code + ' - ' + error.message);

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

@@ -1,16 +1,17 @@
-import React, { useState, useEffect } from 'react'
 import moment from 'moment'
-import { View, Modal, StyleSheet, TouchableOpacity, Dimensions } from 'react-native'
+import { NewOrderNotification as NewOrderNotificationController, useApi, useEvent, useLanguage, useSession } from 'ordering-components/native'
+import React, { useEffect, useState } from 'react'
+import { Dimensions, Modal, StyleSheet, TouchableOpacity, View } from 'react-native'
 import Sound from 'react-native-sound'
 import Icon from 'react-native-vector-icons/Feather'
 import { useTheme } from 'styled-components/native'
-import { useEvent, useLanguage, useSession, useApi, NewOrderNotification as NewOrderNotificationController } from 'ordering-components/native'
 
-import { OText, OIcon } from '../shared'
-import { NotificationContainer } from './styles'
 import { useLocation } from '../../hooks/useLocation'
+import { OIcon, OText } from '../shared'
+import { NotificationContainer } from './styles'
 
-Sound.setCategory('Playback')
+Sound.setCategory('Playback', true)
+Sound.setMode('Default')
 
 const windowWidth = Dimensions.get('screen').width
 
@@ -57,14 +58,16 @@ const NewOrderNotificationUI = (props: any) => {
   const handlePlayNotificationSound = (eventObj: any = null) => {
     setCurrentEvent(eventObj)
     let times = 1
-    if (times < SOUND_LOOP) {
-      _timeout = setInterval(() => {
-        notificationSound.setVolume(1).play(success => success && (times = times + 1))
-        if (times === SOUND_LOOP) {
-          clearInterval(_timeout)
-        }
-      }, 2500)
-    }
+    _timeout = setInterval(() => {
+      if (times <= SOUND_LOOP) {
+        notificationSound.play()
+        times++
+      } else {
+        clearInterval(_timeout)
+        times = 1
+        return
+      }
+    }, 2500)
   }
 
   const handleEventNotification = async (evtType: number, value: any) => {
@@ -88,7 +91,7 @@ const NewOrderNotificationUI = (props: any) => {
     if (evtType === 3 || value.author_id === user.id) return
     handlePlayNotificationSound({
       evt: evtType,
-      orderId: value?.order_id
+      orderId: value?.driver ? value?.order_id : evtList[evtType].event === 'messages' ? value?.order?.id : value?.id
     })
   }
 

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

@@ -12,7 +12,7 @@ export const OrderEta = (props: any) => {
   const [estimatedDeliveryTime, setEstimatedDeliveryTime] = useState(null)
 
   const getEstimatedDeliveryTime = () => {
-    let _estimatedTime
+    let _estimatedTime = null
     let totalEta = 0
     const _delivery = order?.delivery_datetime_utc
       ? order?.delivery_datetime_utc
@@ -40,7 +40,8 @@ export const OrderEta = (props: any) => {
     } else {
       _estimatedTime = moment.utc(_delivery).add(order?.eta_time, 'minutes')
     }
-    _estimatedTime = outputFormat ? moment(_estimatedTime).format(outputFormat) : parseDate(_estimatedTime, { utc: false })
+    if (order?.delivered_in) { _estimatedTime = moment.utc(_delivery).add(order?.delivered_in, 'minutes')}
+    _estimatedTime = outputFormat ? moment(_estimatedTime).local().format(outputFormat) : parseDate(_estimatedTime, { utc: false })
     setEstimatedDeliveryTime(_estimatedTime)
   }