ordering-ui-react-native 0.15.33 → 0.15.36

package/package.json

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

package/themes/kiosk/src/components/Intro/index.tsx

@@ -32,17 +32,17 @@ const Intro = (props: any): React.ReactElement => {
   };
 
   return (
-    <ScrollView
-      scrollEnabled={false}
-      refreshControl={
-        <RefreshControl
-          refreshing={showLogoutPopup ? false : refreshing}
-          onRefresh={() => setShowLogoutPopup(true)}
-        />
-      }
-    >
+    // <ScrollView
+    //   scrollEnabled={false}
+    //   refreshControl={
+    //     <RefreshControl
+    //       refreshing={showLogoutPopup ? false : refreshing}
+    //       onRefresh={() => setShowLogoutPopup(true)}
+    //     />
+    //   }
+    // >
       <Pressable onPress={goBusiness}>
-        <Container nopadding={orientationState.orientation === LANDSCAPE}>
+        <View style={{ height: orientationState?.dimensions?.height }}>
           {orientationState.orientation === PORTRAIT ? (
             <View
               style={{
@@ -132,9 +132,9 @@ const Intro = (props: any): React.ReactElement => {
             open={showLogoutPopup}
             onClose={() => setShowLogoutPopup(false)}
           />
-        </Container>
+        </View>
       </Pressable>
-    </ScrollView>
+    // </ScrollView>
   );
 };
 

package/themes/kiosk/src/components/UpsellingProducts/index.tsx

@@ -1,6 +1,6 @@
 import React,{ useState, useEffect } from 'react'
 import Spinner from 'react-native-loading-spinner-overlay';
-import { StyleSheet, View, Platform } from 'react-native'
+import { StyleSheet, View, Platform, ImageBackground } from 'react-native'
 import {
   UpsellingPage as UpsellingPageController,
   useUtils,
@@ -20,6 +20,7 @@ import { Container } from '../../layouts/Container';
 import GridContainer from '../../layouts/GridContainer';
 import { PORTRAIT, useDeviceOrientation } from "../../../../../src/hooks/DeviceOrientation";
 import { useTheme } from 'styled-components/native';
+import FastImage from 'react-native-fast-image';
 
 const UpsellingProductsUI = (props: UpsellingProductsParams) => {
   const {
@@ -114,7 +115,24 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
                 {
                   !upsellingProducts.error ? upsellingProducts.products.map((product: any) => (
                     <Item key={product.id}>
-                      <OImage source={{ uri: product.images }} style={styles.imageStyle} />
+                      {product?.images ? (
+                        <FastImage
+                          style={styles.imageStyle}
+                          source={{
+                            uri: product?.images,
+                            priority: FastImage.priority.normal,
+                            // cache:FastImage.cacheControl.web
+                          }}
+                          resizeMode={FastImage.resizeMode.cover}
+                        />
+                      ) : (
+                        <ImageBackground
+                          style={styles.imageStyle}
+                          source={theme.images.dummies.product}
+                          imageStyle={{ borderRadius: 10 }}
+                          resizeMode='cover'
+                        />
+                      )}
                       <Details>
                         <OText
                           weight="500"
@@ -125,24 +143,22 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
                           {product.name}
                         </OText>
 
-                        {!!product?.price && (
-                          <OText>
-                            <OText
-                              color={theme.colors.primary}
-                              weight="500"
-                            >
-                              {parsePrice(product.price)}
-                            </OText>
+                        <OText>
+                          <OText
+                            color={theme.colors.primary}
+                            weight="500"
+                          >
+                            {parsePrice(product.price)}
+                          </OText>
 
-                            <OText
-                              color={theme.colors.mediumGray}
-                              size={12}
-                              style={{textDecorationLine: 'line-through', textDecorationStyle: 'solid'}}
-                            >
-                              {product?.offer_price ? `  ${parsePrice(product?.offer_price)}  ` : ''}
-                            </OText>
+                          <OText
+                            color={theme.colors.mediumGray}
+                            size={12}
+                            style={{textDecorationLine: 'line-through', textDecorationStyle: 'solid'}}
+                          >
+                            {product?.offer_price ? `  ${parsePrice(product?.offer_price)}  ` : ''}
                           </OText>
-                        )}
+                        </OText>
                       </Details>
 
                       <OButton
@@ -200,24 +216,22 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
                                   {product.name}
                                 </OText>
 
-                                {!!product?.price && (
-                                  <OText>
-                                    <OText
-                                      color={theme.colors.primary}
-                                      weight="500"
-                                      >
-                                      {parsePrice(product.price)}
-                                    </OText>
+                                <OText>
+                                  <OText
+                                    color={theme.colors.primary}
+                                    weight="500"
+                                    >
+                                    {parsePrice(product.price)}
+                                  </OText>
 
-                                    <OText
-                                      color={theme.colors.mediumGray}
-                                      size={12}
-                                      style={{textDecorationLine: 'line-through', textDecorationStyle: 'solid'}}
-                                      >
-                                      {product?.offer_price ? parsePrice(product?.offer_price) : ''}
-                                    </OText>
+                                  <OText
+                                    color={theme.colors.mediumGray}
+                                    size={12}
+                                    style={{textDecorationLine: 'line-through', textDecorationStyle: 'solid'}}
+                                    >
+                                    {product?.offer_price ? parsePrice(product?.offer_price) : ''}
                                   </OText>
-                                )}
+                                </OText>
                               </Details>
                               <OButton
                                 text={t('ADD_PRODUCT', 'add product')}

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

@@ -4,6 +4,7 @@ import {
 	useUtils,
 	useOrder,
 	useLanguage,
+	useConfig
 } from 'ordering-components/native';
 import { OIcon, OText } from '../shared';
 import { StyleSheet, View } from 'react-native';
@@ -44,6 +45,8 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 	const [orderState] = useOrder();
 	const [, t] = useLanguage();
 	const theme = useTheme()
+	const [{ configs }] = useConfig();
+	const isPreOrderSetting = configs?.preorder_status_enabled?.value === '1'
 
 	const styles = StyleSheet.create({
 		headerStyle: {
@@ -112,7 +115,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 	};
 
 	const handleBusinessClick = (selectedBusiness: any) => {
-		if (business?.open) handleClick && handleClick(selectedBusiness)
+		if (business?.open || !isPreOrderSetting) handleClick && handleClick(selectedBusiness)
 		else {
 			navigation.navigate('BusinessPreorder', { business: selectedBusiness, handleBusinessClick: handleClick })
 		}

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

@@ -17,6 +17,7 @@ import { SearchBar } from '../SearchBar'
 import { BusinessProductsCategories } from '../BusinessProductsCategories'
 import { BusinessProductsList } from '../BusinessProductsList'
 import { BusinessProductsListingParams } from '../../types'
+import { _retrieveStoreData, _removeStoreData } from '../../providers/StoreUtil';
 import {
 	TopHeader,
 	WrapSearchBar,
@@ -50,7 +51,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const theme = useTheme();
 	const [, t] = useLanguage()
 	const [{ auth }] = useSession()
-	const [orderState] = useOrder()
+	const [orderState, { clearCart }] = useOrder()
 	const [{ parsePrice }] = useUtils()
 	const [, { showToast }] = useToast()
 	const [{ configs }] = useConfig()
@@ -163,6 +164,19 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 		navigation?.canGoBack() ? navigation.goBack() : navigation.navigate('BottomTab')
 	}
 
+	const removeCartByReOrder = async () => {
+		const removeCardId = await _retrieveStoreData('remove-cartId')
+		if (currentCart && removeCardId) {
+			clearCart(removeCardId)
+			_removeStoreData('remove-cartId')
+			showToast(ToastType.Info, t('PRODUCT_REMOVED', 'Products removed from cart'))
+		}
+	}
+
+	useEffect(() => {
+		removeCartByReOrder()
+	}, [])
+
 	return (
 		<SafeAreaView
 			style={{ flex: 1 }}

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

@@ -61,7 +61,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		handleChangeSearch,
 		businessId
 	} = props;
-
+	
 	const theme = useTheme();
 	const isFocused = useIsFocused();
 	const appState = useRef(AppState.currentState)
@@ -120,7 +120,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 
 	const isPreorderEnabled = (configs?.preorder_status_enabled?.value === '1' || configs?.preorder_status_enabled?.value === 'true') &&
 		Number(configs?.max_days_preorder?.value) > 0
-
+	const isPreOrderSetting = configs?.preorder_status_enabled?.value === '1'
 	const timerId = useRef<any>(false)
 	// const panResponder = useRef(
 	// 	PanResponder.create({
@@ -266,25 +266,27 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 								style={{ marginStart: 8 }}
 							/>
 						</WrapMomentOption>
-						<WrapMomentOption
-							onPress={() => handleMomentClick()}>
-							<OText
-								size={12}
-								numberOfLines={1}
-								ellipsizeMode="tail"
-								color={theme.colors.textSecondary}>
-								{orderState.options?.momentß
-									? parseDate(orderState.options?.moment, { outputFormat: configs?.dates_moment_format?.value })
-									: t('ASAP_ABBREVIATION', 'ASAP')}
-							</OText>
-							{isPreorderEnabled && (
-								<OIcon
-									src={theme.images.general.arrow_down}
-									width={10}
-									style={{ marginStart: 8 }}
-								/>
-							)}
-						</WrapMomentOption>
+						{isPreOrderSetting && (
+							<WrapMomentOption
+								onPress={() => handleMomentClick()}>
+								<OText
+									size={12}
+									numberOfLines={1}
+									ellipsizeMode="tail"
+									color={theme.colors.textSecondary}>
+									{orderState.options?.momentß
+										? parseDate(orderState.options?.moment, { outputFormat: configs?.dates_moment_format?.value })
+										: t('ASAP_ABBREVIATION', 'ASAP')}
+								</OText>
+								{isPreorderEnabled && (
+									<OIcon
+										src={theme.images.general.arrow_down}
+										width={10}
+										style={{ marginStart: 8 }}
+									/>
+								)}
+							</WrapMomentOption>
+						)}
 
 						{!businessId && (
 							<SearchBar

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

@@ -1,10 +1,12 @@
 import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, BackHandler, Platform, Linking } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
+import { _setStoreData } from '../../providers/StoreUtil';
 import {
   useLanguage,
   OrderDetails as OrderDetailsConTableoller,
   useUtils,
+  useOrder,
   useConfig
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
@@ -87,9 +89,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [, t] = useLanguage();
   const [{ parsePrice, parseNumber, parseDate }] = useUtils();
   const [{ configs }] = useConfig();
+  const [{ carts }] = useOrder()
+
   const [isReviewed, setIsReviewed] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
-
   const { order, businessData } = props.order;
 
   const walletName: any = {
@@ -362,7 +365,12 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
   useEffect(() => {
     if (reorderState?.error) {
-      navigation.navigate('Business', { store: businessData?.slug })
+      const _businessId = 'businessId:' + businessData?.id
+      const _uuid = carts[_businessId]?.uuid
+      if (_uuid) {
+        _setStoreData('remove-cartId', JSON.stringify(_uuid))
+        navigation.navigate('Business', { store: businessData?.slug })
+      }
     }
     if (!reorderState?.error && reorderState?.result?.uuid) {
       onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })

package/themes/single-business/src/components/OrderTypeSelector/index.tsx

@@ -97,27 +97,27 @@ export const OrderTypeSelector = (props: any) => {
       {
         value: 1,
         content: t('DELIVERY', 'Delivery'),
-        description: t('ORDERTYPE_DESCRIPTION_DELIVERY', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_DELIVERY', 'Delivery description')
       },
       {
         value: 2,
         content: t('PICKUP', 'Pickup'),
-        description: t('ORDERTYPE_DESCRIPTION_PICKUP', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_PICKUP', 'Pickup description')
       },
       {
         value: 3,
         content: t('EAT_IN', 'Eat in'),
-        description: t('ORDERTYPE_DESCRIPTION_EATIN', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_EATIN', 'Eat in description')
       },
       {
         value: 4,
         content: t('CURBSIDE', 'Curbside'),
-        description: t('ORDERTYPE_DESCRIPTION_CURBSIDE', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_CURBSIDE', 'Curbside description')
       },
       {
         value: 5,
         content: t('DRIVE_THRU', 'Drive thru'),
-        description: t('ORDERTYPE_DESCRIPTION_DRIVETHRU', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_DRIVETHRU', 'Drive Thru description')
       }
     ]
 	}