ordering-ui-react-native 0.17.34 → 0.17.35-release
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -7
- package/src/DeliveryApp.tsx +43 -1
- package/src/components/BusinessesListing/index.tsx +1 -1
- package/src/components/OrderCreating/index.tsx +1 -21
- package/src/components/PaymentOptionsWebView/index.tsx +119 -120
- package/src/components/StripeMethodForm/index.tsx +108 -79
- package/src/components/VerifyPhone/styles.tsx +1 -2
- package/src/components/shared/OToast.tsx +4 -4
- package/src/types/index.tsx +5 -0
- package/src/utils/index.tsx +7 -1
- package/themes/business/index.tsx +2 -0
- package/themes/business/src/components/AcceptOrRejectOrder/index.tsx +265 -240
- package/themes/business/src/components/AcceptOrRejectOrder/styles.tsx +6 -4
- package/themes/business/src/components/BusinessController/index.tsx +0 -1
- package/themes/business/src/components/Chat/index.tsx +118 -107
- package/themes/business/src/components/DriverMap/index.tsx +17 -6
- package/themes/business/src/components/GoogleMap/index.tsx +58 -57
- package/themes/business/src/components/LoginForm/Otp/index.tsx +120 -0
- package/themes/business/src/components/LoginForm/Otp/styles.tsx +7 -0
- package/themes/business/src/components/LoginForm/index.tsx +238 -80
- package/themes/business/src/components/LoginForm/styles.tsx +10 -0
- package/themes/business/src/components/MapView/index.tsx +10 -10
- package/themes/business/src/components/NewOrderNotification/index.tsx +43 -50
- package/themes/business/src/components/OrderDetails/Delivery.tsx +4 -3
- package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx +90 -47
- package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx +59 -62
- package/themes/business/src/components/OrderDetailsLogistic/index.tsx +195 -0
- package/themes/business/src/components/OrderDetailsLogistic/styles.tsx +5 -0
- package/themes/business/src/components/OrderMessage/index.tsx +18 -17
- package/themes/business/src/components/OrderSummary/index.tsx +113 -121
- package/themes/business/src/components/OrdersOption/index.tsx +32 -75
- package/themes/business/src/components/PreviousOrders/OrderItem.tsx +250 -0
- package/themes/business/src/components/PreviousOrders/OrdersGroupedItem.tsx +115 -0
- package/themes/business/src/components/PreviousOrders/index.tsx +445 -243
- package/themes/business/src/components/PreviousOrders/styles.tsx +31 -3
- package/themes/business/src/components/ProductItemAccordion/index.tsx +27 -3
- package/themes/business/src/components/ReviewCustomer/index.tsx +41 -24
- package/themes/business/src/components/StoresList/index.tsx +2 -2
- package/themes/business/src/components/shared/OLink.tsx +33 -13
- package/themes/business/src/components/shared/OModal.tsx +16 -9
- package/themes/business/src/components/shared/OText.tsx +8 -2
- package/themes/business/src/types/index.tsx +32 -2
- package/themes/business/src/utils/index.tsx +44 -1
- package/themes/doordash/src/components/BusinessesListing/index.tsx +1 -1
- package/themes/doordash/src/components/LoginForm/index.tsx +1 -2
- package/themes/instacart/src/components/BusinessesListing/index.tsx +1 -1
- package/themes/kiosk/src/components/BusinessesListing/index.tsx +2 -1
- package/themes/kiosk/src/components/Checkout/index.tsx +6 -0
- package/themes/kiosk/src/components/LoginForm/Otp/index.tsx +92 -0
- package/themes/kiosk/src/components/LoginForm/Otp/styles.tsx +7 -0
- package/themes/kiosk/src/components/LoginForm/index.tsx +473 -151
- package/themes/kiosk/src/components/LoginForm/styles.tsx +14 -1
- package/themes/kiosk/src/components/NavBar/index.tsx +14 -14
- package/themes/kiosk/src/components/OptionCard/index.tsx +1 -1
- package/themes/kiosk/src/components/OrderTypeCardSelector/index.tsx +8 -10
- package/themes/kiosk/src/components/PhoneInputNumber/index.tsx +3 -2
- package/themes/kiosk/src/components/PhoneInputNumber/styles.tsx +1 -3
- package/themes/kiosk/src/components/ProductForm/index.tsx +1 -14
- package/themes/kiosk/src/components/shared/OButton.tsx +5 -18
- package/themes/kiosk/src/components/shared/OModal.tsx +14 -11
- package/themes/kiosk/src/layouts/Container.tsx +7 -1
- package/themes/kiosk/src/types/index.d.ts +13 -0
- package/themes/kiosk/src/utils/index.tsx +15 -0
- package/themes/original/index.tsx +6 -0
- package/themes/original/src/components/AddressDetails/index.tsx +29 -11
- package/themes/original/src/components/AddressForm/index.tsx +85 -49
- package/themes/original/src/components/AddressList/index.tsx +26 -21
- package/themes/original/src/components/AddressList/styles.tsx +4 -2
- package/themes/original/src/components/AnalyticsSegment/index.tsx +193 -10
- package/themes/original/src/components/AppleLogin/index.tsx +4 -4
- package/themes/original/src/components/BusinessBasicInformation/index.tsx +159 -90
- package/themes/original/src/components/BusinessBasicInformation/styles.tsx +9 -7
- package/themes/original/src/components/BusinessController/index.tsx +154 -68
- package/themes/original/src/components/BusinessController/styles.tsx +22 -9
- package/themes/original/src/components/BusinessFeaturedController/index.tsx +21 -54
- package/themes/original/src/components/BusinessFeaturedController/styles.tsx +8 -0
- package/themes/original/src/components/BusinessInformation/index.tsx +10 -31
- package/themes/original/src/components/BusinessItemAccordion/index.tsx +23 -22
- package/themes/original/src/components/BusinessListingSearch/index.tsx +350 -323
- package/themes/original/src/components/BusinessPreorder/index.tsx +97 -16
- package/themes/original/src/components/BusinessProductsList/index.tsx +20 -11
- package/themes/original/src/components/BusinessProductsList/styles.tsx +8 -3
- package/themes/original/src/components/BusinessProductsListing/UpsellingRedirect.tsx +1 -1
- package/themes/original/src/components/BusinessProductsListing/index.tsx +684 -524
- package/themes/original/src/components/BusinessProductsListing/styles.tsx +4 -6
- package/themes/original/src/components/BusinessReviews/index.tsx +3 -1
- package/themes/original/src/components/BusinessesListing/Layout/Appointment/index.tsx +1 -1
- package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx +105 -78
- package/themes/original/src/components/BusinessesListing/Layout/Original/styles.tsx +1 -9
- package/themes/original/src/components/BusinessesListing/index.tsx +0 -1
- package/themes/original/src/components/Cart/index.tsx +102 -69
- package/themes/original/src/components/CartContent/index.tsx +115 -19
- package/themes/original/src/components/CartContent/styles.tsx +15 -1
- package/themes/original/src/components/Checkout/index.tsx +331 -177
- package/themes/original/src/components/Checkout/styles.tsx +4 -2
- package/themes/original/src/components/CitiesControl/index.tsx +89 -0
- package/themes/original/src/components/CitiesControl/styles.tsx +17 -0
- package/themes/original/src/components/CouponControl/index.tsx +10 -3
- package/themes/original/src/components/DriverTips/index.tsx +52 -34
- package/themes/original/src/components/Favorite/index.tsx +7 -4
- package/themes/original/src/components/Favorite/styles.tsx +1 -1
- package/themes/original/src/components/FavoriteList/index.tsx +51 -80
- package/themes/original/src/components/FloatingButton/index.tsx +1 -2
- package/themes/original/src/components/FloatingButton/styles.tsx +1 -1
- package/themes/original/src/components/GPSButton/index.tsx +6 -4
- package/themes/original/src/components/GPSButton/styles.ts +3 -3
- package/themes/original/src/components/GiftCard/GiftCardUI/index.tsx +96 -0
- package/themes/original/src/components/GiftCard/GiftCardUI/styles.tsx +5 -0
- package/themes/original/src/components/GiftCard/PurchaseGiftCard/index.tsx +100 -0
- package/themes/original/src/components/GiftCard/PurchaseGiftCard/styles.tsx +8 -0
- package/themes/original/src/components/GiftCard/RedeemGiftCard/index.tsx +191 -0
- package/themes/original/src/components/GiftCard/RedeemGiftCard/styles.tsx +8 -0
- package/themes/original/src/components/GiftCard/SendGiftCard/index.tsx +165 -0
- package/themes/original/src/components/GiftCard/SendGiftCard/styles.tsx +9 -0
- package/themes/original/src/components/GoogleMap/index.tsx +15 -4
- package/themes/original/src/components/Help/index.tsx +8 -8
- package/themes/original/src/components/HelpAccountAndPayment/index.tsx +11 -22
- package/themes/original/src/components/HelpAccountAndPayment/styles.tsx +6 -0
- package/themes/original/src/components/HelpGuide/index.tsx +12 -16
- package/themes/original/src/components/HelpGuide/styles.tsx +6 -0
- package/themes/original/src/components/HelpOrder/index.tsx +12 -25
- package/themes/original/src/components/HelpOrder/styles.tsx +8 -1
- package/themes/original/src/components/Home/index.tsx +13 -4
- package/themes/original/src/components/LastOrder/index.tsx +1 -34
- package/themes/original/src/components/LoginForm/Otp/index.tsx +139 -75
- package/themes/original/src/components/LoginForm/Otp/styles.tsx +0 -1
- package/themes/original/src/components/LoginForm/index.tsx +71 -28
- package/themes/original/src/components/LottieAnimation/index.tsx +78 -0
- package/themes/original/src/components/MessageListing/index.tsx +16 -42
- package/themes/original/src/components/Messages/index.tsx +32 -10
- package/themes/original/src/components/MomentOption/index.tsx +195 -88
- package/themes/original/src/components/MultiCart/index.tsx +50 -0
- package/themes/original/src/components/MultiCartsPaymethodsAndWallets/index.tsx +197 -116
- package/themes/original/src/components/MultiCheckout/index.tsx +298 -88
- package/themes/original/src/components/MultiCheckout/styles.tsx +3 -1
- package/themes/original/src/components/MultiOrdersDetails/SingleOrderCard.tsx +37 -224
- package/themes/original/src/components/MultiOrdersDetails/index.tsx +68 -21
- package/themes/original/src/components/MultiOrdersDetails/styles.tsx +1 -1
- package/themes/original/src/components/MyOrders/index.tsx +53 -51
- package/themes/original/src/components/NavBar/index.tsx +18 -18
- package/themes/original/src/components/Notifications/index.tsx +46 -50
- package/themes/original/src/components/Notifications/styles.tsx +6 -3
- package/themes/original/src/components/OrderDetails/OrderEta.tsx +76 -0
- package/themes/original/src/components/OrderDetails/OrderHistory.tsx +15 -3
- package/themes/original/src/components/OrderDetails/index.tsx +199 -359
- package/themes/original/src/components/OrderDetails/styles.tsx +0 -1
- package/themes/original/src/components/OrderItAgain/index.tsx +3 -1
- package/themes/original/src/components/OrderProgress/index.tsx +93 -114
- package/themes/original/src/components/OrderProgress/styles.tsx +5 -0
- package/themes/original/src/components/OrderSummary/index.tsx +87 -59
- package/themes/original/src/components/OrderTypeSelector/index.tsx +1 -1
- package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/index.tsx +24 -19
- package/themes/original/src/components/OrdersOption/index.tsx +63 -56
- package/themes/original/src/components/PageBanner/index.tsx +171 -0
- package/themes/original/src/components/PageBanner/styles.tsx +11 -0
- package/themes/original/src/components/PaymentOptionStripe/styles.tsx +1 -1
- package/themes/original/src/components/PaymentOptionWallet/index.tsx +56 -56
- package/themes/original/src/components/PaymentOptions/index.tsx +34 -6
- package/themes/original/src/components/PhoneInputNumber/index.tsx +3 -3
- package/themes/original/src/components/PlaceSpot/index.tsx +12 -6
- package/themes/original/src/components/ProductForm/index.tsx +223 -232
- package/themes/original/src/components/ProductForm/styles.tsx +5 -8
- package/themes/original/src/components/ProductItemAccordion/index.tsx +59 -29
- package/themes/original/src/components/ProductOptionSubOption/index.tsx +19 -11
- package/themes/original/src/components/ProductOptionSubOption/styles.tsx +1 -2
- package/themes/original/src/components/ProfessionalFilter/SingleProfessionalCard/index.tsx +108 -0
- package/themes/original/src/components/ProfessionalFilter/index.tsx +20 -50
- package/themes/original/src/components/ProfessionalProfile/index.tsx +36 -7
- package/themes/original/src/components/Promotions/index.tsx +234 -220
- package/themes/original/src/components/Promotions/styles.tsx +10 -3
- package/themes/original/src/components/ReviewDriver/index.tsx +3 -3
- package/themes/original/src/components/ReviewOrder/index.tsx +26 -9
- package/themes/original/src/components/ReviewOrder/styles.tsx +7 -0
- package/themes/original/src/components/ReviewProducts/index.tsx +23 -11
- package/themes/original/src/components/ReviewTrigger/index.tsx +27 -9
- package/themes/original/src/components/ReviewTrigger/styles.tsx +8 -1
- package/themes/original/src/components/ScheduleAccordion/index.tsx +68 -0
- package/themes/original/src/components/ScheduleAccordion/styles.tsx +14 -0
- package/themes/original/src/components/ServiceForm/index.tsx +74 -19
- package/themes/original/src/components/Sessions/index.tsx +11 -8
- package/themes/original/src/components/Sessions/styles.tsx +5 -0
- package/themes/original/src/components/SignupForm/index.tsx +42 -19
- package/themes/original/src/components/SingleOrderCard/index.tsx +156 -65
- package/themes/original/src/components/SingleOrderCard/styles.tsx +11 -9
- package/themes/original/src/components/SingleProductCard/index.tsx +100 -56
- package/themes/original/src/components/SingleProductCard/styles.tsx +22 -13
- package/themes/original/src/components/SingleProductReview/styles.tsx +1 -1
- package/themes/original/src/components/StripeCardsList/index.tsx +13 -3
- package/themes/original/src/components/StripeElementsForm/index.tsx +28 -15
- package/themes/original/src/components/UpsellingProducts/index.tsx +238 -224
- package/themes/original/src/components/UpsellingProducts/styles.tsx +12 -1
- package/themes/original/src/components/UserDetails/index.tsx +8 -4
- package/themes/original/src/components/UserFormDetails/index.tsx +47 -7
- package/themes/original/src/components/UserProfile/index.tsx +5 -7
- package/themes/original/src/components/UserProfileForm/index.tsx +25 -28
- package/themes/original/src/components/UserProfileForm/styles.tsx +7 -0
- package/themes/original/src/components/WalletTransactionItem/index.tsx +2 -2
- package/themes/original/src/components/WalletTransactions/index.tsx +3 -3
- package/themes/original/src/components/Wallets/index.tsx +79 -36
- package/themes/original/src/components/Wallets/styles.tsx +5 -4
- package/themes/original/src/components/shared/CardAnimation.tsx +47 -0
- package/themes/original/src/components/shared/HeaderTitle.tsx +8 -3
- package/themes/original/src/components/shared/OBottomPopup.tsx +1 -1
- package/themes/original/src/components/shared/OButton.tsx +6 -2
- package/themes/original/src/components/shared/OIcon.tsx +8 -1
- package/themes/original/src/components/shared/OInput.tsx +16 -2
- package/themes/original/src/components/shared/OModal.tsx +3 -3
- package/themes/original/src/layouts/Container.tsx +13 -9
- package/themes/original/src/types/index.tsx +37 -9
- package/themes/original/src/utils/index.tsx +364 -58
- package/themes/uber-eats/src/components/BusinessesListing/index.tsx +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState } from 'react'
|
|
1
|
+
import React, { useEffect, useState } from 'react'
|
|
2
2
|
import {
|
|
3
3
|
useLanguage,
|
|
4
4
|
useConfig,
|
|
@@ -7,12 +7,13 @@ import {
|
|
|
7
7
|
} from 'ordering-components/native'
|
|
8
8
|
import { useTheme } from 'styled-components/native'
|
|
9
9
|
import { View, TouchableOpacity, FlatList, StyleSheet, KeyboardAvoidingView, Platform } from 'react-native'
|
|
10
|
-
import { Placeholder,
|
|
10
|
+
import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder'
|
|
11
11
|
import { OText, OIcon, OModal, OButton } from '../shared'
|
|
12
12
|
import { getIconCard, flatArray } from '../../utils'
|
|
13
13
|
import { StripeElementsForm } from '../StripeElementsForm'
|
|
14
14
|
import { StripeCardsList } from '../StripeCardsList'
|
|
15
15
|
import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
|
|
16
|
+
import { useApplePay } from '@stripe/stripe-react-native';
|
|
16
17
|
|
|
17
18
|
import {
|
|
18
19
|
PMContainer,
|
|
@@ -25,19 +26,28 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
|
|
|
25
26
|
businessIds,
|
|
26
27
|
paymethodsAndWallets,
|
|
27
28
|
walletsState,
|
|
28
|
-
|
|
29
|
+
walletsPaymethod,
|
|
29
30
|
paymethodSelected,
|
|
30
31
|
handleSelectPaymethod,
|
|
31
32
|
handleSelectWallet,
|
|
32
|
-
handlePaymethodDataChange
|
|
33
|
+
handlePaymethodDataChange,
|
|
34
|
+
setMethodPaySupported,
|
|
35
|
+
placeByMethodPay,
|
|
36
|
+
methodPaySupported,
|
|
37
|
+
setPlaceByMethodPay,
|
|
38
|
+
openCarts,
|
|
39
|
+
cartTotal,
|
|
40
|
+
handlePlaceOrder,
|
|
41
|
+
merchantId
|
|
33
42
|
} = props
|
|
34
43
|
|
|
35
44
|
const theme = useTheme()
|
|
36
45
|
const [, t] = useLanguage()
|
|
37
46
|
const [{ configs }] = useConfig()
|
|
38
47
|
const [{ parsePrice }] = useUtils()
|
|
48
|
+
const { confirmApplePayPayment } = useApplePay()
|
|
39
49
|
|
|
40
|
-
|
|
50
|
+
const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
|
|
41
51
|
|
|
42
52
|
const isWalletCashEnabled = configs?.wallet_cash_enabled?.value === '1'
|
|
43
53
|
const isWalletPointsEnabled = configs?.wallet_credit_point_enabled?.value === '1'
|
|
@@ -53,53 +63,83 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
|
|
|
53
63
|
}
|
|
54
64
|
}
|
|
55
65
|
|
|
66
|
+
const creditBalance: any = (wallet: any) => ` = ${parsePrice(wallet.balance / wallet.redemption_rate, { isTruncable: true })}`
|
|
67
|
+
const filterMethodsPay = (gateway: string) => Platform.OS === 'ios' ? gateway !== 'global_google_pay' : gateway !== 'global_apple_pay'
|
|
68
|
+
const methodsPay = ['global_google_pay', 'global_apple_pay']
|
|
69
|
+
|
|
56
70
|
const getPayIcon = (method: string) => {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
71
|
+
switch (method) {
|
|
72
|
+
case 'cash':
|
|
73
|
+
return theme.images.general.cash
|
|
74
|
+
case 'card_delivery':
|
|
75
|
+
return theme.images.general.carddelivery
|
|
76
|
+
case 'paypal':
|
|
77
|
+
return theme.images.general.paypal
|
|
78
|
+
case 'stripe':
|
|
79
|
+
return theme.images.general.creditCard
|
|
80
|
+
case 'stripe_direct':
|
|
81
|
+
return theme.images.general.stripecc
|
|
82
|
+
case 'stripe_connect':
|
|
83
|
+
return theme.images.general.stripes
|
|
84
|
+
case 'stripe_redirect':
|
|
85
|
+
return theme.images.general.stripesb
|
|
86
|
+
case 'global_apple_pay':
|
|
87
|
+
return theme.images.general.applePayMark
|
|
88
|
+
default:
|
|
89
|
+
return theme.images.general.creditCard
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
useEffect(() => {
|
|
94
|
+
if (methodsPay.includes(paymethodSelected?.gateway)) {
|
|
95
|
+
if (typeof paymethodSelected?.paymethod_data === 'string'){
|
|
96
|
+
const sourceId = JSON.parse(paymethodSelected?.paymethod_data)?.source_id
|
|
97
|
+
sourceId && handlePlaceOrder(confirmApplePayPayment)
|
|
98
|
+
}
|
|
74
99
|
}
|
|
75
|
-
}
|
|
100
|
+
}, [JSON.stringify(paymethodSelected)])
|
|
76
101
|
|
|
77
102
|
const renderPaymethods = ({ item }: any) => {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
+
return (
|
|
104
|
+
<>
|
|
105
|
+
{item?.gateway === 'global_apple_pay' ? (
|
|
106
|
+
<TouchableOpacity
|
|
107
|
+
onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
|
|
108
|
+
>
|
|
109
|
+
<OIcon
|
|
110
|
+
src={getPayIcon(item.gateway)}
|
|
111
|
+
width={70}
|
|
112
|
+
height={70}
|
|
113
|
+
style={{ marginRight: 10 }}
|
|
114
|
+
/>
|
|
115
|
+
</TouchableOpacity>
|
|
116
|
+
) : (
|
|
117
|
+
<TouchableOpacity
|
|
118
|
+
onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
|
|
119
|
+
>
|
|
120
|
+
<PMItem
|
|
121
|
+
key={item.id}
|
|
122
|
+
isActive={paymethodSelected?.id === item.id}
|
|
123
|
+
>
|
|
124
|
+
<OIcon
|
|
125
|
+
src={getPayIcon(item?.gateway ?? item.paymethod?.gateway)}
|
|
126
|
+
width={20}
|
|
127
|
+
height={20}
|
|
128
|
+
color={item?.gateway === 'global_apple_pay' ? '' : paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
|
|
129
|
+
/>
|
|
130
|
+
<OText
|
|
131
|
+
size={10}
|
|
132
|
+
style={{ margin: 0, marginTop: 4 }}
|
|
133
|
+
color={paymethodSelected?.id === item.id ? theme.colors.white : '#000'}
|
|
134
|
+
>
|
|
135
|
+
{t(item?.gateway.toUpperCase(), item?.name)}
|
|
136
|
+
</OText>
|
|
137
|
+
</PMItem>
|
|
138
|
+
</TouchableOpacity>
|
|
139
|
+
)}
|
|
140
|
+
</>
|
|
141
|
+
)
|
|
142
|
+
}
|
|
103
143
|
|
|
104
144
|
return (
|
|
105
145
|
<PMContainer>
|
|
@@ -123,10 +163,10 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
|
|
|
123
163
|
) : (
|
|
124
164
|
<FlatList
|
|
125
165
|
horizontal
|
|
126
|
-
|
|
127
|
-
data={
|
|
128
|
-
|
|
129
|
-
|
|
166
|
+
showsHorizontalScrollIndicator={false}
|
|
167
|
+
data={paymethodsAndWallets.paymethods.filter((p: any) => filterMethodsPay(p.gateway))}
|
|
168
|
+
renderItem={renderPaymethods}
|
|
169
|
+
keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
|
|
130
170
|
/>
|
|
131
171
|
)}
|
|
132
172
|
{!paymethodsAndWallets.loading && !paymethodsAndWallets.error && paymethodsAndWallets.paymethods.length === 0 && (
|
|
@@ -138,25 +178,46 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
|
|
|
138
178
|
{paymethodSelected?.paymethod?.gateway === 'stripe' && (
|
|
139
179
|
<View>
|
|
140
180
|
<OButton
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
181
|
+
text={t('ADD_PAYMENT_CARD', 'Add New Payment Card')}
|
|
182
|
+
bgColor={theme.colors.white}
|
|
183
|
+
borderColor={theme.colors.primary}
|
|
184
|
+
style={styles.btnAddStyle}
|
|
185
|
+
textStyle={{ color: theme.colors.primary, fontSize: 12 }}
|
|
186
|
+
imgRightSrc={null}
|
|
187
|
+
onClick={() => setAddCardOpen({ ...addCardOpen, stripe: true })}
|
|
188
|
+
/>
|
|
149
189
|
<StripeCardsList
|
|
150
|
-
|
|
151
|
-
|
|
190
|
+
paymethod={paymethodSelected?.paymethod}
|
|
191
|
+
businessId={businessIds[0]}
|
|
152
192
|
businessIds={businessIds}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
193
|
+
publicKey={paymethodSelected?.data?.publishable}
|
|
194
|
+
payType={paymethodSelected?.paymethod?.name}
|
|
195
|
+
onSelectCard={handlePaymethodDataChange}
|
|
196
|
+
/>
|
|
157
197
|
</View>
|
|
158
198
|
)}
|
|
159
199
|
|
|
200
|
+
{/* Google pay, Apple pay */}
|
|
201
|
+
{methodsPay.includes(paymethodSelected?.paymethod?.gateway) && (
|
|
202
|
+
<StripeElementsForm
|
|
203
|
+
toSave
|
|
204
|
+
businessId={businessIds[0]}
|
|
205
|
+
businessIds={businessIds}
|
|
206
|
+
publicKey={paymethodSelected?.data?.publishable}
|
|
207
|
+
requirements={props.clientSecret}
|
|
208
|
+
handleSource={handlePaymethodDataChange}
|
|
209
|
+
onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
|
|
210
|
+
setMethodPaySupported={setMethodPaySupported}
|
|
211
|
+
methodPaySupported={methodPaySupported}
|
|
212
|
+
placeByMethodPay={placeByMethodPay}
|
|
213
|
+
setPlaceByMethodPay={setPlaceByMethodPay}
|
|
214
|
+
methodsPay={methodsPay}
|
|
215
|
+
paymethod={paymethodSelected?.paymethod?.gateway}
|
|
216
|
+
cartTotal={cartTotal}
|
|
217
|
+
merchantId={merchantId}
|
|
218
|
+
/>
|
|
219
|
+
)}
|
|
220
|
+
|
|
160
221
|
{(paymethodsAndWallets.loading || walletsState.loading) ? (
|
|
161
222
|
<>
|
|
162
223
|
{[...Array(2).keys()].map(i => (
|
|
@@ -170,67 +231,87 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
|
|
|
170
231
|
</>
|
|
171
232
|
) : (
|
|
172
233
|
<>
|
|
173
|
-
{walletsState
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
234
|
+
{walletsState?.result?.filter((wallet: any) =>
|
|
235
|
+
paymethodsAndWallets.wallets.find((item: any) => item.type === wallet.type))
|
|
236
|
+
.map((wallet: any, idx: any) => walletName[wallet.type]?.isActive &&
|
|
237
|
+
(
|
|
238
|
+
<WalletItem
|
|
239
|
+
key={wallet.type}
|
|
240
|
+
isBottomBorder={idx === paymethodsAndWallets.wallets?.length - 1}
|
|
241
|
+
onPress={() => handleSelectWallet(!!!walletsPaymethod?.find((walletPay: any) => walletPay.wallet_id === wallet.id)?.id, wallet)}
|
|
242
|
+
>
|
|
243
|
+
{!!walletsPaymethod?.find((walletPay: any) => walletPay.wallet_id === wallet.id)?.id ? (
|
|
244
|
+
<MaterialCommunityIcons
|
|
245
|
+
name="checkbox-marked"
|
|
246
|
+
size={25}
|
|
247
|
+
color={theme.colors.primary}
|
|
248
|
+
/>
|
|
249
|
+
) : (
|
|
250
|
+
<MaterialCommunityIcons
|
|
251
|
+
name="checkbox-blank-outline"
|
|
252
|
+
size={25}
|
|
253
|
+
color={theme.colors.disabled}
|
|
254
|
+
/>
|
|
255
|
+
)}
|
|
256
|
+
<OText size={12} style={{ flex: 1, marginLeft: 15 }}>{walletName[wallet.type]?.name}</OText>
|
|
257
|
+
{wallet.type === 'cash' && (
|
|
258
|
+
<OText>
|
|
259
|
+
{parsePrice(wallet?.balance, { isTruncable: true })}
|
|
260
|
+
</OText>
|
|
261
|
+
)}
|
|
262
|
+
{wallet.type === 'credit_point' && (
|
|
263
|
+
<OText>
|
|
264
|
+
<OText color={theme.colors.primary} weight='bold'>
|
|
265
|
+
{`${wallet?.balance} ${t('POINTS', 'Points')}`}
|
|
266
|
+
</OText>
|
|
267
|
+
<OText>
|
|
268
|
+
{wallet?.balance > 0
|
|
269
|
+
? creditBalance(wallet)
|
|
270
|
+
: null}
|
|
271
|
+
</OText>
|
|
272
|
+
</OText>
|
|
273
|
+
)}
|
|
274
|
+
</WalletItem>
|
|
275
|
+
))}
|
|
196
276
|
</>
|
|
197
277
|
)}
|
|
198
278
|
|
|
199
279
|
<OModal
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
280
|
+
entireModal
|
|
281
|
+
title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
|
|
282
|
+
open={addCardOpen.stripe}
|
|
283
|
+
onClose={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
|
|
284
|
+
style={{ backgroundColor: 'red' }}
|
|
285
|
+
>
|
|
286
|
+
<KeyboardAvoidingView
|
|
287
|
+
behavior={Platform.OS == 'ios' ? 'padding' : 'height'}
|
|
288
|
+
keyboardVerticalOffset={Platform.OS == 'ios' ? 0 : 0}
|
|
289
|
+
enabled={Platform.OS === 'ios' ? true : false}
|
|
290
|
+
>
|
|
291
|
+
<StripeElementsForm
|
|
292
|
+
openCarts={openCarts}
|
|
293
|
+
toSave
|
|
294
|
+
businessId={businessIds[0]}
|
|
214
295
|
businessIds={businessIds}
|
|
215
296
|
publicKey={paymethodSelected?.data?.publishable}
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
297
|
+
requirements={props.clientSecret}
|
|
298
|
+
onSelectCard={handlePaymethodDataChange}
|
|
299
|
+
onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
|
|
300
|
+
/>
|
|
301
|
+
</KeyboardAvoidingView>
|
|
302
|
+
</OModal>
|
|
222
303
|
</PMContainer>
|
|
223
304
|
)
|
|
224
305
|
}
|
|
225
306
|
|
|
226
307
|
const styles = StyleSheet.create({
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
308
|
+
btnAddStyle: {
|
|
309
|
+
marginVertical: 20,
|
|
310
|
+
borderRadius: 7.6,
|
|
311
|
+
shadowOpacity: 0,
|
|
312
|
+
height: 44,
|
|
313
|
+
borderWidth: 1
|
|
314
|
+
},
|
|
234
315
|
})
|
|
235
316
|
|
|
236
317
|
|