ordering-ui-react-native 0.23.99 → 0.24.1

package/package.json

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

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

@@ -4,10 +4,7 @@ import {
   View,
   StyleSheet,
   Dimensions,
-  TouchableOpacity,
-  NativeModules,
-  PermissionsAndroid,
-  Platform
+  TouchableOpacity
 } from 'react-native';
 import { useTheme } from 'styled-components/native'
 import moment from 'moment'
@@ -20,7 +17,6 @@ import {
   useEvent,
   useLanguage,
   useSession,
-  useConfig,
   useToast,
   ToastType
 } from 'ordering-components/native'
@@ -36,48 +32,25 @@ const SoundPlayerComponent = (props: any) => {
   const { evtList, currentEvent, handleCloseEvents } = props
 
   const theme = useTheme()
-  const [count, setCount] = useState(0);
-  const [isEnabledReadStorage, setIsEnabledReadStorage] = useState(true)
-  const URL_SOUND = 'https://d33aymufw4jvwf.cloudfront.net/notification.mp3' ?? theme.sounds.notification
+  const URL_SOUND = 'https://d33aymufw4jvwf.cloudfront.net/notification.mp3'
 
   useEffect(() => {
-    const id = setInterval(() => setCount(count + 1), 2500)
-
-    const playSound = async () => {
+    if (!currentEvent?.orderId) return
+    const playSound = () => {
       try {
         SoundPlayer.playUrl(URL_SOUND)
-        await new Promise(resolve => setTimeout(resolve, DELAY_SOUND))
-        SoundPlayer.stop()
-      } catch (err: any) {
+      } catch (e) {
         console.log('Sound Error - ', err.message)
       }
     }
-    if (NativeModules?.RNSoundPlayer?.playUrl && typeof URL_SOUND === 'string' && isEnabledReadStorage) {
-      playSound()
-    }
 
-    return () => {
-      clearInterval(id);
-      try {
-        SoundPlayer.stop()
-      } catch (err: any) {
-        console.log('Sound Error - ', err.message)
-      }
-    }
-  }, [count, isEnabledReadStorage])
+    const interval = setInterval(() => {
+      playSound()
+    }, DELAY_SOUND)
 
-  useEffect(() => {
-    const checkSoundMedia = async () => {
-      if (Platform.OS === 'android') {
-        const enabled = await PermissionsAndroid.check(PermissionsAndroid.PERMISSIONS.READ_EXTERNAL_STORAGE)
-        setIsEnabledReadStorage(enabled)
-      } else {
-        setIsEnabledReadStorage(true)
-      }
-    }
-    // checkSoundMedia()
+    return () => clearInterval(interval)
+  }, [currentEvent?.orderId])
 
-  }, [])
   return (
     <Modal
       animationType='slide'
@@ -129,7 +102,7 @@ const NewOrderNotificationUI = (props: any) => {
   const handleEventNotification = async (evtType: number, value: any, orderStatus?: any) => {
     if (value?.driver) {
       try {
-        const location = await getCurrentLocation()
+        const location: any = await getCurrentLocation()
         if (!location?.latitude || !location?.longitude) {
           showToast(t('ERROR_UPDATING_COORDS', 'Error updating coords'), ToastType.Error)
           return
@@ -154,18 +127,18 @@ const NewOrderNotificationUI = (props: any) => {
       const duration = moment.duration(moment().diff(moment.utc(value?.last_driver_assigned_at)))
       const assignedSecondsDiff = duration.asSeconds()
       if (assignedSecondsDiff < 5 && !isBusinessApp && !value?.logistic_status) {
-        setCurrentEvent({ evt: 2, orderId: value?.id ?? value?.order_id })
+        setCurrentEvent(() => ({ evt: 2, orderId: value?.id ?? value?.order_id }))
       }
     }
     if ((!orderStatus.includes(value.status) && evtType !== 1 && isBusinessApp && orderStatus?.length > 0) || value?.author_id === user.id) return
-    setCurrentEvent({
+    setCurrentEvent(() => ({
       evt: evtType,
       orderId: value?.driver
         ? value?.order_id ?? value?.id
         : evtList(currentEvent)[evtType].event === 'messages'
           ? value?.order?.id
           : value?.order_id ?? value?.id
-    })
+    }))
   }
 
   useEffect(() => {

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

@@ -84,6 +84,7 @@ const CartUI = (props: any) => {
   const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
     ? JSON.parse(configs?.driver_tip_options?.value) || []
     : configs?.driver_tip_options?.value || []
+  const allowDriverTipPickup = configs?.driver_tip_allowed_at_pickup?.value === '1' && orderState?.options?.type === 2
 
   const momentFormatted = !orderState?.option?.moment
     ? t('RIGHT_NOW', 'Right Now')
@@ -465,7 +466,7 @@ const CartUI = (props: any) => {
             {!isMultiCheckout &&
               cart &&
               cart?.valid &&
-              orderState?.options?.type === 1 &&
+              (orderState?.options?.type === 1 || allowDriverTipPickup) &&
               cart?.status !== 2 &&
               validationFields?.fields?.checkout?.driver_tip?.enabled &&
               driverTipsOptions && driverTipsOptions?.length > 0 &&

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

@@ -71,6 +71,8 @@ const mapConfigs = {
 	}
 };
 
+const driverTipsTypes = [1, 2]
+
 const manageErrorsToShow = (array = []) => {
 	let stringError = ''
 	const list = Array.isArray(array) ? array : Object.values(array)
@@ -184,7 +186,7 @@ const CheckoutUI = (props: any) => {
 	const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes', 'comments']
 
 	const checkoutFields = useMemo(() => checkoutFieldsState?.fields?.filter((field: any) => field.order_type_id === options?.type), [checkoutFieldsState, options])
-	const guestCheckoutDriveTip = useMemo(() => checkoutFields?.find((field: any) => field.order_type_id === 1 && field?.validation_field?.code === 'driver_tip'), [JSON.stringify(checkoutFields), options])
+	const guestCheckoutDriveTip = useMemo(() => checkoutFields?.find((field: any) => driverTipsTypes.includes(field.order_type_id) && field?.validation_field?.code === 'driver_tip'), [JSON.stringify(checkoutFields), options])
 	const guestCheckoutComment = useMemo(() => checkoutFields?.find((field: any) => field.order_type_id === options?.type && field?.validation_field?.code === 'comments'), [JSON.stringify(checkoutFields), options])
 	const guestCheckoutCoupon = useMemo(() => checkoutFields?.find((field: any) => field.order_type_id === options?.type && field?.validation_field?.code === 'coupon'), [JSON.stringify(checkoutFields), options])
 	const guestCheckoutZipcode = useMemo(() => checkoutFields?.find((field: any) => field.order_type_id === options?.type && field?.validation_field?.code === 'zipcode'), [JSON.stringify(checkoutFields), options])
@@ -213,9 +215,9 @@ const CheckoutUI = (props: any) => {
 			return acc = acc + item?.summary?.tax
 		return acc = acc
 	}, cart?.subtotal)
-
+	const allowDriverTipPickup = configs?.driver_tip_allowed_at_pickup?.value === '1' && options?.type === 2
 	const validateCommentsCartField = (guestCheckoutComment?.enabled && (user?.guest_id ? guestCheckoutComment?.required_with_guest : guestCheckoutComment?.required)) && (cart?.comment === null || cart?.comment?.trim().length === 0)
-	const validateDriverTipField = options.type === 1 && (guestCheckoutDriveTip?.enabled && (user?.guest_id ? guestCheckoutDriveTip?.required_with_guest : guestCheckoutDriveTip?.required)) && (Number(cart?.driver_tip) <= 0)
+	const validateDriverTipField = (options.type === 1 || allowDriverTipPickup) && (guestCheckoutDriveTip?.enabled && (user?.guest_id ? guestCheckoutDriveTip?.required_with_guest : guestCheckoutDriveTip?.required)) && (Number(cart?.driver_tip) <= 0)
 	const validateCouponField = (guestCheckoutCoupon?.enabled && (user?.guest_id ? guestCheckoutCoupon?.required_with_guest : guestCheckoutCoupon?.required)) && !cart?.offers?.some((offer: any) => offer?.type === 2)
 	const validateZipcodeCard = (guestCheckoutZipcode?.enabled && (user?.guest_id ? guestCheckoutZipcode?.required_with_guest : guestCheckoutZipcode?.required)) && paymethodSelected?.gateway === 'stripe' && paymethodSelected?.data?.card && !paymethodSelected?.data?.card?.zipcode
 
@@ -236,7 +238,7 @@ const CheckoutUI = (props: any) => {
 	const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
 		? JSON.parse(configs?.driver_tip_options?.value) || []
 		: configs?.driver_tip_options?.value || []
-	const driverTipsField = !cartState.loading && cart && cart?.business_id && options.type === 1 && cart?.status !== 2 && (guestCheckoutDriveTip?.enabled) && driverTipsOptions.length > 0
+	const driverTipsField = !cartState.loading && cart && cart?.business_id && (options.type === 1 || allowDriverTipPickup) && cart?.status !== 2 && (guestCheckoutDriveTip?.enabled) && driverTipsOptions.length > 0
 
 	const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
 

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

@@ -103,6 +103,7 @@ const MultiCheckoutUI = (props: any) => {
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
   const isPreOrder = configs?.preorder_status_enabled?.value === '1'
   const isMultiDriverTips = configs?.checkout_multi_business_enabled?.value === '1'
+  const allowDriverTipPickup = configs?.driver_tip_allowed_at_pickup?.value === '1' && options?.type === 2
   const isGuestCheckoutEnabled = configs?.guest_checkout_enabled?.value === '1'
   const walletCarts = (Object.values(carts)?.filter((cart: any) => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && cart?.wallets) || null) || []
   const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
@@ -494,7 +495,7 @@ const MultiCheckoutUI = (props: any) => {
           )}
           {
             isMultiDriverTips &&
-            options?.type === 1 &&
+            (options?.type === 1 || allowDriverTipPickup) &&
             validationFields?.fields?.checkout?.driver_tip?.enabled &&
             openCarts.every((cart: any) => cart.business_id && cart.status !== 2) &&
             driverTipsOptions && driverTipsOptions?.length > 0 &&