ordering-ui-react-native 0.16.54 → 0.16.55-release

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

@@ -45,7 +45,7 @@ const PaymentOptionWalletUI = (props: any) => {
     new Array(walletsState.result?.length).fill(false)
   );
 
-  const creditBalance: any = (wallet: any) => ` = ${parsePrice(wallet.balance / wallet.redemption_rate, { isTruncable: true })}`
+  const creditBalance: any = (wallet: any) => ` = ${parsePrice(wallet.balance / wallet.redemption_rate)}`
 
   const walletName: any = {
     cash: {
@@ -87,65 +87,65 @@ const PaymentOptionWalletUI = (props: any) => {
       {!walletsState.loading &&
         !walletsState.error &&
         walletsState.result?.length > 0 &&
-        (
-          <>
-            {walletsState.result?.map((wallet: any, idx: any) => wallet.valid && wallet.balance >= 0 && walletName[wallet.type]?.isActive && (
-              <Container
-                key={wallet.id}
-                isBottomBorder={idx === walletsState.result?.filter((wallet: any) => wallet.valid)?.length - 1}
-                onPress={() => handleOnChange(idx, wallet)}
-                disabled={(cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0}
-              >
-                <SectionLeft>
-                  {checkedState[idx] ? (
-                    <MaterialCommunityIcons
-                      name="checkbox-marked"
-                      size={25}
-                      color={theme.colors.primary}
-                    />
-                  ) : (
-                    <MaterialCommunityIcons
-                      name="checkbox-blank-outline"
-                      size={25}
-                      color={theme.colors.disabled}
-                    />
-                  )}
-                  <View style={{ alignItems: 'baseline', marginLeft: 5 }}>
-                    <View>
-                      <OText
-                        style={((cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0) ? {
-                          color: theme.colors.disabled
-                        } : {}}
-                      >
-                        {walletName[wallet.type]?.name}
-                      </OText>
-                    </View>
+      (
+        <>
+          {walletsState.result?.map((wallet: any, idx: any) => wallet.valid && wallet.balance >= 0 && walletName[wallet.type]?.isActive && (
+            <Container
+              key={wallet.id}
+              isBottomBorder={idx === walletsState.result?.filter((wallet: any) => wallet.valid)?.length - 1}
+              onPress={() => handleOnChange(idx, wallet)}
+              disabled={(cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0}
+            >
+              <SectionLeft>
+                {checkedState[idx] ? (
+                  <MaterialCommunityIcons
+                    name="checkbox-marked"
+                    size={25}
+                    color={theme.colors.primary}
+                  />
+                ) : (
+                  <MaterialCommunityIcons
+                    name="checkbox-blank-outline"
+                    size={25}
+                    color={theme.colors.disabled}
+                  />
+                )}
+                <View style={{ alignItems: 'baseline', marginLeft: 5 }}>
+                  <View>
+                    <OText
+                      style={((cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0) ?{
+                        color: theme.colors.disabled
+                      } : {}}
+                    >
+                      {walletName[wallet.type]?.name}
+                    </OText>
                   </View>
-                </SectionLeft>
-
-                <View style={{ maxWidth: '35%', alignItems: 'flex-end' }}>
-                  {wallet.type === 'cash' && (
-                    <OText>
-                      {parsePrice(wallet?.balance, { isTruncable: true })}
+              </View>
+              </SectionLeft>
+
+              <View style={{maxWidth: '35%', alignItems: 'flex-end' }}>
+                {wallet.type === 'cash' && (
+                  <OText>
+                    {parsePrice(wallet?.balance)}
+                  </OText>
+                )}
+                {wallet.type === 'credit_point' && (
+                  <OText>
+                    <OText color={theme.colors.primary} weight='bold'>
+                    {`${wallet?.balance} ${t('POINTS', 'Points')}`}
                     </OText>
-                  )}
-                  {wallet.type === 'credit_point' && (
                     <OText>
-                      <OText color={theme.colors.primary} weight='bold'>
-                        {`${wallet?.balance} ${t('POINTS', 'Points')}`}
-                      </OText>
-                      <OText>
-                        {wallet?.balance > 0
-                          ? creditBalance(wallet)
-                          : null}
-                      </OText>
+                      {wallet?.balance > 0
+                        ? creditBalance(wallet)
+                        : null}
                     </OText>
-                  )}
-                </View>
-              </Container>
-            ))}
-          </>
-        )}
+                  </OText>
+                )}
+              </View>
+            </Container>
+          ))}
+        </>
+      )}
 
       {walletsState?.loading && (
         <View>

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

@@ -160,7 +160,6 @@ const PaymentOptionsUI = (props: any) => {
 					<TouchableOpacity
 						onPress={() => handlePaymentMethodClick(item)}
 					>
-						{console.log(item?.gateway)}
 						<PMItem
 							key={item.id}
 							isDisabled={isDisabled}
@@ -187,7 +186,7 @@ const PaymentOptionsUI = (props: any) => {
 		)
 	}
 
-	const excludeIds: any = [32]; //exclude paypal & connect & redirect
+	const excludeIds: any = [32, 66]; //exclude paypal & connect & redirect
 
 	return (
 		<PMContainer>

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

@@ -124,7 +124,7 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 				flagButtonStyle={flagStyle}
 				countryPickerButtonStyle={{ ...style.countryBtn, ...boxStyle ? boxStyle : {} }}
 				placeholder={t('PHONE_NUMBER', 'Phone Number')}
-				textInputProps={{ autoCompleteType: 'tel', ref: forwardRef, ...textInputProps }}
+				textInputProps={{ keyboardType: 'number-pad', autoCompleteType: 'tel', textContentType: 'telephoneNumber', dataDetectorTypes: 'phoneNumber', ref: forwardRef, ...textInputProps }}
 				containerStyle={{ width: '100%' }}
 				renderDropdownImage={noDropIcon ? <View /> : <OIcon src={theme.images.general.arrow_down} width={13} color={'#B1BCCC'}></OIcon>}
 			/>

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

@@ -1,24 +1,79 @@
 import React, { useEffect, useState } from 'react'
-import { View } from 'react-native'
-import { PlaceSpot as PlaceSpotController, useLanguage } from 'ordering-components/native'
+import { View, StyleSheet } from 'react-native'
+import { PlaceSpot as PlaceSpotController, useLanguage, useOrder, useToast, ToastType } from 'ordering-components/native'
 import { PlaceGroupContainer, PlaceSpotContainer } from './styles'
 import { NotFoundSource } from '../NotFoundSource'
-import { OText, ODropDown } from '../shared'
+import { OText, ODropDown, OInput, OButton } from '../shared'
 import { Placeholder, PlaceholderLine } from 'rn-placeholder'
 import { PlaceSpotParams } from '../../types'
+import { useTheme } from 'styled-components/native'
+import SelectDropdown from 'react-native-select-dropdown'
+import IconAntDesign from 'react-native-vector-icons/AntDesign'
 
 const PlaceSpotUI = (props: PlaceSpotParams) => {
   const {
-    isOpenPlaceSpot,
     cart,
+    orderTypes,
     placesState,
     handleChangePlace,
-    getPlacesList,
-    setOpenPlaceModal
+    spotNumber,
+    spotState,
+    isCheckout,
+    vehicle,
+    isInputMode,
+    setSpotNumber,
+    setVehicle,
+    handleChangeSpot,
+    setPlaceSpotNumber
   } = props
 
+  const theme = useTheme()
   const [, t] = useLanguage()
+  const [orderState] = useOrder()
+  const [, { showToast }] = useToast();
+
   const [placeGroupSelected, setPlaceGroupSelected] = useState<any>(null)
+  const vehicleInputAllowed = [4, 5]
+
+  const currentOrderType = isCheckout ? orderState?.options?.type : cart?.delivery_type
+  const isEatin = currentOrderType === 3
+  const isDriveThru = currentOrderType === 5
+  const placeholderText = isEatin
+    ? t('EATIN_SPOT_NUMBER', 'Table number')
+    : isDriveThru
+      ? t('DRIVE_THRU_SPOT_NUMBER', 'Drive thru lane')
+      : t('CURBSIDE_SPOT_NUMBER', 'Spot number')
+
+  const styles = StyleSheet.create({
+    selectOption: {
+      backgroundColor: theme.colors.backgroundGray100,
+      borderRadius: 7.6,
+      paddingVertical: 10,
+      paddingHorizontal: 14,
+      flexDirection: 'row-reverse',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+      height: 50,
+      width: '100%'
+    },
+    optionWrapper: {
+      marginBottom: 20
+    }
+  })
+
+  const vehicleTypeList: any = [
+    { key: 'car', text: t('VEHICLE_TYPE_CAR', 'Car') },
+    { key: 'truck', text: t('VEHICLE_TYPE_TRUCK', 'Truck') },
+    { key: 'suv', text: t('VEHICLE_TYPE_SUV', 'SUV') },
+    { key: 'van', text: t('VEHICLE_TYPE_VAN', 'Van') },
+    { key: 'motorcycle', text: t('VEHICLE_TYPE_MOTORCYCLE', 'Motorcycle') }
+  ]
+
+  const vehicleInputList = [
+    { key: 'model', text: t('VEHICLE_MODEL', 'Model') },
+    { key: 'car_registration', text: t('VEHICLE_CAR_REGISTRATION', 'Car registration') },
+    { key: 'color', text: t('VEHICLE_COLOR', 'Color') }
+  ]
 
   const getPlacesGroups = () => {
     const groups = placesState.placeGroups?.filter((group: any) => group?.enabled && placesState?.places?.find((place: any) => place?.enabled && place?.place_group_id === group?.id))
@@ -39,10 +94,37 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
   }
 
   const handlerChangePlace = (place: any) => {
-    setOpenPlaceModal(false)
     handleChangePlace(place)
   }
 
+  const onChangeSpot = () => {
+    if (orderState.loading) return
+    if (!Number.isInteger(Number(spotNumber))) {
+      showToast(ToastType.Error, t('VALIDATION_ERROR_INTEGER', 'The _attribute_ must be an integer.').replace('_attribute_', placeholderText))
+      return
+    }
+    if (Number(spotNumber) < 0) {
+      showToast(ToastType.Error, t('VALIDATION_MUST_BIGGER_ZERO', '_attribute_ must be bigger than zero').replace('_attribute_', placeholderText))
+      return
+    }
+    const isVehicle = Object.values(vehicle).every(e => e)
+    const bodyToSend: any = {}
+    spotNumber && (bodyToSend.spot_number = spotNumber)
+    isVehicle && (bodyToSend.vehicle = vehicle)
+
+    if (Object.keys(bodyToSend).length) {
+      handleChangeSpot({ bodyToSend, isCheckout: !!isCheckout })
+    }
+  }
+
+  const manageErrorsToShow = (array = []) => {
+    let stringError = ''
+    const list = Array.isArray(array) ? array : Object.values(array)
+    list.map((item: any, i: number) => {
+      stringError += (i + 1) === array.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
+    })
+    return stringError;
+  }
 
   useEffect(() => {
     if (!placesState?.loading) {
@@ -52,51 +134,162 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
   }, [placesState])
 
   useEffect(() => {
-    getPlacesList()
-  }, [isOpenPlaceSpot])
+    if (spotState?.error?.length > 0) {
+      const errorText = manageErrorsToShow(spotState?.error)
+      showToast(ToastType.Error, errorText)
+    }
+  }, [spotState?.error])
+
+  const onChangePlaceSpot = (value: string) => {
+    setSpotNumber(value)
+    setPlaceSpotNumber(value)
+  }
 
   return (
     <PlaceSpotContainer>
-      {(placesState.error || placesState?.placeGroups?.length === 0) && !placesState?.loading && (
-        <NotFoundSource
-          content={t('NO_PLACES_THIS_BUSINESS', 'There are not places for this business')}
-        />
-      )}
-      {placesState?.loading && (
-        <Placeholder>
-          <PlaceGroupContainer>
-            <PlaceholderLine width={100} height={25} />
-            <PlaceholderLine height={30} />
-          </PlaceGroupContainer>
-          <View>
-            <PlaceholderLine width={120} height={25} />
-            <PlaceholderLine height={30} />
+      {isInputMode ? (
+        <PlaceGroupContainer>
+          <OText color={theme.colors.textNormal} size={16} weight='500' mBottom={15}>{orderTypes[currentOrderType]}</OText>
+          {vehicleInputAllowed.includes(currentOrderType) && (
+            <>
+              <View style={styles.optionWrapper}>
+                <OText color={theme.colors.textNormal} size={12} mBottom={5}>{t('VEHICLE_TYPE', 'Vehicle type')}</OText>
+                <SelectDropdown
+                  defaultButtonText={t('SELECT_AN_OPTION', 'Select an option')}
+                  data={vehicleTypeList}
+                  defaultValue={vehicle?.type ? vehicleTypeList.find((obj: any) => obj.key === vehicle.type) : null}
+                  onSelect={(selectedItem, index) => {
+                    setVehicle({ ...vehicle, type: selectedItem.key ?? '' })
+                  }}
+                  buttonTextAfterSelection={(selectedItem, index) => {
+                    return selectedItem.text
+                  }}
+                  rowTextForSelection={(item, index) => {
+                    return item.text
+                  }}
+                  buttonStyle={styles.selectOption}
+                  buttonTextStyle={{
+                    color: theme.colors.disabled,
+                    fontSize: 14,
+                    textAlign: 'left',
+                    marginHorizontal: 0
+                  }}
+                  dropdownStyle={{
+                    borderRadius: 8,
+                    borderColor: theme.colors.lightGray
+                  }}
+                  rowStyle={{
+                    borderBottomColor: theme.colors.backgroundGray100,
+                    backgroundColor: theme.colors.backgroundGray100,
+                    height: 40,
+                    flexDirection: 'column',
+                    alignItems: 'flex-start',
+                    paddingTop: 8,
+                    paddingHorizontal: 14
+                  }}
+                  rowTextStyle={{
+                    color: theme.colors.disabled,
+                    fontSize: 14,
+                    marginHorizontal: 0
+                  }}
+                  renderDropdownIcon={() => {
+                    return (
+                      <IconAntDesign
+                        name='down'
+                        color={theme.colors.textThird}
+                        size={16}
+                      />
+                    )
+                  }}
+                />
+              </View>
+              {vehicleInputList.map((input: any) => (
+                <View key={input.key}>
+                  <OText color={theme.colors.textNormal} size={12} mBottom={5}>{input.text}</OText>
+                  <OInput
+                    placeholder={input.text}
+                    value={vehicle[input.key] ?? ''}
+                    onChange={(value: string) => setVehicle({ ...vehicle, [input.key]: value })}
+                    style={{
+                      borderColor: theme.colors.border,
+                      borderRadius: 7.6,
+                      marginBottom: 20
+                    }}
+                    inputStyle={{ fontSize: 12, color: theme.colors.textNormal }}
+                  />
+                </View>
+              ))}
+            </>
+          )}
+          <OText color={theme.colors.textNormal} size={12} mBottom={5}>{placeholderText}</OText>
+          <OInput
+            value={spotNumber?.toString() ?? ''}
+            placeholder={placeholderText}
+            type='number-pad'
+            onChange={(value: string) => onChangePlaceSpot(value)}
+            style={{
+              borderColor: theme.colors.border,
+              borderRadius: 7.6
+            }}
+            inputStyle={{ fontSize: 12, color: theme.colors.textNormal }}
+          />
+          <View style={{ alignItems: 'flex-start' }}>
+            <OButton
+              onClick={() => onChangeSpot()}
+              bgColor={theme.colors.primary}
+              borderColor={theme.colors.primary}
+              textStyle={{ color: 'white', fontSize: 12 }}
+              imgRightSrc={null}
+              text={t('UPDATE_SPOT_NUMBER', 'Update')}
+              isDisabled={(!spotNumber && !Object.values(vehicle).every(e => e))}
+              style={{ borderRadius: 7.6, height: 44, shadowOpacity: 0, marginTop: 20 }}
+            />
           </View>
-        </Placeholder>
-      )}
-      {!(placesState.error || placesState?.placeGroups?.length === 0) && !placesState?.loading && (
+        </PlaceGroupContainer>
+      ) : (
         <>
-          <PlaceGroupContainer>
-            <OText size={16} mBottom={10}>{t('PLACE_GROUP', 'Place group')}</OText>
-            <ODropDown
-              placeholder={t('PLACE_GROUP', 'Place group')}
-              options={getPlacesGroups()}
-              onSelect={(group: any) => setPlaceGroupSelected(group)}
-              defaultValue={placeGroupSelected ?? cart?.place}
-              isModal
+          {(placesState.error || placesState?.placeGroups?.length === 0) && !placesState?.loading && (
+            <NotFoundSource
+              content={t('NO_PLACES_THIS_BUSINESS', 'There are not places for this business')}
             />
-          </PlaceGroupContainer>
-          {placeGroupSelected && (
-            <View>
-              <OText size={16} mBottom={10}>{t('SELECT_YOUR_SPOT', 'Select your spot')}</OText>
-              <ODropDown
-                onSelect={(place: any) => handlerChangePlace(place)}
-                placeholder={t('SELECT_YOUR_SPOT', 'Select your spot')}
-                options={getPlaces()}
-                defaultValue={placesState?.places?.find((place : any) => place?.id === cart?.place_id)}
-                isModal
-              />
-            </View>
+          )}
+          {placesState?.loading && (
+            <Placeholder>
+              <PlaceGroupContainer>
+                <PlaceholderLine width={100} height={25} />
+                <PlaceholderLine height={30} />
+              </PlaceGroupContainer>
+              <View>
+                <PlaceholderLine width={120} height={25} />
+                <PlaceholderLine height={30} />
+              </View>
+            </Placeholder>
+          )}
+          {!(placesState.error || placesState?.placeGroups?.length === 0) && !placesState?.loading && (
+            <>
+              <PlaceGroupContainer>
+                <OText size={16} mBottom={10}>{t('PLACE_GROUP', 'Place group')}</OText>
+                <ODropDown
+                  placeholder={t('PLACE_GROUP', 'Place group')}
+                  options={getPlacesGroups()}
+                  onSelect={(group: any) => setPlaceGroupSelected(group)}
+                  defaultValue={placeGroupSelected ?? cart?.place}
+                  isModal
+                />
+              </PlaceGroupContainer>
+              {placeGroupSelected && (
+                <View>
+                  <OText size={16} mBottom={10}>{t('SELECT_YOUR_SPOT', 'Select your spot')}</OText>
+                  <ODropDown
+                    onSelect={(place: any) => handlerChangePlace(place)}
+                    placeholder={t('SELECT_YOUR_SPOT', 'Select your spot')}
+                    options={getPlaces()}
+                    defaultValue={placesState?.places?.find((place: any) => place?.id === cart?.place_id)}
+                    isModal
+                  />
+                </View>
+              )}
+            </>
           )}
         </>
       )}
@@ -105,9 +298,18 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
 }
 
 export const PlaceSpot = (props: PlaceSpotParams) => {
+  const [, t] = useLanguage()
+
   const placeSpotProps = {
     ...props,
-    UIComponent: PlaceSpotUI
+    UIComponent: PlaceSpotUI,
+    orderTypes: {
+      1: t('DELIVERY', 'Delivery'),
+      2: t('PICKUP', 'Pickup'),
+      3: t('EAT_IN', 'Eat in'),
+      4: t('CURBSIDE', 'Curbside'),
+      5: t('DRIVE_THRU', 'Drive thru')
+    }
   }
 
   return <PlaceSpotController {...placeSpotProps} />

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

@@ -1,8 +1,6 @@
 import styled from 'styled-components/native'
 
 export const PlaceSpotContainer = styled.View`
-  min-height: 300px;
-  padding: 20px;
 `
 
 export const PlaceGroupContainer = styled.View`

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

@@ -19,7 +19,8 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 		handleReorder,
 		reorderLoading,
 		orderID,
-		handleUpdateOrderList
+		handleUpdateOrderList,
+		loading
 	} = props;
 
 	const theme = useTheme();
@@ -42,7 +43,7 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 					handleUpdateOrderList={handleUpdateOrderList}
 				/>
 			))}
-			{pagination.totalPages && pagination.currentPage < pagination.totalPages && (
+			{!loading && pagination.totalPages && pagination.currentPage < pagination.totalPages && (
 				<WrappButton>
 					<OButton
 						onClick={loadMoreOrders}