ordering-ui-react-native 0.15.20 → 0.15.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.15.20",
+  "version": "0.15.21",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/original/src/components/CouponControl/index.tsx

@@ -87,6 +87,7 @@ const CouponControlUI = (props: any) => {
 			) : (
 				<CCWrapper>
 					<OInput
+						value={couponInput}
 						placeholder={t('DISCOUNT_COUPON', 'Discount coupon')}
 						onChange={(e: any) => onChangeInputCoupon(e)}
 						style={styles.inputsStyle}

package/themes/original/src/components/OrderDetails/index.tsx

@@ -5,7 +5,7 @@ import {
   useLanguage,
   OrderDetails as OrderDetailsConTableoller,
   useUtils,
-  useConfig,
+  useConfig
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import {
@@ -28,6 +28,7 @@ import {
   OrderDriver,
   Map,
   Divider,
+  OrderAction
 } from './styles';
 import { OButton, OIcon, OModal, OText } from '../shared';
 import { ProductItemAccordion } from '../ProductItemAccordion';
@@ -48,6 +49,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     readMessages,
     isFromCheckout,
     driverLocation,
+    onNavigationRedirect,
+    reorderState,
+    handleReorder
   } = props;
 
   const theme = useTheme();
@@ -83,11 +87,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [, t] = useLanguage();
   const [{ parsePrice, parseNumber, parseDate }] = useUtils();
   const [{ configs }] = useConfig();
-
   const [isReviewed, setIsReviewed] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
 
-  const { order } = props.order;
+  const { order, businessData } = props.order;
 
   const walletName: any = {
     cash: {
@@ -310,8 +313,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         business: type === 'business',
         driver: type === 'driver',
         onClose: () => navigation?.canGoBack()
-        ? navigation.goBack()
-        : navigation.navigate('BottomTab', { screen: 'MyOrders' }),
+          ? navigation.goBack()
+          : navigation.navigate('BottomTab', { screen: 'MyOrders' }),
       }
     )
   }
@@ -356,6 +359,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     )
   }
 
