ordering-ui-react-native 0.15.54 → 0.15.55-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 +5 -3
- package/src/DeliveryApp.tsx +43 -1
- package/src/components/AddressForm/index.tsx +18 -2
- package/src/components/BusinessController/index.tsx +16 -8
- package/src/components/BusinessTypeFilter/index.tsx +3 -1
- package/src/components/BusinessesListing/index.tsx +1 -1
- package/src/components/Checkout/index.tsx +23 -2
- package/src/components/DriverTips/index.tsx +11 -6
- package/src/components/LanguageSelector/index.tsx +7 -2
- package/src/components/LoginForm/index.tsx +120 -30
- package/src/components/LoginForm/styles.tsx +6 -0
- package/src/components/OrderDetails/index.tsx +9 -23
- package/src/components/PaymentOptions/index.tsx +67 -50
- package/src/components/PaymentOptionsWebView/index.tsx +123 -124
- package/src/components/SignupForm/index.tsx +145 -61
- package/src/components/SingleProductCard/index.tsx +16 -4
- package/src/components/StripeMethodForm/index.tsx +1 -2
- package/src/components/UpsellingProducts/index.tsx +1 -1
- package/src/components/UserProfileForm/index.tsx +63 -6
- package/src/components/UserProfileForm/styles.tsx +8 -0
- package/src/components/VerifyPhone/styles.tsx +1 -2
- package/src/components/shared/OModal.tsx +1 -1
- package/src/hooks/useCountdownTimer.tsx +26 -0
- package/src/navigators/CheckoutNavigator.tsx +6 -0
- package/src/navigators/HomeNavigator.tsx +12 -0
- package/src/pages/BusinessesListing.tsx +1 -1
- package/src/pages/MultiCheckout.tsx +31 -0
- package/src/pages/MultiOrdersDetails.tsx +27 -0
- package/src/pages/Sessions.tsx +22 -0
- package/src/theme.json +0 -1
- package/src/types/index.tsx +18 -11
- package/src/utils/index.tsx +68 -1
- package/themes/business/src/components/AcceptOrRejectOrder/index.tsx +103 -15
- package/themes/business/src/components/AcceptOrRejectOrder/styles.tsx +6 -0
- package/themes/business/src/components/Chat/index.tsx +42 -90
- package/themes/business/src/components/DriverMap/index.tsx +6 -5
- package/themes/business/src/components/Home/index.tsx +128 -55
- package/themes/business/src/components/Home/styles.tsx +8 -1
- package/themes/business/src/components/LoginForm/index.tsx +89 -2
- package/themes/business/src/components/LoginForm/styles.tsx +6 -0
- package/themes/business/src/components/LogoutButton/index.tsx +1 -1
- package/themes/business/src/components/NewOrderNotification/index.tsx +79 -105
- package/themes/business/src/components/OrderDetails/Business.tsx +2 -2
- package/themes/business/src/components/OrderDetails/Delivery.tsx +28 -11
- package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx +159 -91
- package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx +6 -0
- package/themes/business/src/components/OrderDetails/styles.tsx +7 -0
- package/themes/business/src/components/OrdersListManager/index.tsx +1 -1
- package/themes/business/src/components/OrdersOption/index.tsx +5 -2
- package/themes/business/src/components/ProductItemAccordion/index.tsx +2 -2
- package/themes/business/src/components/shared/OModal.tsx +1 -1
- package/themes/business/src/types/index.tsx +5 -1
- package/themes/doordash/src/components/BusinessesListing/index.tsx +1 -1
- package/themes/doordash/src/components/LoginForm/index.tsx +1 -2
- package/themes/instacart/src/components/BusinessesListing/index.tsx +1 -1
- package/themes/kiosk/src/components/BusinessMenu/index.tsx +39 -28
- package/themes/kiosk/src/components/BusinessesListing/index.tsx +2 -3
- package/themes/kiosk/src/components/Cart/index.tsx +99 -26
- package/themes/kiosk/src/components/Cart/styles.tsx +6 -0
- package/themes/kiosk/src/components/CartBottomSheet/index.tsx +9 -2
- package/themes/kiosk/src/components/CartContent/index.tsx +0 -11
- package/themes/kiosk/src/components/CartItem/index.tsx +4 -3
- package/themes/kiosk/src/components/CategoriesMenu/index.tsx +107 -62
- package/themes/kiosk/src/components/Checkout/index.tsx +40 -22
- package/themes/kiosk/src/components/CustomerName/index.tsx +0 -6
- package/themes/kiosk/src/components/DrawerView/index.tsx +1 -0
- package/themes/kiosk/src/components/DrawerView/styles.tsx +2 -2
- package/themes/kiosk/src/components/NavBar/index.tsx +29 -20
- package/themes/kiosk/src/components/OptionCard/index.tsx +1 -1
- package/themes/kiosk/src/components/OrderDetails/index.tsx +165 -65
- package/themes/kiosk/src/components/OrderDetails/styles.tsx +5 -0
- package/themes/kiosk/src/components/OrderTypeCardSelector/index.tsx +9 -11
- package/themes/kiosk/src/components/PaymentOptions/index.tsx +56 -54
- package/themes/kiosk/src/components/ProductForm/index.tsx +7 -8
- package/themes/kiosk/src/components/ProductItemAccordion/index.tsx +2 -2
- package/themes/kiosk/src/components/ProductOption/index.tsx +1 -1
- package/themes/kiosk/src/components/ProductOptionSubOption/index.tsx +3 -1
- package/themes/kiosk/src/components/UpsellingProducts/index.tsx +16 -5
- package/themes/kiosk/src/components/shared/OButton.tsx +5 -18
- package/themes/kiosk/src/types/index.d.ts +3 -0
- package/themes/original/index.tsx +169 -4
- package/themes/original/src/components/ActiveOrders/index.tsx +15 -132
- package/themes/original/src/components/ActiveOrders/styles.tsx +0 -54
- package/themes/original/src/components/AddressForm/index.tsx +1 -1
- package/themes/original/src/components/AddressList/index.tsx +30 -18
- package/themes/original/src/components/AppleLogin/index.tsx +54 -21
- package/themes/original/src/components/BusinessBasicInformation/index.tsx +136 -45
- package/themes/original/src/components/BusinessBasicInformation/styles.tsx +4 -0
- package/themes/original/src/components/BusinessController/index.tsx +48 -11
- package/themes/original/src/components/BusinessController/styles.tsx +27 -0
- package/themes/original/src/components/BusinessFeaturedController/index.tsx +20 -1
- package/themes/original/src/components/BusinessFeaturedController/styles.tsx +23 -0
- package/themes/original/src/components/BusinessItemAccordion/index.tsx +8 -5
- package/themes/original/src/components/BusinessItemAccordion/styles.tsx +3 -1
- package/themes/original/src/components/BusinessListingSearch/index.tsx +196 -58
- package/themes/original/src/components/BusinessListingSearch/styles.tsx +22 -2
- package/themes/original/src/components/BusinessPreorder/index.tsx +1 -1
- package/themes/original/src/components/BusinessProductsCategories/index.tsx +2 -2
- package/themes/original/src/components/BusinessProductsList/CategoryDescription/index.tsx +44 -0
- package/themes/original/src/components/BusinessProductsList/index.tsx +119 -35
- package/themes/original/src/components/BusinessProductsList/styles.tsx +12 -4
- package/themes/original/src/components/BusinessProductsListing/index.tsx +109 -21
- package/themes/original/src/components/BusinessProductsListing/styles.tsx +22 -0
- package/themes/original/src/components/BusinessReviews/index.tsx +10 -26
- package/themes/original/src/components/BusinessTypeFilter/index.tsx +1 -2
- package/themes/original/src/components/BusinessesListing/index.tsx +127 -66
- package/themes/original/src/components/BusinessesListing/styles.tsx +11 -3
- package/themes/original/src/components/Cart/index.tsx +60 -41
- package/themes/original/src/components/Checkout/index.tsx +48 -32
- package/themes/original/src/components/DriverTips/index.tsx +17 -12
- package/themes/original/src/components/Favorite/index.tsx +92 -0
- package/themes/original/src/components/Favorite/styles.tsx +22 -0
- package/themes/original/src/components/FavoriteList/index.tsx +298 -0
- package/themes/original/src/components/FavoriteList/styles.tsx +5 -0
- package/themes/original/src/components/ForgotPasswordForm/index.tsx +84 -4
- package/themes/original/src/components/GPSButton/index.tsx +15 -8
- package/themes/original/src/components/GoogleMap/index.tsx +11 -11
- package/themes/original/src/components/Help/index.tsx +21 -4
- package/themes/original/src/components/HighestRatedBusinesses/index.tsx +18 -1
- package/themes/original/src/components/Home/index.tsx +1 -1
- package/themes/original/src/components/LastOrders/index.tsx +12 -1
- package/themes/original/src/components/LoginForm/Otp/index.tsx +91 -0
- package/themes/original/src/components/LoginForm/Otp/styles.tsx +7 -0
- package/themes/original/src/components/LoginForm/index.tsx +332 -164
- package/themes/original/src/components/LoginForm/styles.tsx +1 -3
- package/themes/original/src/components/MessageListing/index.tsx +10 -1
- package/themes/original/src/components/Messages/index.tsx +1 -1
- package/themes/original/src/components/MomentOption/index.tsx +10 -1
- package/themes/original/src/components/MomentOption/styles.tsx +1 -1
- package/themes/original/src/components/MultiCartsPaymethodsAndWallets/index.tsx +243 -0
- package/themes/original/src/components/MultiCartsPaymethodsAndWallets/styles.tsx +46 -0
- package/themes/original/src/components/MultiCheckout/index.tsx +298 -0
- package/themes/original/src/components/MultiCheckout/styles.tsx +59 -0
- package/themes/original/src/components/MultiOrdersDetails/SingleOrderCard.tsx +372 -0
- package/themes/original/src/components/MultiOrdersDetails/index.tsx +258 -0
- package/themes/original/src/components/MultiOrdersDetails/styles.tsx +50 -0
- package/themes/original/src/components/MyOrders/index.tsx +120 -32
- package/themes/original/src/components/MyOrders/styles.tsx +8 -1
- package/themes/original/src/components/OrderDetails/OrderHistory.tsx +167 -0
- package/themes/original/src/components/OrderDetails/index.tsx +117 -46
- package/themes/original/src/components/OrderDetails/styles.tsx +1 -2
- package/themes/original/src/components/OrderSummary/index.tsx +2 -2
- package/themes/original/src/components/OrderTypeSelector/index.tsx +4 -2
- package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/index.tsx +153 -0
- package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/styles.tsx +6 -0
- package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/index.tsx +53 -0
- package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/styles.tsx +6 -0
- package/themes/original/src/components/OrdersOption/index.tsx +130 -38
- package/themes/original/src/components/OrdersOption/styles.tsx +4 -1
- package/themes/original/src/components/PaymentOptionCash/index.tsx +2 -2
- package/themes/original/src/components/PaymentOptionWallet/index.tsx +17 -23
- package/themes/original/src/components/PaymentOptionWallet/styles.tsx +1 -1
- package/themes/original/src/components/PaymentOptions/index.tsx +57 -36
- package/themes/original/src/components/PhoneInputNumber/index.tsx +1 -1
- package/themes/original/src/components/PreviousOrders/index.tsx +18 -147
- package/themes/original/src/components/ProductForm/index.tsx +70 -62
- package/themes/original/src/components/ProductForm/styles.tsx +0 -1
- package/themes/original/src/components/ProductItemAccordion/index.tsx +2 -2
- package/themes/original/src/components/ProductOptionSubOption/index.tsx +18 -12
- package/themes/original/src/components/Promotions/index.tsx +151 -133
- package/themes/original/src/components/Promotions/styles.tsx +3 -23
- package/themes/original/src/components/SearchBar/index.tsx +10 -4
- package/themes/original/src/components/Sessions/index.tsx +160 -0
- package/themes/original/src/components/Sessions/styles.tsx +15 -0
- package/themes/original/src/components/SignupForm/index.tsx +269 -130
- package/themes/original/src/components/SingleOrderCard/index.tsx +282 -0
- package/themes/original/src/components/SingleOrderCard/styles.tsx +54 -0
- package/themes/original/src/components/SingleProductCard/index.tsx +59 -17
- package/themes/original/src/components/StripeElementsForm/index.tsx +16 -8
- package/themes/original/src/components/StripeElementsForm/naked.tsx +2 -2
- package/themes/original/src/components/UpsellingProducts/index.tsx +86 -74
- package/themes/original/src/components/UserDetails/index.tsx +5 -96
- package/themes/original/src/components/UserFormDetails/index.tsx +34 -24
- package/themes/original/src/components/UserProfile/index.tsx +53 -6
- package/themes/original/src/components/UserProfileForm/index.tsx +20 -18
- package/themes/original/src/components/UserVerification/index.tsx +178 -192
- package/themes/original/src/components/VerifyPhone/index.tsx +10 -7
- package/themes/original/src/components/VerifyPhone/styles.tsx +2 -1
- package/themes/original/src/components/Wallets/index.tsx +76 -9
- package/themes/original/src/components/Wallets/styles.tsx +21 -0
- package/themes/original/src/components/shared/OModal.tsx +4 -2
- package/themes/original/src/config/constants.tsx +6 -6
- package/themes/original/src/types/index.tsx +192 -33
- package/themes/original/src/utils/index.tsx +85 -2
- package/themes/single-business/src/components/AddressList/index.tsx +1 -1
- package/themes/single-business/src/components/OrderTypeSelector/index.tsx +1 -1
- package/themes/single-business/src/components/UserProfile/index.tsx +1 -1
- package/themes/uber-eats/src/components/BusinessesListing/index.tsx +1 -1
|
@@ -1,18 +1,66 @@
|
|
|
1
|
-
import React, { useState } from 'react';
|
|
1
|
+
import React, { useState, useEffect } from 'react';
|
|
2
2
|
import { StyleSheet, View, Dimensions, Platform } from 'react-native';
|
|
3
|
-
import {
|
|
3
|
+
import { useForm, Controller } from 'react-hook-form';
|
|
4
|
+
import { useLanguage, useApi } from 'ordering-components/native';
|
|
4
5
|
import { useTheme } from 'styled-components/native';
|
|
5
|
-
import { LogoWrapper, Container, BackgroundImage } from './styles';
|
|
6
|
-
import { OButton, OIcon, OText } from '../shared';
|
|
6
|
+
import { LogoWrapper, Container, BackgroundImage, FormInput } from './styles';
|
|
7
|
+
import { OButton, OIcon, OText, OInput } from '../shared';
|
|
7
8
|
import { _setStoreData } from '../../providers/StoreUtil';
|
|
8
9
|
|
|
9
10
|
export const Home = (props: any) => {
|
|
10
|
-
const { onNavigationRedirect } = props;
|
|
11
|
+
const { onNavigationRedirect, useRootPoint } = props;
|
|
11
12
|
const safeHeight = Platform.OS === 'ios' ? 80 : 40;
|
|
12
13
|
|
|
13
14
|
const theme = useTheme();
|
|
15
|
+
const [ordering, { setOrdering }] = useApi();
|
|
14
16
|
const [, t] = useLanguage();
|
|
17
|
+
const { control, handleSubmit, errors } = useForm();
|
|
15
18
|
|
|
19
|
+
|
|
20
|
+
const styles = StyleSheet.create({
|
|
21
|
+
logo: {
|
|
22
|
+
height: 65,
|
|
23
|
+
width: 300,
|
|
24
|
+
},
|
|
25
|
+
wrapperContent: {
|
|
26
|
+
width: '100%',
|
|
27
|
+
},
|
|
28
|
+
wrapperText: {
|
|
29
|
+
marginBottom: 20,
|
|
30
|
+
},
|
|
31
|
+
textTitle: {
|
|
32
|
+
fontWeight: '600',
|
|
33
|
+
fontStyle: 'normal',
|
|
34
|
+
fontSize: 50,
|
|
35
|
+
},
|
|
36
|
+
textSubtitle: {
|
|
37
|
+
fontWeight: 'normal',
|
|
38
|
+
fontStyle: 'normal',
|
|
39
|
+
fontSize: 14,
|
|
40
|
+
},
|
|
41
|
+
wrapperBtn: {
|
|
42
|
+
marginBottom: 20
|
|
43
|
+
},
|
|
44
|
+
btn: {
|
|
45
|
+
borderRadius: 7.6,
|
|
46
|
+
marginTop: 20,
|
|
47
|
+
},
|
|
48
|
+
btnText: {
|
|
49
|
+
fontFamily: 'Poppins',
|
|
50
|
+
fontStyle: 'normal',
|
|
51
|
+
fontWeight: 'normal',
|
|
52
|
+
fontSize: 18,
|
|
53
|
+
},
|
|
54
|
+
input: {
|
|
55
|
+
borderWidth: 1,
|
|
56
|
+
borderRadius: 7.6,
|
|
57
|
+
borderColor: Object.keys(errors).length > 0 ? theme.colors.error : theme.colors.inputSignup,
|
|
58
|
+
backgroundColor: theme.colors.transparent,
|
|
59
|
+
},
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
const [projectName, setProjectName] = useState<any>(null)
|
|
63
|
+
const [isLoadingProject, setLoadingProject] = useState(false)
|
|
16
64
|
const [orientation, setOrientation] = useState(
|
|
17
65
|
Dimensions.get('window').width < Dimensions.get('window').height
|
|
18
66
|
? 'Portrait'
|
|
@@ -34,6 +82,27 @@ export const Home = (props: any) => {
|
|
|
34
82
|
}
|
|
35
83
|
});
|
|
36
84
|
|
|
85
|
+
const onSubmit = (values: any) => {
|
|
86
|
+
setLoadingProject(true)
|
|
87
|
+
setProjectName(values)
|
|
88
|
+
setOrdering({ ...ordering, project: values?.project_name })
|
|
89
|
+
_setStoreData('project_name', values?.project_name)
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
useEffect(() => {
|
|
93
|
+
if (Object.keys(errors).length > 0) {
|
|
94
|
+
setProjectName(null)
|
|
95
|
+
setLoadingProject(false)
|
|
96
|
+
}
|
|
97
|
+
}, [errors])
|
|
98
|
+
|
|
99
|
+
useEffect(() => {
|
|
100
|
+
if (ordering?.project === projectName?.project_name) {
|
|
101
|
+
setLoadingProject(false)
|
|
102
|
+
onNavigationRedirect('Login')
|
|
103
|
+
}
|
|
104
|
+
}, [ordering])
|
|
105
|
+
|
|
37
106
|
return (
|
|
38
107
|
<Container height={windowHeight - safeHeight} orientation={orientation}>
|
|
39
108
|
<BackgroundImage
|
|
@@ -54,58 +123,62 @@ export const Home = (props: any) => {
|
|
|
54
123
|
</OText>
|
|
55
124
|
</View>
|
|
56
125
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
126
|
+
<>
|
|
127
|
+
{useRootPoint && (
|
|
128
|
+
<FormInput>
|
|
129
|
+
<Controller
|
|
130
|
+
control={control}
|
|
131
|
+
name='project_name'
|
|
132
|
+
rules={{ required: t(`VALIDATION_ERROR_PROJECT_NAME_REQUIRED`, 'The field project name is required') }}
|
|
133
|
+
defaultValue=""
|
|
134
|
+
render={({ onChange, value }: any) => (
|
|
135
|
+
<OInput
|
|
136
|
+
name='project_name'
|
|
137
|
+
placeholderTextColor={theme.colors.arrowColor}
|
|
138
|
+
placeholder={t('PROJECT_NAME', 'Project Name')}
|
|
139
|
+
icon={theme.images.general.project}
|
|
140
|
+
iconColor={theme.colors.arrowColor}
|
|
141
|
+
onChange={(e: any) => onChange(e?.target?.value)}
|
|
142
|
+
selectionColor={theme.colors.primary}
|
|
143
|
+
color={theme.colors.white}
|
|
144
|
+
value={value}
|
|
145
|
+
style={styles.input}
|
|
146
|
+
returnKeyType='done'
|
|
147
|
+
autoCorrect={false}
|
|
148
|
+
autoCapitalize='none'
|
|
149
|
+
blurOnSubmit={false}
|
|
150
|
+
onSubmitEditing={() => handleSubmit(onSubmit)()}
|
|
151
|
+
/>
|
|
152
|
+
)}
|
|
153
|
+
/>
|
|
154
|
+
</FormInput>
|
|
155
|
+
)}
|
|
156
|
+
{Object.keys(errors).length > 0 && (
|
|
157
|
+
<OText
|
|
158
|
+
color={theme.colors.white}
|
|
159
|
+
style={{ alignSelf: 'center', marginTop: 5 }}
|
|
160
|
+
>
|
|
161
|
+
{errors['project_name'].message}
|
|
162
|
+
</OText>
|
|
163
|
+
)}
|
|
164
|
+
<View style={styles.wrapperBtn}>
|
|
165
|
+
<OButton
|
|
166
|
+
text={useRootPoint ? t('SET_PROJECT', 'Set project') : t('LOGIN', 'Login')}
|
|
167
|
+
textStyle={{
|
|
168
|
+
...styles.btnText,
|
|
169
|
+
color: theme.colors.inputTextColor,
|
|
170
|
+
}}
|
|
171
|
+
bgColor={theme.colors.primary}
|
|
172
|
+
borderColor={theme.colors.primary}
|
|
173
|
+
isLoading={isLoadingProject}
|
|
174
|
+
style={styles.btn}
|
|
175
|
+
imgRightSrc={false}
|
|
176
|
+
onClick={() => useRootPoint ? handleSubmit(onSubmit)() : onNavigationRedirect('Login')}
|
|
177
|
+
/>
|
|
178
|
+
</View>
|
|
179
|
+
</>
|
|
71
180
|
</View>
|
|
72
181
|
</BackgroundImage>
|
|
73
182
|
</Container>
|
|
74
183
|
);
|
|
75
184
|
};
|
|
76
|
-
|
|
77
|
-
const styles = StyleSheet.create({
|
|
78
|
-
logo: {
|
|
79
|
-
height: 65,
|
|
80
|
-
width: 300,
|
|
81
|
-
},
|
|
82
|
-
wrapperContent: {
|
|
83
|
-
width: '100%',
|
|
84
|
-
},
|
|
85
|
-
wrapperText: {
|
|
86
|
-
marginBottom: 20,
|
|
87
|
-
},
|
|
88
|
-
textTitle: {
|
|
89
|
-
fontWeight: '600',
|
|
90
|
-
fontStyle: 'normal',
|
|
91
|
-
fontSize: 50,
|
|
92
|
-
},
|
|
93
|
-
textSubtitle: {
|
|
94
|
-
fontWeight: 'normal',
|
|
95
|
-
fontStyle: 'normal',
|
|
96
|
-
fontSize: 14,
|
|
97
|
-
},
|
|
98
|
-
wrapperBtn: {
|
|
99
|
-
marginBottom: 20,
|
|
100
|
-
},
|
|
101
|
-
btn: {
|
|
102
|
-
borderRadius: 7.6,
|
|
103
|
-
marginTop: 20,
|
|
104
|
-
},
|
|
105
|
-
btnText: {
|
|
106
|
-
fontFamily: 'Poppins',
|
|
107
|
-
fontStyle: 'normal',
|
|
108
|
-
fontWeight: 'normal',
|
|
109
|
-
fontSize: 18,
|
|
110
|
-
},
|
|
111
|
-
});
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import styled from 'styled-components/native';
|
|
1
|
+
import styled, { css } from 'styled-components/native';
|
|
2
2
|
|
|
3
3
|
export const Container = styled.View`
|
|
4
4
|
width: 100%;
|
|
@@ -25,3 +25,10 @@ export const BackgroundImage = styled.ImageBackground`
|
|
|
25
25
|
align-items: center;
|
|
26
26
|
padding: 20px 40px;
|
|
27
27
|
`;
|
|
28
|
+
|
|
29
|
+
export const FormInput = styled.View`
|
|
30
|
+
display: flex;
|
|
31
|
+
flex-direction: column;
|
|
32
|
+
width: 100%;
|
|
33
|
+
min-height: 50px;
|
|
34
|
+
`;
|
|
@@ -8,6 +8,8 @@ import {
|
|
|
8
8
|
ScrollView,
|
|
9
9
|
} from 'react-native';
|
|
10
10
|
import { useForm, Controller } from 'react-hook-form';
|
|
11
|
+
import Recaptcha from 'react-native-recaptcha-that-works'
|
|
12
|
+
import { TouchableOpacity } from 'react-native-gesture-handler';
|
|
11
13
|
import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
|
|
12
14
|
import {
|
|
13
15
|
ToastType,
|
|
@@ -25,6 +27,7 @@ import {
|
|
|
25
27
|
TabsContainer,
|
|
26
28
|
OrSeparator,
|
|
27
29
|
LineSeparator,
|
|
30
|
+
RecaptchaButton
|
|
28
31
|
} from './styles';
|
|
29
32
|
import { _setStoreData } from '../../providers/StoreUtil'
|
|
30
33
|
import { OText, OButton, OInput, OIconButton, OModal } from '../shared';
|
|
@@ -47,7 +50,10 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
47
50
|
handleCheckPhoneCode,
|
|
48
51
|
setCheckPhoneCodeState,
|
|
49
52
|
allowedLevels,
|
|
50
|
-
useRootPoint
|
|
53
|
+
useRootPoint,
|
|
54
|
+
notificationState,
|
|
55
|
+
handleReCaptcha,
|
|
56
|
+
enableReCaptcha
|
|
51
57
|
} = props;
|
|
52
58
|
|
|
53
59
|
const [ordering, { setOrdering }] = useApi();
|
|
@@ -61,6 +67,7 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
61
67
|
const inputRef = useRef<any>(null);
|
|
62
68
|
const inputMailRef = useRef<any>(null);
|
|
63
69
|
|
|
70
|
+
const [projectName, setProjectName] = useState({name: '', isFocued: false});
|
|
64
71
|
const [passwordSee, setPasswordSee] = useState(false);
|
|
65
72
|
const [isLoadingVerifyModal, setIsLoadingVerifyModal] = useState(false);
|
|
66
73
|
const [isModalVisible, setIsModalVisible] = useState(false);
|
|
@@ -84,6 +91,50 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
84
91
|
const [submitted, setSubmitted] = useState(false);
|
|
85
92
|
const [formValues, setFormValues] = useState(null);
|
|
86
93
|
|
|
94
|
+
const [recaptchaConfig, setRecaptchaConfig] = useState<any>({})
|
|
95
|
+
const [recaptchaVerified, setRecaptchaVerified] = useState(false)
|
|
96
|
+
|
|
97
|
+
const recaptchaRef = useRef<any>({});
|
|
98
|
+
|
|
99
|
+
const handleOpenRecaptcha = () => {
|
|
100
|
+
setRecaptchaVerified(false)
|
|
101
|
+
if (!recaptchaConfig?.siteKey) {
|
|
102
|
+
showToast(ToastType.Error, t('NO_RECAPTCHA_SITE_KEY', 'The config doesn\'t have recaptcha site key'));
|
|
103
|
+
return
|
|
104
|
+
}
|
|
105
|
+
if (!recaptchaConfig?.baseUrl) {
|
|
106
|
+
showToast(ToastType.Error, t('NO_RECAPTCHA_BASE_URL', 'The config doesn\'t have recaptcha base url'));
|
|
107
|
+
return
|
|
108
|
+
}
|
|
109
|
+
recaptchaRef.current.open()
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
const onRecaptchaVerify = (token: any) => {
|
|
113
|
+
setRecaptchaVerified(true)
|
|
114
|
+
handleReCaptcha(token)
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
useEffect(() => {
|
|
118
|
+
if (configs && Object.keys(configs).length > 0 && enableReCaptcha) {
|
|
119
|
+
setRecaptchaConfig({
|
|
120
|
+
siteKey: configs?.security_recaptcha_site_key?.value || null,
|
|
121
|
+
baseUrl: configs?.security_recaptcha_base_url?.value || null
|
|
122
|
+
})
|
|
123
|
+
}
|
|
124
|
+
}, [configs, enableReCaptcha])
|
|
125
|
+
|
|
126
|
+
useEffect(() => {
|
|
127
|
+
const projectInputInterval = setInterval(() => {
|
|
128
|
+
if (projectName.name && useRootPoint && projectName.isFocued) {
|
|
129
|
+
setOrdering({
|
|
130
|
+
...ordering,
|
|
131
|
+
project: projectName.name
|
|
132
|
+
})
|
|
133
|
+
}
|
|
134
|
+
}, 1500)
|
|
135
|
+
return () => clearInterval(projectInputInterval);
|
|
136
|
+
}, [projectName])
|
|
137
|
+
|
|
87
138
|
const getTraduction = (key: string) => {
|
|
88
139
|
const keyList: any = {
|
|
89
140
|
// Add the key and traduction that you need below
|
|
@@ -465,6 +516,7 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
465
516
|
icon={theme.images.general.project}
|
|
466
517
|
iconColor={theme.colors.arrowColor}
|
|
467
518
|
onChange={(e: any) => {
|
|
519
|
+
setProjectName({name: e?.target?.value, isFocued: true})
|
|
468
520
|
onChange(e?.target?.value);
|
|
469
521
|
setSubmitted(false);
|
|
470
522
|
}}
|
|
@@ -493,6 +545,7 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
493
545
|
icon={theme.images.logos.emailInputIcon}
|
|
494
546
|
iconColor={theme.colors.arrowColor}
|
|
495
547
|
onChange={(e: any) => {
|
|
548
|
+
setProjectName({...projectName, isFocued: false})
|
|
496
549
|
handleChangeInputEmail(e, onChange);
|
|
497
550
|
}}
|
|
498
551
|
selectionColor={theme.colors.primary}
|
|
@@ -590,7 +643,7 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
590
643
|
|
|
591
644
|
{onNavigationRedirect && (
|
|
592
645
|
<Pressable
|
|
593
|
-
style={{ marginRight: 'auto', marginBottom:
|
|
646
|
+
style={{ marginRight: 'auto', marginBottom: 20 }}
|
|
594
647
|
onPress={() => onNavigationRedirect('Forgot')}>
|
|
595
648
|
<OText style={styles.textForgot}>
|
|
596
649
|
{t('FORGOT_YOUR_PASSWORD', 'Forgot your password?')}
|
|
@@ -598,6 +651,39 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
598
651
|
</Pressable>
|
|
599
652
|
)}
|
|
600
653
|
|
|
654
|
+
{enableReCaptcha && (
|
|
655
|
+
<>
|
|
656
|
+
<TouchableOpacity
|
|
657
|
+
style={{ marginBottom: 15 }}
|
|
658
|
+
onPress={handleOpenRecaptcha}
|
|
659
|
+
>
|
|
660
|
+
<RecaptchaButton>
|
|
661
|
+
{recaptchaVerified ? (
|
|
662
|
+
<MaterialCommunityIcons
|
|
663
|
+
name="checkbox-marked"
|
|
664
|
+
size={26}
|
|
665
|
+
color={theme.colors.primary}
|
|
666
|
+
/>
|
|
667
|
+
) : (
|
|
668
|
+
<MaterialCommunityIcons
|
|
669
|
+
name="checkbox-blank-outline"
|
|
670
|
+
size={26}
|
|
671
|
+
color={theme.colors.mediumGray}
|
|
672
|
+
/>
|
|
673
|
+
)}
|
|
674
|
+
<OText size={14} mLeft={8}>{t('VERIFY_ReCAPTCHA', 'Verify reCAPTCHA')}</OText>
|
|
675
|
+
</RecaptchaButton>
|
|
676
|
+
</TouchableOpacity>
|
|
677
|
+
<Recaptcha
|
|
678
|
+
ref={recaptchaRef}
|
|
679
|
+
siteKey={recaptchaConfig?.siteKey}
|
|
680
|
+
baseUrl={recaptchaConfig?.baseUrl}
|
|
681
|
+
onVerify={onRecaptchaVerify}
|
|
682
|
+
onExpire={() => setRecaptchaVerified(false)}
|
|
683
|
+
/>
|
|
684
|
+
</>
|
|
685
|
+
)}
|
|
686
|
+
|
|
601
687
|
<OButton
|
|
602
688
|
onClick={handleLogin}
|
|
603
689
|
text={t('LOGIN', 'Login')}
|
|
@@ -657,6 +743,7 @@ const LoginFormUI = (props: LoginParams) => {
|
|
|
657
743
|
export const LoginForm = (props: any) => {
|
|
658
744
|
const loginProps = {
|
|
659
745
|
...props,
|
|
746
|
+
isRecaptchaEnable: true,
|
|
660
747
|
UIComponent: LoginFormUI,
|
|
661
748
|
};
|
|
662
749
|
|
|
@@ -15,7 +15,7 @@ const LogoutButtonUI = (props: any) => {
|
|
|
15
15
|
const data = await _retrieveStoreData('notification_state');
|
|
16
16
|
const res = await handleLogoutClick(data);
|
|
17
17
|
if (res) {
|
|
18
|
-
_clearStoreData({ excludedKeys: ['
|
|
18
|
+
_clearStoreData({ excludedKeys: ['isTutorial'] });
|
|
19
19
|
}
|
|
20
20
|
};
|
|
21
21
|
|
|
@@ -1,50 +1,57 @@
|
|
|
1
|
-
import React, { useState, useEffect
|
|
2
|
-
import
|
|
1
|
+
import React, { useState, useEffect } from 'react'
|
|
2
|
+
import moment from 'moment'
|
|
3
3
|
import { View, Modal, StyleSheet, TouchableOpacity, Dimensions } from 'react-native'
|
|
4
|
-
import
|
|
5
|
-
import { useTheme } from 'styled-components/native'
|
|
4
|
+
import Sound from 'react-native-sound'
|
|
6
5
|
import Icon from 'react-native-vector-icons/Feather'
|
|
6
|
+
import { useTheme } from 'styled-components/native'
|
|
7
|
+
import { useEvent, useLanguage, useSession, useApi, NewOrderNotification as NewOrderNotificationController } from 'ordering-components/native'
|
|
8
|
+
|
|
9
|
+
import { OText, OIcon } from '../shared'
|
|
7
10
|
import { NotificationContainer } from './styles'
|
|
8
|
-
import Sound from 'react-native-sound'
|
|
9
|
-
import moment from 'moment'
|
|
10
11
|
import { useLocation } from '../../hooks/useLocation'
|
|
11
|
-
|
|
12
|
+
|
|
12
13
|
Sound.setCategory('Playback')
|
|
13
14
|
|
|
14
15
|
const windowWidth = Dimensions.get('screen').width
|
|
15
16
|
|
|
16
17
|
const NewOrderNotificationUI = (props: any) => {
|
|
18
|
+
const { isBusinessApp } = props
|
|
17
19
|
const [events] = useEvent()
|
|
18
20
|
const theme = useTheme()
|
|
19
21
|
const [, t] = useLanguage()
|
|
20
22
|
const [{ user, token }] = useSession()
|
|
21
23
|
const [ordering] = useApi()
|
|
22
|
-
const [{ getTimeAgo }] = useUtils()
|
|
23
24
|
const { getCurrentLocation } = useLocation();
|
|
24
|
-
const [modalOpen, setModalOpen] = useState(false)
|
|
25
|
-
const [newOrderId, setNewOrderId] = useState(null)
|
|
26
|
-
const [messageOrderId, setMessageOrderId] = useState(null)
|
|
27
25
|
const [soundTimeout, setSoundTimeout] = useState<any>(null)
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
let [currentEvent, setCurrentEvent] = useState<any>(null)
|
|
27
|
+
|
|
28
|
+
const evtList: any = {
|
|
29
|
+
1: {
|
|
30
|
+
event: 'messages',
|
|
31
|
+
message: t('NEW_MESSAGES_RECEIVED', 'New messages have been received!'),
|
|
32
|
+
message2: t('ORDER_N_UNREAD_MESSAGES', 'Order #_order_id_ has unread messages.').replace('_order_id_', currentEvent?.orderId),
|
|
33
|
+
},
|
|
34
|
+
2: {
|
|
35
|
+
event: 'order_added',
|
|
36
|
+
message: t('NEW_ORDERS_RECEIVED', 'New orders have been received!'),
|
|
37
|
+
message2: t('ORDER_N_ORDERED', 'Order #_order_id_ has been ordered.').replace('_order_id_', currentEvent?.orderId),
|
|
38
|
+
},
|
|
39
|
+
3: {
|
|
40
|
+
event: 'order_updated',
|
|
41
|
+
message: t('NEW_ORDERS_UPDATED', 'New orders have been updated!'),
|
|
42
|
+
message2: t('ORDER_N_UPDATED', 'Order #_order_id_ has been updated.').replace('_order_id_', currentEvent?.orderId),
|
|
43
|
+
},
|
|
44
|
+
}
|
|
30
45
|
|
|
31
|
-
const notificationSound = new Sound(theme.sounds.notification,
|
|
32
|
-
if (error) {
|
|
33
|
-
console.log('failed to load the sound', error);
|
|
34
|
-
return
|
|
35
|
-
}
|
|
36
|
-
console.log('loaded successfully');
|
|
37
|
-
});
|
|
46
|
+
const notificationSound = new Sound(theme.sounds.notification, (e) => { console.log(e) });
|
|
38
47
|
|
|
39
48
|
const handlePlayNotificationSound = () => {
|
|
49
|
+
if (currentEvent) return
|
|
40
50
|
let times = 0
|
|
41
51
|
const _timeout = setInterval(function () {
|
|
42
52
|
notificationSound.play(success => {
|
|
43
53
|
if (success) {
|
|
44
|
-
console.log('successfully finished playing');
|
|
45
54
|
times = times + 1
|
|
46
|
-
} else {
|
|
47
|
-
console.log('playback failed due to audio decoding errors');
|
|
48
55
|
}
|
|
49
56
|
})
|
|
50
57
|
setSoundTimeout(_timeout)
|
|
@@ -57,67 +64,57 @@ const NewOrderNotificationUI = (props: any) => {
|
|
|
57
64
|
|
|
58
65
|
const handleCloseModal = () => {
|
|
59
66
|
clearInterval(soundTimeout)
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
setMessageOrderId(null)
|
|
67
|
+
currentEvent = null
|
|
68
|
+
setCurrentEvent({ evt: null })
|
|
63
69
|
}
|
|
64
70
|
|
|
65
|
-
const
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
71
|
+
const handleEventNotification = async (evtType: number, value: any) => {
|
|
72
|
+
if (value?.driver) {
|
|
73
|
+
try {
|
|
74
|
+
const location = await getCurrentLocation()
|
|
75
|
+
await fetch(`${ordering.root}/users/${user.id}/locations`, {
|
|
76
|
+
method: 'POST',
|
|
77
|
+
body: JSON.stringify({
|
|
78
|
+
location: JSON.stringify({location: `{lat: ${location.latitude}, lng: ${location.longitude}}`})
|
|
79
|
+
}),
|
|
80
|
+
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }
|
|
81
|
+
})
|
|
82
|
+
} catch (error) {
|
|
83
|
+
console.log(error)
|
|
84
|
+
}
|
|
85
|
+
const duration = moment.duration(moment().diff(moment.utc(value?.last_driver_assigned_at)))
|
|
86
|
+
const assignedSecondsDiff = duration.asSeconds()
|
|
87
|
+
if (assignedSecondsDiff < 5 && !isBusinessApp) {
|
|
88
|
+
handlePlayNotificationSound()
|
|
89
|
+
clearInterval(soundTimeout)
|
|
90
|
+
currentEvent = { evt: 2, orderId: value?.id }
|
|
91
|
+
setCurrentEvent({ evt: 2, orderId: value?.id })
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
if (evtType === 3 || value.author_id === user.id) return
|
|
69
95
|
handlePlayNotificationSound()
|
|
70
|
-
setNewOrderId(order.id)
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
const handleMessageNotification = (message: any) => {
|
|
74
|
-
const { order_id: orderId } = message;
|
|
75
|
-
if (!modalOpen) setModalOpen(true)
|
|
76
96
|
clearInterval(soundTimeout)
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
97
|
+
currentEvent = {
|
|
98
|
+
evt: evtType,
|
|
99
|
+
orderId: evtList[evtType].event === 'messages' ? value?.order_id : value?.id
|
|
100
|
+
}
|
|
101
|
+
setCurrentEvent({
|
|
102
|
+
evt: evtType,
|
|
103
|
+
orderId: evtList[evtType].event === 'messages' ? value?.order_id : value?.id
|
|
104
|
+
})
|
|
80
105
|
}
|
|
81
106
|
|
|
82
107
|
useEffect(() => {
|
|
83
|
-
events.on('
|
|
84
|
-
events.on('
|
|
108
|
+
events.on('message_added_notification', (o: any) => handleEventNotification(1, o))
|
|
109
|
+
events.on('order_added_notification', (o: any) => handleEventNotification(2, o))
|
|
110
|
+
events.on('order_updated_notification', (o: any) => handleEventNotification(3, o))
|
|
85
111
|
return () => {
|
|
86
|
-
events.off('
|
|
87
|
-
events.off('
|
|
112
|
+
events.off('message_added_notification', (o: any) => handleEventNotification(1, o))
|
|
113
|
+
events.off('order_added_notification', (o: any) => handleEventNotification(2, o))
|
|
114
|
+
events.off('order_updated_notification', (o: any) => handleEventNotification(3, o))
|
|
88
115
|
}
|
|
89
116
|
}, [])
|
|
90
117
|
|
|
91
|
-
const handleUpdateOrder = useCallback(async (order: any) => {
|
|
92
|
-
if (order?.driver) {
|
|
93
|
-
const location = await getCurrentLocation()
|
|
94
|
-
await fetch(`${ordering.root}/users/${user.id}/locations`, {
|
|
95
|
-
method: 'POST',
|
|
96
|
-
body: JSON.stringify({
|
|
97
|
-
location: JSON.stringify({location: `{lat: ${location.latitude}, lng: ${location.longitude}}`})
|
|
98
|
-
}),
|
|
99
|
-
headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` }
|
|
100
|
-
})
|
|
101
|
-
const assignedTimeDiff = moment.utc(order?.driver?.last_order_assigned_at).local().fromNow()
|
|
102
|
-
if (assignedTimeDiff === 'a few seconds ago') {
|
|
103
|
-
clearInterval(soundTimeout)
|
|
104
|
-
handlePlayNotificationSound()
|
|
105
|
-
setNewOrderId(order.id)
|
|
106
|
-
if(isFocused){
|
|
107
|
-
setModalOpen(true)
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
}, [newOrderId, notificationSound, soundTimeout])
|
|
112
|
-
|
|
113
|
-
useEffect(() => {
|
|
114
|
-
if (user?.level !== 4) return
|
|
115
|
-
events.on('order_updated_noification', handleUpdateOrder)
|
|
116
|
-
return () => {
|
|
117
|
-
events.off('order_updated_noification', handleUpdateOrder)
|
|
118
|
-
}
|
|
119
|
-
}, [handleUpdateOrder, user])
|
|
120
|
-
|
|
121
118
|
useEffect(() => {
|
|
122
119
|
notificationSound.setVolume(1);
|
|
123
120
|
return () => {
|
|
@@ -125,21 +122,12 @@ const NewOrderNotificationUI = (props: any) => {
|
|
|
125
122
|
}
|
|
126
123
|
}, [])
|
|
127
124
|
|
|
128
|
-
useFocusEffect(
|
|
129
|
-
useCallback(() => {
|
|
130
|
-
setIsFocused(true)
|
|
131
|
-
return () => {
|
|
132
|
-
setIsFocused(false)
|
|
133
|
-
}
|
|
134
|
-
}, [])
|
|
135
|
-
)
|
|
136
|
-
|
|
137
125
|
return (
|
|
138
126
|
<>
|
|
139
127
|
<Modal
|
|
140
128
|
animationType='slide'
|
|
141
129
|
transparent={true}
|
|
142
|
-
visible={
|
|
130
|
+
visible={!!currentEvent?.orderId}
|
|
143
131
|
>
|
|
144
132
|
<NotificationContainer>
|
|
145
133
|
<View style={styles.modalView}>
|
|
@@ -147,40 +135,26 @@ const NewOrderNotificationUI = (props: any) => {
|
|
|
147
135
|
style={styles.wrapperIcon}
|
|
148
136
|
onPress={() => handleCloseModal()}
|
|
149
137
|
>
|
|
150
|
-
<Icon
|
|
151
|
-
name="x"
|
|
152
|
-
size={30}
|
|
153
|
-
/>
|
|
138
|
+
<Icon name="x" size={30} />
|
|
154
139
|
</TouchableOpacity>
|
|
155
140
|
<OText
|
|
156
141
|
size={18}
|
|
157
142
|
color={theme.colors.textGray}
|
|
158
143
|
weight={600}
|
|
159
144
|
>
|
|
160
|
-
{
|
|
145
|
+
{evtList[currentEvent?.evt]?.message}
|
|
161
146
|
</OText>
|
|
162
147
|
<OIcon
|
|
163
148
|
src={theme.images.general.newOrder}
|
|
164
149
|
width={250}
|
|
165
150
|
height={200}
|
|
166
151
|
/>
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
</OText>
|
|
174
|
-
)}
|
|
175
|
-
|
|
176
|
-
{messageOrderId !== null && (
|
|
177
|
-
<OText
|
|
178
|
-
color={theme.colors.textGray}
|
|
179
|
-
mBottom={15}
|
|
180
|
-
>
|
|
181
|
-
{t('ORDER_N_UNREAD_MESSAGES', 'Order #_order_id_ has unread messages.').replace('_order_id_', messageOrderId)}
|
|
182
|
-
</OText>
|
|
183
|
-
)}
|
|
152
|
+
<OText
|
|
153
|
+
color={theme.colors.textGray}
|
|
154
|
+
mBottom={15}
|
|
155
|
+
>
|
|
156
|
+
{evtList[currentEvent?.evt]?.message2}
|
|
157
|
+
</OText>
|
|
184
158
|
</View>
|
|
185
159
|
</NotificationContainer>
|
|
186
160
|
</Modal>
|
|
@@ -335,7 +335,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
|
|
|
335
335
|
addressName: order?.business?.address,
|
|
336
336
|
zipcode: order?.business?.zipcode
|
|
337
337
|
},
|
|
338
|
-
icon: order?.business?.logo ||
|
|
338
|
+
icon: order?.business?.logo || 'https://res.cloudinary.com/demo/image/fetch/c_thumb,g_face,r_max/https://res.cloudinary.com/ordering2/image/upload/v1654619525/hzegwosnplvrbtjkpfi6.png',
|
|
339
339
|
level: 2,
|
|
340
340
|
},
|
|
341
341
|
{
|
|
@@ -439,7 +439,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
|
|
|
439
439
|
<>
|
|
440
440
|
<OrderContentComponent order={order} />
|
|
441
441
|
{(order?.status === 7 || order?.status === 4) &&
|
|
442
|
-
order?.delivery_type === 1 && (
|
|
442
|
+
order?.delivery_type === 1 && configs?.assign_driver_enabled?.value === '1' && (
|
|
443
443
|
<AssignDriver>
|
|
444
444
|
<OText style={{ marginBottom: 5 }} size={16} weight="600">
|
|
445
445
|
{t('ASSIGN_DRIVER', 'Assign driver')}
|