ordering-ui-react-native 0.21.13 → 0.21.15

package/package.json

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

package/src/components/BusinessInformation/index.tsx

@@ -19,6 +19,8 @@ import { BusinessBasicInformation } from '../BusinessBasicInformation'
 import { BusinessInformationParams } from '../../types'
 import { GoogleMap } from '../GoogleMap'
 import { useTheme } from 'styled-components/native';
+import moment from 'moment';
+
 const BusinessInformationUI = (props: BusinessInformationParams) => {
   const {
     businessState,
@@ -38,14 +40,13 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
     t('FRIDAY_ABBREVIATION', 'Fri'),
     t('SATURDAY_ABBREVIATION', 'Sat')
   ]
-  const is12hours = configs?.format_time?.value?.includes('12')
 
-  const scheduleFormatted = ({ hour, minute } : { hour : number | string, minute : number | string}) => {
-    const checkTime = (val: number | string) => (val < 10 ? `0${val}` : val);
-		const zz = hour === 0 ? t('AM', 'AM') : hour >= 12 ? t('PM', 'PM') : t('AM', 'AM');
-		const h = parseInt(`${hour}`);
-		return is12hours ? `${h === 0 ? 12 : h > 12 ? h - 12 : h}:${checkTime(minute)} ${zz}` : `${checkTime(hour)}:${checkTime(minute)}`;
-  }
+  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)
+	}
 
   return (
     <BusinessInformationContainer>
@@ -105,13 +106,13 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
                   {schedule.enabled ? (
                     schedule.lapses.map( (time: any, k: number) => (
                     <React.Fragment key={k}>
-                      <OText>{scheduleFormatted(time.open)}</OText>
+                      <OText>{timeFormated(time.open)}</OText>
                       <OText mBottom={10} style={{
                         padding: 3,
                         borderBottomColor: theme.colors.primary,
                         borderBottomWidth: 1
                       }}
-                      >{scheduleFormatted(time.close)}</OText>
+                      >{timeFormated(time.close)}</OText>
                     </React.Fragment>
                   ))) : ( <OText>{t('CLOSED', 'Closed')}</OText>)}
                 </ScheduleBlock>

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

@@ -107,8 +107,12 @@ export const OrderHistory = (props: any) => {
               ellipsizeMode='tail'
             >
               {t('ORDER_PLACED', 'Order placed')} {' '}
-              {t('VIA', 'Via')}{' '}
-              {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+              {!props.hideViaText && (
+                <>
+                  {t('VIA', 'Via')}{' '}
+                  {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+                </>
+              )}
             </OText>
             <OText size={12}>{parseDate(order?.created_at, { outputFormat: 'MMM DD, hh:mm A' })}</OText>
           </View>

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

@@ -1066,6 +1066,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       >
         <OrderHistory
           order={order}
+          hideViaText={props.hideViaText}
           messages={messages}
           enableReview={(
             parseInt(order?.status) === 1 ||

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

@@ -437,6 +437,7 @@ export interface OrderDetailsParams {
 	onNavigationRedirect?: any,
 	reorderState?: any,
 	handleReorder?: any,
+	hideViaText?: boolean,
 }
 export interface ProductItemAccordionParams {
 	key?: any;
@@ -581,7 +582,7 @@ export interface BusinessPreorderParams {
 	handleBusinessClick: (value: any) => {};
 	getActualSchedule?: any;
 	cateringPreorder?: boolean;
-	preorderLeadTime?: number 
+	preorderLeadTime?: number
 }
 export interface BusinessMenuListParams {
 	menu: any;