ordering-ui-react-native 0.14.34 → 0.14.35-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 (50) hide show
  1. package/package.json +2 -2
  2. package/src/components/BusinessItemAccordion/index.tsx +2 -2
  3. package/src/components/BusinessProductsListing/index.tsx +10 -26
  4. package/src/components/Cart/index.tsx +136 -62
  5. package/src/components/Cart/styles.tsx +7 -0
  6. package/src/components/Checkout/index.tsx +10 -6
  7. package/src/components/OrderDetails/index.tsx +102 -34
  8. package/src/components/OrderDetails/styles.tsx +7 -0
  9. package/src/components/OrderSummary/index.tsx +142 -58
  10. package/src/components/OrderSummary/styles.tsx +10 -2
  11. package/src/components/ProductForm/index.tsx +6 -8
  12. package/src/components/SingleProductCard/index.tsx +1 -1
  13. package/src/components/StripeElementsForm/index.tsx +28 -13
  14. package/src/components/TaxInformation/index.tsx +58 -26
  15. package/src/components/UpsellingProducts/index.tsx +13 -31
  16. package/src/components/VerifyPhone/styles.tsx +1 -2
  17. package/src/navigators/HomeNavigator.tsx +6 -0
  18. package/src/pages/ProductDetails.tsx +55 -0
  19. package/src/types/index.tsx +2 -0
  20. package/src/types/react-native-color-matrix-image-filters/index.d.ts +1 -0
  21. package/themes/doordash/src/components/LoginForm/index.tsx +1 -2
  22. package/themes/kiosk/src/components/Cart/index.tsx +14 -21
  23. package/themes/kiosk/src/components/CartItem/index.tsx +9 -7
  24. package/themes/kiosk/src/components/CustomerName/index.tsx +2 -1
  25. package/themes/kiosk/src/components/Intro/index.tsx +4 -4
  26. package/themes/kiosk/src/components/OptionCard/index.tsx +11 -6
  27. package/themes/kiosk/src/components/PaymentOptions/index.tsx +46 -44
  28. package/themes/original/index.tsx +4 -0
  29. package/themes/original/src/components/BusinessItemAccordion/index.tsx +12 -9
  30. package/themes/original/src/components/BusinessItemAccordion/styles.tsx +3 -2
  31. package/themes/original/src/components/BusinessPreorder/index.tsx +37 -35
  32. package/themes/original/src/components/BusinessProductsListing/UpsellingRedirect.tsx +35 -0
  33. package/themes/original/src/components/BusinessProductsListing/index.tsx +22 -49
  34. package/themes/original/src/components/BusinessesListing/index.tsx +100 -75
  35. package/themes/original/src/components/Cart/index.tsx +10 -31
  36. package/themes/original/src/components/Checkout/index.tsx +2 -0
  37. package/themes/original/src/components/FacebookLogin/index.tsx +20 -5
  38. package/themes/original/src/components/Help/index.tsx +1 -1
  39. package/themes/original/src/components/Home/index.tsx +5 -3
  40. package/themes/original/src/components/MessageListing/index.tsx +4 -2
  41. package/themes/original/src/components/OrderDetails/index.tsx +3 -1
  42. package/themes/original/src/components/OrderSummary/index.tsx +11 -30
  43. package/themes/original/src/components/PaymentOptionWallet/index.tsx +6 -2
  44. package/themes/original/src/components/ProductForm/index.tsx +67 -77
  45. package/themes/original/src/components/ProductForm/styles.tsx +9 -2
  46. package/themes/original/src/components/SingleProductCard/index.tsx +21 -11
  47. package/themes/original/src/components/SingleProductCard/styles.tsx +4 -0
  48. package/themes/original/src/components/StripeElementsForm/index.tsx +28 -13
  49. package/themes/original/src/components/UpsellingProducts/index.tsx +85 -83
  50. package/themes/original/src/types/index.tsx +6 -0
@@ -52,7 +52,6 @@ export const ProductOptionsUI = (props: any) => {
52
52
  handleChangeSuboptionState,
53
53
  handleChangeCommentState,
54
54
  productObject,
55
- onClose,
56
55
  businessSlug
57
56
  } = props
58
57
 
@@ -84,7 +83,6 @@ export const ProductOptionsUI = (props: any) => {
84
83
  }
