ordering-ui-react-native 0.17.90 → 0.17.91-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 (215) hide show
  1. package/package.json +8 -7
  2. package/src/DeliveryApp.tsx +43 -1
  3. package/src/components/BusinessInformation/index.tsx +10 -9
  4. package/src/components/BusinessesListing/index.tsx +1 -1
  5. package/src/components/OrderCreating/index.tsx +1 -21
  6. package/src/components/PaymentOptionsWebView/index.tsx +29 -8
  7. package/src/components/PhoneInputNumber/index.tsx +6 -2
  8. package/src/components/StripeMethodForm/index.tsx +136 -102
  9. package/src/components/VerifyPhone/styles.tsx +1 -2
  10. package/src/components/shared/OToast.tsx +3 -2
  11. package/src/types/index.tsx +5 -0
  12. package/src/utils/index.tsx +5 -0
  13. package/themes/business/index.tsx +2 -0
  14. package/themes/business/src/components/AcceptOrRejectOrder/index.tsx +37 -27
  15. package/themes/business/src/components/BusinessController/index.tsx +0 -1
  16. package/themes/business/src/components/Chat/index.tsx +163 -123
  17. package/themes/business/src/components/DriverMap/index.tsx +17 -6
  18. package/themes/business/src/components/DriverSchedule/index.tsx +45 -8
  19. package/themes/business/src/components/FloatingButton/index.tsx +34 -31
  20. package/themes/business/src/components/GoogleMap/index.tsx +58 -57
  21. package/themes/business/src/components/LoginForm/Otp/index.tsx +31 -3
  22. package/themes/business/src/components/LoginForm/index.tsx +15 -22
  23. package/themes/business/src/components/MapView/index.tsx +14 -10
  24. package/themes/business/src/components/MessagesOption/index.tsx +20 -93
  25. package/themes/business/src/components/NewOrderNotification/index.tsx +123 -96
  26. package/themes/business/src/components/NotFoundSource/index.tsx +2 -2
  27. package/themes/business/src/components/OrderDetails/Business.tsx +1 -1
  28. package/themes/business/src/components/OrderDetails/Delivery.tsx +202 -12
  29. package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx +84 -37
  30. package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx +81 -66
  31. package/themes/business/src/components/OrderDetailsLogistic/index.tsx +200 -0
  32. package/themes/business/src/components/OrderDetailsLogistic/styles.tsx +5 -0
  33. package/themes/business/src/components/OrderMessage/index.tsx +19 -18
  34. package/themes/business/src/components/OrderSummary/index.tsx +114 -123
  35. package/themes/business/src/components/OrdersOption/index.tsx +22 -22
  36. package/themes/business/src/components/PreviousMessages/FooterMessageComponent.tsx +103 -0
  37. package/themes/business/src/components/PreviousMessages/index.tsx +97 -55
  38. package/themes/business/src/components/PreviousOrders/OrderItem.tsx +17 -12
  39. package/themes/business/src/components/PreviousOrders/OrderList.tsx +93 -0
  40. package/themes/business/src/components/PreviousOrders/OrdersGroupedItem.tsx +1 -1
  41. package/themes/business/src/components/PreviousOrders/index.tsx +198 -221
  42. package/themes/business/src/components/ProductItemAccordion/index.tsx +7 -1
  43. package/themes/business/src/components/ReviewCustomer/index.tsx +18 -13
  44. package/themes/business/src/components/StoresList/index.tsx +3 -4
  45. package/themes/business/src/components/UserProfileForm/index.tsx +14 -15
  46. package/themes/business/src/components/shared/OModal.tsx +16 -9
  47. package/themes/business/src/types/index.tsx +25 -10
  48. package/themes/business/src/utils/index.tsx +29 -2
  49. package/themes/doordash/src/components/BusinessesListing/index.tsx +1 -1
  50. package/themes/doordash/src/components/LoginForm/index.tsx +1 -2
  51. package/themes/instacart/src/components/BusinessesListing/index.tsx +1 -1
  52. package/themes/kiosk/src/components/Checkout/index.tsx +6 -0
  53. package/themes/kiosk/src/components/Intro/index.tsx +16 -1
  54. package/themes/kiosk/src/components/LoginForm/index.tsx +7 -9
  55. package/themes/kiosk/src/components/NavBar/index.tsx +14 -14
  56. package/themes/kiosk/src/components/OptionCard/index.tsx +1 -1
  57. package/themes/kiosk/src/components/OrderTypeCardSelector/index.tsx +8 -10
  58. package/themes/kiosk/src/components/PhoneInputNumber/index.tsx +2 -2
  59. package/themes/kiosk/src/components/shared/OButton.tsx +5 -18
  60. package/themes/original/index.tsx +1 -1
  61. package/themes/original/src/components/AddressDetails/index.tsx +19 -3
  62. package/themes/original/src/components/AddressForm/index.tsx +35 -17
  63. package/themes/original/src/components/AddressList/index.tsx +5 -8
  64. package/themes/original/src/components/AnalyticsSegment/index.tsx +193 -10
  65. package/themes/original/src/components/AppleLogin/index.tsx +4 -4
  66. package/themes/original/src/components/AppleLogin/styles.tsx +3 -1
  67. package/themes/original/src/components/BusinessBasicInformation/index.tsx +73 -37
  68. package/themes/original/src/components/BusinessBasicInformation/styles.tsx +10 -12
  69. package/themes/original/src/components/BusinessController/index.tsx +35 -44
  70. package/themes/original/src/components/BusinessController/styles.tsx +12 -5
  71. package/themes/original/src/components/BusinessFeaturedController/index.tsx +21 -54
  72. package/themes/original/src/components/BusinessFeaturedController/styles.tsx +8 -0
  73. package/themes/original/src/components/BusinessInformation/index.tsx +140 -85
  74. package/themes/original/src/components/BusinessItemAccordion/index.tsx +15 -20
  75. package/themes/original/src/components/BusinessListingSearch/index.tsx +347 -341
  76. package/themes/original/src/components/BusinessListingSearch/styles.tsx +0 -18
  77. package/themes/original/src/components/BusinessPreorder/index.tsx +103 -19
  78. package/themes/original/src/components/BusinessProductsCategories/index.tsx +1 -2
  79. package/themes/original/src/components/BusinessProductsList/index.tsx +15 -7
  80. package/themes/original/src/components/BusinessProductsList/styles.tsx +8 -3
  81. package/themes/original/src/components/BusinessProductsListing/UpsellingRedirect.tsx +1 -1
  82. package/themes/original/src/components/BusinessProductsListing/index.tsx +664 -556
  83. package/themes/original/src/components/BusinessProductsListing/styles.tsx +2 -3
  84. package/themes/original/src/components/BusinessReviews/index.tsx +3 -1
  85. package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListFooter.tsx +69 -0
  86. package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListHeader.tsx +406 -0
  87. package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListing.tsx +76 -0
  88. package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx +38 -405
  89. package/themes/original/src/components/BusinessesListing/index.tsx +0 -1
  90. package/themes/original/src/components/Cart/index.tsx +57 -49
  91. package/themes/original/src/components/CartContent/index.tsx +102 -58
  92. package/themes/original/src/components/CartContent/styles.tsx +6 -6
  93. package/themes/original/src/components/Checkout/index.tsx +277 -33
  94. package/themes/original/src/components/CitiesControl/index.tsx +1 -1
  95. package/themes/original/src/components/CouponControl/index.tsx +10 -3
  96. package/themes/original/src/components/DriverTips/index.tsx +14 -6
  97. package/themes/original/src/components/FacebookLogin/styles.tsx +3 -1
  98. package/themes/original/src/components/Favorite/index.tsx +1 -5
  99. package/themes/original/src/components/GPSButton/index.tsx +6 -4
  100. package/themes/original/src/components/GiftCard/GiftCardUI/index.tsx +8 -3
  101. package/themes/original/src/components/GiftCard/PurchaseGiftCard/index.tsx +42 -5
  102. package/themes/original/src/components/GiftCard/PurchaseGiftCard/styles.tsx +2 -0
  103. package/themes/original/src/components/GiftCard/RedeemGiftCard/index.tsx +86 -10
  104. package/themes/original/src/components/GoogleLogin/styles.tsx +1 -1
  105. package/themes/original/src/components/GoogleMap/index.tsx +63 -7
  106. package/themes/original/src/components/Home/index.tsx +13 -4
  107. package/themes/original/src/components/LastOrder/index.tsx +2 -1
  108. package/themes/original/src/components/LastOrders/index.tsx +2 -1
  109. package/themes/original/src/components/LoginForm/Otp/index.tsx +91 -25
  110. package/themes/original/src/components/LoginForm/index.tsx +64 -34
  111. package/themes/original/src/components/LottieAnimation/index.tsx +88 -63
  112. package/themes/original/src/components/MessageListing/index.tsx +9 -2
  113. package/themes/original/src/components/Messages/index.tsx +15 -4
  114. package/themes/original/src/components/MomentOption/index.tsx +193 -92
  115. package/themes/original/src/components/MomentSelector/index.tsx +1 -1
  116. package/themes/original/src/components/MultiCartsPaymethodsAndWallets/index.tsx +162 -50
  117. package/themes/original/src/components/MultiCheckout/index.tsx +385 -46
  118. package/themes/original/src/components/MultiCheckout/styles.tsx +3 -1
  119. package/themes/original/src/components/MultiOrdersDetails/index.tsx +23 -19
  120. package/themes/original/src/components/MyOrders/index.tsx +15 -4
  121. package/themes/original/src/components/NavBar/index.tsx +20 -13
  122. package/themes/original/src/components/NotFoundSource/index.tsx +14 -10
  123. package/themes/original/src/components/OrderDetails/OrderEta.tsx +76 -0
  124. package/themes/original/src/components/OrderDetails/OrderHistory.tsx +21 -5
  125. package/themes/original/src/components/OrderDetails/index.tsx +50 -38
  126. package/themes/original/src/components/OrderDetails/styles.tsx +0 -1
  127. package/themes/original/src/components/OrderItAgain/index.tsx +3 -1
  128. package/themes/original/src/components/OrderProgress/index.tsx +34 -25
  129. package/themes/original/src/components/OrderSummary/index.tsx +83 -57
  130. package/themes/original/src/components/OrderTypeSelector/index.tsx +5 -6
  131. package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/index.tsx +13 -13
  132. package/themes/original/src/components/OrdersOption/index.tsx +43 -20
  133. package/themes/original/src/components/OrdersOption/styles.tsx +1 -1
  134. package/themes/original/src/components/PageBanner/index.tsx +65 -29
  135. package/themes/original/src/components/PageBanner/styles.tsx +0 -3
  136. package/themes/original/src/components/PaymentOptionCard/index.tsx +180 -0
  137. package/themes/original/src/components/PaymentOptionStripe/styles.tsx +3 -0
  138. package/themes/original/src/components/PaymentOptionWallet/index.tsx +56 -56
  139. package/themes/original/src/components/PaymentOptions/index.tsx +100 -34
  140. package/themes/original/src/components/PhoneInputNumber/index.tsx +18 -4
  141. package/themes/original/src/components/ProductForm/index.tsx +87 -31
  142. package/themes/original/src/components/ProductForm/styles.tsx +3 -3
  143. package/themes/original/src/components/ProductItemAccordion/index.tsx +8 -6
  144. package/themes/original/src/components/ProductOptionSubOption/index.tsx +49 -20
  145. package/themes/original/src/components/ProductOptionSubOption/styles.tsx +10 -9
  146. package/themes/original/src/components/ProfessionalFilter/SingleProfessionalCard/index.tsx +108 -0
  147. package/themes/original/src/components/ProfessionalFilter/index.tsx +20 -50
  148. package/themes/original/src/components/ProfessionalProfile/index.tsx +36 -7
  149. package/themes/original/src/components/Promotions/index.tsx +2 -2
  150. package/themes/original/src/components/Promotions/styles.tsx +3 -1
  151. package/themes/original/src/components/ReviewProducts/index.tsx +16 -7
  152. package/themes/original/src/components/ScheduleAccordion/index.tsx +3 -3
  153. package/themes/original/src/components/ServiceForm/index.tsx +63 -20
  154. package/themes/original/src/components/SignupForm/index.tsx +43 -27
  155. package/themes/original/src/components/SingleOrderCard/index.tsx +42 -19
  156. package/themes/original/src/components/SingleOrderCard/styles.tsx +1 -1
  157. package/themes/original/src/components/SingleProductCard/index.tsx +14 -11
  158. package/themes/original/src/components/SingleProductCard/styles.tsx +8 -3
  159. package/themes/original/src/components/SingleProductReview/styles.tsx +1 -1
  160. package/themes/original/src/components/StripeCardsList/index.tsx +61 -5
  161. package/themes/original/src/components/StripeElementsForm/index.tsx +48 -34
  162. package/themes/original/src/components/StripeElementsForm/naked.tsx +12 -1
  163. package/themes/original/src/components/UpsellingProducts/index.tsx +5 -10
  164. package/themes/original/src/components/UserDetails/index.tsx +3 -1
  165. package/themes/original/src/components/UserFormDetails/index.tsx +78 -9
  166. package/themes/original/src/components/UserFormDetails/styles.tsx +1 -1
  167. package/themes/original/src/components/UserProfile/index.tsx +8 -26
  168. package/themes/original/src/components/UserProfileForm/index.tsx +30 -31
  169. package/themes/original/src/components/UserVerification/index.tsx +55 -50
  170. package/themes/original/src/components/WalletTransactionItem/index.tsx +2 -2
  171. package/themes/original/src/components/WalletTransactions/index.tsx +3 -3
  172. package/themes/original/src/components/Wallets/index.tsx +52 -62
  173. package/themes/original/src/components/Wallets/styles.tsx +2 -4
  174. package/themes/original/src/components/shared/OButton.tsx +3 -3
  175. package/themes/original/src/components/shared/OInput.tsx +4 -5
  176. package/themes/original/src/components/shared/OModal.tsx +3 -3
  177. package/themes/original/src/types/index.tsx +37 -10
  178. package/themes/original/src/utils/index.tsx +185 -13
  179. package/themes/uber-eats/src/components/BusinessesListing/index.tsx +1 -1
  180. package/src/navigators/BottomNavigator.tsx +0 -117
  181. package/src/navigators/CheckoutNavigator.tsx +0 -66
  182. package/src/navigators/HomeNavigator.tsx +0 -202
  183. package/src/navigators/NavigationRef.tsx +0 -7
  184. package/src/navigators/RootNavigator.tsx +0 -269
  185. package/src/pages/Account.tsx +0 -34
  186. package/src/pages/AddressForm.tsx +0 -62
  187. package/src/pages/AddressList.tsx +0 -24
  188. package/src/pages/BusinessProductsList.tsx +0 -81
  189. package/src/pages/BusinessesListing.tsx +0 -43
  190. package/src/pages/CartList.tsx +0 -49
  191. package/src/pages/Checkout.tsx +0 -101
  192. package/src/pages/ForgotPassword.tsx +0 -24
  193. package/src/pages/Help.tsx +0 -23
  194. package/src/pages/HelpAccountAndPayment.tsx +0 -23
  195. package/src/pages/HelpGuide.tsx +0 -23
  196. package/src/pages/HelpOrder.tsx +0 -23
  197. package/src/pages/Home.tsx +0 -36
  198. package/src/pages/IntroductoryTutorial.tsx +0 -170
  199. package/src/pages/Login.tsx +0 -47
  200. package/src/pages/MomentOption.tsx +0 -30
  201. package/src/pages/MultiCheckout.tsx +0 -31
  202. package/src/pages/MultiOrdersDetails.tsx +0 -27
  203. package/src/pages/MyOrders.tsx +0 -40
  204. package/src/pages/NetworkError.tsx +0 -24
  205. package/src/pages/NotFound.tsx +0 -22
  206. package/src/pages/OrderDetails.tsx +0 -25
  207. package/src/pages/ProductDetails.tsx +0 -55
  208. package/src/pages/Profile.tsx +0 -36
  209. package/src/pages/ReviewDriver.tsx +0 -30
  210. package/src/pages/ReviewOrder.tsx +0 -32
  211. package/src/pages/ReviewProducts.tsx +0 -30
  212. package/src/pages/Sessions.tsx +0 -22
  213. package/src/pages/Signup.tsx +0 -53
  214. package/src/pages/SpinnerLoader.tsx +0 -10
  215. package/src/pages/Splash.tsx +0 -21
