ordering-ui-react-native 0.16.67 → 0.16.68-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 +6 -5
- package/src/DeliveryApp.tsx +43 -1
- package/src/components/ActiveOrders/index.tsx +61 -63
- package/src/components/ActiveOrders/styles.tsx +8 -14
- package/src/components/BusinessInformation/index.tsx +19 -4
- package/src/components/BusinessInformation/styles.tsx +2 -2
- package/src/components/BusinessProductsList/index.tsx +10 -10
- package/src/components/BusinessesListing/index.tsx +1 -1
- package/src/components/Checkout/index.tsx +2 -1
- package/src/components/LanguageSelector/index.tsx +21 -16
- package/src/components/Messages/index.tsx +2 -2
- package/src/components/NotificationSetting/index.tsx +85 -0
- package/src/components/OrdersOption/index.tsx +54 -56
- package/src/components/PaymentOptions/index.tsx +298 -345
- package/src/components/PaymentOptionsWebView/index.tsx +119 -120
- package/src/components/SingleProductReview/index.tsx +7 -4
- package/src/components/StripeElementsForm/index.tsx +25 -16
- package/src/components/VerifyPhone/styles.tsx +1 -2
- package/src/components/shared/OBottomPopup.tsx +6 -2
- package/src/components/shared/OToast.tsx +4 -4
- package/src/index.tsx +2 -0
- package/src/types/@fatnlazycat/react-native-recaptcha-v3/index.d.ts +1 -0
- package/src/utils/index.tsx +2 -1
- package/themes/business/src/components/AcceptOrRejectOrder/index.tsx +260 -238
- package/themes/business/src/components/AcceptOrRejectOrder/styles.tsx +6 -4
- package/themes/business/src/components/BusinessController/index.tsx +2 -2
- package/themes/business/src/components/Chat/index.tsx +31 -31
- package/themes/business/src/components/DriverMap/index.tsx +7 -5
- package/themes/business/src/components/LoginForm/index.tsx +111 -74
- package/themes/business/src/components/MapView/index.tsx +14 -3
- package/themes/business/src/components/MessagesOption/index.tsx +11 -1
- package/themes/business/src/components/NewOrderNotification/index.tsx +31 -41
- package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx +70 -43
- package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx +3 -3
- package/themes/business/src/components/OrdersListManager/index.tsx +10 -3
- package/themes/business/src/components/OrdersOption/index.tsx +74 -76
- package/themes/business/src/components/OrdersOption/styles.tsx +5 -1
- package/themes/business/src/components/OrdersOptionBusiness/index.tsx +15 -1
- package/themes/business/src/components/OrdersOptionCity/index.tsx +15 -1
- package/themes/business/src/components/OrdersOptionDate/index.tsx +19 -6
- package/themes/business/src/components/OrdersOptionDelivery/index.tsx +15 -1
- package/themes/business/src/components/OrdersOptionDriver/index.tsx +15 -1
- package/themes/business/src/components/OrdersOptionPaymethod/index.tsx +15 -1
- package/themes/business/src/components/OrdersOptionStatus/index.tsx +10 -1
- package/themes/business/src/components/PreviousMessages/index.tsx +17 -18
- 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 +440 -245
- package/themes/business/src/components/PreviousOrders/styles.tsx +31 -3
- package/themes/business/src/components/ProductItemAccordion/index.tsx +3 -2
- package/themes/business/src/components/ReviewCustomer/index.tsx +39 -15
- package/themes/business/src/components/shared/ODropDown.tsx +42 -8
- package/themes/business/src/components/shared/ODropDownCalendar.tsx +36 -7
- package/themes/business/src/components/shared/OLink.tsx +33 -13
- package/themes/business/src/components/shared/OText.tsx +8 -2
- package/themes/business/src/types/index.tsx +22 -10
- package/themes/business/src/utils/index.tsx +10 -0
- 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/index.tsx +121 -10
- package/themes/kiosk/src/components/LoginForm/styles.tsx +5 -0
- 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/ProductForm/index.tsx +1 -14
- package/themes/kiosk/src/components/shared/OButton.tsx +5 -18
- package/themes/kiosk/src/types/index.d.ts +2 -0
- package/themes/original/index.tsx +8 -0
- package/themes/original/src/components/AddressDetails/index.tsx +10 -8
- package/themes/original/src/components/AddressForm/index.tsx +153 -137
- package/themes/original/src/components/AddressList/index.tsx +18 -18
- package/themes/original/src/components/AddressList/styles.tsx +4 -2
- package/themes/original/src/components/AppleLogin/index.tsx +4 -4
- package/themes/original/src/components/BusinessBasicInformation/index.tsx +49 -33
- package/themes/original/src/components/BusinessController/index.tsx +101 -70
- package/themes/original/src/components/BusinessController/styles.tsx +14 -9
- package/themes/original/src/components/BusinessInformation/index.tsx +10 -31
- package/themes/original/src/components/BusinessItemAccordion/index.tsx +12 -6
- package/themes/original/src/components/BusinessListingSearch/BusinessControllerSkeletons/index.tsx +57 -0
- package/themes/original/src/components/BusinessListingSearch/MaxSectionItem/index.tsx +59 -0
- package/themes/original/src/components/BusinessListingSearch/MaxSectionItem/styles.tsx +13 -0
- package/themes/original/src/components/BusinessListingSearch/index.tsx +87 -142
- package/themes/original/src/components/BusinessListingSearch/styles.tsx +10 -12
- package/themes/original/src/components/BusinessProductsList/SubcategoriesComponent/index.tsx +87 -0
- package/themes/original/src/components/BusinessProductsList/SubcategoriesComponent/styles.tsx +12 -0
- package/themes/original/src/components/BusinessProductsList/index.tsx +54 -60
- package/themes/original/src/components/BusinessProductsList/styles.tsx +0 -3
- package/themes/original/src/components/BusinessProductsListing/index.tsx +561 -477
- package/themes/original/src/components/BusinessProductsListing/styles.tsx +13 -12
- package/themes/original/src/components/BusinessTypeFilter/index.tsx +3 -2
- package/themes/original/src/components/BusinessesListing/Layout/Appointment/index.tsx +2 -1
- package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx +93 -98
- package/themes/original/src/components/BusinessesListing/Layout/Original/styles.tsx +1 -9
- package/themes/original/src/components/BusinessesListing/index.tsx +13 -8
- package/themes/original/src/components/Cart/index.tsx +63 -38
- package/themes/original/src/components/CartContent/index.tsx +80 -18
- package/themes/original/src/components/CartContent/styles.tsx +11 -1
- package/themes/original/src/components/Checkout/index.tsx +110 -114
- package/themes/original/src/components/Checkout/styles.tsx +4 -3
- 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/DriverTips/index.tsx +47 -37
- package/themes/original/src/components/DriverTips/styles.tsx +2 -1
- 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 +69 -45
- 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 +20 -19
- package/themes/original/src/components/GPSButton/styles.ts +3 -3
- package/themes/original/src/components/GoogleMap/index.tsx +10 -1
- package/themes/original/src/components/Help/index.tsx +7 -7
- package/themes/original/src/components/HelpAccountAndPayment/index.tsx +14 -20
- package/themes/original/src/components/HelpAccountAndPayment/styles.tsx +6 -0
- package/themes/original/src/components/HelpGuide/index.tsx +12 -11
- package/themes/original/src/components/HelpGuide/styles.tsx +5 -0
- package/themes/original/src/components/HelpOrder/index.tsx +12 -20
- package/themes/original/src/components/HelpOrder/styles.tsx +8 -1
- package/themes/original/src/components/LanguageSelector/index.tsx +19 -14
- package/themes/original/src/components/LoginForm/Otp/index.tsx +89 -73
- package/themes/original/src/components/LoginForm/Otp/styles.tsx +0 -1
- package/themes/original/src/components/LoginForm/index.tsx +98 -41
- package/themes/original/src/components/LottieAnimation/index.tsx +78 -0
- package/themes/original/src/components/MessageListing/index.tsx +7 -7
- package/themes/original/src/components/Messages/index.tsx +35 -20
- package/themes/original/src/components/MomentOption/index.tsx +17 -11
- package/themes/original/src/components/MultiCart/index.tsx +50 -0
- package/themes/original/src/components/MultiCartsPaymethodsAndWallets/index.tsx +92 -93
- package/themes/original/src/components/MultiCheckout/index.tsx +158 -77
- package/themes/original/src/components/MultiOrdersDetails/index.tsx +60 -33
- package/themes/original/src/components/MyOrders/index.tsx +86 -20
- package/themes/original/src/components/NavBar/index.tsx +7 -6
- package/themes/original/src/components/NetworkError/index.tsx +5 -3
- package/themes/original/src/components/NotFoundSource/index.tsx +2 -1
- package/themes/original/src/components/Notifications/index.tsx +144 -0
- package/themes/original/src/components/Notifications/styles.tsx +20 -0
- package/themes/original/src/components/OrderDetails/index.tsx +114 -15
- package/themes/original/src/components/OrderDetails/styles.tsx +15 -2
- package/themes/original/src/components/OrderItAgain/index.tsx +75 -0
- package/themes/original/src/components/OrderItAgain/styles.tsx +10 -0
- package/themes/original/src/components/OrderProgress/index.tsx +77 -66
- package/themes/original/src/components/OrderProgress/styles.tsx +5 -0
- package/themes/original/src/components/OrderSummary/index.tsx +3 -36
- package/themes/original/src/components/OrderTypeSelector/index.tsx +13 -6
- package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/index.tsx +94 -98
- package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/index.tsx +3 -0
- package/themes/original/src/components/OrdersOption/index.tsx +97 -55
- 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 +1 -2
- package/themes/original/src/components/PhoneInputNumber/index.tsx +1 -1
- package/themes/original/src/components/PlaceSpot/index.tsx +249 -47
- package/themes/original/src/components/PlaceSpot/styles.tsx +0 -2
- package/themes/original/src/components/PreviousOrders/index.tsx +3 -2
- package/themes/original/src/components/ProductForm/index.tsx +212 -253
- package/themes/original/src/components/ProductForm/styles.tsx +5 -8
- package/themes/original/src/components/ProductItemAccordion/index.tsx +199 -128
- package/themes/original/src/components/ProductOptionSubOption/index.tsx +17 -9
- package/themes/original/src/components/ProductOptionSubOption/styles.tsx +0 -1
- package/themes/original/src/components/ProfessionalFilter/index.tsx +2 -1
- package/themes/original/src/components/ProfessionalProfile/index.tsx +19 -8
- package/themes/original/src/components/Promotions/index.tsx +234 -220
- package/themes/original/src/components/Promotions/styles.tsx +7 -2
- package/themes/original/src/components/ReviewDriver/index.tsx +3 -3
- package/themes/original/src/components/ReviewOrder/index.tsx +43 -11
- package/themes/original/src/components/ReviewOrder/styles.tsx +7 -0
- package/themes/original/src/components/ReviewProducts/index.tsx +8 -5
- 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 +328 -264
- package/themes/original/src/components/SignupForm/index.tsx +134 -89
- package/themes/original/src/components/SingleOrderCard/index.tsx +129 -54
- package/themes/original/src/components/SingleOrderCard/styles.tsx +10 -8
- package/themes/original/src/components/SingleProductCard/index.tsx +101 -85
- package/themes/original/src/components/SingleProductCard/styles.tsx +2 -9
- package/themes/original/src/components/SingleProductReview/index.tsx +38 -5
- package/themes/original/src/components/SingleProductReview/styles.tsx +12 -0
- package/themes/original/src/components/StripeCardsList/index.tsx +1 -1
- package/themes/original/src/components/StripeElementsForm/index.tsx +13 -2
- package/themes/original/src/components/UpsellingProducts/index.tsx +244 -215
- package/themes/original/src/components/UpsellingProducts/styles.tsx +12 -1
- package/themes/original/src/components/UserDetails/index.tsx +5 -3
- package/themes/original/src/components/UserFormDetails/index.tsx +6 -48
- package/themes/original/src/components/UserProfile/index.tsx +58 -35
- package/themes/original/src/components/UserProfile/styles.ts +17 -0
- package/themes/original/src/components/UserProfileForm/index.tsx +19 -28
- package/themes/original/src/components/UserProfileForm/styles.tsx +7 -0
- package/themes/original/src/components/WalletTransactions/index.tsx +76 -0
- package/themes/original/src/components/WalletTransactions/styles.tsx +13 -0
- package/themes/original/src/components/Wallets/index.tsx +176 -164
- package/themes/original/src/components/Wallets/styles.tsx +12 -8
- 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 +6 -4
- package/themes/original/src/components/shared/OButton.tsx +9 -4
- package/themes/original/src/components/shared/OIcon.tsx +8 -1
- package/themes/original/src/components/shared/OInput.tsx +10 -1
- package/themes/original/src/layouts/Container.tsx +13 -9
- package/themes/original/src/types/index.tsx +55 -5
- package/themes/original/src/utils/index.tsx +103 -58
- package/themes/uber-eats/src/components/BusinessesListing/index.tsx +1 -1
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import { OText } from '../shared'
|
|
3
|
+
import { useLanguage } from 'ordering-components/native'
|
|
4
|
+
import { useTheme } from 'styled-components/native'
|
|
5
|
+
import { SingleProductCard } from '../SingleProductCard'
|
|
6
|
+
import { OrderItAgainParams } from '../../types'
|
|
7
|
+
import { ScrollView, Dimensions } from 'react-native'
|
|
8
|
+
import moment from 'moment';
|
|
9
|
+
import {
|
|
10
|
+
Container,
|
|
11
|
+
ProductWrapper
|
|
12
|
+
} from './styles'
|
|
13
|
+
|
|
14
|
+
export const OrderItAgain = (props: OrderItAgainParams) => {
|
|
15
|
+
const {
|
|
16
|
+
onProductClick,
|
|
17
|
+
productList,
|
|
18
|
+
businessId,
|
|
19
|
+
categoryState,
|
|
20
|
+
currentCart,
|
|
21
|
+
handleUpdateProducts,
|
|
22
|
+
navigation,
|
|
23
|
+
searchValue
|
|
24
|
+
} = props
|
|
25
|
+
|
|
26
|
+
const [, t] = useLanguage()
|
|
27
|
+
const theme = useTheme()
|
|
28
|
+
const { width } = Dimensions.get('window');
|
|
29
|
+
const productsFilterd = productList?.length > 0 && productList.filter((product : any) => !searchValue || product?.name?.toLowerCase()?.includes(searchValue?.toLowerCase()))?.sort((a: any, b:any) => moment(b?.last_ordered_date).valueOf() - moment(a?.last_ordered_date).valueOf())
|
|
30
|
+
return (
|
|
31
|
+
productsFilterd?.length > 0 ? (
|
|
32
|
+
<Container>
|
|
33
|
+
<OText
|
|
34
|
+
size={16}
|
|
35
|
+
lineHeight={24}
|
|
36
|
+
color={theme.colors.textNormal}
|
|
37
|
+
style={{
|
|
38
|
+
fontWeight: '600',
|
|
39
|
+
marginBottom: 6
|
|
40
|
+
}}
|
|
41
|
+
>
|
|
42
|
+
{t('ORDER_IT_AGAIN', 'Order it again')}
|
|
43
|
+
</OText>
|
|
44
|
+
<OText
|
|
45
|
+
size={12}
|
|
46
|
+
lineHeight={18}
|
|
47
|
+
color={theme.colors.disabled}
|
|
48
|
+
>
|
|
49
|
+
{t('ORDER_IT_AGAIN_DESC', 'Quickly add items from your past orders.')}
|
|
50
|
+
</OText>
|
|
51
|
+
<ScrollView
|
|
52
|
+
horizontal
|
|
53
|
+
showsVerticalScrollIndicator={false}
|
|
54
|
+
showsHorizontalScrollIndicator={false}
|
|
55
|
+
>
|
|
56
|
+
{productsFilterd.map((product: any, i: number) => (
|
|
57
|
+
<ProductWrapper key={'prod_' + product.id + `_${i}`} style={{ width: width - 120, }}>
|
|
58
|
+
<SingleProductCard
|
|
59
|
+
isSoldOut={product.inventoried && !product.quantity}
|
|
60
|
+
product={product}
|
|
61
|
+
businessId={businessId}
|
|
62
|
+
categoryState={categoryState}
|
|
63
|
+
onProductClick={() => onProductClick(product)}
|
|
64
|
+
productAddedToCartLength={currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0)}
|
|
65
|
+
handleUpdateProducts={handleUpdateProducts}
|
|
66
|
+
navigation={navigation}
|
|
67
|
+
isPreviously
|
|
68
|
+
/>
|
|
69
|
+
</ProductWrapper>
|
|
70
|
+
))}
|
|
71
|
+
</ScrollView>
|
|
72
|
+
</Container>
|
|
73
|
+
) : null
|
|
74
|
+
)
|
|
75
|
+
}
|
|
@@ -17,7 +17,8 @@ import {
|
|
|
17
17
|
ProgressBar,
|
|
18
18
|
TimeWrapper,
|
|
19
19
|
ProgressTextWrapper,
|
|
20
|
-
OrderInfoWrapper
|
|
20
|
+
OrderInfoWrapper,
|
|
21
|
+
OrderProgressWrapper
|
|
21
22
|
} from './styles'
|
|
22
23
|
const OrderProgressUI = (props: any) => {
|
|
23
24
|
const {
|
|
@@ -33,6 +34,7 @@ const OrderProgressUI = (props: any) => {
|
|
|
33
34
|
const [{ optimizeImage, parseDate, parseTime }] = useUtils()
|
|
34
35
|
const [lastOrder, setLastOrder] = useState<any>(null)
|
|
35
36
|
const imageFails = theme.images.general.emptyActiveOrders
|
|
37
|
+
const [initialLoaded, setInitialLoaded] = useState(false)
|
|
36
38
|
|
|
37
39
|
const styles = StyleSheet.create({
|
|
38
40
|
main: {
|
|
@@ -46,9 +48,9 @@ const OrderProgressUI = (props: any) => {
|
|
|
46
48
|
height: 1
|
|
47
49
|
},
|
|
48
50
|
shadowColor: '#000',
|
|
49
|
-
shadowOpacity: 0.
|
|
50
|
-
shadowRadius:
|
|
51
|
-
elevation:
|
|
51
|
+
shadowOpacity: 0.2,
|
|
52
|
+
shadowRadius: 2,
|
|
53
|
+
elevation: 3
|
|
52
54
|
},
|
|
53
55
|
logoWrapper: {
|
|
54
56
|
overflow: 'hidden',
|
|
@@ -135,73 +137,82 @@ const OrderProgressUI = (props: any) => {
|
|
|
135
137
|
}
|
|
136
138
|
}, [isFocused])
|
|
137
139
|
|
|
140
|
+
useEffect(() => {
|
|
141
|
+
if (orderList.loading || initialLoaded) return
|
|
142
|
+
setInitialLoaded(true)
|
|
143
|
+
}, [orderList.loading, initialLoaded])
|
|
144
|
+
|
|
138
145
|
return (
|
|
139
146
|
<>
|
|
140
|
-
{orderList?.loading && (
|
|
141
|
-
<
|
|
142
|
-
<
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
147
|
+
{(orderList?.loading && !initialLoaded) && (
|
|
148
|
+
<OrderProgressWrapper>
|
|
149
|
+
<Placeholder Animation={Fade} height={Platform.OS === 'ios' ? 147.5 : 158}>
|
|
150
|
+
<PlaceholderLine height={60} style={{ borderRadius: 8, marginBottom: 10 }} />
|
|
151
|
+
<PlaceholderLine height={20} style={{ marginBottom: 10 }} />
|
|
152
|
+
<PlaceholderLine height={40} style={{ borderRadius: 8, marginBottom: 10 }} />
|
|
153
|
+
</Placeholder>
|
|
154
|
+
</OrderProgressWrapper>
|
|
146
155
|
)}
|
|
147
|
-
{!orderList?.loading && orderList?.orders?.length > 0 && lastOrder && (
|
|
148
|
-
<
|
|
149
|
-
<
|
|
150
|
-
<
|
|
151
|
-
<
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
<
|
|
175
|
-
<
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
156
|
+
{(!orderList?.loading || initialLoaded) && orderList?.orders?.length > 0 && lastOrder && (
|
|
157
|
+
<OrderProgressWrapper>
|
|
158
|
+
<View style={styles.main}>
|
|
159
|
+
<OrderInfoWrapper style={{ flex: 1 }}>
|
|
160
|
+
<View style={styles.logoWrapper}>
|
|
161
|
+
<FastImage
|
|
162
|
+
style={{ width: 50, height: 50 }}
|
|
163
|
+
source={{
|
|
164
|
+
uri: optimizeImage(lastOrder?.business?.logo, 'h_50,c_limit'),
|
|
165
|
+
priority: FastImage.priority.normal,
|
|
166
|
+
}}
|
|
167
|
+
resizeMode={FastImage.resizeMode.cover}
|
|
168
|
+
/>
|
|
169
|
+
</View>
|
|
170
|
+
<View style={{
|
|
171
|
+
paddingHorizontal: 10,
|
|
172
|
+
flex: 1
|
|
173
|
+
}}
|
|
174
|
+
>
|
|
175
|
+
<OText
|
|
176
|
+
size={13}
|
|
177
|
+
style={{
|
|
178
|
+
fontWeight: 'bold',
|
|
179
|
+
marginBottom: 3
|
|
180
|
+
}}
|
|
181
|
+
>{t('ORDER_IN_PROGRESS', 'Order in progress')}</OText>
|
|
182
|
+
<OText size={11} numberOfLines={1} ellipsizeMode='tail'>{t('RESTAURANT_PREPARING_YOUR_ORDER', 'The restaurant is preparing your order')}</OText>
|
|
183
|
+
<TouchableOpacity onPress={() => handleGoToOrder('MyOrders')}>
|
|
184
|
+
<View style={styles.navigationButton}>
|
|
185
|
+
<OText size={11} color={theme.colors.primary}>{t('GO_TO_MY_ORDERS', 'Go to my orders')}</OText>
|
|
186
|
+
<IconAntDesign
|
|
187
|
+
name='arrowright'
|
|
188
|
+
color={theme.colors.primary}
|
|
189
|
+
size={13}
|
|
190
|
+
style={{ marginHorizontal: 5 }}
|
|
191
|
+
/>
|
|
192
|
+
</View>
|
|
193
|
+
</TouchableOpacity>
|
|
194
|
+
</View>
|
|
195
|
+
</OrderInfoWrapper>
|
|
196
|
+
<View style={{ flex: 1 }}>
|
|
197
|
+
<ProgressContentWrapper>
|
|
198
|
+
<ProgressBar style={{ width: getOrderStatus(lastOrder.status)?.percentage ? `${getOrderStatus(lastOrder.status)?.percentage}%` : '0%' }} />
|
|
199
|
+
</ProgressContentWrapper>
|
|
200
|
+
<ProgressTextWrapper>
|
|
201
|
+
<OText size={12} style={{ width: '50%' }}>{getOrderStatus(lastOrder.status)?.value}</OText>
|
|
202
|
+
<TimeWrapper>
|
|
203
|
+
<OText size={11}>{t('ESTIMATED_DELIVERY', 'Estimated delivery')}</OText>
|
|
204
|
+
<OText size={11}>
|
|
205
|
+
{lastOrder?.delivery_datetime_utc
|
|
206
|
+
? parseTime(lastOrder?.delivery_datetime_utc, { outputFormat: 'hh:mm A' })
|
|
207
|
+
: parseTime(lastOrder?.delivery_datetime, { utc: false })}
|
|
208
|
+
-
|
|
209
|
+
{convertDiffToHours(lastOrder)}
|
|
210
|
+
</OText>
|
|
211
|
+
</TimeWrapper>
|
|
212
|
+
</ProgressTextWrapper>
|
|
184
213
|
</View>
|
|
185
|
-
</OrderInfoWrapper>
|
|
186
|
-
<View style={{ flex: 1 }}>
|
|
187
|
-
<ProgressContentWrapper>
|
|
188
|
-
<ProgressBar style={{ width: getOrderStatus(lastOrder.status)?.percentage ? `${getOrderStatus(lastOrder.status)?.percentage}%` : '0%' }} />
|
|
189
|
-
</ProgressContentWrapper>
|
|
190
|
-
<ProgressTextWrapper>
|
|
191
|
-
<OText size={12} style={{ width: '50%' }}>{getOrderStatus(lastOrder.status)?.value}</OText>
|
|
192
|
-
<TimeWrapper>
|
|
193
|
-
<OText size={11}>{t('ESTIMATED_DELIVERY', 'Estimated delivery')}</OText>
|
|
194
|
-
<OText size={11}>
|
|
195
|
-
{lastOrder?.delivery_datetime_utc
|
|
196
|
-
? parseTime(lastOrder?.delivery_datetime_utc, { outputFormat: 'hh:mm A' })
|
|
197
|
-
: parseTime(lastOrder?.delivery_datetime, { utc: false })}
|
|
198
|
-
-
|
|
199
|
-
{convertDiffToHours(lastOrder)}
|
|
200
|
-
</OText>
|
|
201
|
-
</TimeWrapper>
|
|
202
|
-
</ProgressTextWrapper>
|
|
203
214
|
</View>
|
|
204
|
-
</
|
|
215
|
+
</OrderProgressWrapper>
|
|
205
216
|
)}
|
|
206
217
|
{/* {!orderList?.loading && orderList?.orders?.length === 0 && (
|
|
207
218
|
<NotFoundSource
|
|
@@ -26,7 +26,6 @@ import AntIcon from 'react-native-vector-icons/AntDesign'
|
|
|
26
26
|
import { TaxInformation } from '../TaxInformation';
|
|
27
27
|
import { TouchableOpacity } from 'react-native';
|
|
28
28
|
import { OAlert } from '../../../../../src/components/shared'
|
|
29
|
-
import { PlaceSpot } from '../PlaceSpot'
|
|
30
29
|
|
|
31
30
|
const OrderSummaryUI = (props: any) => {
|
|
32
31
|
const {
|
|
@@ -39,8 +38,7 @@ const OrderSummaryUI = (props: any) => {
|
|
|
39
38
|
commentState,
|
|
40
39
|
handleChangeComment,
|
|
41
40
|
onNavigationRedirect,
|
|
42
|
-
handleRemoveOfferClick
|
|
43
|
-
placeSpotTypes
|
|
41
|
+
handleRemoveOfferClick
|
|
44
42
|
} = props;
|
|
45
43
|
|
|
46
44
|
const theme = useTheme()
|
|
@@ -51,7 +49,6 @@ const OrderSummaryUI = (props: any) => {
|
|
|
51
49
|
const [validationFields] = useValidationFields();
|
|
52
50
|
const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, data: null, type: '' })
|
|
53
51
|
const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
|
|
54
|
-
const [openPlaceModal, setOpenPlaceModal] = useState(false)
|
|
55
52
|
const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled;
|
|
56
53
|
|
|
57
54
|
const handleDeleteClick = (product: any) => {
|
|
@@ -295,33 +292,15 @@ const OrderSummaryUI = (props: any) => {
|
|
|
295
292
|
{cart?.total >= 1 && (
|
|
296
293
|
<View style={{ marginTop: 15, borderTopWidth: 1, borderTopColor: '#d9d9d9' }}>
|
|
297
294
|
<OSTable style={{ marginTop: 15 }}>
|
|
298
|
-
<OText size={14} style={{ fontWeight: 'bold' }}>
|
|
295
|
+
<OText size={14} style={{ fontWeight: 'bold' }} color={theme.colors.textNormal}>
|
|
299
296
|
{t('TOTAL', 'Total')}
|
|
300
297
|
</OText>
|
|
301
|
-
<OText size={14} style={{ fontWeight: 'bold' }} >
|
|
298
|
+
<OText size={14} style={{ fontWeight: 'bold' }} color={theme.colors.textNormal}>
|
|
302
299
|
{parsePrice(cart?.balance >= 0 ? cart?.balance : 0)}
|
|
303
300
|
</OText>
|
|
304
301
|
</OSTable>
|
|
305
302
|
</View>
|
|
306
303
|
)}
|
|
307
|
-
{placeSpotTypes && placeSpotTypes.includes(orderState?.options?.type) && (
|
|
308
|
-
<OSTable style={{ marginTop: 15 }}>
|
|
309
|
-
<OText size={14} lineHeight={21} weight={'600'}>
|
|
310
|
-
{t('SPOT', 'Spot')}: {cart?.place?.name || t('NO_SELECTED', 'No selected')}
|
|
311
|
-
</OText>
|
|
312
|
-
<TouchableOpacity onPress={() => setOpenPlaceModal(true)}>
|
|
313
|
-
<OText
|
|
314
|
-
size={14}
|
|
315
|
-
lineHeight={21}
|
|
316
|
-
weight={'600'}
|
|
317
|
-
color={theme.colors.primary}
|
|
318
|
-
style={{ textDecorationLine: 'underline' }}
|
|
319
|
-
>
|
|
320
|
-
{t('EDIT', 'Edit')}
|
|
321
|
-
</OText>
|
|
322
|
-
</TouchableOpacity>
|
|
323
|
-
</OSTable>
|
|
324
|
-
)}
|
|
325
304
|
{cart?.status !== 2 && (
|
|
326
305
|
<OSTable>
|
|
327
306
|
<View style={{ width: '100%', marginTop: 20 }}>
|
|
@@ -370,18 +349,6 @@ const OrderSummaryUI = (props: any) => {
|
|
|
370
349
|
products={cart?.products}
|
|
371
350
|
/>
|
|
372
351
|
</OModal>
|
|
373
|
-
<OModal
|
|
374
|
-
open={openPlaceModal}
|
|
375
|
-
title={t('CHOOSE_YOUR_SPOT', 'Choose your spot')}
|
|
376
|
-
onClose={() => setOpenPlaceModal(false)}
|
|
377
|
-
entireModal
|
|
378
|
-
>
|
|
379
|
-
<PlaceSpot
|
|
380
|
-
cart={cart}
|
|
381
|
-
isOpenPlaceSpot={openPlaceModal}
|
|
382
|
-
setOpenPlaceModal={setOpenPlaceModal}
|
|
383
|
-
/>
|
|
384
|
-
</OModal>
|
|
385
352
|
<OAlert
|
|
386
353
|
open={confirm.open}
|
|
387
354
|
title={confirm.title}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { useEffect } from 'react'
|
|
2
2
|
import {
|
|
3
3
|
OrderTypeControl,
|
|
4
4
|
useLanguage,
|
|
@@ -11,11 +11,13 @@ import { OrderTypeSelectParams } from '../../types'
|
|
|
11
11
|
import { OIcon, OText } from '../shared'
|
|
12
12
|
import NavBar from '../NavBar';
|
|
13
13
|
import { ORDER_TYPES } from '../../config/constants';
|
|
14
|
+
import AntDesignIcon from 'react-native-vector-icons/AntDesign'
|
|
14
15
|
|
|
15
16
|
const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
|
|
16
17
|
const {
|
|
17
18
|
navigation,
|
|
18
19
|
handleChangeOrderType,
|
|
20
|
+
handleChangeType,
|
|
19
21
|
typeSelected,
|
|
20
22
|
defaultValue,
|
|
21
23
|
configTypes,
|
|
@@ -44,12 +46,16 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
|
|
|
44
46
|
if (!orderState.loading) {
|
|
45
47
|
setOrderTypeValue && setOrderTypeValue(orderType)
|
|
46
48
|
handleChangeOrderType(orderType)
|
|
47
|
-
if(!isChewLayout){
|
|
49
|
+
if (!isChewLayout) {
|
|
48
50
|
goToBack();
|
|
49
51
|
}
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
|
|
55
|
+
useEffect(() => {
|
|
56
|
+
handleChangeType && handleChangeType(typeSelected)
|
|
57
|
+
}, [typeSelected])
|
|
58
|
+
|
|
53
59
|
return (
|
|
54
60
|
<Wrapper>
|
|
55
61
|
{isChewLayout ? (
|
|
@@ -58,7 +64,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
|
|
|
58
64
|
horizontal
|
|
59
65
|
showsHorizontalScrollIndicator={false}
|
|
60
66
|
>
|
|
61
|
-
{chewOrderTypes?.map((type
|
|
67
|
+
{chewOrderTypes?.map((type: any) => (
|
|
62
68
|
<TabBtn
|
|
63
69
|
key={type.value}
|
|
64
70
|
onPress={() => handleChangeOrderTypeCallback(type.value)}
|
|
@@ -89,12 +95,13 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
|
|
|
89
95
|
<>
|
|
90
96
|
<NavBar
|
|
91
97
|
onActionLeft={() => goToBack()}
|
|
92
|
-
btnStyle={{ paddingLeft: 0 }}
|
|
93
|
-
paddingTop={0}
|
|
98
|
+
btnStyle={{ paddingLeft: 0, width: 50 }}
|
|
99
|
+
paddingTop={Platform.OS === 'ios' ? 10 : 0}
|
|
94
100
|
style={{ paddingBottom: 0 }}
|
|
95
101
|
title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
|
|
96
102
|
titleAlign={'center'}
|
|
97
103
|
titleStyle={{ fontSize: 14 }}
|
|
104
|
+
noMargin
|
|
98
105
|
/>
|
|
99
106
|
{
|
|
100
107
|
items.length > 0 && (
|
|
@@ -108,7 +115,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
|
|
|
108
115
|
<OText size={10} lineHeight={15} color={theme.colors.white}>{item?.description}</OText>
|
|
109
116
|
<View style={{ flexDirection: 'row', alignItems: 'center' }}>
|
|
110
117
|
<OText size={10} lineHeight={15} color={theme.colors.white}>{t('START_MY_ORDER', 'Start my order')}</OText>
|
|
111
|
-
<
|
|
118
|
+
<AntDesignIcon name='arrowleft' size={26} color={theme.colors.white} style={{ transform: [{ rotate: '180deg' }], marginStart: 4 }} />
|
|
112
119
|
</View>
|
|
113
120
|
</MaskCont>
|
|
114
121
|
</BgImage>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import React
|
|
2
|
-
import {
|
|
1
|
+
import React from 'react'
|
|
2
|
+
import { useOrder } from 'ordering-components/native'
|
|
3
3
|
import { BusinessController } from '../../BusinessController'
|
|
4
4
|
import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
|
|
5
5
|
|
|
@@ -12,43 +12,12 @@ import {
|
|
|
12
12
|
} from 'react-native';
|
|
13
13
|
import { PreviousBusinessOrderedParams } from '../../../types';
|
|
14
14
|
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
businessId,
|
|
21
|
-
onNavigationRedirect,
|
|
22
|
-
isBusinessesSearchList,
|
|
23
|
-
businessLoading
|
|
24
|
-
} = props
|
|
25
|
-
|
|
26
|
-
const [orderState] = useOrder()
|
|
27
|
-
const windowWidth = Dimensions.get('window').width;
|
|
28
|
-
|
|
29
|
-
const onBusinessClick = (business: any) => {
|
|
30
|
-
onNavigationRedirect('Business', { store: business.slug })
|
|
31
|
-
}
|
|
32
|
-
useEffect(() => {
|
|
33
|
-
if (businessesList?.loading && businessesList?.businesses?.length === 0) {
|
|
34
|
-
setBusinessLoading(true)
|
|
35
|
-
} else {
|
|
36
|
-
setBusinessLoading(false)
|
|
37
|
-
}
|
|
38
|
-
}, [businessesList?.loading])
|
|
39
|
-
|
|
40
|
-
const styles = StyleSheet.create({
|
|
41
|
-
container: {
|
|
42
|
-
marginBottom: 0,
|
|
43
|
-
},
|
|
44
|
-
});
|
|
45
|
-
|
|
46
|
-
const BusinessControllerList = ({ style }: any) => {
|
|
47
|
-
return (
|
|
48
|
-
<>
|
|
49
|
-
{businessesList.businesses?.filter((business: any) => businessId?.includes(business?.id))?.map((business: any, i: number) => (
|
|
15
|
+
const BusinessControllerList = ({ businesses, onBusinessClick, navigation, orderState, handleCustomUpdate, style }: any) => {
|
|
16
|
+
return (
|
|
17
|
+
<>
|
|
18
|
+
{businesses?.result?.map((business: any, i: number) => (
|
|
19
|
+
<View style={style} key={`${business.id}_` + i}>
|
|
50
20
|
<BusinessController
|
|
51
|
-
key={`${business.id}_` + i}
|
|
52
21
|
business={business}
|
|
53
22
|
isBusinessOpen={business.open}
|
|
54
23
|
handleCustomClick={() => onBusinessClick(business)}
|
|
@@ -62,76 +31,115 @@ export const PreviousBusinessOrderedUI = (props: PreviousBusinessOrderedParams)
|
|
|
62
31
|
businessDeliveryTime={business?.delivery_time}
|
|
63
32
|
businessPickupTime={business?.pickup_time}
|
|
64
33
|
businessDistance={business?.distance}
|
|
65
|
-
|
|
34
|
+
handleCustomUpdate={handleCustomUpdate}
|
|
66
35
|
/>
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
36
|
+
</View>
|
|
37
|
+
))}
|
|
38
|
+
</>
|
|
39
|
+
)
|
|
40
|
+
}
|
|
71
41
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
<PlaceholderLine
|
|
92
|
-
height={25}
|
|
93
|
-
width={40}
|
|
94
|
-
style={{ marginBottom: 10 }}
|
|
95
|
-
/>
|
|
96
|
-
<PlaceholderLine
|
|
97
|
-
height={25}
|
|
98
|
-
width={20}
|
|
99
|
-
style={{ marginBottom: 10 }}
|
|
100
|
-
/>
|
|
101
|
-
</View>
|
|
42
|
+
const BusinessSkeletons = () => {
|
|
43
|
+
return (
|
|
44
|
+
<>
|
|
45
|
+
{[...Array(4).keys()].map((item, i) => (
|
|
46
|
+
<Placeholder
|
|
47
|
+
Animation={Fade}
|
|
48
|
+
key={i}
|
|
49
|
+
style={{ marginBottom: 20 }}>
|
|
50
|
+
<View style={{ width: '100%' }}>
|
|
51
|
+
<PlaceholderLine
|
|
52
|
+
height={200}
|
|
53
|
+
style={{ marginBottom: 20, borderRadius: 25 }}
|
|
54
|
+
/>
|
|
55
|
+
<View style={{ paddingHorizontal: 10 }}>
|
|
56
|
+
<View
|
|
57
|
+
style={{
|
|
58
|
+
flexDirection: 'row',
|
|
59
|
+
justifyContent: 'space-between',
|
|
60
|
+
}}>
|
|
102
61
|
<PlaceholderLine
|
|
103
|
-
height={
|
|
104
|
-
width={
|
|
62
|
+
height={25}
|
|
63
|
+
width={40}
|
|
105
64
|
style={{ marginBottom: 10 }}
|
|
106
65
|
/>
|
|
107
66
|
<PlaceholderLine
|
|
108
|
-
height={
|
|
109
|
-
width={
|
|
67
|
+
height={25}
|
|
68
|
+
width={20}
|
|
110
69
|
style={{ marginBottom: 10 }}
|
|
111
70
|
/>
|
|
112
71
|
</View>
|
|
72
|
+
<PlaceholderLine
|
|
73
|
+
height={20}
|
|
74
|
+
width={30}
|
|
75
|
+
style={{ marginBottom: 10 }}
|
|
76
|
+
/>
|
|
77
|
+
<PlaceholderLine
|
|
78
|
+
height={20}
|
|
79
|
+
width={80}
|
|
80
|
+
style={{ marginBottom: 10 }}
|
|
81
|
+
/>
|
|
113
82
|
</View>
|
|
114
|
-
</
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
83
|
+
</View>
|
|
84
|
+
</Placeholder>
|
|
85
|
+
))}
|
|
86
|
+
</>
|
|
87
|
+
)
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
export const PreviousBusinessOrdered = (props: PreviousBusinessOrderedParams) => {
|
|
91
|
+
const {
|
|
92
|
+
navigation,
|
|
93
|
+
businesses,
|
|
94
|
+
onNavigationRedirect,
|
|
95
|
+
isBusinessesSearchList,
|
|
96
|
+
handleUpdateBusinesses,
|
|
97
|
+
} = props
|
|
98
|
+
|
|
99
|
+
const [orderState] = useOrder()
|
|
100
|
+
const windowWidth = Dimensions.get('window').width;
|
|
101
|
+
const onBusinessClick = (business: any) => {
|
|
102
|
+
onNavigationRedirect('Business', { store: business.slug, logo: business.logo, header: business.header })
|
|
118
103
|
}
|
|
119
104
|
|
|
105
|
+
const styles = StyleSheet.create({
|
|
106
|
+
container: {
|
|
107
|
+
marginBottom: 0,
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
|
|
120
111
|
return (
|
|
121
|
-
<ScrollView
|
|
112
|
+
<ScrollView
|
|
113
|
+
horizontal={isBusinessesSearchList}
|
|
114
|
+
style={styles.container}
|
|
115
|
+
showsVerticalScrollIndicator={false}
|
|
116
|
+
showsHorizontalScrollIndicator={false}
|
|
117
|
+
>
|
|
122
118
|
{isBusinessesSearchList ? (
|
|
123
119
|
<>
|
|
124
|
-
{!
|
|
120
|
+
{!businesses?.loading && (
|
|
125
121
|
<BusinessControllerList
|
|
126
|
-
style={{ width: windowWidth -
|
|
122
|
+
style={{ width: windowWidth - 120, marginRight: 20 }}
|
|
123
|
+
onBusinessClick={onBusinessClick}
|
|
124
|
+
orderState={orderState}
|
|
125
|
+
navigation={navigation}
|
|
126
|
+
businesses={businesses}
|
|
127
|
+
handleCustomUpdate={handleUpdateBusinesses}
|
|
127
128
|
/>
|
|
128
129
|
)}
|
|
129
130
|
</>
|
|
130
131
|
) : (
|
|
131
132
|
<ListWrapper>
|
|
132
|
-
|
|
133
|
-
{businessesList.loading && (
|
|
133
|
+
{businesses?.loading ? (
|
|
134
134
|
<BusinessSkeletons />
|
|
135
|
+
) : (
|
|
136
|
+
<BusinessControllerList
|
|
137
|
+
onBusinessClick={onBusinessClick}
|
|
138
|
+
orderState={orderState}
|
|
139
|
+
navigation={navigation}
|
|
140
|
+
businesses={businesses}
|
|
141
|
+
handleCustomUpdate={handleUpdateBusinesses}
|
|
142
|
+
/>
|
|
135
143
|
)}
|
|
136
144
|
</ListWrapper>
|
|
137
145
|
)}
|
|
@@ -139,15 +147,3 @@ export const PreviousBusinessOrderedUI = (props: PreviousBusinessOrderedParams)
|
|
|
139
147
|
</ScrollView>
|
|
140
148
|
)
|
|
141
149
|
}
|
|
142
|
-
|
|
143
|
-
export const PreviousBusinessOrdered = (props: PreviousBusinessOrderedParams) => {
|
|
144
|
-
const previousBusinessOrderedController = {
|
|
145
|
-
...props,
|
|
146
|
-
UIComponent: PreviousBusinessOrderedUI,
|
|
147
|
-
paginationSettings: { initialPage: 1, pageSize: 50, controlType: 'infinity' }
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
return (
|
|
151
|
-
<BusinessListController {...previousBusinessOrderedController} />
|
|
152
|
-
)
|
|
153
|
-
}
|