ordering-ui-react-native 0.21.14 → 0.21.15

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/components/BusinessInformation/index.tsx +10 -9
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ordering-ui-react-native",
3
- "version": "0.21.14",
3
+ "version": "0.21.15",
4
4
  "description": "Reusable components made in react native",
5
5
  "main": "src/index.tsx",
6
6
  "author": "ordering.inc",
package/src/components/BusinessInformation/index.tsx CHANGED
@@ -19,6 +19,8 @@ import { BusinessBasicInformation } from '../BusinessBasicInformation'
19
19
  import { BusinessInformationParams } from '../../types'
20
20
  import { GoogleMap } from '../GoogleMap'
21
21
  import { useTheme } from 'styled-components/native';
22
+ import moment from 'moment';
23
+
22
24
  const BusinessInformationUI = (props: BusinessInformationParams) => {
23
25
  const {
24
26
  businessState,
@@ -38,14 +40,13 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
38
40
  t('FRIDAY_ABBREVIATION', 'Fri'),
39
41
  t('SATURDAY_ABBREVIATION', 'Sat')
40
42
  ]
41
- const is12hours = configs?.format_time?.value?.includes('12')
42
43
 
43
- const scheduleFormatted = ({ hour, minute } : { hour : number | string, minute : number | string}) => {
44
- const checkTime = (val: number | string) => (val < 10 ? `0${val}` : val);
45
- const zz = hour === 0 ? t('AM', 'AM') : hour >= 12 ? t('PM', 'PM') : t('AM', 'AM');
46
- const h = parseInt(`${hour}`);
47
- return is12hours ? `${h === 0 ? 12 : h > 12 ? h - 12 : h}:${checkTime(minute)} ${zz}` : `${checkTime(hour)}:${checkTime(minute)}`;
48
- }
44
+ const formatTime = configs?.general_hour_format?.value
45
+
46
+ const checkTime = (val: number) => (val < 10 ? `0${val}` : val);
47
+ const timeFormated = (time: any) => {
48
+ return moment(`1900-01-01 ${checkTime(time.hour)}:${checkTime(time.minute)}`).format(formatTime)
49
+ }
49
50
 
50
51
  return (
51
52
  <BusinessInformationContainer>
@@ -105,13 +106,13 @@ const BusinessInformationUI = (props: BusinessInformationParams) => {
105
106
  {schedule.enabled ? (
106
107
  schedule.lapses.map( (time: any, k: number) => (
107
108
  <React.Fragment key={k}>
108
- <OText>{scheduleFormatted(time.open)}</OText>
109
+ <OText>{timeFormated(time.open)}</OText>
109
110
  <OText mBottom={10} style={{
110
111
  padding: 3,
111
112
  borderBottomColor: theme.colors.primary,
112
113
  borderBottomWidth: 1
113
114
  }}
114
- >{scheduleFormatted(time.close)}</OText>
115
+ >{timeFormated(time.close)}</OText>
115
116
  </React.Fragment>
116
117
  ))) : ( <OText>{t('CLOSED', 'Closed')}</OText>)}
117
118
  </ScheduleBlock>