ordering-ui-react-native 0.18.0 → 0.18.1-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 +9 -7
- package/src/DeliveryApp.tsx +43 -1
- package/src/components/BusinessInformation/index.tsx +10 -9
- package/src/components/BusinessesListing/index.tsx +1 -1
- package/src/components/OrderCreating/index.tsx +0 -20
- package/src/components/PaymentOptionsWebView/index.tsx +29 -8
- package/src/components/PhoneInputNumber/index.tsx +6 -2
- package/src/components/StripeMethodForm/index.tsx +136 -102
- package/src/components/VerifyPhone/styles.tsx +1 -2
- package/src/components/shared/OToast.tsx +3 -2
- package/src/types/index.tsx +5 -0
- package/src/utils/index.tsx +7 -2
- package/themes/business/index.tsx +4 -0
- package/themes/business/src/components/AcceptOrRejectOrder/index.tsx +36 -26
- package/themes/business/src/components/BusinessController/index.tsx +19 -17
- package/themes/business/src/components/BusinessProductList/AccordionDropdown.tsx +63 -0
- package/themes/business/src/components/BusinessProductList/IterateCategories.tsx +108 -0
- package/themes/business/src/components/BusinessProductList/ProductList.tsx +196 -0
- package/themes/business/src/components/BusinessProductList/index.tsx +196 -0
- package/themes/business/src/components/BusinessProductList/styles.tsx +10 -0
- package/themes/business/src/components/Chat/index.tsx +163 -123
- package/themes/business/src/components/DriverMap/index.tsx +17 -6
- package/themes/business/src/components/DriverSchedule/index.tsx +45 -8
- package/themes/business/src/components/FloatingButton/index.tsx +34 -31
- package/themes/business/src/components/GoogleMap/index.tsx +58 -57
- package/themes/business/src/components/LoginForm/index.tsx +5 -2
- package/themes/business/src/components/MapView/index.tsx +14 -10
- package/themes/business/src/components/MessagesOption/index.tsx +22 -94
- package/themes/business/src/components/NewOrderNotification/index.tsx +123 -96
- package/themes/business/src/components/NotFoundSource/index.tsx +2 -2
- package/themes/business/src/components/OrderDetails/Business.tsx +1 -1
- package/themes/business/src/components/OrderDetails/Delivery.tsx +205 -12
- package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx +91 -43
- package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx +87 -66
- package/themes/business/src/components/OrderDetailsLogistic/index.tsx +200 -0
- package/themes/business/src/components/OrderDetailsLogistic/styles.tsx +5 -0
- package/themes/business/src/components/OrderMessage/index.tsx +19 -18
- package/themes/business/src/components/OrderSummary/index.tsx +114 -123
- package/themes/business/src/components/OrdersListManager/index.tsx +7 -2
- package/themes/business/src/components/OrdersListManager/utils.tsx +1 -1
- package/themes/business/src/components/OrdersOption/index.tsx +60 -47
- package/themes/business/src/components/PreviousMessages/FooterMessageComponent.tsx +103 -0
- package/themes/business/src/components/PreviousMessages/index.tsx +97 -55
- package/themes/business/src/components/PreviousOrders/OrderItem.tsx +21 -29
- package/themes/business/src/components/PreviousOrders/OrderList.tsx +93 -0
- package/themes/business/src/components/PreviousOrders/OrdersGroupedItem.tsx +1 -1
- package/themes/business/src/components/PreviousOrders/index.tsx +198 -221
- package/themes/business/src/components/PreviousOrders/styles.tsx +10 -0
- package/themes/business/src/components/ProductItemAccordion/index.tsx +7 -1
- package/themes/business/src/components/ReviewCustomer/index.tsx +18 -13
- package/themes/business/src/components/SearchBar/index.tsx +2 -1
- package/themes/business/src/components/StoresList/index.tsx +6 -5
- package/themes/business/src/components/UserProfileForm/index.tsx +14 -15
- package/themes/business/src/components/WebsocketStatus/index.tsx +171 -0
- package/themes/business/src/components/WebsocketStatus/styles.tsx +28 -0
- package/themes/business/src/components/shared/OModal.tsx +16 -9
- package/themes/business/src/types/index.tsx +25 -10
- package/themes/business/src/utils/index.tsx +29 -2
- 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/Checkout/index.tsx +6 -0
- package/themes/kiosk/src/components/Intro/index.tsx +16 -1
- package/themes/kiosk/src/components/LoginForm/index.tsx +7 -5
- 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/PhoneInputNumber/index.tsx +2 -2
- package/themes/kiosk/src/components/shared/OButton.tsx +5 -18
- package/themes/original/index.tsx +7 -3
- package/themes/original/src/components/AddressDetails/index.tsx +19 -3
- package/themes/original/src/components/AddressForm/index.tsx +33 -15
- package/themes/original/src/components/AddressForm/styles.tsx +1 -1
- package/themes/original/src/components/AddressList/index.tsx +5 -8
- package/themes/original/src/components/AddressList/styles.tsx +4 -4
- package/themes/original/src/components/AnalyticsSegment/index.tsx +193 -10
- package/themes/original/src/components/AppleLogin/index.tsx +4 -4
- package/themes/original/src/components/AppleLogin/styles.tsx +3 -1
- package/themes/original/src/components/BusinessBasicInformation/index.tsx +74 -38
- package/themes/original/src/components/BusinessBasicInformation/styles.tsx +11 -13
- package/themes/original/src/components/BusinessController/index.tsx +35 -44
- package/themes/original/src/components/BusinessController/styles.tsx +12 -5
- package/themes/original/src/components/BusinessFeaturedController/index.tsx +21 -54
- package/themes/original/src/components/BusinessFeaturedController/styles.tsx +8 -0
- package/themes/original/src/components/BusinessInformation/index.tsx +140 -85
- package/themes/original/src/components/BusinessInformation/styles.tsx +2 -2
- package/themes/original/src/components/BusinessItemAccordion/index.tsx +25 -26
- package/themes/original/src/components/BusinessListingSearch/MaxSectionItem/index.tsx +1 -1
- package/themes/original/src/components/BusinessListingSearch/index.tsx +346 -341
- package/themes/original/src/components/BusinessListingSearch/styles.tsx +1 -19
- package/themes/original/src/components/BusinessPreorder/index.tsx +105 -22
- package/themes/original/src/components/BusinessPreorder/styles.tsx +14 -0
- package/themes/original/src/components/BusinessProductsCategories/index.tsx +2 -3
- package/themes/original/src/components/BusinessProductsList/index.tsx +15 -7
- package/themes/original/src/components/BusinessProductsList/styles.tsx +8 -3
- package/themes/original/src/components/BusinessProductsListing/UpsellingRedirect.tsx +1 -1
- package/themes/original/src/components/BusinessProductsListing/index.tsx +162 -39
- package/themes/original/src/components/BusinessProductsListing/styles.tsx +4 -5
- package/themes/original/src/components/BusinessReviews/index.tsx +4 -2
- package/themes/original/src/components/BusinessesListing/Layout/Appointment/index.tsx +1 -1
- package/themes/original/src/components/BusinessesListing/Layout/Appointment/styles.tsx +5 -5
- package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListFooter.tsx +69 -0
- package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListHeader.tsx +406 -0
- package/themes/original/src/components/BusinessesListing/Layout/Original/FlatListBusinessListing.tsx +76 -0
- package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx +37 -404
- package/themes/original/src/components/BusinessesListing/Layout/Original/styles.tsx +1 -1
- package/themes/original/src/components/BusinessesListing/index.tsx +0 -1
- package/themes/original/src/components/Cart/index.tsx +49 -47
- package/themes/original/src/components/CartContent/index.tsx +99 -38
- package/themes/original/src/components/CartContent/styles.tsx +6 -6
- package/themes/original/src/components/CartStoresListing/styles.tsx +2 -2
- package/themes/original/src/components/Checkout/index.tsx +324 -43
- package/themes/original/src/components/Checkout/styles.tsx +17 -0
- package/themes/original/src/components/CitiesControl/index.tsx +1 -1
- package/themes/original/src/components/CitiesControl/styles.tsx +1 -1
- package/themes/original/src/components/CouponControl/index.tsx +10 -3
- package/themes/original/src/components/DatePicker/index.tsx +17 -0
- package/themes/original/src/components/DatePicker/styles.tsx +20 -0
- package/themes/original/src/components/DriverTips/index.tsx +12 -4
- package/themes/original/src/components/FacebookLogin/styles.tsx +3 -1
- package/themes/original/src/components/Favorite/index.tsx +4 -9
- package/themes/original/src/components/Favorite/styles.tsx +0 -2
- package/themes/original/src/components/FloatingButton/styles.tsx +1 -1
- package/themes/original/src/components/GPSButton/index.tsx +7 -5
- package/themes/original/src/components/GiftCard/GiftCardUI/index.tsx +8 -3
- package/themes/original/src/components/GiftCard/PurchaseGiftCard/index.tsx +42 -5
- package/themes/original/src/components/GiftCard/PurchaseGiftCard/styles.tsx +3 -1
- package/themes/original/src/components/GiftCard/RedeemGiftCard/index.tsx +84 -8
- package/themes/original/src/components/GiftCard/RedeemGiftCard/styles.tsx +1 -1
- package/themes/original/src/components/GiftCard/SendGiftCard/styles.tsx +1 -1
- package/themes/original/src/components/GoogleLogin/styles.tsx +1 -1
- package/themes/original/src/components/GoogleMap/index.tsx +63 -7
- package/themes/original/src/components/HighestRatedBusinesses/index.tsx +1 -1
- package/themes/original/src/components/HighestRatedBusinesses/styles.tsx +1 -1
- package/themes/original/src/components/Home/index.tsx +14 -5
- package/themes/original/src/components/LastOrder/index.tsx +2 -1
- package/themes/original/src/components/LastOrders/index.tsx +2 -1
- package/themes/original/src/components/LoginForm/Otp/index.tsx +91 -25
- package/themes/original/src/components/LoginForm/index.tsx +64 -34
- package/themes/original/src/components/LottieAnimation/index.tsx +88 -63
- package/themes/original/src/components/MessageListing/index.tsx +9 -2
- package/themes/original/src/components/Messages/index.tsx +15 -4
- package/themes/original/src/components/Messages/styles.tsx +1 -1
- package/themes/original/src/components/MomentOption/index.tsx +43 -38
- package/themes/original/src/components/MomentSelector/index.tsx +1 -1
- package/themes/original/src/components/MultiCart/index.tsx +1 -1
- package/themes/original/src/components/MultiCartsPaymethodsAndWallets/index.tsx +161 -49
- package/themes/original/src/components/MultiCheckout/index.tsx +348 -70
- package/themes/original/src/components/MultiCheckout/styles.tsx +3 -1
- package/themes/original/src/components/MultiOrdersDetails/index.tsx +2 -2
- package/themes/original/src/components/MyOrders/index.tsx +16 -5
- package/themes/original/src/components/NavBar/index.tsx +20 -13
- package/themes/original/src/components/NetworkError/styles.tsx +2 -2
- package/themes/original/src/components/NotFoundSource/index.tsx +14 -10
- package/themes/original/src/components/Notifications/index.tsx +2 -4
- package/themes/original/src/components/Notifications/styles.tsx +0 -1
- package/themes/original/src/components/OrderDetails/OrderEta.tsx +76 -0
- package/themes/original/src/components/OrderDetails/OrderHistory.tsx +22 -6
- package/themes/original/src/components/OrderDetails/index.tsx +721 -670
- package/themes/original/src/components/OrderDetails/styles.tsx +24 -8
- package/themes/original/src/components/OrderItAgain/index.tsx +3 -1
- package/themes/original/src/components/OrderProgress/index.tsx +34 -25
- package/themes/original/src/components/OrderProgress/styles.tsx +1 -1
- package/themes/original/src/components/OrderSummary/index.tsx +62 -57
- package/themes/original/src/components/OrderTypeSelector/index.tsx +5 -6
- package/themes/original/src/components/OrdersOption/PreviousBusinessOrdered/styles.tsx +1 -1
- package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/index.tsx +13 -13
- package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/styles.tsx +1 -1
- package/themes/original/src/components/OrdersOption/index.tsx +44 -21
- package/themes/original/src/components/OrdersOption/styles.tsx +2 -2
- package/themes/original/src/components/PageBanner/index.tsx +65 -29
- package/themes/original/src/components/PageBanner/styles.tsx +0 -3
- package/themes/original/src/components/PaymentOptionCard/index.tsx +180 -0
- package/themes/original/src/components/PaymentOptionStripe/styles.tsx +3 -0
- package/themes/original/src/components/PaymentOptionWallet/index.tsx +56 -56
- package/themes/original/src/components/PaymentOptions/index.tsx +100 -34
- package/themes/original/src/components/PhoneInputNumber/index.tsx +18 -4
- package/themes/original/src/components/ProductForm/ActionButton.tsx +120 -0
- package/themes/original/src/components/ProductForm/ExtraOptions.tsx +56 -0
- package/themes/original/src/components/ProductForm/index.tsx +106 -170
- package/themes/original/src/components/ProductForm/styles.tsx +3 -3
- package/themes/original/src/components/ProductItemAccordion/index.tsx +13 -6
- package/themes/original/src/components/ProductOptionSubOption/index.tsx +49 -20
- package/themes/original/src/components/ProductOptionSubOption/styles.tsx +10 -9
- package/themes/original/src/components/ProfessionalProfile/index.tsx +35 -6
- package/themes/original/src/components/ProfessionalProfile/styles.tsx +3 -3
- package/themes/original/src/components/Promotions/index.tsx +6 -6
- package/themes/original/src/components/Promotions/styles.tsx +3 -3
- package/themes/original/src/components/ReviewDriver/styles.tsx +1 -1
- package/themes/original/src/components/ReviewOrder/styles.tsx +1 -1
- package/themes/original/src/components/ReviewProducts/index.tsx +16 -7
- package/themes/original/src/components/ReviewProducts/styles.tsx +1 -1
- package/themes/original/src/components/ScheduleAccordion/index.tsx +3 -3
- package/themes/original/src/components/ServiceForm/index.tsx +36 -24
- package/themes/original/src/components/ServiceForm/styles.tsx +4 -4
- package/themes/original/src/components/SignupForm/index.tsx +27 -16
- package/themes/original/src/components/SingleOrderCard/index.tsx +44 -20
- package/themes/original/src/components/SingleOrderCard/styles.tsx +1 -1
- package/themes/original/src/components/SingleProductCard/index.tsx +13 -10
- package/themes/original/src/components/SingleProductCard/styles.tsx +8 -3
- package/themes/original/src/components/SingleProductReview/styles.tsx +1 -1
- package/themes/original/src/components/StripeCardsList/index.tsx +61 -5
- package/themes/original/src/components/StripeElementsForm/index.tsx +48 -34
- package/themes/original/src/components/StripeElementsForm/naked.tsx +12 -1
- package/themes/original/src/components/UpsellingProducts/UpsellingContent.tsx +170 -0
- package/themes/original/src/components/UpsellingProducts/UpsellingLayout.tsx +86 -0
- package/themes/original/src/components/UpsellingProducts/index.tsx +16 -205
- package/themes/original/src/components/UpsellingProducts/styles.tsx +19 -0
- package/themes/original/src/components/UserDetails/index.tsx +3 -1
- package/themes/original/src/components/UserFormDetails/index.tsx +100 -22
- package/themes/original/src/components/UserFormDetails/styles.tsx +1 -1
- package/themes/original/src/components/UserProfile/index.tsx +8 -26
- package/themes/original/src/components/UserProfileForm/index.tsx +30 -31
- package/themes/original/src/components/UserVerification/index.tsx +55 -50
- package/themes/original/src/components/WalletTransactionItem/index.tsx +2 -2
- package/themes/original/src/components/WalletTransactions/index.tsx +3 -3
- package/themes/original/src/components/WalletTransactions/styles.tsx +1 -0
- package/themes/original/src/components/Wallets/index.tsx +48 -60
- package/themes/original/src/components/Wallets/styles.tsx +3 -4
- package/themes/original/src/components/shared/HeaderTitle.tsx +1 -1
- package/themes/original/src/components/shared/OButton.tsx +3 -3
- package/themes/original/src/components/shared/OInput.tsx +4 -5
- package/themes/original/src/components/shared/OModal.tsx +15 -17
- package/themes/original/src/layouts/Container.tsx +1 -1
- package/themes/original/src/types/index.tsx +28 -6
- package/themes/original/src/utils/index.tsx +180 -13
- package/themes/uber-eats/src/components/BusinessesListing/index.tsx +1 -1
- package/src/navigators/BottomNavigator.tsx +0 -117
- package/src/navigators/CheckoutNavigator.tsx +0 -66
- package/src/navigators/HomeNavigator.tsx +0 -202
- package/src/navigators/NavigationRef.tsx +0 -7
- package/src/navigators/RootNavigator.tsx +0 -269
- package/src/pages/Account.tsx +0 -34
- package/src/pages/AddressForm.tsx +0 -62
- package/src/pages/AddressList.tsx +0 -24
- package/src/pages/BusinessProductsList.tsx +0 -81
- package/src/pages/BusinessesListing.tsx +0 -43
- package/src/pages/CartList.tsx +0 -49
- package/src/pages/Checkout.tsx +0 -101
- package/src/pages/ForgotPassword.tsx +0 -24
- package/src/pages/Help.tsx +0 -23
- package/src/pages/HelpAccountAndPayment.tsx +0 -23
- package/src/pages/HelpGuide.tsx +0 -23
- package/src/pages/HelpOrder.tsx +0 -23
- package/src/pages/Home.tsx +0 -36
- package/src/pages/IntroductoryTutorial.tsx +0 -170
- package/src/pages/Login.tsx +0 -47
- package/src/pages/MomentOption.tsx +0 -30
- package/src/pages/MultiCheckout.tsx +0 -31
- package/src/pages/MultiOrdersDetails.tsx +0 -27
- package/src/pages/MyOrders.tsx +0 -40
- package/src/pages/NetworkError.tsx +0 -24
- package/src/pages/NotFound.tsx +0 -22
- package/src/pages/OrderDetails.tsx +0 -25
- package/src/pages/ProductDetails.tsx +0 -55
- package/src/pages/Profile.tsx +0 -36
- package/src/pages/ReviewDriver.tsx +0 -30
- package/src/pages/ReviewOrder.tsx +0 -32
- package/src/pages/ReviewProducts.tsx +0 -30
- package/src/pages/Sessions.tsx +0 -22
- package/src/pages/Signup.tsx +0 -53
- package/src/pages/SpinnerLoader.tsx +0 -10
- package/src/pages/Splash.tsx +0 -21
|
@@ -0,0 +1,200 @@
|
|
|
1
|
+
//React & React Native
|
|
2
|
+
import React, { useState, useEffect } from 'react';
|
|
3
|
+
import { View } from 'react-native';
|
|
4
|
+
|
|
5
|
+
// Thirds
|
|
6
|
+
import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
|
|
7
|
+
|
|
8
|
+
//OrderingComponent
|
|
9
|
+
import {
|
|
10
|
+
useLanguage,
|
|
11
|
+
OrderDetails as OrderDetailsConTableoller,
|
|
12
|
+
useSession,
|
|
13
|
+
useConfig
|
|
14
|
+
} from 'ordering-components/native';
|
|
15
|
+
|
|
16
|
+
//Components
|
|
17
|
+
import Alert from '../../providers/AlertProvider';
|
|
18
|
+
import { FloatingButton } from '../FloatingButton';
|
|
19
|
+
import { OrderDetailsLogisticParams } from '../../types';
|
|
20
|
+
import { useTheme } from 'styled-components/native';
|
|
21
|
+
import { NotFoundSource } from '../NotFoundSource';
|
|
22
|
+
import { getOrderStatus } from '../../utils';
|
|
23
|
+
import { OrderHeaderComponent } from '../OrderDetails/OrderHeaderComponent';
|
|
24
|
+
import { OrderContentComponent } from '../OrderDetails/OrderContentComponent';
|
|
25
|
+
//Styles
|
|
26
|
+
import { OrderDetailsContainer } from './styles';
|
|
27
|
+
|
|
28
|
+
export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
|
|
29
|
+
const {
|
|
30
|
+
navigation,
|
|
31
|
+
handleClickLogisticOrder,
|
|
32
|
+
orderAssingId,
|
|
33
|
+
} = props;
|
|
34
|
+
const { order } = props.order
|
|
35
|
+
const theme = useTheme();
|
|
36
|
+
const [, t] = useLanguage();
|
|
37
|
+
const [session] = useSession();
|
|
38
|
+
const [{ configs }] = useConfig();
|
|
39
|
+
|
|
40
|
+
const [alertState, setAlertState] = useState<{
|
|
41
|
+
open: boolean;
|
|
42
|
+
content: Array<string>;
|
|
43
|
+
key?: string | null;
|
|
44
|
+
}>({ open: false, content: [], key: null });
|
|
45
|
+
|
|
46
|
+
const logisticOrderStatus = [4, 6, 7]
|
|
47
|
+
const isHideRejectButtons = configs?.reject_orders_enabled && configs?.reject_orders_enabled?.value !== '1'
|
|
48
|
+
|
|
49
|
+
const showFloatButtonsAcceptOrReject: any = {
|
|
50
|
+
0: true,
|
|
51
|
+
4: true,
|
|
52
|
+
7: true,
|
|
53
|
+
14: true
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
const handleArrowBack: any = () => {
|
|
57
|
+
navigation?.canGoBack() && navigation.goBack();
|
|
58
|
+
};
|
|
59
|
+
|
|
60
|
+
const handleRejectLogisticOrder = (order: any) => {
|
|
61
|
+
handleClickLogisticOrder?.(2, orderAssingId || order?.logistic_order_id, order)
|
|
62
|
+
handleArrowBack()
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
const handleAcceptLogisticOrder = (order: any) => {
|
|
66
|
+
handleClickLogisticOrder?.(1, orderAssingId || order?.logistic_order_id, order)
|
|
67
|
+
handleArrowBack()
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
useEffect(() => {
|
|
71
|
+
if (order?.driver === null && session?.user?.level === 4) {
|
|
72
|
+
setAlertState({
|
|
73
|
+
open: true,
|
|
74
|
+
content: [
|
|
75
|
+
t(
|
|
76
|
+
'YOU_HAVE_BEEN_REMOVED_FROM_THE_ORDER',
|
|
77
|
+
'You have been removed from the order',
|
|
78
|
+
),
|
|
79
|
+
],
|
|
80
|
+
key: null,
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
}, [order?.driver]);
|
|
84
|
+
|
|
85
|
+
const OrderDetailsInformation = (props: { order: any, isOrderGroup?: boolean, lastOrder?: boolean }) => {
|
|
86
|
+
const {
|
|
87
|
+
order,
|
|
88
|
+
isOrderGroup,
|
|
89
|
+
lastOrder,
|
|
90
|
+
} = props
|
|
91
|
+
return (
|
|
92
|
+
<>
|
|
93
|
+
<OrderContentComponent
|
|
94
|
+
order={order}
|
|
95
|
+
logisticOrderStatus={logisticOrderStatus}
|
|
96
|
+
isOrderGroup={isOrderGroup}
|
|
97
|
+
lastOrder={lastOrder}
|
|
98
|
+
/>
|
|
99
|
+
<View
|
|
100
|
+
style={{
|
|
101
|
+
height:
|
|
102
|
+
order?.status === 8 && order?.delivery_type === 1 ? 50 : 35,
|
|
103
|
+
}}
|
|
104
|
+
/>
|
|
105
|
+
|
|
106
|
+
</>
|
|
107
|
+
)
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
return (
|
|
111
|
+
<>
|
|
112
|
+
{(!order || Object.keys(order).length === 0) &&
|
|
113
|
+
(props.order?.error?.length < 1 || !props.order?.error) && (
|
|
114
|
+
<View style={{ flex: 1 }}>
|
|
115
|
+
{[...Array(6)].map((item, i) => (
|
|
116
|
+
<Placeholder key={i} Animation={Fade}>
|
|
117
|
+
<View style={{ flexDirection: 'row', paddingVertical: 20 }}>
|
|
118
|
+
<Placeholder>
|
|
119
|
+
<PlaceholderLine width={100} />
|
|
120
|
+
<PlaceholderLine width={70} />
|
|
121
|
+
<PlaceholderLine width={30} />
|
|
122
|
+
<PlaceholderLine width={20} />
|
|
123
|
+
</Placeholder>
|
|
124
|
+
</View>
|
|
125
|
+
</Placeholder>
|
|
126
|
+
))}
|
|
127
|
+
</View>
|
|
128
|
+
)}
|
|
129
|
+
|
|
130
|
+
{(!!props.order?.error || props.order?.error) && (
|
|
131
|
+
<NotFoundSource
|
|
132
|
+
btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
|
|
133
|
+
content={
|
|
134
|
+
props.order.error[0] ||
|
|
135
|
+
props.order.error ||
|
|
136
|
+
t('NETWORK_ERROR', 'Network Error')
|
|
137
|
+
}
|
|
138
|
+
onClickButton={() => navigation.navigate('Orders')}
|
|
139
|
+
/>
|
|
140
|
+
)}
|
|
141
|
+
{!((!order || Object.keys(order).length === 0) &&
|
|
142
|
+
(props.order?.error?.length < 1 || !props.order?.error)) && (
|
|
143
|
+
<View style={{ flex: 1 }}>
|
|
144
|
+
<OrderHeaderComponent
|
|
145
|
+
order={order}
|
|
146
|
+
getOrderStatus={getOrderStatus}
|
|
147
|
+
handleArrowBack={handleArrowBack}
|
|
148
|
+
logisticOrderStatus={logisticOrderStatus}
|
|
149
|
+
/>
|
|
150
|
+
{order && Object.keys(order).length > 0 && (props.order?.error?.length < 1 || !props.order?.error) && (
|
|
151
|
+
<>
|
|
152
|
+
<OrderDetailsContainer
|
|
153
|
+
keyboardShouldPersistTaps="handled"
|
|
154
|
+
showsVerticalScrollIndicator={false}
|
|
155
|
+
>
|
|
156
|
+
{order?.order_group && !!order?.order_group_id && order?.isLogistic ? order?.order_group?.orders.map((order: any, i: number, hash: any) => (
|
|
157
|
+
<OrderDetailsInformation key={order?.id} order={order} isOrderGroup lastOrder={hash?.length === i + 1} />
|
|
158
|
+
)) : (
|
|
159
|
+
<OrderDetailsInformation order={order} />
|
|
160
|
+
)}
|
|
161
|
+
</OrderDetailsContainer>
|
|
162
|
+
|
|
163
|
+
{showFloatButtonsAcceptOrReject[order?.status] && (
|
|
164
|
+
<FloatingButton
|
|
165
|
+
btnText={t('REJECT', 'Reject')}
|
|
166
|
+
isSecondaryBtn={false}
|
|
167
|
+
secondButtonClick={() => handleAcceptLogisticOrder(order)}
|
|
168
|
+
firstButtonClick={() => handleRejectLogisticOrder(order)}
|
|
169
|
+
secondBtnText={t('ACCEPT', 'Accept')}
|
|
170
|
+
secondButton={true}
|
|
171
|
+
firstColorCustom={theme.colors.red}
|
|
172
|
+
secondColorCustom={theme.colors.green}
|
|
173
|
+
widthButton={isHideRejectButtons ? '100%': '45%'}
|
|
174
|
+
isHideRejectButtons={isHideRejectButtons}
|
|
175
|
+
/>
|
|
176
|
+
)}
|
|
177
|
+
</>
|
|
178
|
+
)}
|
|
179
|
+
</View>
|
|
180
|
+
)}
|
|
181
|
+
{alertState?.open && (
|
|
182
|
+
<Alert
|
|
183
|
+
open={alertState.open}
|
|
184
|
+
onAccept={handleArrowBack}
|
|
185
|
+
onClose={handleArrowBack}
|
|
186
|
+
content={alertState.content}
|
|
187
|
+
title={t('WARNING', 'Warning')}
|
|
188
|
+
/>
|
|
189
|
+
)}
|
|
190
|
+
</>
|
|
191
|
+
);
|
|
192
|
+
};
|
|
193
|
+
|
|
194
|
+
export const OrderDetailsLogistic = (props: OrderDetailsLogisticParams) => {
|
|
195
|
+
const orderDetailsProps = {
|
|
196
|
+
...props,
|
|
197
|
+
UIComponent: OrderDetailsLogisticUI,
|
|
198
|
+
};
|
|
199
|
+
return <OrderDetailsConTableoller {...orderDetailsProps} />;
|
|
200
|
+
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useState, useEffect } from 'react';
|
|
2
2
|
import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
|
|
3
3
|
import { Chat } from '../Chat';
|
|
4
|
-
import { StyleSheet, View, BackHandler } from 'react-native';
|
|
4
|
+
import { StyleSheet, View, BackHandler, TouchableOpacity } from 'react-native';
|
|
5
5
|
import {
|
|
6
6
|
useLanguage,
|
|
7
7
|
OrderDetails as OrderDetailsController,
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
} from 'ordering-components/native';
|
|
10
10
|
import { useUtils } from 'ordering-components/native';
|
|
11
11
|
|
|
12
|
-
import { OIcon,
|
|
12
|
+
import { OIcon, OText } from '../shared';
|
|
13
13
|
import { OrderDetailsParams } from '../../types';
|
|
14
14
|
import { USER_TYPE } from '../../config/constants';
|
|
15
15
|
import { useTheme } from 'styled-components/native';
|
|
@@ -146,13 +146,6 @@ export const OrderMessageUI = (props: OrderDetailsParams) => {
|
|
|
146
146
|
shadowRadius: 3.84,
|
|
147
147
|
elevation: 3,
|
|
148
148
|
},
|
|
149
|
-
cancelBtn: {
|
|
150
|
-
marginRight: 5,
|
|
151
|
-
zIndex: 10000,
|
|
152
|
-
height: 30,
|
|
153
|
-
width: 20,
|
|
154
|
-
justifyContent: 'flex-end',
|
|
155
|
-
},
|
|
156
149
|
modalText: {
|
|
157
150
|
fontFamily: 'Poppins',
|
|
158
151
|
fontStyle: 'normal',
|
|
@@ -161,6 +154,18 @@ export const OrderMessageUI = (props: OrderDetailsParams) => {
|
|
|
161
154
|
textAlign: 'center',
|
|
162
155
|
zIndex: 10,
|
|
163
156
|
},
|
|
157
|
+
btnBackArrow: {
|
|
158
|
+
borderWidth: 0,
|
|
159
|
+
width: 32,
|
|
160
|
+
height: 32,
|
|
161
|
+
tintColor: theme.colors.textGray,
|
|
162
|
+
backgroundColor: theme.colors.clear,
|
|
163
|
+
borderColor: theme.colors.clear,
|
|
164
|
+
shadowColor: theme.colors.clear,
|
|
165
|
+
paddingLeft: 0,
|
|
166
|
+
paddingRight: 0,
|
|
167
|
+
marginTop: 10
|
|
168
|
+
},
|
|
164
169
|
});
|
|
165
170
|
|
|
166
171
|
return (
|
|
@@ -260,13 +265,9 @@ export const OrderMessageUI = (props: OrderDetailsParams) => {
|
|
|
260
265
|
<>
|
|
261
266
|
<View style={styles.titleSection}>
|
|
262
267
|
<View style={styles.titleGroups}>
|
|
263
|
-
<
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
borderColor={theme.colors.clear}
|
|
267
|
-
style={styles.cancelBtn}
|
|
268
|
-
onClick={handleArrowBack}
|
|
269
|
-
/>
|
|
268
|
+
<TouchableOpacity onPress={() => handleArrowBack()} style={styles.btnBackArrow}>
|
|
269
|
+
<OIcon src={theme.images.general.arrow_left} color={theme.colors.textGray} />
|
|
270
|
+
</TouchableOpacity>
|
|
270
271
|
|
|
271
272
|
<OText size={16} style={styles.modalText} adjustsFontSizeToFit>
|
|
272
273
|
{`${t('INVOICE_ORDER_NO', 'Order No.')} ${order?.id}`}
|
|
@@ -275,7 +276,7 @@ export const OrderMessageUI = (props: OrderDetailsParams) => {
|
|
|
275
276
|
|
|
276
277
|
<View style={styles.titleGroups}>
|
|
277
278
|
<View style={styles.shadow}>
|
|
278
|
-
{order?.business?.logo ? (
|
|
279
|
+
{!!order?.business?.logo ? (
|
|
279
280
|
<OIcon
|
|
280
281
|
url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
|
|
281
282
|
style={styles.titleIcons}
|
|
@@ -292,7 +293,7 @@ export const OrderMessageUI = (props: OrderDetailsParams) => {
|
|
|
292
293
|
<OIcon
|
|
293
294
|
url={optimizeImage(
|
|
294
295
|
order?.customer?.photo ||
|
|
295
|
-
|
|
296
|
+
theme?.images?.dummies?.customerPhoto,
|
|
296
297
|
'h_300,c_limit',
|
|
297
298
|
)}
|
|
298
299
|
style={styles.titleIcons}
|