ordering-ui-react-native 0.18.90 → 0.18.92

package/package.json

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

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -83,6 +83,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
   const validStatusComplete = [9, 19, 23]
 
+  const pendingOrderStatus = [1, 4, 7, 13]
+
   const logisticOrderStatus = [4, 6, 7]
 
   const showFloatButtonsPickUp: any = {
@@ -325,7 +327,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const handleArrowBack: any = () => {
-    if (alertState?.open && !isAllowedDriverRejectOrder) {
+    if (alertState?.open && !isAllowedDriverRejectOrder && !pendingOrderStatus.includes(order?.status)) {
       setAlertState({
         ...alertState,
         open: false
@@ -385,7 +387,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   }, [props.order?.loading]);
 
   useEffect(() => {
-    if (order?.driver === null && session?.user?.level === 4) {
+    if (!order?.driver_id && session?.user?.level === 4) {
       setAlertState({
         open: true,
         content: [
@@ -525,7 +527,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           </View>
         )}
 
-      {(!!props.order?.error || props.order?.error) && (
+      {(!!props.order?.error || props.order?.error?.length > 0) && (
         <NotFoundSource
           btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
           content={

package/themes/business/src/components/PreviousOrders/OrderItem.tsx

@@ -94,8 +94,7 @@ export const OrderItem = (props: any) => {
   });
 
   const getDelayMinutes = (order: any) => {
-    const offset = 300
-    const cdtToutc = moment(order?.delivery_datetime).add(offset, 'minutes').format('YYYY-MM-DD HH:mm:ss')
+    const cdtToutc = moment(order?.delivery_datetime).utc().format('YYYY-MM-DD HH:mm:ss')
     const _delivery = order?.delivery_datetime_utc
       ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
       : parseDate(cdtToutc, { outputFormat: 'YYYY-MM-DD hh:mm A' })

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

@@ -229,10 +229,11 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 						)}
 						{(!isCustomLayout) && !hideBusinessOffer && (
 							getBusinessOffer((business?.offers)) &&
-							<OfferBox>
+							<OfferBox isClosed={!isBusinessOpen && (configState?.configs?.preorder_status_enabled?.value === '1')}>
 								<OText
 									size={10}
 									weight={'400'}
+									color={theme.colors.textThird}
 									numberOfLines={2}
 									ellipsizeMode='tail'
 									lineHeight={13}

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

@@ -34,8 +34,8 @@ export const Metadata = styled.View`
 
 export const BusinessState = styled.View`
   position: absolute;
-	top: 13px;
-	end: 18px;
+	top: 15px;
+	right: 15px;
 `
 
 export const BusinessLogo = styled.View`
@@ -85,10 +85,9 @@ export const RibbonBox = styled.View`
 export const OfferBox = styled.View`
   position: absolute;
   z-index: 1;
-  top: 20px;
-  right: 10px;
   border-radius: 50px;
-  color: ${(props: any) => props.theme.colors.textThird};
+  top: 15px;
+  right: ${(props: any) => props.isClosed ? '110px' : '15px'};
   background: ${(props: any) => props.theme.colors.inputBorderColor};
   padding: 3px 8px;
   max-width: 180px;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import {
 	BusinessInformation as BusinessInformationController,
-	useLanguage, useUtils
+	useLanguage, useUtils, useConfig,
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { OIcon, OText } from '../shared';
@@ -22,31 +22,27 @@ import { GoogleMap } from '../GoogleMap';
 import { WebView } from 'react-native-webview';
 import { formatUrlVideo } from '../../utils'
 import { ScheduleAccordion } from '../ScheduleAccordion';
+import moment from 'moment';
 const BusinessInformationUI = (props: BusinessInformationParams) => {
 	const { businessState, businessSchedule, businessLocation } = props;
 
 	const theme = useTheme();
 	const [, t] = useLanguage();
 	const [{ optimizeImage }] = useUtils();
+	const [{ configs }] = useConfig()
 
 	const hideLocation = theme?.business_view?.components?.information?.components?.location?.hidden
 	const hideSchedule = theme?.business_view?.components?.information?.components?.schedule?.hidden
 	const hideVideos = theme?.business_view?.components?.information?.components?.videos?.hidden
 	const hideImages = theme?.business_view?.components?.information?.components?.images?.hidden
 	const hideAddress = theme?.business_view?.components?.information?.components?.address?.hidden
+	const formatTime = configs?.general_hour_format?.value
+
+	const checkTime = (val: number) => (val < 10 ? `0${val}` : val);
+	const timeFormated = (time: any) => {
+		return moment(`1900-01-01 ${checkTime(time.hour)}:${checkTime(time.minute)}`).format(formatTime)
+	}
 
-	const scheduleFormatted = ({
-		hour,
-		minute,
-	}: {
-		hour: number | string;
-		minute: number | string;
-	}) => {
-		const checkTime = (val: number | string) => (val < 10 ? `0${val}` : val);
-		const zz = hour > 12 ? 'PM' : 'AM';
-		const h = parseInt(`${hour}`);
-		return `${h > 12 ? h - 12 : h}:${checkTime(minute)} ${zz}`;
-	};
 	const businessCoordinate = {
 		lat: businessState?.business?.location?.lat,
 		lng: businessState?.business?.location?.lng,
@@ -121,7 +117,7 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
 										<ScheduleBlock key={i}>
 											<ScheduleAccordion
 												weekIndex={i}
-												scheduleFormatted={scheduleFormatted}
+												timeFormated={timeFormated}
 												schedule={schedule}
 											/>
 										</ScheduleBlock>

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

@@ -572,7 +572,7 @@ const CheckoutUI = (props: any) => {
 												data: deliveryOptions || [],
 												renderItem: ({ item }: any) => (
 													<TouchableOpacity
-														onPress={() => changeDeliveryOption(item.value)}
+														onPress={() => !!cart?.uuid && changeDeliveryOption(item.value)}
 														disabled={
 															deliveryOptionSelected === item.value
 														}

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

@@ -200,7 +200,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
 	return (
 		<>
-			{!loading && ordersLength.activeOrdersLength === 0 && ordersLength.previousOrdersLength === 0 && !activeOrders && (
+			{!loading && ordersLength.activeOrdersLength === 0 && ordersLength.previousOrdersLength === 0 && ordersLength?.preordersLength === 0 && !activeOrders && !preOrders && (
 				<NoOrdersWrapper>
 					<NotFoundSource
 						hideImage

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

@@ -13,7 +13,7 @@ import { OIcon, OText } from '../shared';
 export const ScheduleAccordion = (props: any) => {
 
 	const {
-		scheduleFormatted,
+		timeFormated,
 		schedule,
 		weekIndex
 	} = props
@@ -52,9 +52,9 @@ export const ScheduleAccordion = (props: any) => {
 					{schedule?.lapses?.map((lapse: any) => (
 						schedule?.enabled ?
 							<OText mBottom={16}>
-								{scheduleFormatted(lapse.open) +
+								{timeFormated(lapse.open) +
 									' - ' +
-									scheduleFormatted(lapse.close)}
+									timeFormated(lapse.close)}
 							</OText>
 							:
 							<OText color={theme.colors.red} mBottom={16}>

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

@@ -143,7 +143,7 @@ const WalletsUI = (props: any) => {
               btnStyle={{ paddingLeft: 0 }}
               hideArrowLeft={!hideWalletsTheme}
             />
-            {isChewLayout && (
+            {isChewLayout && !openHistory && (
               <OButton
                 text={t('WALLET_HISTORY', 'Wallet history')}
                 bgColor={theme.colors.white}