ordering-ui-react-native 0.12.62 → 0.12.66
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 +2 -1
- package/src/components/BusinessProductsListing/index.tsx +2 -1
- package/src/components/Messages/index.tsx +4 -4
- package/src/components/OrderCreating/index.tsx +1 -2
- package/src/components/OrderDetails/index.tsx +7 -1
- package/src/navigators/HomeNavigator.tsx +0 -1
- package/themes/business/src/components/Chat/index.tsx +31 -16
- package/themes/doordash/src/components/BusinessProductsListing/index.tsx +341 -341
- package/themes/original/index.tsx +4 -0
- package/themes/original/src/components/BusinessBasicInformation/index.tsx +1 -1
- package/themes/original/src/components/BusinessController/index.tsx +9 -2
- package/themes/original/src/components/BusinessMenuList/index.tsx +132 -0
- package/themes/original/src/components/BusinessMenuList/styles.tsx +15 -0
- package/themes/original/src/components/BusinessPreorder/index.tsx +474 -0
- package/themes/original/src/components/BusinessPreorder/styles.tsx +60 -0
- package/themes/original/src/components/BusinessesListing/index.tsx +2 -1
- package/themes/original/src/components/HighestRatedBusinesses/index.tsx +3 -1
- package/themes/original/src/types/index.tsx +22 -1
- package/themes/single-business/src/components/BusinessBasicInformation/index.tsx +2 -2
- package/themes/single-business/src/components/BusinessProductsListing/index.tsx +2 -2
- package/themes/single-business/src/components/BusinessesListing/index.tsx +1 -1
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import styled, { css } from 'styled-components/native'
|
|
2
|
+
|
|
3
|
+
export const PreOrderContainer = styled.ScrollView`
|
|
4
|
+
padding: 20px 40px 30px 40px;
|
|
5
|
+
`
|
|
6
|
+
|
|
7
|
+
export const BusinessInfoWrapper = styled.View`
|
|
8
|
+
flex-direction: row;
|
|
9
|
+
justify-content: space-between;
|
|
10
|
+
align-items: center;
|
|
11
|
+
`
|
|
12
|
+
|
|
13
|
+
export const PreorderTypeWrapper = styled.View`
|
|
14
|
+
margin-top: 23px;
|
|
15
|
+
`
|
|
16
|
+
|
|
17
|
+
export const MenuWrapper = styled(PreorderTypeWrapper)``
|
|
18
|
+
|
|
19
|
+
export const OrderTimeWrapper = styled.View`
|
|
20
|
+
margin-top: 34px;
|
|
21
|
+
`
|
|
22
|
+
|
|
23
|
+
export const TimeListWrapper = styled.ScrollView`
|
|
24
|
+
margin-top: 30px;
|
|
25
|
+
max-height: 160px;
|
|
26
|
+
`
|
|
27
|
+
|
|
28
|
+
export const TimeContentWrapper = styled.View`
|
|
29
|
+
flex: 1;
|
|
30
|
+
flex-wrap: wrap;
|
|
31
|
+
flex-direction: row;
|
|
32
|
+
justify-content: space-between;
|
|
33
|
+
`
|
|
34
|
+
|
|
35
|
+
export const TimeItem = styled.View`
|
|
36
|
+
width: 86px;
|
|
37
|
+
height: 34px;
|
|
38
|
+
background: #E9ECEF;
|
|
39
|
+
border-radius: 7.6px;
|
|
40
|
+
justify-content: center;
|
|
41
|
+
align-items: center;
|
|
42
|
+
margin: 10px 0px;
|
|
43
|
+
${({ active }: any) => active && css`
|
|
44
|
+
background: #F5F9FF;
|
|
45
|
+
`}
|
|
46
|
+
`
|
|
47
|
+
|
|
48
|
+
export const PreorderTypeListWrapper = styled.ScrollView`
|
|
49
|
+
padding: 20px 40px 30px 40px;
|
|
50
|
+
`
|
|
51
|
+
|
|
52
|
+
export const DropOption = styled.View`
|
|
53
|
+
padding: 10px;
|
|
54
|
+
margin-bottom: 5px;
|
|
55
|
+
font-size: 16px;
|
|
56
|
+
border-bottom-width: 1px;
|
|
57
|
+
border-bottom-color: ${(props: any) => props.theme.colors.lightGray};
|
|
58
|
+
flex-direction: row;
|
|
59
|
+
align-items: center;
|
|
60
|
+
`
|
|
@@ -263,7 +263,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
|
|
|
263
263
|
</FeaturedWrapper>
|
|
264
264
|
)}
|
|
265
265
|
<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
|
|
266
|
-
<HighestRatedBusinesses onBusinessClick={handleBusinessClick} />
|
|
266
|
+
<HighestRatedBusinesses onBusinessClick={handleBusinessClick} navigation={navigation} />
|
|
267
267
|
<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
|
|
268
268
|
<ListWrapper>
|
|
269
269
|
<BusinessTypeFilter
|
|
@@ -287,6 +287,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
|
|
|
287
287
|
business={business}
|
|
288
288
|
handleCustomClick={handleBusinessClick}
|
|
289
289
|
orderType={orderState?.options?.type}
|
|
290
|
+
navigation={navigation}
|
|
290
291
|
/>
|
|
291
292
|
)
|
|
292
293
|
)}
|
|
@@ -17,7 +17,8 @@ import {
|
|
|
17
17
|
const HighestRatedBusinessesUI = (props: HighestRatedBusinessesParams) => {
|
|
18
18
|
const {
|
|
19
19
|
businessesList,
|
|
20
|
-
onBusinessClick
|
|
20
|
+
onBusinessClick,
|
|
21
|
+
navigation
|
|
21
22
|
} = props;
|
|
22
23
|
|
|
23
24
|
const [, t] = useLanguage()
|
|
@@ -104,6 +105,7 @@ const HighestRatedBusinessesUI = (props: HighestRatedBusinessesParams) => {
|
|
|
104
105
|
business={business}
|
|
105
106
|
handleCustomClick={onBusinessClick}
|
|
106
107
|
orderType={orderState?.options?.type}
|
|
108
|
+
navigation={navigation}
|
|
107
109
|
/>
|
|
108
110
|
</View>
|
|
109
111
|
)
|
|
@@ -132,6 +132,7 @@ export interface BusinessesListingParams {
|
|
|
132
132
|
export interface HighestRatedBusinessesParams {
|
|
133
133
|
businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
|
|
134
134
|
onBusinessClick?: void;
|
|
135
|
+
navigation? :any;
|
|
135
136
|
}
|
|
136
137
|
export interface BusinessTypeFilterParams {
|
|
137
138
|
businessTypes?: Array<any>;
|
|
@@ -149,7 +150,8 @@ export interface BusinessControllerParams {
|
|
|
149
150
|
handleClick?: any;
|
|
150
151
|
isBusinessOpen?: boolean;
|
|
151
152
|
businessWillCloseSoonMinutes?: number
|
|
152
|
-
isBusinessClose?: number
|
|
153
|
+
isBusinessClose?: number,
|
|
154
|
+
navigation?: any
|
|
153
155
|
}
|
|
154
156
|
export interface BusinessProductsListingParams {
|
|
155
157
|
navigation?: any;
|
|
@@ -379,6 +381,25 @@ export interface MomentOptionParams {
|
|
|
379
381
|
handleChangeDate: (value: any) => {};
|
|
380
382
|
handleChangeTime: (value: any) => {};
|
|
381
383
|
}
|
|
384
|
+
export interface BusinessPreorderParams {
|
|
385
|
+
navigation?: any;
|
|
386
|
+
datesList: Array<any>;
|
|
387
|
+
hoursList: Array<any>;
|
|
388
|
+
dateSelected?: any;
|
|
389
|
+
timeSelected?: any;
|
|
390
|
+
isAsap?: boolean;
|
|
391
|
+
handleAsap?: () => {};
|
|
392
|
+
handleChangeDate: (value: any) => {};
|
|
393
|
+
handleChangeTime: (value: any) => {};
|
|
394
|
+
goToBack: any;
|
|
395
|
+
business: any;
|
|
396
|
+
handleBusinessClick: (value: any) => {};
|
|
397
|
+
}
|
|
398
|
+
export interface BusinessMenuListParams {
|
|
399
|
+
menu: any;
|
|
400
|
+
businessMenuList: any;
|
|
401
|
+
setMenu: (value: any) => {};
|
|
402
|
+
}
|
|
382
403
|
export interface OrderTypeSelectParams {
|
|
383
404
|
navigation?: any;
|
|
384
405
|
handleChangeOrderType: (value: any) => {};
|
|
@@ -65,8 +65,8 @@ export const BusinessBasicInformation = (
|
|
|
65
65
|
<BusinessHeader
|
|
66
66
|
style={
|
|
67
67
|
isBusinessInfoShow
|
|
68
|
-
? {...styles.businesInfoheaderStyle, paddingTop:
|
|
69
|
-
: { ...styles.headerStyle, paddingTop:
|
|
68
|
+
? {...styles.businesInfoheaderStyle, paddingTop: 0}
|
|
69
|
+
: { ...styles.headerStyle, paddingTop: 0, backgroundColor: theme.colors.backgroundGray }
|
|
70
70
|
}
|
|
71
71
|
source={{
|
|
72
72
|
uri:
|
|
@@ -182,7 +182,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
|
|
|
182
182
|
>
|
|
183
183
|
<WrapHeader>
|
|
184
184
|
{(!auth || props.isFranchiseApp) && !loading &&
|
|
185
|
-
<TopHeader style={{top:
|
|
185
|
+
<TopHeader style={{top: 0}}>
|
|
186
186
|
<NavBar
|
|
187
187
|
style={{ paddingBottom: 0, marginLeft: 20, backgroundColor: 'transparent' }}
|
|
188
188
|
btnStyle={{ backgroundColor: 'transparent' }}
|
|
@@ -297,7 +297,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
|
|
|
297
297
|
btnRightValue={parsePrice(currentCart?.total)}
|
|
298
298
|
disabled={openUpselling || currentCart?.subtotal < currentCart?.minimum}
|
|
299
299
|
handleClick={() => onRedirect('Cart')}
|
|
300
|
-
hasBottom
|
|
300
|
+
hasBottom={false}
|
|
301
301
|
/>
|
|
302
302
|
)}
|
|
303
303
|
<OModal
|
|
@@ -163,7 +163,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
|
|
|
163
163
|
isFromBusinesses: true,
|
|
164
164
|
})
|
|
165
165
|
}
|
|
166
|
-
style={{ marginTop: !auth ? 36 :
|
|
166
|
+
style={{ marginTop: !auth ? 36 : 20 }}
|
|
167
167
|
activeOpacity={0.8}
|
|
168
168
|
>
|
|
169
169
|
<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textSecondary} />
|