@@ -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,16 +28,27 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
25
28
  businessIds,
26
29
  paymethodsAndWallets,
27
30
  walletsState,
31
+ walletsPaymethod,
28
32
  paymethodSelected,
29
33
  handleSelectPaymethod,
30
34
  handleSelectWallet,
31
- handlePaymethodDataChange
35
+ handlePaymethodDataChange,
36
+ setMethodPaySupported,
37
+ placeByMethodPay,
38
+ methodPaySupported,
39
+ setPlaceByMethodPay,
40
+ openCarts,
41
+ cartTotal,
42
+ handlePlaceOrder,
43
+ merchantId
32
44
  } = props
33
45
 
34
46
  const theme = useTheme()
35
47
  const [, t] = useLanguage()
36
48
  const [{ configs }] = useConfig()
37
49
  const [{ parsePrice }] = useUtils()
50
+ const [, { showToast }] = useToast();
51
+ const { confirmApplePayPayment } = useApplePay()
38
52
 
39
53
  const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
40
54
 
@@ -52,6 +66,10 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
52
66
  }
53
67
  }
54
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
+
55
73
  const getPayIcon = (method: string) => {
56
74
  switch (method) {
57
75
  case 'cash':
@@ -61,42 +79,88 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
61
79
  case 'paypal':
62
80
  return theme.images.general.paypal
63
81
  case 'stripe':
64
- return theme.images.general.stripe
82
+ return theme.images.general.creditCard
65
83
  case 'stripe_direct':
66
84
  return theme.images.general.stripecc
67
85
  case 'stripe_connect':
68
86
  return theme.images.general.stripes
69
87
  case 'stripe_redirect':
70
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
71
93
  default:
72
94
  return theme.images.general.creditCard
73
95
  }
74
96
  }
