ordering-ui-react-native 0.17.76 → 0.17.77-release

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

@@ -1,63 +1,50 @@
 import React from 'react'
-import { ChAddress, ChContainer, ChSection, ChUserDetails, DeliveryOptionsContainer } from '../Checkout/styles'
+import { View } from 'react-native'
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder'
-import { Container } from '../../layouts/Container';
-import { View, StyleSheet } from 'react-native'
 import { useTheme } from 'styled-components/native';
 import { MultiCartCreate } from 'ordering-components/native'
 
-export const MultiCartUI = () => {
-    const theme = useTheme();
-
-    const styles = StyleSheet.create({
-        pagePadding: {
-            paddingHorizontal: 40
-        }
-    })
-
-    return (
-        <>
-            <Container noPadding>
-                <ChContainer style={styles.pagePadding}>
-                    <ChSection>
-                        <ChUserDetails>
-                            <Placeholder Animation={Fade}>
-                                <PlaceholderLine height={20} />
-                                <PlaceholderLine height={12} />
-                                <PlaceholderLine height={12} />
-                                <PlaceholderLine height={12} style={{ marginBottom: 20 }} />
-                            </Placeholder>
-                        </ChUserDetails>
-                        <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
-                    </ChSection>
-                    <DeliveryOptionsContainer>
-                        <View style={{ height: 110 }}>
-                            <Placeholder Animation={Fade}>
-                                <PlaceholderLine height={20} />
-                                <PlaceholderLine height={40} />
-                            </Placeholder>
-                        </View>
-                    </DeliveryOptionsContainer>
-                    <ChSection>
-                        <ChAddress>
-                            <Placeholder Animation={Fade}>
-                                <PlaceholderLine height={20} style={{ marginBottom: 50 }} />
-                                <PlaceholderLine height={100} />
-                            </Placeholder>
-                        </ChAddress>
-                        <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
-                    </ChSection>
-                </ChContainer>
-            </Container>
+import { Container } from '../../layouts/Container';
+import { ChContainer, ChSection, ChUserDetails } from '../Checkout/styles'
 
-        </>
-    )
+export const MultiCartUI = () => {
+  const theme = useTheme();
+  return (
+    <Container noPadding>
+      <ChContainer style={{ paddingHorizontal: 40 }}>
+        <ChSection>
+          <ChUserDetails>
+            <Placeholder Animation={Fade}>
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={20} style={{ marginBottom: 20 }} />
+            </Placeholder>
+            <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40, marginBottom: 20 }} />
+            <Placeholder Animation={Fade}>
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={20} style={{ marginBottom: 20 }} />
+            </Placeholder>
+            <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40, marginBottom: 20 }} />
+            <Placeholder Animation={Fade}>
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={120} style={{ marginBottom: 20, borderRadius: 8 }} />
+              <PlaceholderLine height={20} />
+              <PlaceholderLine height={20} />
+            </Placeholder>
+          </ChUserDetails>
+        </ChSection>
+      </ChContainer>
+    </Container>
+  )
 }
 
-export const MultiCart = (props : any) => {
-    const mulcartProps = {
-        ...props,
-        UIComponent: MultiCartUI
-    }
-    return <MultiCartCreate {...mulcartProps} />
+export const MultiCart = (props: any) => {
+  const mulcartProps = {
+    ...props,
+    UIComponent: MultiCartUI
+  }
+  return <MultiCartCreate {...mulcartProps} />
 }

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':
@@ -61,42 +79,88 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
       case 'paypal':
         return theme.images.general.paypal
       case 'stripe':
-        return theme.images.general.stripe
+        return theme.images.general.creditCard
       case 'stripe_direct':
         return theme.images.general.stripecc
       case 'stripe_connect':
         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.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 })}
+          >
+            <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 })}
           >
-            {t(item?.gateway.toUpperCase(), item?.name)}
-          </OText>
-        </PMItem>
-      </TouchableOpacity>
+            <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>
   )
 }