ordering-ui-react-native 0.18.3 → 0.18.4-release

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

@@ -123,7 +123,9 @@ const OrderMessageUI = (props: any) => {
 		setMessages,
 		readMessages,
 		messagesReadList,
-		setOpenMessges
+		setOpenMessges,
+		setSeletedOrder,
+		setSelectedOrderId
 	} = props;
 	const [openModalForBusiness, setOpenModalForBusiness] = useState(false);
 	const [openModalForDriver, setOpenModalForDriver] = useState(false);
@@ -140,6 +142,8 @@ const OrderMessageUI = (props: any) => {
 
 	const handleClose = () => {
 		setOpenMessges(false)
+		setSeletedOrder(null)
+		setSelectedOrderId(null)
 	}
 
 	const handleOpenMessages = (data: any) => {
@@ -269,7 +273,7 @@ export const MessageListing = (props: MessageListingParams) => {
 				setOpenMessges={setOpenMessges}
 				franchiseId={props.franchiseId}
 			/>
-			{openMessages && seletedOrder && (
+			{openMessages && !!seletedOrder?.id && (
 				<OModal
 					open={openMessages}
 					entireModal
@@ -278,7 +282,10 @@ export const MessageListing = (props: MessageListingParams) => {
 				>
 					<MessagesView
 						order={seletedOrder}
+						orderId={seletedOrder?.id}
 						setOpenMessges={setOpenMessges}
+						setSeletedOrder={setSeletedOrder}
+						setSelectedOrderId={setSelectedOrderId}
 					/>
 				</OModal>
 			)}

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

@@ -126,9 +126,13 @@ const MessagesUI = (props: MessagesParams) => {
 	const messageConsole = (message: any) => {
 		return message.change?.attribute !== 'driver_id'
 			?
-			`${t('ORDER', 'Order')} ${t(message.change.attribute.toUpperCase(), message.change.attribute.replace('_', ' '))} ${t('CHANGED_FROM', 'Changed from')} ${filterSpecialStatus.includes(message.change.attribute) ?
-				`${message.change.old === null ? '0' : message.change.old} ${t('TO', 'to')} ${message.change.new} ${t('MINUTES', 'Minutes')}` :
-				`${message.change?.attribute !== 'logistic_status' ? message.change.old !== null && t(ORDER_STATUS[parseInt(message.change.old, 10)]) : message.change.old !== null && getLogisticTag(message.change.old)} ${t('TO', 'to')} ${message.change?.attribute !== 'logistic_status' ? t(ORDER_STATUS[parseInt(message.change.new, 10)]) : getLogisticTag(message.change.new)}`
+			`${t('ORDER', 'Order')} ${t(message.change.attribute.toUpperCase(), message.change.attribute.replace('_', ' '))} ${t('CHANGED_FROM', 'Changed from')} ${filterSpecialStatus.includes(message.change.attribute)
+        ? `${message.change.old === null ? '0' : message.change.old} ${t('TO', 'to')} ${message.change.new} ${t('MINUTES', 'Minutes')}`
+        : `${message.change?.attribute !== 'logistic_status'
+          ? message.change.old !== null && t(ORDER_STATUS[parseInt(message.change.old, 10)])
+          : message.change.old !== null && getLogisticTag(message.change.old)} ${t('TO', 'to')} ${message.change?.attribute !== 'logistic_status'
+            ? t(ORDER_STATUS[parseInt(message.change.new, 10)])
+            : getLogisticTag(message.change.new)}`
 			}`
 			: message.change.new
 				?
@@ -148,6 +152,7 @@ const MessagesUI = (props: MessagesParams) => {
 		}
 		const newMessage: any = [];
 		messages.messages.map((message: any) => {
+			if (message.change?.attribute === 'driver_group_id') return
 			if (business && message.type !== 0 && (messagesToShow?.messages?.length || message?.can_see?.includes('2'))) {
 				newMessage.push({
 					_id: message?.id,
@@ -171,7 +176,7 @@ const MessagesUI = (props: MessagesParams) => {
 					image: message.source,
 					system: message.type === 1,
 					user: {
-						_id: message.author && message.author.id ,
+						_id: message.author && message.author.id,
 						name: message.author && message.author.name,
 						avatar: message.author && (message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo)
 					}
@@ -242,6 +247,7 @@ const MessagesUI = (props: MessagesParams) => {
 
 	const renderAccessory = () => {
 		return (
+			!chatDisabled &&
 			<QuickMessageContainer
 				style={{
 					marginLeft: 10,
@@ -412,6 +418,11 @@ const MessagesUI = (props: MessagesParams) => {
 		);
 	}
 
+	useEffect(() => {
+		if (!order?.id || messages?.loading) return
+		readMessages && readMessages()
+	}, [order?.id, messages?.loading])
+
 	return (
 		<View style={{ height: getViewHeight(), width: '100%', paddingTop: 12, backgroundColor: 'white' }}>
 			<Wrapper>

package/themes/original/src/components/Messages/styles.tsx

@@ -10,7 +10,7 @@ export const Header = styled.View`
   background-color: ${(props: any) => props.theme.colors.white};
   box-shadow: 0 2px 2px #0000001A;
   padding-bottom: 10px;
-  padding-horizontal: 20px;
+  padding-horizontal: 10px;
 `
 
 export const TitleHeader = styled.View``

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

@@ -155,7 +155,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 	});
 	const { bottom } = useSafeAreaInsets();
 
-	const is12hours = configs?.dates_moment_format?.value?.includes('hh:mm')
+	const is12hours = configs?.general_hour_format?.value?.includes('hh:mm')
 
 	const [selectedTime, setSelectedTime] = useState(null);
 	const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
@@ -256,7 +256,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				setDateWhitelist([{ start: _minDate, end: _maxDate }])
 			}
 		}
-	}, [JSON.stringify(datesList), preorderMinimumDays, preorderMaximumDays])
+	}, [JSON.stringify(datesList), preorderMinimumDays, preorderMaximumDays, cateringPreorder])
 
 	useEffect(() => {
 		if (dateSelected) {
@@ -321,14 +321,14 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				}
 			}))
 		}
-	}, [dateSelected, JSON.stringify(hoursList), JSON.stringify(datesWhitelist), cateringPreorder])
+	}, [dateSelected, JSON.stringify(hoursList), JSON.stringify(datesWhitelist), cateringPreorder, JSON.stringify(business)])
 
 	return (
 		<>
 			<Container
 				style={{
-					paddingLeft: !cateringPreorder || isPage ? 40 : 0,
-					paddingRight: !cateringPreorder || isPage ? 40 : 0
+					paddingLeft: !cateringPreorder || isPage ? 20 : 0,
+					paddingRight: !cateringPreorder || isPage ? 20 : 0
 				}}
 				nestedScrollEnabled
 			>
@@ -385,17 +385,16 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 					</WrapSelectOption>
 					{optionSelected.isSchedule && (
 						<OrderTimeWrapper>
-							{datesWhitelist?.length <= 1 && (
+							{datesWhitelist[0]?.start === datesWhitelist[0]?.end && (
 								<OText>
 									{moment(selectDate).format('Do MMMM, YYYY')}
 								</OText>
 							)}
-							{datesWhitelist > 1 && (
+							{datesWhitelist[0]?.start !== datesWhitelist[0]?.end && (
 								<View style={{ flex: 1 }}>
 									{selectDate && datesWhitelist[0]?.start !== null && (
 										<CalendarStrip
 											scrollable
-											locale={locale}
 											style={styles.calendar}
 											calendarHeaderContainerStyle={styles.calendarHeaderContainer}
 											calendarHeaderStyle={styles.calendarHeader}
@@ -467,8 +466,8 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				</View>
 				<Spinner visible={momentState.isLoading === 1} />
 			</Container>
-			{!isCart && (
-				<View style={{ position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 40, backgroundColor: 'white', width: '100%' }}>
+			{!isCart && !cateringPreorder && (
+				<View style={{ position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 20, 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/MomentSelector/index.tsx

@@ -30,7 +30,7 @@ const MomentSelectorUI = (props: any) => {
   const [customizedDateList, setCustomizedDateList] = useState([])
   const [customizedTimeList, setCustomizedTimeList] = useState([])
 
-  const is12hours = configs?.dates_moment_format?.value?.includes('hh:mm')
+  const is12hours = configs?.general_hour_format?.value?.includes('hh:mm')
 
   const styles = StyleSheet.create({
     selectOption: {

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

@@ -11,7 +11,7 @@ export const MultiCartUI = () => {
   const theme = useTheme();
   return (
     <Container noPadding>
-      <ChContainer style={{ paddingHorizontal: 40 }}>
+      <ChContainer style={{ paddingHorizontal: 20 }}>
         <ChSection>
           <ChUserDetails>
             <Placeholder Animation={Fade}>

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

@@ -1,8 +1,10 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import {
   useLanguage,
   useConfig,
   useUtils,
+  useToast,
+  ToastType,
   MultiCartsPaymethodsAndWallets as MultiCartsPaymethodsAndWalletsController
 } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native'
@@ -13,6 +15,7 @@ import { getIconCard, flatArray } from '../../utils'
 import { StripeElementsForm } from '../StripeElementsForm'
 import { StripeCardsList } from '../StripeCardsList'
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
+import { useApplePay } from '@stripe/stripe-react-native';
 
 import {
   PMContainer,
@@ -25,16 +28,27 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
     businessIds,
     paymethodsAndWallets,
     walletsState,
+    walletsPaymethod,
     paymethodSelected,
     handleSelectPaymethod,
     handleSelectWallet,
-    handlePaymethodDataChange
+    handlePaymethodDataChange,
+    setMethodPaySupported,
+    placeByMethodPay,
+    methodPaySupported,
+    setPlaceByMethodPay,
+    openCarts,
+    cartTotal,
+    handlePlaceOrder,
+    merchantId
   } = props
 
   const theme = useTheme()
   const [, t] = useLanguage()
   const [{ configs }] = useConfig()
   const [{ parsePrice }] = useUtils()
+  const [, { showToast }] = useToast();
+  const { confirmApplePayPayment } = useApplePay()
 
   const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
 
@@ -52,6 +66,10 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
     }
   }
 
+  const creditBalance: any = (wallet: any) => ` = ${parsePrice(wallet.balance / wallet.redemption_rate, { isTruncable: true })}`
+  const filterMethodsPay = (gateway: string) => Platform.OS === 'ios' ? gateway !== 'global_google_pay' : gateway !== 'global_apple_pay'
+  const methodsPay = ['global_google_pay', 'global_apple_pay']
+
   const getPayIcon = (method: string) => {
     switch (method) {
       case 'cash':
@@ -68,35 +86,81 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
         return theme.images.general.stripes
       case 'stripe_redirect':
         return theme.images.general.stripesb
+      case 'global_apple_pay':
+        return theme.images.general.applePayMark
+      case 'global_google_pay':
+        return theme.images.general.googlePayMark
       default:
         return theme.images.general.creditCard
     }
   }
 
+  useEffect(() => {
+    if (methodsPay.includes(paymethodSelected?.gateway)) {
+      if (typeof paymethodSelected?.paymethod_data === 'string') {
+        const sourceId = JSON.parse(paymethodSelected?.paymethod_data)?.source_id
+        sourceId && handlePlaceOrder(confirmApplePayPayment)
+      }
+    }
+  }, [JSON.stringify(paymethodSelected)])
+
+  useEffect(() => {
+    if (cartTotal === 0) {
+      handlePaymethodDataChange(null)
+      handleSelectPaymethod(null)
+    }
+  }, [cartTotal])
+
+  const handleChangePaymethod = (paymethod: any) => {
+    if (cartTotal > 0) {
+      handleSelectPaymethod(paymethod)
+      return
+    }
+    showToast(
+      ToastType.Error,
+      t('CART_BALANCE_ZERO', 'Sorry, the amount to pay is equal to zero and it is not necessary to select a payment method'))
+      ;
+  }
+
   const renderPaymethods = ({ item }: any) => {
     return (
-      <TouchableOpacity
-        onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
-      >
-        <PMItem
-          key={item.id}
-          isActive={paymethodSelected?.id === item.id}
-        >
-          <OIcon
-            src={getPayIcon(item?.gateway ?? item.paymethod?.gateway)}
-            width={20}
-            height={20}
-            color={paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
-          />
-          <OText
-            size={10}
-            style={{ margin: 0, marginTop: 4 }}
-            color={paymethodSelected?.id === item.id ? theme.colors.white : '#000'}
+      <>
+        {methodsPay.includes(item?.gateway) ? (
+          <TouchableOpacity
+            onPress={() => handleChangePaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
           >
-            {t(item?.gateway.toUpperCase(), item?.name)}
-          </OText>
-        </PMItem>
-      </TouchableOpacity>
+            <OIcon
+              src={getPayIcon(item.gateway)}
+              width={70}
+              height={70}
+              style={{ marginRight: 10 }}
+            />
+          </TouchableOpacity>
+        ) : (
+          <TouchableOpacity
+            onPress={() => handleChangePaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
+          >
+            <PMItem
+              key={item.id}
+              isActive={paymethodSelected?.id === item.id}
+            >
+              <OIcon
+                src={getPayIcon(item?.gateway ?? item.paymethod?.gateway)}
+                width={20}
+                height={20}
+                color={item?.gateway === 'global_apple_pay' ? '' : paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
+              />
+              <OText
+                size={10}
+                style={{ margin: 0, marginTop: 4 }}
+                color={paymethodSelected?.id === item.id ? theme.colors.white : '#000'}
+              >
+                {t(item?.gateway.toUpperCase(), item?.name)}
+              </OText>
+            </PMItem>
+          </TouchableOpacity>
+        )}
+      </>
     )
   }
 
@@ -123,7 +187,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
         <FlatList
           horizontal
           showsHorizontalScrollIndicator={false}
-          data={paymethodsAndWallets.paymethods}
+          data={paymethodsAndWallets.paymethods.filter((p: any) => filterMethodsPay(p.gateway))}
           renderItem={renderPaymethods}
           keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
         />
@@ -152,10 +216,38 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
             publicKey={paymethodSelected?.data?.publishable}
             payType={paymethodSelected?.paymethod?.name}
             onSelectCard={handlePaymethodDataChange}
+            addCardOpen={addCardOpen}
+            setAddCardOpen={setAddCardOpen}
+            openCarts={openCarts}
+            toSave
+            handlePaymethodDataChange={handlePaymethodDataChange}
+            clientSecret={props.clientSecret}
+            onPaymentChange={handlePaymethodDataChange}
           />
         </View>
       )}
 
+      {/* Google pay, Apple pay */}
+      {methodsPay.includes(paymethodSelected?.paymethod?.gateway) && (
+        <StripeElementsForm
+          toSave
+          businessId={businessIds[0]}
+          businessIds={businessIds}
+          publicKey={paymethodSelected?.data?.publishable}
+          requirements={props.clientSecret}
+          handleSource={handlePaymethodDataChange}
+          onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
+          setMethodPaySupported={setMethodPaySupported}
+          methodPaySupported={methodPaySupported}
+          placeByMethodPay={placeByMethodPay}
+          setPlaceByMethodPay={setPlaceByMethodPay}
+          methodsPay={methodsPay}
+          paymethod={paymethodSelected?.paymethod?.gateway}
+          cartTotal={cartTotal}
+          merchantId={merchantId}
+        />
+      )}
+
       {(paymethodsAndWallets.loading || walletsState.loading) ? (
         <>
           {[...Array(2).keys()].map(i => (
@@ -169,33 +261,52 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
         </>
       ) : (
         <>
-          {walletsState?.result?.filter((wallet: any) => paymethodsAndWallets.wallets.find((item: any) => item.type === wallet.type)).map((wallet: any, idx: any) => walletName[wallet.type]?.isActive && (
-            <WalletItem
-              key={wallet.type}
-              isBottomBorder={idx === paymethodsAndWallets.wallets?.length - 1}
-              onPress={() => handleSelectWallet(paymethodSelected.wallet_id === wallet.id ? false : true, wallet)}
-            >
-              {paymethodSelected.wallet_id === wallet.id ? (
-                <MaterialCommunityIcons
-                  name="checkbox-marked"
-                  size={25}
-                  color={theme.colors.primary}
-                />
-              ) : (
-                <MaterialCommunityIcons
-                  name="checkbox-blank-outline"
-                  size={25}
-                  color={theme.colors.disabled}
-                />
-              )}
-              <OText size={12} style={{ flex: 1, marginLeft: 15 }}>{walletName[wallet.type]?.name}</OText>
-              <OText size={12}>{parsePrice(wallet.balance)}</OText>
-            </WalletItem>
-          ))}
+          {walletsState?.result?.filter((wallet: any) =>
+            paymethodsAndWallets.wallets.find((item: any) => item.type === wallet.type))
+            .map((wallet: any, idx: any) => walletName[wallet.type]?.isActive &&
+              (
+                <WalletItem
+                  key={wallet.type}
+                  isBottomBorder={idx === paymethodsAndWallets.wallets?.length - 1}
+                  onPress={() => handleSelectWallet(!!!walletsPaymethod?.find((walletPay: any) => walletPay.wallet_id === wallet.id)?.id, wallet)}
+                >
+                  {!!walletsPaymethod?.find((walletPay: any) => walletPay.wallet_id === wallet.id)?.id ? (
+                    <MaterialCommunityIcons
+                      name="checkbox-marked"
+                      size={25}
+                      color={theme.colors.primary}
+                    />
+                  ) : (
+                    <MaterialCommunityIcons
+                      name="checkbox-blank-outline"
+                      size={25}
+                      color={theme.colors.disabled}
+                    />
+                  )}
+                  <OText size={12} style={{ flex: 1, marginLeft: 15 }}>{walletName[wallet.type]?.name}</OText>
+                  {wallet.type === 'cash' && (
+                    <OText>
+                      {parsePrice(wallet?.balance, { isTruncable: true })}
+                    </OText>
+                  )}
+                  {wallet.type === 'credit_point' && (
+                    <OText>
+                      <OText color={theme.colors.primary} weight='bold'>
+                        {`${wallet?.balance} ${t('POINTS', 'Points')}`}
+                      </OText>
+                      <OText>
+                        {wallet?.balance > 0
+                          ? creditBalance(wallet)
+                          : null}
+                      </OText>
+                    </OText>
+                  )}
+                </WalletItem>
+              ))}
         </>
       )}
 
-      <OModal
+      {/* <OModal
         entireModal
         title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
         open={addCardOpen.stripe}
@@ -208,6 +319,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
           enabled={Platform.OS === 'ios' ? true : false}
         >
           <StripeElementsForm
+            openCarts={openCarts}
             toSave
             businessId={businessIds[0]}
             businessIds={businessIds}
@@ -217,7 +329,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
             onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
           />
         </KeyboardAvoidingView>
-      </OModal>
+      </OModal> */}
     </PMContainer>
   )
 }