+
+  useEffect(() => {
+    if (reorderState?.error) {
+      navigation.navigate('Business', { store: businessData?.slug })
+    }
+    if (!reorderState?.error && reorderState?.result?.uuid) {
+      onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+    }
+  }, [reorderState])
+
   useEffect(() => {
     BackHandler.addEventListener('hardwareBackPress', handleArrowBack);
     return () => {
@@ -737,16 +750,37 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   'Once business accepts your order, we will send you an email, thank you!',
                 )}
               </OText>
-              <OButton
-                text={t('YOUR_ORDERS', 'Your Orders')}
-                textStyle={{ fontSize: 14, color: theme.colors.primary }}
-                imgRightSrc={null}
-                borderColor={theme.colors.primary}
-                bgColor={theme.colors.clear}
-                style={{ borderRadius: 7.6, borderWidth: 1, height: 44, shadowOpacity: 0 }}
-                parentStyle={{ marginTop: 29, width: '50%' }}
-                onClick={() => navigation.navigate('BottomTab', { screen: 'MyOrders' })}
-              />
+              <OrderAction>
+                <OButton
+                  text={t('YOUR_ORDERS', 'Your Orders')}
+                  textStyle={{ fontSize: 14, color: theme.colors.primary }}
+                  imgRightSrc={null}
+                  borderColor={theme.colors.primary}
+                  bgColor={theme.colors.clear}
+                  style={{ borderRadius: 7.6, borderWidth: 1, height: 44, shadowOpacity: 0 }}
+                  parentStyle={{ marginTop: 29, marginEnd: 15 }}
+                  onClick={() => navigation.navigate('BottomTab', { screen: 'MyOrders' })}
+                />
+                {(
+                  parseInt(order?.status) === 1 ||
+                  parseInt(order?.status) === 2 ||
+                  parseInt(order?.status) === 5 ||
+                  parseInt(order?.status) === 6 ||
+                  parseInt(order?.status) === 10 ||
+                  parseInt(order?.status) === 11 ||
+                  parseInt(order?.status) === 12
+                ) && (
+                    <OButton
+                      text={order.id === reorderState?.loading ? t('LOADING', 'Loading..') : t('REORDER', 'Reorder')}
+                      textStyle={{ fontSize: 14, color: theme.colors.primary }}
+                      imgRightSrc={null}
+                      borderColor='transparent'
+                      bgColor={theme.colors.primary + 10}
+                      style={{ borderRadius: 7.6, borderWidth: 1, height: 44, shadowOpacity: 0, marginTop: 29 }}
+                      onClick={() => handleReorder && handleReorder(order.id)}
+                    />
+                  )}
+              </OrderAction>
             </HeaderInfo>
             <OrderProducts>
               {order?.products?.length &&

package/themes/original/src/components/OrderDetails/styles.tsx

@@ -125,3 +125,6 @@ export const Divider = styled.View`
   margin-top: 5px;
   margin-bottom: 5px;
 `
+export const OrderAction = styled.View`
+  flex-direction: row;
+`

package/themes/original/src/types/index.tsx

@@ -143,9 +143,9 @@ export interface BusinessesListingParams {
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
 	onBusinessClick?: void;
-	navigation? :any;
+	navigation?: any;
 	isLoading?: boolean;
-	getBusinesses: (newFetch : boolean) => void
+	getBusinesses: (newFetch: boolean) => void
 }
 export interface BusinessTypeFilterParams {
 	businessTypes?: Array<any>;
@@ -182,7 +182,7 @@ export interface BusinessProductsListingParams {
 	header?: any;
 	logo?: any;
 	productModal?: any;
-  getNextProducts?: () => {};
+	getNextProducts?: () => {};
 	handleChangeCategory: (value: any) => {};
 	setProductLogin?: () => {};
 	updateProductModal?: (value: any) => {};
@@ -209,8 +209,8 @@ export interface BusinessProductsCategoriesParams {
 	categoriesLayout?: any;
 	selectedCategoryId?: any;
 	lazyLoadProductsRecommended?: any;
-  setSelectedCategoryId?: any
-  setCategoryClicked?: any
+	setSelectedCategoryId?: any
+	setCategoryClicked?: any
 }
 export interface BusinessProductsListParams {
 	errors?: any;
@@ -321,7 +321,10 @@ export interface OrderDetailsParams {
 	isFromCheckout?: boolean,
 	driverLocation?: any,
 	isFromRoot?: any,
-	goToBusinessList?: boolean
+	goToBusinessList?: boolean,
+	onNavigationRedirect?: any,
+	reorderState?: any,
+	handleReorder?: any,
 }
 export interface ProductItemAccordionParams {
 	key?: any;
@@ -355,7 +358,7 @@ export interface ReviewProductParams {
 	formState?: any,
 	handleChangeFormState?: any,
 	handleSendProductReview?: any
-  }
+}
 export interface SingleProductReviewParams {
 	product: any,
 	formState?: any,
@@ -522,34 +525,34 @@ export interface HelpGuideParams {
 export interface HelpAccountAndPaymentParams {
 	navigation: any;
 }
-  
+
 export interface MessageListingParams {
 	navigation: any;
 	franchiseId?: any;
 }
 
-export interface BusinessSearchParams { 
+export interface BusinessSearchParams {
 	navigation: any,
-    businessesSearchList: any,
-    onBusinessClick: any,
-    handleChangeTermValue: (term: string) => void,
-    termValue: string,
-    paginationProps: any,
-    handleSearchbusinessAndProducts: (newFetch?: boolean) => void,
-    handleChangeFilters: (prop : string, value : any) => void,
-    filters: any,
-    businessTypes: Array<number>,
-    setFilters: (filters: any) => void,
+	businessesSearchList: any,
+	onBusinessClick: any,
+	handleChangeTermValue: (term: string) => void,
+	termValue: string,
+	paginationProps: any,
+	handleSearchbusinessAndProducts: (newFetch?: boolean) => void,
+	handleChangeFilters: (prop: string, value: any) => void,
+	filters: any,
+	businessTypes: Array<number>,
+	setFilters: (filters: any) => void,
 	lazySearch?: boolean
 }
-  
+
 export interface NoNetworkParams {
 	image?: any,
 }
 
 export interface PlaceSpotParams {
 	isOpenPlaceSpot?: boolean,
-	cart?: any ,
+	cart?: any,
 	placesState?: any,
 	handleChangePlace?: any,
 	getPlacesList?: any,