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