85
84
 
86
85
  const handleRedirectLogin = (product : any) => {
87
- onClose()
88
86
  navigation.navigate('Login', {product: {businessId: product?.businessId, id: product?.id, categoryId: product?.categoryId, slug: businessSlug} })
89
87
  }
90
88
 
@@ -110,7 +108,7 @@ export const ProductOptionsUI = (props: any) => {
110
108
  name="x"
111
109
  size={35}
112
110
  style={{ color: theme.colors.white, backgroundColor: 'rgba(0,0,0,0.3)' }}
113
- onPress={onClose}
111
+ onPress={props.handleGoBack}
114
112
  />
115
113
  </View>
116
114
  </TopHeader>
@@ -134,26 +132,26 @@ export const ProductOptionsUI = (props: any) => {
134
132
  <View style={{ flexDirection: 'column', width: '100%' }}>
135
133
  <View style={{ flexDirection: 'row', marginTop: 15 }}>
136
134
  <OText size={20} style={{ flex: I18nManager.isRTL ? 0 : 1, marginBottom: 10 }}>{product?.name || productCart.name}{' '}</OText>
137
- {product?.calories && (
135
+ {!!product?.calories && (
138
136
  <OText size={16} style={styles.caloriesStyle}>{product?.calories} cal</OText>
139
137
  )}
140
138
  </View>
141
139
  <View style={{ flexDirection: 'row', marginBottom: 10 }}>
142
140
  <OText size={16} style={{ flex: I18nManager.isRTL ? 1 : 0 }} color={theme.colors.primary}>{productCart.price ? parsePrice(productCart.price) : ''}</OText>
143
- {product?.offer_price && (
141
+ {product?.offer_price !== null && product?.in_offer && (
144
142
  <OText style={styles.regularPriceStyle}>{parsePrice(product?.offer_price)}</OText>
145
143
  )}
146
144
  </View>
147
- {(product?.estimated_person || (product?.sku && product?.sku !== '-1' && product?.sku !== '1')) && (
145
+ {(!!product?.estimated_person || (!!product?.sku && product?.sku !== '-1' && product?.sku !== '1')) && (
148
146
  <OText size={14} style={{ flex: I18nManager.isRTL ? 1 : 0, marginBottom: 10 }} color={'#909BA9'}>
149
147
  {
150
148
  ((product?.sku && product?.sku !== '-1' && product?.sku !== '1') || (productCart?.sku && productCart?.sku !== '-1' && productCart?.sku !== '1'))
151
149
  && <>{t('SKU', 'Sku')}{' '}{product?.sku || productCart?.sku}</>
152
150
  }
153
- {product?.sku && product?.sku !== '-1' && product?.sku !== '1' && product?.estimated_person && (
151
+ {!!product?.sku && product?.sku !== '-1' && product?.sku !== '1' && !!product?.estimated_person && (
154
152
  <>&nbsp;&#183;&nbsp;</>
155
153
  )}
156
- {product?.estimated_person
154
+ {!!product?.estimated_person
157
155
  && <>{product?.estimated_person}{' '}{t('ESTIMATED_PERSONS', 'persons')}</>
158
156
  }
159
157
  </OText>
@@ -86,7 +86,7 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
86
86
  <OText size={12} numberOfLines={2} ellipsizeMode='tail' style={styles.textStyle}>{product?.description}</OText>
87
87
  <PricesContainer>
88
88
  <OText color={theme.colors.primary}>{parsePrice(product?.price)}</OText>
89
- {product?.offer_price && (
89
+ {product?.offer_price !== null && product?.in_offer && (
90
90
  <OText style={styles.regularPriceStyle}>{parsePrice(product?.offer_price)}</OText>
91
91
  )}
92
92
  </PricesContainer>
@@ -33,19 +33,33 @@ const StripeElementsFormUI = (props: any) => {
33
33
  const { confirmSetupIntent, loading: confirmSetupLoading } = useConfirmSetupIntent();
34
34
  const [createPmLoading, setCreatePmLoading] = useState(false);
35
35
 
36
- const billingDetails = {
37
- name: `${user.name} ${user.lastname}`,
38
- email: user.email,
39
- address: user.address
40
- };
36
+ let billingDetails: any = {}
37
+
38
+ if (user?.name || user?.lastname) {
39
+ if (user?.name) {
40
+ billingDetails.name = user?.name
41
+ }
42
+ if (user?.lastname) {
43
+ billingDetails.name = `${billingDetails?.name} ${user?.lastname}`
44
+ }
45
+ }
46
+
47
+ if (user?.email) {
48
+ billingDetails.email = user?.email
49
+ }
50
+
51
+ if (user?.address) {
52
+ billingDetails.addressLine1 = user?.address
53
+ }
41
54
 
42
55
  const createPayMethod = async () => {
56
+ const params: any = { type: 'Card' }
57
+ if (Object.keys(billingDetails).length > 0) {
58
+ params.billingDetails = billingDetails
59
+ }
43
60
  try {
44
61
  setCreatePmLoading(true)
45
- const { paymentMethod } = await createPaymentMethod({
46
- type: 'Card',
47
- billingDetails,
48
- });
62
+ const { paymentMethod } = await createPaymentMethod(params);
49
63
 
50
64
  setCreatePmLoading(false)
51
65
  handleSource && handleSource({
@@ -68,11 +82,12 @@ const StripeElementsFormUI = (props: any) => {
68
82
  createPayMethod();
69
83
  return
70
84
  }
85
+ const params: any = { type: 'Card' }
86
+ if (Object.keys(billingDetails).length > 0) {
87
+ params.billingDetails = billingDetails
88
+ }
71
89
  try {
72
- const { setupIntent, error } = await confirmSetupIntent(requirements, {
73
- type: 'Card',
74
- billingDetails,
75
- });
90
+ const { setupIntent, error } = await confirmSetupIntent(requirements, params);
76
91
 
77
92
  if (setupIntent?.status === 'Succeeded') {
78
93
  stripeTokenHandler(setupIntent?.paymentMethodId, user, businessId);
@@ -1,51 +1,83 @@
1
1
  import React from 'react'
2
- import { useLanguage, useUtils } from 'ordering-components/native'
2
+ import { useLanguage } from 'ordering-components/native'
3
3
  import { SingleProductCard } from '../SingleProductCard'
4
4
  import { TaxInformationContainer, ProductContainer } from './styles'
5
5
  import { OText } from '../shared'
6
6
 
7
7
  interface taxInformationParams {
8
- data: { name: string, description?: string, rate: string | number, type: number, fixed?: number, percentage?: number, id: number },
9
- products: Array<any>
8
+ data: {
9
+ name: string,
10
+ description?: string,
11
+ rate: string | number,
12
+ type: number,
13
+ fixed?: number,
14
+ percentage?: number,
15
+ id: number,
16
+ discounts?: any
17
+ },
18
+ products: Array<any>,
19
+ type: string
10
20
  }
11
21
 
12
22
  export const TaxInformation = (props: taxInformationParams) => {
13
23
  const {
14
24
  data,
15
- products
25
+ products,
26
+ type
16
27
  } = props
17
28
 
18
29
  const [, t] = useLanguage()
19
- const [{ parsePrice }] = useUtils()
20
30
 
21
- const isTax = typeof data?.rate === 'number'
22
- const TaxFeeString = isTax ? 'tax' : 'fee'
23
31
  const includedOnPriceString = data?.type === 1 ? `(${t('INCLUDED_ON_PRICE', 'Included on price')})` : `(${t('NOT_INCLUDED_ON_PRICE', 'Not included on price')})`
24
32
 
33
+ const getFilterValidation = (product: any) => {
34
+ return (
35
+ type === 'tax'
36
+ ? (product.tax?.id ? product.tax?.id === data?.id : product.tax?.id === null && data?.id === null)
37
+ : type === 'fee'
38
+ ? (product.fee?.id ? product.fee?.id === data?.id : (product.fee?.id === null && data?.id === null))
39
+ : Object.keys(data?.discounts ?? {}).map(code => code.includes(product?.code))
40
+ )
41
+ }
42
+
43
+ const getTypeString = () => {
44
+ return (
45
+ type === 'offer_target_1'
46
+ ? t('PRODUCT_DISCOUNT', 'Product discount')
47
+ : type === 'tax'
48
+ ? t('TAX', 'Tax')
49
+ : t('Fee', 'Fee')
50
+ )
51
+ }
52
+
25
53
  return (
26
54
  <TaxInformationContainer>
27
- <OText size={24} style={{ alignSelf: 'center', textAlign: 'center' }} mBottom={10}>
28
- {`${data?.name ||
29
- t('INHERIT_FROM_BUSINESS', 'Inherit from business')} (${typeof data?.rate === 'number' ? `${data?.rate}%` : `${parsePrice(data?.fixed ?? 0)} + ${data?.percentage}%`})`}
30
- </OText>
31
- {data?.description && (
55
+ {!!data?.description ? (
56
+ <OText size={24} style={{ alignSelf: 'center', textAlign: 'center' }} mBottom={10}>
57
+ {t('DESCRIPTION', 'Description')}: {data?.description} {data?.type && !type?.includes('offer') && includedOnPriceString}
58
+ </OText>
59
+ ) : (
32
60
  <OText mBottom={10} size={18} style={{ alignSelf: 'center', textAlign: 'center' }}>
33
- {t('DESCRIPTION', 'Description')}: {data?.description} {data?.type && includedOnPriceString}
61
+ {t('WITHOUT_DESCRIPTION', 'Without description')}
34
62
  </OText>
35
63
  )}
36
- <OText>{t(`OTHER_PRODUCTS_WITH_THIS_${TaxFeeString.toUpperCase()}`, `Other products with this ${TaxFeeString}`)}:</OText>
37
- <ProductContainer>
38
- {
39
- products.filter((product: any) => isTax ? (product.tax?.id ? product.tax?.id === data?.id : product.tax?.id === null && data?.id === null) : (product.fee?.id ? product.fee?.id === data?.id : (product.fee?.id === null && data?.id === null))).map(product => (
40
- <SingleProductCard
41
- key={product.id}
42
- product={product}
43
- isSoldOut={false}
44
- businessId={product?.business_id}
45
- />
46
- ))
47
- }
48
- </ProductContainer>
64
+ {!(type === 'offer_target_2' || type === 'offer_target_3') && (
65
+ <>
66
+ <OText>{t('OTHER_PRODUCTS_WITH_THIS', 'Other products with this')} {getTypeString()}:</OText>
67
+ <ProductContainer>
68
+ {
69
+ products.filter((product: any) => getFilterValidation(product)).map(product => (
70
+ <SingleProductCard
71
+ key={product.id}
72
+ product={product}
73
+ isSoldOut={false}
74
+ businessId={product?.business_id}
75
+ />
76
+ ))
77
+ }
78
+ </ProductContainer>
79
+ </>
80
+ )}
49
81
  </TaxInformationContainer>
50
82
  )
51
83
  }
@@ -16,7 +16,6 @@ import {
16
16
  AddButton,
17
17
  CloseUpselling
18
18
  } from './styles'
19
- import { ProductForm } from '../ProductForm';
20
19
  import { useTheme } from 'styled-components/native'
21
20
 
22
21
  const UpsellingProductsUI = (props: UpsellingProductsParams) => {
@@ -27,7 +26,9 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
27
26
  handleUpsellingPage,
28
27
  openUpselling,
29
28
  canOpenUpselling,
30
- setCanOpenUpselling
29
+ setCanOpenUpselling,
30
+ onRedirect,
31
+ setOpenUpselling
31
32
  } = props
32
33
 
33
34
  const theme = useTheme();
@@ -53,8 +54,6 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
53
54
  }
54
55
  })
55
56
 
56
- const [actualProduct, setActualProduct] = useState<any>(null)
57
- const [modalIsOpen, setModalIsOpen] = useState(false)
58
57
  const [{ parsePrice }] = useUtils()
59
58
  const [, t] = useLanguage()
60
59
 
@@ -71,13 +70,15 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
71
70
  }, [upsellingProducts.loading, upsellingProducts?.products.length])
72
71
 
73
72
  const handleFormProduct = (product: any) => {
74
- setActualProduct(product)
75
- setModalIsOpen(true)
76
- }
77
-
78
- const handleSaveProduct = () => {
79
- setActualProduct(null)
80
- setModalIsOpen(false)
73
+ setOpenUpselling && setOpenUpselling(false)
74
+ onRedirect && onRedirect('ProductDetails', {
75
+ product: product,
76
+ businessId: product?.api?.businessId,
77
+ businessSlug: business.slug,
78
+ onAction: () => {
79
+ setOpenUpselling && setOpenUpselling(true)
80
+ }
81
+ })
81
82
  }
82
83
 
83
84
  const UpsellingLayout = () => {
@@ -132,13 +133,12 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
132
133
  <>
133
134
  {!canOpenUpselling || upsellingProducts?.products?.length === 0 ? null : (
134
135
  <>
135
- {!modalIsOpen && (
136
136
  <OBottomPopup
137
137
  title={t('WANT_SOMETHING_ELSE', 'Do you want something else?')}
138
138
  open={openUpselling}
139
139
  onClose={() => handleUpsellingPage()}
140
140
  >
141
- <UpsellingLayout />
141
+ <UpsellingLayout />
142
142
  <CloseUpselling>
143
143
  <OButton
144
144
  imgRightSrc=''
@@ -148,28 +148,10 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
148
148
  />
149
149
  </CloseUpselling>
150
150
  </OBottomPopup>
151
- )}
152
151
  </>
153
152
  )}
154
153
  </>
155
154
  )}
156
- <OModal
157
- open={modalIsOpen}
158
- onClose={() => setModalIsOpen(false)}
159
- entireModal
160
- customClose
161
- isAvoidKeyBoardView
162
- >
163
- {actualProduct && (
164
- <ProductForm
165
- product={actualProduct}
166
- businessId={actualProduct?.api?.businessId}
167
- businessSlug={business.slug}
168
- onSave={() => handleSaveProduct()}
169
- onClose={() => setModalIsOpen(false)}
170
- />
171
- )}
172
- </OModal>
173
155
  </>
174
156
  )
175
157
  }
@@ -2,7 +2,7 @@ import styled from 'styled-components/native';
2
2
 
3
3
  export const Container = styled.View`
4
4
  width: 100%;
5
- padding: 0 43px;
5
+ padding: 0 30px;
6
6
  `
7
7
 
8
8
  export const CountDownContainer = styled.View`
@@ -20,7 +20,6 @@ export const ResendSection = styled.View`
20
20
  display: flex;
21
21
  flex-direction: row;
22
22
  justify-content: center;
23
- flex-wrap: wrap;
24
23
  `
25
24
 
26
25
  export const WrappCountdown = styled.View`
@@ -21,6 +21,7 @@ import HelpOrder from '../pages/HelpOrder'
21
21
  import HelpGuide from '../pages/HelpGuide'
22
22
  import HelpAccountAndPayment from '../pages/HelpAccountAndPayment'
23
23
  import Splash from '../pages/Splash';
24
+ import ProductDetails from '../pages/ProductDetails';
24
25
  const Stack = createStackNavigator();
25
26
 
26
27
  const HomeNavigator = (e : any) => {
@@ -101,6 +102,11 @@ const HomeNavigator = (e : any) => {
101
102
  component={BusinessProductsList}
102
103
  options={{ headerShown: false }}
103
104
  />
105
+ <Stack.Screen
106
+ name="ProductDetails"
107
+ component={ProductDetails}
108
+ options={{ headerShown: false }}
109
+ />
104
110
  <Stack.Screen
105
111
  name="ReviewOrder"
106
112
  component={ReviewOrder}
@@ -0,0 +1,55 @@
1
+ import * as React from 'react';
2
+ import styled, { useTheme } from 'styled-components/native';
3
+ import { Platform } from 'react-native';
4
+ import { ProductForm as ProductFormController } from '../components/ProductForm';
5
+ interface Props {
6
+ navigation: any;
7
+ route: any;
8
+ }
9
+
10
+ const ProductDetails = (props: Props) => {
11
+ const theme = useTheme()
12
+
13
+ const productProps = {
14
+ ...props,
15
+ isCartProduct: props.route.params?.isCartProduct,
16
+ isFromCheckout: props.route.params?.isFromCheckout,
17
+ productCart: props.route.params?.productCart,
18
+ product: props.route.params?.product,
19
+ businessSlug: props.route.params?.businessSlug,
20
+ businessId: props.route.params?.businessId,
21
+ categoryId: props.route.params?.categoryId,
22
+ productId: props.route.params?.productId,
23
+ onSave: props?.navigation?.canGoBack()
24
+ ? () => { props.route.params?.onAction && props.route.params?.onAction(); props?.navigation?.goBack(); }
25
+ : () => { props.route.params?.onAction && props.route.params?.onAction(); props?.navigation?.navigate('BottomTab') }
26
+ ,
27
+ handleGoBack: props?.navigation?.canGoBack()
28
+ ? () => {
29
+ props.route.params?.onAction &&
30
+ props.route.params?.onAction();
31
+ props?.navigation?.goBack();
32
+ }
33
+ : (businessSlug: any) => {
34
+ props.route.params?.onAction &&
35
+ props.route.params?.onAction();
36
+ businessSlug
37
+ ? props?.navigation.navigate('Business', { store: businessSlug })
38
+ : props?.navigation.navigate('BottomTab')
39
+ }
40
+ };
41
+
42
+ const BusinessProductsListView = styled.SafeAreaView`
43
+ flex: 1;
44
+ background-color: ${theme.colors.backgroundPage};
45
+ padding-top: ${Platform.OS === 'ios' ? '0px' : '20px'};
46
+ `;
47
+
48
+ return (
49
+ <BusinessProductsListView>
50
+ <ProductFormController {...productProps} />
51
+ </BusinessProductsListView>
52
+ );
53
+ };
54
+
55
+ export default ProductDetails;
@@ -408,6 +408,8 @@ export interface UpsellingProductsParams {
408
408
  isCustomMode?: boolean;
409
409
  upsellingProducts?: any;
410
410
  business?: any;
411
+ setOpenUpselling?: any;
412
+ onRedirect?: any;
411
413
  businessId?: number;
412
414
  cartProducts?: Array<any>;
413
415
  handleUpsellingPage: () => void;
@@ -0,0 +1 @@
1
+ declare module 'react-native-color-matrix-image-filters'
@@ -410,8 +410,7 @@ const LoginFormUI = (props: LoginParams) => {
410
410
  textInputProps={{
411
411
  returnKeyType: 'next',
412
412
  onSubmitEditing: () => inputRef?.current?.focus?.(),
413
- style: { borderWidth: 0, fontSize: 12 },
414
- maxLength: 10
413
+ style: { borderWidth: 0, fontSize: 12 }
415
414
  }}
416
415
  textWrapStyle={{ borderColor: theme.colors.clear, borderWidth: 0, height: 40, paddingStart: 0 }}
417
416
  />
@@ -21,10 +21,10 @@ import { Cart as TypeCart } from '../../types';
21
21
  import CartItem from '../CartItem';
22
22
  import NavBar from '../NavBar';
23
23
  import { CouponControl } from '../CouponControl';
24
- import { LANDSCAPE, PORTRAIT, useDeviceOrientation} from "../../../../../src/hooks/DeviceOrientation";
24
+ import { LANDSCAPE, PORTRAIT, useDeviceOrientation } from "../../../../../src/hooks/DeviceOrientation";
25
25
  import { useCartBottomSheet } from '../../providers/CartBottomSheetProvider';
26
26
  import { Container } from '../../../../../src/layouts/Container';
27
-
27
+ import AntDesignIcon from 'react-native-vector-icons/AntDesign'
28
28
  const CartUI = (props: any) => {
29
29
  const {
30
30
  cart,
@@ -35,7 +35,7 @@ const CartUI = (props: any) => {
35
35
  removeProduct,
36
36
  setIsCartsLoading,
37
37
  navigation,
38
- } : CartUIProps = props
38
+ }: CartUIProps = props
39
39
 
40
40
  const theme = useTheme()
41
41
  const [, t] = useLanguage()
@@ -83,8 +83,8 @@ const CartUI = (props: any) => {
83
83
 
84
84
  const handleChangeOrderType = () => {
85
85
  navigation.push('DeliveryType', {
86
- callback : () => {navigation.pop(1)},
87
- goBack: () => {navigation.pop(1)},
86
+ callback: () => { navigation.pop(1) },
87
+ goBack: () => { navigation.pop(1) },
88
88
  });
89
89
  }
90
90
 
@@ -97,7 +97,7 @@ const CartUI = (props: any) => {
97
97
  title={t('CONFIRM_YOUR_ORDER', 'Confirm your order')}
98
98
  onActionLeft={goToBack}
99
99
  style={{ height: orientationState?.dimensions?.height * 0.08 }}
100
- btnStyle={{paddingLeft: 0}}
100
+ btnStyle={{ paddingLeft: 0 }}
101
101
  rightComponent={(
102
102
  <OButton
103
103
  text={t('CANCEL_ORDER', 'Cancel order')}
@@ -183,6 +183,7 @@ const CartUI = (props: any) => {
183
183
  </OText>
184
184
  </OSTable>
185
185
  {cart?.discount > 0 && cart?.total >= 0 && orientationState?.orientation == PORTRAIT && (
186
+
186
187
  <OSTable
187
188
  style={{
188
189
  backgroundColor: theme.colors.success,
@@ -197,10 +198,7 @@ const CartUI = (props: any) => {
197
198
  flexDirection: 'row',
198
199
  }}
199
200
  >
200
- <OIcon
201
- src={theme.images.general.check_decagram}
202
- />
203
-
201
+ <AntDesignIcon name='checkcircle' size={24} color='#00D27A' />
204
202
  {cart?.discount_type === 1 ? (
205
203
  <OText
206
204
  mLeft={15}
@@ -219,8 +217,6 @@ const CartUI = (props: any) => {
219
217
  </OText>
220
218
  )}
221
219
  </View>
222
-
223
-
224
220
  <OText
225
221
  size={16}
226
222
  color={theme.colors.green}
@@ -252,9 +248,9 @@ const CartUI = (props: any) => {
252
248
  {cart?.driver_tip_rate > 0 &&
253
249
  parseInt(configs?.driver_tip_type?.value, 10) === 2 &&
254
250
  !!!parseInt(configs?.driver_tip_use_custom?.value, 10) &&
255
- (
256
- `(${parseNumber(cart?.driver_tip_rate)}%)`
257
- )}
251
+ (
252
+ `(${parseNumber(cart?.driver_tip_rate)}%)`
253
+ )}
258
254
  </OText>
259
255
  <OText>{parsePrice(cart?.driver_tip)}</OText>
260
256
  </OSTable>
@@ -294,7 +290,7 @@ const CartUI = (props: any) => {
294
290
  <>
295
291
  <FloatingLayout isIos={Platform.OS === 'ios'}>
296
292
  <CheckoutAction>
297
- <View style={{display: 'flex', flexDirection: 'row'}}>
293
+ <View style={{ display: 'flex', flexDirection: 'row' }}>
298
294
  {cart?.discount > 0 && cart?.total >= 0 && orientationState?.orientation == LANDSCAPE && (
299
295
  <OSTable
300
296
  style={{
@@ -311,10 +307,7 @@ const CartUI = (props: any) => {
311
307
  flexDirection: 'row',
312
308
  }}
313
309
  >
314
- <OIcon
315
- src={theme.images.general.check_decagram}
316
- />
317
-
310
+ <AntDesignIcon name='checkcircle' size={24} color='#00D27A' />
318
311
  {cart?.discount_type === 1 ? (
319
312
  <OText
320
313
  mLeft={15}
@@ -369,7 +362,7 @@ const CartUI = (props: any) => {
369
362
  imgRightSrc={null}
370
363
  textStyle={{ color: 'white', textAlign: 'center', flex: 1 }}
371
364
  onClick={() => { navigation?.navigate('CustomerName', { cartUuid: cart?.uuid }) }}
372
- style={{width: '100%', marginTop: 4}}
365
+ style={{ width: '100%', marginTop: 4 }}
373
366
  />
374
367
  </View>
375
368
  </View>
@@ -16,6 +16,7 @@ import { Product } from '../../types';
16
16
  import QuantityControl from '../QuantityControl';
17
17
  import { LANDSCAPE, useDeviceOrientation } from '../../../../../src/hooks/DeviceOrientation';
18
18
  import { useTheme } from 'styled-components/native';
19
+ import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome'
19
20
 
20
21
  const CartItem = (props: CartItemProps) => {
21
22
  const theme = useTheme()
@@ -97,7 +98,6 @@ const CartItem = (props: CartItemProps) => {
97
98
  <OButton
98
99
  bgColor="transparent"
99
100
  borderColor="transparent"
100
- imgLeftSrc={theme.images.general.edit}
101
101
  text={t('EDIT', 'Edit')}
102
102
  style={{ justifyContent: 'flex-start', paddingLeft: 0, maxWidth: 80 }}
103
103
  textStyle={{
@@ -105,16 +105,18 @@ const CartItem = (props: CartItemProps) => {
105
105
  marginLeft: 6,
106
106
  }}
107
107
  onClick={() => { onEditProduct ? onEditProduct(product) : null }}
108
+ iconProps={{ name: 'edit' }}
109
+ IconCustom={() => <FontAwesomeIcon name='edit' size={24} color={theme.colors.primary} />}
108
110
  />
109
111
  <OIconButton
110
112
  bgColor="transparent"
111
113
  borderColor="transparent"
112
- RenderIcon={isProductIngredients && (() =>
113
- <EvilIcons
114
- name={isActive ? 'chevron-up': 'chevron-down'}
115
- size={40}
116
- color={theme.colors.primary}
117
- />
114
+ RenderIcon={isProductIngredients && (() =>
115
+ <EvilIcons
116
+ name={isActive ? 'chevron-up' : 'chevron-down'}
117
+ size={40}
118
+ color={theme.colors.primary}
119
+ />
118
120
  )}
119
121
  style={{ justifyContent: 'flex-start', right: 40 }}
120
122
  onClick={() => (!product?.valid_menu && isCartProduct)
@@ -72,12 +72,13 @@ const CustomerName = (props: Props): React.ReactElement => {
72
72
  <OButton
73
73
  text={t('SKIP', 'Skip')}
74
74
  onClick={onProceedToPay}
75
- textStyle={{color: theme.colors.primaryContrast, fontSize: 20}}
75
+ textStyle={{color: theme.colors.primary, fontSize: 20}}
76
76
  parentStyle={{
77
77
  height: orientationState?.orientation === PORTRAIT
78
78
  ? 50 : 100
79
79
  }}
80
80
  style={{
81
+ backgroundColor: theme.colors.white,
81
82
  width: orientationState?.orientation === PORTRAIT
82
83
  ? orientationState?.dimensions.width - 40
83
84
  : orientationState?.dimensions.width * 0.1,
@@ -8,7 +8,7 @@ import OImage from '../../components/shared/OImage';
8
8
  import OButton from '../../components/shared/OButton';
9
9
  import { LanguageSelector } from '../../components/LanguageSelector';
10
10
  import { LogoutPopup } from '../../components/LogoutPopup';
11
- import {PORTRAIT, LANDSCAPE, useDeviceOrientation} from "../../../../../src/hooks/DeviceOrientation";
11
+ import { PORTRAIT, LANDSCAPE, useDeviceOrientation } from "../../../../../src/hooks/DeviceOrientation";
12
12
 
13
13
  const Intro = (props: any): React.ReactElement => {
14
14
  const { navigation } = props;
@@ -87,7 +87,7 @@ const Intro = (props: any): React.ReactElement => {
87
87
  source={theme.images.general.homeHeroLandscape}
88
88
  width={orientationState?.dimensions?.width * 0.40}
89
89
  height={orientationState?.dimensions?.height * 1.1}
90
- style={{bottom: 100, right: 100}}
90
+ style={{ bottom: 100, right: 100 }}
91
91
  resizeMode='cover'
92
92
  />
93
93
 
@@ -114,7 +114,7 @@ const Intro = (props: any): React.ReactElement => {
114
114
 
115
115
  <OButton
116
116
  style={styles.buttonLandStyle}
117
- text={t('TOUCH_TO_ORDER', 'Touch to order')}
117
+ text={t('TOUCH_ANYWHERE_TO_ORDER', 'Touch anywhere to order')}
118
118
  parentStyle={{
119
119
  alignItems: 'center',
120
120
  width: orientationState?.dimensions?.width - _offset
@@ -138,7 +138,7 @@ const Intro = (props: any): React.ReactElement => {
138
138
 
139
139
  const styles = StyleSheet.create({
140
140
  buttonLandStyle: {
141
- width: 260,
141
+ width: 290,
142
142
  marginBottom: 16
143
143
  }
144
144
  });