75
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
+
76
125
  const renderPaymethods = ({ item }: any) => {
77
126
  return (
78
- <TouchableOpacity
79
- onPress={() => handleSelectPaymethod({ ...item, paymethod: { gateway: item.gateway }, paymethod_id: item?.id })}
80
- >
81
- <PMItem
82
- key={item.id}
83
- isActive={paymethodSelected?.id === item.id}
84
- >
85
- <OIcon
86
- src={getPayIcon(item.paymethod?.gateway)}
87
- width={20}
88
- height={20}
89
- color={paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
90
- />
91
- <OText
92
- size={10}
93
- style={{ margin: 0, marginTop: 4 }}
94
- color={paymethodSelected?.id === item.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 })}
95
142
  >
96
- {t(item?.gateway.toUpperCase(), item?.name)}
97
- </OText>
98
- </PMItem>
99
- </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
+ </>
100
164
  )
101
165
  }
102
166
 
@@ -123,7 +187,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
123
187
  <FlatList
124
188
  horizontal
125
189
  showsHorizontalScrollIndicator={false}
126
- data={paymethodsAndWallets.paymethods}
190
+ data={paymethodsAndWallets.paymethods.filter((p: any) => filterMethodsPay(p.gateway))}
127
191
  renderItem={renderPaymethods}
