ordering-ui-react-native 0.15.81 → 0.15.82-release

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

@@ -49,7 +49,7 @@ export const ProductDescription = styled.View`
 `
 
 export const ProductEditions = styled.View`
-
+  padding: 0 40px;
 `
 
 export const SectionTitle = styled.View`
@@ -65,26 +65,24 @@ export const WrapperSubOption = styled.View`
 `
 
 export const ProductComment = styled.View`
-  padding-bottom: 50px;
+  padding-bottom: 60px;
 `
 
 export const ProductActions = styled.View`
   position: absolute;
   bottom: 0px;
-	min-height: 70px;
   padding-top: ${(props: any) => props.ios ? '20px' : '0'};
   padding-horizontal: 40px;
+  padding-vertical: 20px;
   width: 100%;
-  flex-direction: row;
+  flex-direction: ${(props: any) => props.isColumn ? 'column' : 'row'};
   background-color: #FFF;
   z-index: 1000;
-  align-items: center;
-  justify-content: space-between;
   border-top-width: 1px;
   border-top-color: ${(props: any) => props.theme.colors.border};
 `
 export const ExtraOptionWrap = styled.ScrollView`
-	margin-horizontal: -40px;
+	margin-horizontal: 30px;
 `;
 
 export const WeightUnitSwitch = styled.View`
@@ -99,4 +97,8 @@ export const WeightUnitItem = styled.View`
   `}
 `
 export const ProductSummary = styled.View`