128
192
  keyExtractor={(paymethod: any) => paymethod?.id?.toString?.()}
129
193
  />
@@ -152,10 +216,38 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
152
216
  publicKey={paymethodSelected?.data?.publishable}
153
217
  payType={paymethodSelected?.paymethod?.name}
154
218
  onSelectCard={handlePaymethodDataChange}
219
+ addCardOpen={addCardOpen}
220
+ setAddCardOpen={setAddCardOpen}
221
+ openCarts={openCarts}
222
+ toSave
223
+ handlePaymethodDataChange={handlePaymethodDataChange}
224
+ clientSecret={props.clientSecret}
225
+ onPaymentChange={handlePaymethodDataChange}
155
226
  />
156
227
  </View>
157
228
  )}
158
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
+
159
251
  {(paymethodsAndWallets.loading || walletsState.loading) ? (
160
252
  <>
161
253
  {[...Array(2).keys()].map(i => (
@@ -169,33 +261,52 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
169
261
  </>
170
262
  ) : (
171
263
  <>
172
- {walletsState?.result?.filter((wallet: any) => paymethodsAndWallets.wallets.find((item: any) => item.type === wallet.type)).map((wallet: any, idx: any) => walletName[wallet.type]?.isActive && (
173
- <WalletItem
174
- key={wallet.type}
175
- isBottomBorder={idx === paymethodsAndWallets.wallets?.length - 1}
176
- onPress={() => handleSelectWallet(paymethodSelected.wallet_id === wallet.id ? false : true, wallet)}
177
- >
178
- {paymethodSelected.wallet_id === wallet.id ? (
179
- <MaterialCommunityIcons
180
- name="checkbox-marked"
181
- size={25}
182
- color={theme.colors.primary}
183
- />
184
- ) : (
185
- <MaterialCommunityIcons
186
- name="checkbox-blank-outline"
187
- size={25}
188
- color={theme.colors.disabled}
189
- />
190
- )}
191
- <OText size={12} style={{ flex: 1, marginLeft: 15 }}>{walletName[wallet.type]?.name}</OText>
192
- <OText size={12}>{parsePrice(wallet.balance)}</OText>
193
- </WalletItem>
194
- ))}
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
+ ))}
195
306
  </>
196
307
  )}
197
308
 
198
- <OModal
309
+ {/* <OModal
199
310
  entireModal
200
311
  title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
201
312
  open={addCardOpen.stripe}
@@ -208,6 +319,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
208
319
  enabled={Platform.OS === 'ios' ? true : false}
209
320
  >
210
321
  <StripeElementsForm
322
+ openCarts={openCarts}
211
323
  toSave
212
324
  businessId={businessIds[0]}
213
325
  businessIds={businessIds}
@@ -217,7 +329,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
217
329
  onCancel={() => setAddCardOpen({ ...addCardOpen, stripe: false })}
218
330
  />
219
331
  </KeyboardAvoidingView>
220
- </OModal>
332
+ </OModal> */}
221
333
  </PMContainer>
222
334
  )
223
335
  }