+  padding: 26px 40px;
+  position: relative;
+  background-color: white;
+  z-index: 100;
 `

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

@@ -40,7 +40,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 
 	const pickerStyle = StyleSheet.create({
 		inputAndroid: {
-			width: 27,
+			width: 34,
 			textAlign: 'center',
 			overflow: 'visible',
 			fontSize: 12,
@@ -49,7 +49,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 			color: theme.colors.textNormal
 		},
 		inputIOS: {
-			width: 27,
+			width: 34,
 			textAlign: 'center',
 			overflow: 'visible',
 			fontSize: 12,

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

@@ -30,7 +30,7 @@ const ProductOptionUI = (props: any) => {
 	return (
 		<Container style={{ color: error ? 'orange' : theme.colors.white }}>
 			<WrapHeader>
-				<OText size={16} lineHeight={24} weight={'600'}>{option.name}</OText>
+				<OText size={16} lineHeight={24} weight={'600'} style={{ flex: 1 }}>{option.name}</OText>
 				<OText color={theme.colors.red}>{maxMin}</OText>
 			</WrapHeader>
 			{children}

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

@@ -28,36 +28,40 @@ export const ProductOptionSubOptionUI = (props: any) => {
 		toggleSelect,
 		changePosition,
 		disabled,
-		error,
-		scrollDown
+		setIsScrollAvailable
 	} = props
 
+	const disableIncrement = option?.limit_suboptions_by_max ? balance === option?.max : state.quantity === suboption?.max || (!state.selected && balance === option?.max)
+	const price = option?.with_half_option && suboption?.half_price && state.position !== 'whole' ? suboption?.half_price : suboption?.price
+	
 	const theme = useTheme();
-
 	const [, t] = useLanguage()
 	const [{ parsePrice }] = useUtils()
 	const [showMessage, setShowMessage] = useState(false)
+	const [isDirty, setIsDirty] = useState(false)
 
 	const handleSuboptionClick = () => {
 		toggleSelect()
-
-		if (balance === option?.max - 1 && !state.selected) {
-			scrollDown(option?.id)
-		}
+		setIsDirty(true)
 
 		if (balance === option?.max && option?.suboptions?.length > balance && !(option?.min === 1 && option?.max === 1)) {
 			setShowMessage(true)
 		}
 	}
 
+	useEffect(() => {
+		if (balance === option?.max && state?.selected && isDirty) {
+			setIsDirty(false)
+			setIsScrollAvailable(option?.id)
+		}
+	}, [state?.selected])
+
 	useEffect(() => {
 		if (!(balance === option?.max && option?.suboptions?.length > balance && !(option?.min === 1 && option?.max === 1))) {
 			setShowMessage(false)
 		}
 	}, [balance])
 
-	const disableIncrement = option?.limit_suboptions_by_max ? balance === option?.max : state.quantity === suboption?.max || (!state.selected && balance === option?.max)
-	const price = option?.with_half_option && suboption?.half_price && state.position !== 'whole' ? suboption?.half_price : suboption?.price
 	return (
 		<View>
 			<Container onPress={() => handleSuboptionClick()}>

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

@@ -0,0 +1,128 @@
+import React, { useState } from 'react'
+import { ScrollView, TouchableOpacity, View, StyleSheet, Platform } from 'react-native'
+import { useUtils, useLanguage } from 'ordering-components/native'
+import { useTheme } from 'styled-components/native'
+import FastImage from 'react-native-fast-image'
+import { OIcon, OText, OModal } from '../shared'
+import { ProfessionalProfile } from '../ProfessionalProfile'
+import { ProfessionalFilterParams } from '../../types'
+
+export const ProfessionalFilter = (props: ProfessionalFilterParams) => {
+  const {
+    professionals,
+    professionalSelected,
+		handleChangeProfessionalSelected
+  } = props
+
+  const theme = useTheme()
+  const [{ optimizeImage }] = useUtils()
+  const [, t] = useLanguage()
+  const [open, setOpen] = useState(false)
+  const [currentProfessional, setCurrentProfessional] = useState(null)
+
+  const handleOpenProfile = (professional: any) => {
+    setCurrentProfessional(professional)
+    setOpen(true)
+  }
+
+  const handleCloseProfile = () => {
+    setCurrentProfessional(null)
+    setOpen(false)
+  }
+
+  const styles = StyleSheet.create({
+    professionalItem: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      borderRadius: 7.6,
+      padding: 11,
+      borderWidth: 1,
+      marginRight: 12,
+      minHeight: 64
+    },
+		photoStyle: {
+			width: 42,
+			height: 42,
+			borderRadius: 7.6
+		}
+  })
+
+  return (
+    <>
+      <ScrollView
+        horizontal
+        showsVerticalScrollIndicator={false}
+        showsHorizontalScrollIndicator={false}
+      >
+        <TouchableOpacity
+          onPress={() => handleChangeProfessionalSelected(null)}
+        >
+          <View
+            style={{
+              ...styles.professionalItem,
+              borderColor: !professionalSelected
+                ? theme.colors.primary
+                : theme.colors.border 
+            }}
+          >
+            <OText
+              size={12}
+              weight={'400'}
+            >
+              {t('ANY_PROFESSIONAL_MEMBER', 'Any professional member')}
+            </OText>
+          </View>
+        </TouchableOpacity>
+        {professionals.map((professional: any, i: number) => (
+          <TouchableOpacity
+            key={i}
+            onPress={() => handleOpenProfile(professional)}
+          >
+            <View
+              style={{
+                ...styles.professionalItem,
+                borderColor: (professional?.id === professionalSelected?.id)
+                  ? theme.colors.primary
+                  : theme.colors.border 
+              }}
+            >
+              {professional?.photo ? (
+                <FastImage
+                  style={styles.photoStyle}
+                  source={{
+                    uri: optimizeImage(professional?.photo, 'h_250,c_limit'),
+                    priority: FastImage.priority.normal,
+                  }}
+                  resizeMode={FastImage.resizeMode.cover}
+                />
+              ) : (
+                <OIcon
+                  src={theme?.images?.dummies?.product}
+                  style={styles.photoStyle}
+                />
+              )}
+              <OText
+                size={12}
+                style={{ marginLeft: 12 }}
+                weight={'400'}
+              >
+                {professional?.name} {professional?.lastname}
+              </OText>
+            </View>
+          </TouchableOpacity>
+        ))}
+      </ScrollView>
+      <OModal
+				open={open}
+				onClose={() => handleCloseProfile()}
+				entireModal
+			>
+				<ProfessionalProfile
+          professional={currentProfessional}
+          onClose={() => handleCloseProfile()}
+          handleChangeProfessionalSelected={handleChangeProfessionalSelected}
+        />
+			</OModal>
+    </>
+  )
+}

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

@@ -0,0 +1,298 @@
+import React, { useState, useEffect, useRef } from 'react'
+import { StyleSheet, Platform, View, Dimensions } from 'react-native'
+import { useUtils, useLanguage, useConfig } from 'ordering-components/native'
+import { useTheme } from 'styled-components/native'
+import CalendarPicker from 'react-native-calendar-picker'
+import FeatherIcon from 'react-native-vector-icons/Feather';
+import moment from 'moment'
+import SelectDropdown from 'react-native-select-dropdown'
+import { OButton, OText } from '../shared'
+import IconAntDesign from 'react-native-vector-icons/AntDesign'
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { ProfessionalProfileParams } from '../../types'
+
+import {
+  Container,
+  ProfessionalPhoto,
+  InfoWrapper,
+  Divider,
+  ScheduleWrapper,
+  ButtonWrapper,
+  CalendarWrapper
+} from './styles'
+
+const windowWidth = Dimensions.get('window').width
+
+export const ProfessionalProfile = (props: ProfessionalProfileParams) => {
+  const {
+    professional,
+    handleChangeProfessionalSelected,
+    onClose
+  } = props
+
+  const [{ optimizeImage }] = useUtils()
+  const theme = useTheme()
+  const [, t] = useLanguage()
+  const [{ configs }] = useConfig()
+  const { top } = useSafeAreaInsets()
+
+  const [selectDate, setSelectedDate] = useState<any>(new Date())
+  const [isEnabled, setIsEnabled] = useState(false)
+  const [timeList, setTimeList] = useState<any>([])
+  const dropdownRef = useRef<any>(null)
+
+  const styles = StyleSheet.create({
+    buttonStyle: {
+      borderRadius: 7.6,
+      height: 44,
+      borderWidth: 0
+    },
+    selectOption: {
+      width: '100%',
+      backgroundColor: theme.colors.backgroundGray100,
+      paddingVertical: 5,
+      paddingHorizontal: 14,
+      flexDirection: 'row-reverse',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+      height: 40,
+      marginBottom: 30
+    },
+  })
+
+  const onDateChange = (date: any) => {
+    setSelectedDate(date)
+    dropdownRef?.current && dropdownRef.current.reset()
+  }
+
+  const dropDownIcon = () => {
+    return (
+      <IconAntDesign
+        name='down'
+        color={theme.colors.textThird}
+        size={12}
+      />
+    )
+  }
+
+  const customDayHeaderStylesCallback = () => {
+    return {
+      textStyle: {
+        color: theme.colors.disabled,
+        fontSize: 12,
+      },
+    };
+  };
+
+  const validateSelectedDate = (curdate: any, menu: any) => {
+    const day = moment(curdate).format('d')
+    setIsEnabled(menu?.schedule?.[day]?.enabled || false)
+  }
+
+  const getTimes = (curdate: any, menu: any) => {
+    validateSelectedDate(curdate, menu)
+    const date = new Date()
+    var dateSeleted = new Date(curdate)
+    var times = []
+    for (var k = 0; k < menu.schedule[dateSeleted.getDay()].lapses.length; k++) {
+      var open = {
+        hour: menu.schedule[dateSeleted.getDay()].lapses[k].open.hour,
+        minute: menu.schedule[dateSeleted.getDay()].lapses[k].open.minute
+      }
+      var close = {
+        hour: menu.schedule[dateSeleted.getDay()].lapses[k].close.hour,
+        minute: menu.schedule[dateSeleted.getDay()].lapses[k].close.minute
+      }
+      for (var i = open.hour; i <= close.hour; i++) {
+        if (date.getDate() !== dateSeleted.getDate() || i >= date.getHours()) {
+          let hour = ''
+          let meridian = ''
+          if (configs?.format_time?.value === '12') {
+            if (i === 0) {
+              hour = '12'
+              meridian = ' ' + t('AM', 'AM')
+            } else if (i > 0 && i < 12) {
+              hour = (i < 10 ? '0' + i : i)
+              meridian = ' ' + t('AM', 'AM')
+            } else if (i === 12) {
+              hour = '12'
+              meridian = ' ' + t('PM', 'PM')
+            } else {
+              hour = ((i - 12 < 10) ? '0' + (i - 12) : `${(i - 12)}`)
+              meridian = ' ' + t('PM', 'PM')
+            }
+          } else {
+            hour = i < 10 ? '0' + i : i
+          }
+          for (let j = (i === open.hour ? open.minute : 0); j <= (i === close.hour ? close.minute : 59); j += 15) {
+            if (i !== date.getHours() || j >= date.getMinutes() || date.getDate() !== dateSeleted.getDate()) {
+              times.push({
+                text: hour + ':' + (j < 10 ? '0' + j : j) + meridian,
+                value: (i < 10 ? '0' + i : i) + ':' + (j < 10 ? '0' + j : j)
+              })
+            }
+          }
+        }
+      }
+    }
+    return times
+  }
+
+  const handleSelectProfessional = () => {
+    handleChangeProfessionalSelected(professional)
+    onClose && onClose()
+  }
+
+  useEffect(() => {
+    if (selectDate === null) return
+    const _times = getTimes(selectDate, professional)
+    setTimeList(_times)
+  }, [selectDate, professional])
+
+  return (
+    <Container>
+			<ProfessionalPhoto
+				source={{
+					uri:
+          professional?.photo ||
+						optimizeImage(theme.images.general.user, 'h_250,c_limit'),
+				}}
+      />
+      <InfoWrapper>
+        <OText
+          size={20}
+          style={{ marginBottom: 3 }}
+          weight={Platform.OS === 'ios' ? '600' : 'bold'}
+        >
+          {professional?.name} {professional?.lastname}
+        </OText>
+      </InfoWrapper>
+      <Divider />
+      <ScheduleWrapper>
+        <View
+          style={{
+            flexDirection: 'row',
+            justifyContent: 'space-between',
+            alignItems: 'center',
+            marginBottom: 23
+          }}
+        >
+          <OText
+            size={16}
+            weight={Platform.OS === 'ios' ? '600' : 'bold'}
+          >
+            {t('SCHEDULE', 'Schedule')}
+          </OText>
+          <OText
+            size={10}
+            weight={'400'}
+            color={theme.colors?.danger5}
+          >
+            {t('REQUIRED', 'Required')}
+          </OText>
+        </View>
+        {!!professional?.schedule ? (
+          <CalendarWrapper>
+            {(timeList?.length > 0 && isEnabled) ? (
+              <SelectDropdown
+                ref={dropdownRef} 
+                data={timeList}
+                onSelect={(selectedItem, index) => {
+                  console.log(selectedItem.value)
+                }}
+                buttonTextAfterSelection={(selectedItem, index) => {
+                  return selectedItem.text
+                }}
+                rowTextForSelection={(item, index) => {
+                  return item.text
+                }}
+                buttonStyle={{borderRadius: 7.6, ...styles.selectOption}}
+                buttonTextStyle={{
+                  color: theme.colors.disabled,
+                  fontSize: 14,
+                  textAlign: 'left',
+                  marginHorizontal: 0
+                }}
+                dropdownStyle={{
+                  borderRadius: 8,
+                  borderColor: theme.colors.lightGray,
+                  marginTop: Platform.OS === 'ios' ? 12 : -top
+                }}
+                rowStyle={{
+                  borderBottomColor: theme.colors.backgroundGray100,
+                  backgroundColor: theme.colors.backgroundGray100,
+                  height: 30,
+                  flexDirection: 'column',
+                  alignItems: 'flex-start',
+                  paddingTop: 8,
+                  paddingHorizontal: 12
+                }}
+                rowTextStyle={{
+                  color: theme.colors.disabled,
+                  fontSize: 14,
+                  marginHorizontal: 0
+                }}
+                renderDropdownIcon={() => dropDownIcon()}
+                dropdownOverlayColor='transparent'
+              />
+            ) : (
+              <OText
+                size={12}
+                style={{ marginBottom: 30 }}
+                weight={'400'}
+                color={theme.colors?.danger5}
+              >
+                {t('PROFESSIONAL_NOT_AVAILABLE', 'Professional is not available at the moment')}
+              </OText>
+            )}
+
+            <CalendarPicker
+              previousComponent={
+                <FeatherIcon
+                  name='chevron-left'
+                  color={theme.colors.disabled}
+                  size={24}
+                  style={{ marginHorizontal: 4 }}
+                />
+              }
+              nextComponent={
+                <FeatherIcon
+                  name='chevron-right'
+                  color={theme.colors.disabled}
+                  size={24}
+                  style={{ marginHorizontal: 4 }}
+                />
+              }
+              width={windowWidth - 110}
+              selectedDayTextColor={theme.colors.white}
+              selectedDayColor={theme.colors.primary}
+              todayBackgroundColor={theme.colors.border}
+              dayLabelsWrapper={{ borderColor: theme.colors.clear }}
+              onDateChange={onDateChange}
+              minDate={new Date()}
+              customDayHeaderStyles={customDayHeaderStylesCallback}
+              selectedStartDate={selectDate}
+            />
+          </CalendarWrapper>
+        ) : (
+          <OText
+            size={20}
+            style={{ marginBottom: 30 }}
+            weight={Platform.OS === 'ios' ? '600' : 'bold'}
+          >
+            {t('NO_SCHEDULE', 'No schedule')}
+          </OText>
+        )}
+      </ScheduleWrapper>
+      <ButtonWrapper>
+        <OButton
+          bgColor={theme.colors.primary}
+          onClick={() => handleSelectProfessional()}
+          text={t('BOOK', 'Book')}
+          style={styles.buttonStyle}
+          textStyle={{ fontSize: 14, color: theme.colors.white }}
+        />
+      </ButtonWrapper>
+    </Container>
+  )
+}

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

@@ -0,0 +1,46 @@
+import styled from 'styled-components/native'
+
+export const Container = styled.ScrollView``
+
+export const ProfessionalPhoto = styled.ImageBackground`
+  width: 100%;
+  position: relative;
+  max-height: 258px;
+  height: 258px;
+  resize-mode: cover;
+`;
+
+export const InfoWrapper = styled.View`
+  margin-vertical: 30px;
+  padding-horizontal: 40px;
+`
+
+export const Divider = styled.View`
+  width: 100%;
+  height: 8px;
+  background-color: ${(props: any) => props.theme.colors.backgroundGray100};
+`
+
+export const ScheduleWrapper = styled.View`
+  padding-horizontal: 40px;
+  margin-top: 30px;
+`
+
+export const ButtonWrapper = styled.View`
+  justify-content: center;
+  flex-direction: row;
+  padding-vertical: 13px;
+  margin-top: 30px;
+  margin-bottom: 40px;
+  width: 100%;
+  border-top-width: 1px;
+  border-top-color: ${(props: any) => props.theme.colors.backgroundGray200};
+`
+
+export const CalendarWrapper = styled.View`
+  flex: 1;
+  border-width: 1px;
+  border-color: ${(props: any) => props.theme.colors.backgroundGray200};
+  border-radius: 7.6px;
+  padding: 15px;
+`

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

@@ -17,7 +17,7 @@ import { useTheme } from 'styled-components/native';
 import { OButton, OIcon, OModal, OText } from '../shared'
 import { Placeholder, PlaceholderLine } from 'rn-placeholder'
 import { NotFoundSource } from '../NotFoundSource'
-import { View, StyleSheet, ScrollView, Platform } from 'react-native'
+import { View, StyleSheet, ScrollView, Platform, RefreshControl } from 'react-native'
 import FastImage from 'react-native-fast-image'
 import { PromotionParams } from '../../types'
 import { Container } from '../../layouts/Container'
@@ -28,6 +28,7 @@ const PromotionsUI = (props: PromotionParams) => {
         offersState,
         handleSearchValue,
         searchValue,
+        loadOffers,
         offerSelected,
         setOfferSelected
     } = props
@@ -68,6 +69,7 @@ const PromotionsUI = (props: PromotionParams) => {
     const [, t] = useLanguage()
     const [{ parseDate, parsePrice, optimizeImage }] = useUtils()
     const [openModal, setOpenModal] = useState(false)
+    const [refreshing] = useState(false);
 
     const handleClickOffer = (offer: any) => {
         setOpenModal(true)
@@ -79,6 +81,12 @@ const PromotionsUI = (props: PromotionParams) => {
         navigation.navigate('Business', { store: store.slug })
     }
 
+    const handleOnRefresh = () => {
+        if (!offersState.loading) {
+            loadOffers();
+        }
+    }
+
     const filteredOffers = offersState?.offers?.filter((offer: any) => offer.name.toLowerCase().includes(searchValue.toLowerCase()))
     const targetString = offerSelected?.target === 1
         ? t('SUBTOTAL', 'Subtotal')
@@ -87,12 +95,21 @@ const PromotionsUI = (props: PromotionParams) => {
             : t('SERVICE_FEE', 'Service fee')
 
     return (
-        <Container noPadding>
+        <Container
+            noPadding
+            refreshControl={
+                <RefreshControl
+                    refreshing={refreshing}
+                    onRefresh={() => handleOnRefresh()}
+                />
+            }
+        >
             <NavBar
                 title={t('PROMOTIONS', 'Promotions')}
                 titleAlign={'center'}
                 onActionLeft={() => navigation.goBack()}
                 showCall={false}
+                style={{ paddingVertical: Platform.OS === 'ios' ? 0 : 20, marginLeft: 20 }}
             />
             <PromotionsContainer>
                 <SearchBarContainer>
@@ -123,7 +140,7 @@ const PromotionsUI = (props: PromotionParams) => {
                         <SingleOfferContainer key={offer.id}>
                             <OfferInformation>
                                 <OText style={styles.offerTitle} numberOfLines={2}>{offer?.name}</OText>
-                                {offer?.description && (
+                                {!!offer?.description && (
                                     <OText style={styles.offerDescription} numberOfLines={2}>{offer?.description}</OText>
                                 )}
                                 <OText style={styles.offerExtraInfo}>
@@ -169,13 +186,13 @@ const PromotionsUI = (props: PromotionParams) => {
                             {offerSelected?.auto && (
                                 <OText>{t('OFFER_AUTOMATIC', 'This offer applies automatic')}</OText>
                             )}
-                            {offerSelected?.minimum && (
+                            {!!offerSelected?.minimum && (
                                 <OText>{t('MINIMUM_PURCHASE_FOR_OFFER', 'Minimum purchase for use this offer')}: {parsePrice(offerSelected?.minimum)}</OText>
                             )}
-                            {offerSelected?.max_discount && (
+                            {!!offerSelected?.max_discount && (
                                 <OText>{t('MAX_DISCOUNT_ALLOWED', 'Max discount allowed')}: {parsePrice(offerSelected?.max_discount)}</OText>
                             )}
-                            {offerSelected?.description && (
+                            {!!offerSelected?.description && (
                                 <OText>{offerSelected?.description}</OText>
                             )}
                         </OfferData>

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

@@ -2,6 +2,8 @@ import styled, { css } from 'styled-components/native'
 
 export const PromotionsContainer = styled.View`
   width: 100%;
+  padding-left: 40px;
+	padding-right: 40px;
 `
 
 export const SingleOfferContainer = styled.View`