ordering-ui-react-native 0.21.85 → 0.21.86-release

package/themes/business/src/components/PrinterEdition/styles.tsx

@@ -0,0 +1,61 @@
+import styled from "styled-components/native";
+
+export const ContainerEdition = styled.View`
+  margin-bottom: 50px;
+`
+
+export const BackArrowWrapper = styled.View`
+  align-items: center;
+  flex-direction: row;
+  min-height: 33px;
+`
+
+export const BackArrow = styled.TouchableOpacity`
+  border-width: 0;
+  width: 32px;
+  height: 32px;
+  tint-color: ${(props: any) => props.theme.colors.textGray};
+  background-color: ${(props: any) => props.theme.colors.clear};
+  border-color: ${(props: any) => props.theme.colors.clear};
+  shadow-color: ${(props: any) => props.theme.colors.clear};
+  padding-left: 0;
+  padding-right: 0;
+`
+
+export const WrapperHeader = styled.View`
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  width: 100%;
+`
+
+export const WrapperIcons = styled.View`
+  flex-direction: column;
+  justify-content: flex-start;
+  margin-top: 20px;
+`
+
+export const WrapperIcon = styled.TouchableOpacity`
+  flex-direction: row;
+  justify-content: flex-start;
+  padding: 8px;
+  border-width: 1px;
+  border-radius: 8px;
+  margin-bottom: 10px;
+`
+
+export const ContainerList = styled.View`
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+  padding: 5px 5px 5px 0;
+  border-bottom-width: 1px;
+  border-bottom-color: ${(props: any) => props.theme.colors.lightGray};
+`
+
+export const EnabledAutoPrint = styled.View`
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 0px 10px;
+`;

package/themes/business/src/components/PrinterSettings/index.tsx

@@ -0,0 +1,267 @@
+import React, { useEffect, useState } from 'react'
+import { StyleSheet, TouchableOpacity, View, Dimensions } from 'react-native'
+import SimpleLineIcons from 'react-native-vector-icons/SimpleLineIcons'
+import FeatherIcon from 'react-native-vector-icons/Feather'
+import { useTheme } from 'styled-components/native'
+import ToggleSwitch from 'toggle-switch-react-native';
+import { useLanguage } from 'ordering-components/native'
+
+import { _setStoreData, _retrieveStoreData } from '../../providers/StoreUtil'
+import { Container, ContainerList, EnabledAutoPrint, NoPrintersContainer } from './styles'
+import { OText, OIcon, OModal, OButton } from '../shared'
+import { PrinterEdition } from '../PrinterEdition'
+
+export const PrinterSettings = (props: any) => {
+  const { navigation, onClose } = props
+
+  const [printers, setPrinters] = useState<any>({ list: [] })
+  const [autoPrintEnabled, setAutoPrintEnabled] = useState<boolean>(false)
+  const [openModal, setOpenModal] = useState<any>({ open: false, data: null })
+
+  const WIDTH_SCREEN = Dimensions.get('window').width
+  const HEIGHT_SCREEN = Dimensions.get('window').height
+
+  const [, t] = useLanguage()
+  const theme = useTheme()
+
+  const styles = StyleSheet.create({
+    icons: {
+      maxWidth: 40,
+      height: 40,
+      padding: 10,
+      alignItems: 'flex-end'
+    },
+    optionIcons: {
+      padding: 8,
+      borderWidth: 1,
+      marginRight: 10,
+      borderRadius: 8,
+    },
+    wIconContainer: {
+      flexDirection: 'row',
+      alignItems: 'center',
+      width: WIDTH_SCREEN - 40 - 22 - 22 - 10, // screen - margin - icon - icon - marginIcon
+    },
+    wrapperContainer: {
+      flexDirection: 'column',
+    },
+    wrapperIcons: {
+      flexDirection: 'row',
+      justifyContent: 'flex-start',
+      marginBottom: 5,
+    },
+    inputStyle: {
+      height: 40,
+      borderWidth: 1,
+      borderRadius: 8,
+    },
+    btnBackArrow: {
+      borderWidth: 0,
+      width: 32,
+      height: 32,
+      tintColor: theme.colors.textGray,
+      backgroundColor: theme.colors.clear,
+      borderColor: theme.colors.clear,
+      shadowColor: theme.colors.clear,
+      paddingLeft: 0,
+      paddingRight: 0,
+    },
+    titleGroups: {
+      alignItems: 'center',
+      flexDirection: 'row',
+      minHeight: 33,
+    },
+    addButtonText: {
+      color: theme.colors.inputTextColor,
+      fontSize: 16,
+    },
+    addButton: {
+      height: 40,
+      marginTop: 10,
+      borderRadius: 8,
+      marginRight: 10,
+      marginBottom: 10,
+    },
+  })
+
+  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
+
+  const handleClick = async ({ item, type, ip, edit, isAdd, index }: any) => {
+    let _item = item
+    const action = edit || isAdd
+    let _printers = printers.list
+    const idx = index ?? _printers.findIndex((p: any) => p.model === _item.model)
+
+    if (idx !== -1 && !action) {
+      _printers.splice(idx, 1);
+    } else {
+      const _currentPrinter = _printers.find((p: any) => p.model === _item?.model)
+      _item = {
+        ..._currentPrinter,
+        ...item,
+        type: type ?? _currentPrinter?.type ?? 1,
+        ip: ip ?? _currentPrinter?.ip ?? '',
+        portName: (type ?? _currentPrinter?.type) === 1 || !ip
+          ? item?.bt ?? item.portName1 ?? _currentPrinter?.portName1
+          : `TCP:${ip}`
+      }
+      edit ? (_printers[idx] = _item) : _printers.push(_item)
+    }
+
+    setPrinters({ list: _printers })
+    await _setStoreData('printers', _printers)
+    type === 1 && onClose && onClose()
+  }
+
+  const handleAutoPrint = async () => {
+    setAutoPrintEnabled(!autoPrintEnabled)
+    await _setStoreData('auto_print_after_accept_order', !autoPrintEnabled)
+  }
+
+  useEffect(() => {
+    const getStorageData = async () => {
+      const printers = await _retrieveStoreData('printers')
+      const autoPrint = await _retrieveStoreData('auto_print_after_accept_order')
+      setPrinters({ list: printers ?? [] })
+      setAutoPrintEnabled(!!autoPrint)
+    }
+
+    getStorageData()
+  }, [])
+
+  return (
+    <Container>
+      <View style={styles.titleGroups}>
+        <TouchableOpacity onPress={() => goToBack()} style={styles.btnBackArrow}>
+          <OIcon src={theme.images.general.arrow_left} color={theme.colors.textGray} />
+        </TouchableOpacity>
+      </View>
+      <OText size={24} style={{ paddingTop: 0 }}>
+        {t('PRINTER_SETTINGS', 'Printer Settings')}
+      </OText>
+      {!!printers.list.length && (
+        <EnabledAutoPrint>
+          <View style={{ flex: 1 }}>
+            <OText
+              numberOfLines={2}
+              adjustsFontSizeToFit
+              color={theme.colors.textGray}
+              style={{ paddingHorizontal: 0 }}>
+              {t('AUTO_PRINT_AFTER_ACCEPTING_ORDER', 'Auto print after accepting order')}
+            </OText>
+          </View>
+          <ToggleSwitch
+            isOn={autoPrintEnabled}
+            onColor={theme.colors.primary}
+            offColor={theme.colors.offColor}
+            size="small"
+            onToggle={() => handleAutoPrint()}
+            animationSpeed={200}
+          />
+        </EnabledAutoPrint>
+      )}
+      {!!printers.list.length && (
+        <OButton
+          text={t('ADD_PRINTER', 'Add printer')}
+          imgRightSrc={null}
+          textStyle={styles.addButtonText}
+          style={styles.addButton}
+          bgColor={theme.colors.primary}
+          borderColor={theme.colors.primary}
+          onClick={() => setOpenModal({ open: true, data: null })}
+        />
+      )}
+      <View>
+        {printers.list.map((item: any, i: number) => (
+          <ContainerList
+            key={i}
+            activeOpacity={1}
+          >
+            <View style={styles.wrapperContainer}>
+              <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+                <TouchableOpacity
+                  activeOpacity={1}
+                  style={styles.wIconContainer}
+                  onPress={() => setOpenModal({ open: true, data: { ...item, index: i} })}
+                >
+                  <SimpleLineIcons
+                    name='printer'
+                    color={theme.colors.textGray}
+                    size={18}
+                    style={{
+                      ...styles.icons,
+                      color: theme.colors.primary
+                    }}
+                  />
+                  <OText
+                    size={18}
+                    color={theme.colors.primary}
+                  >
+                    {item?.nickname ?? item.model}
+                  </OText>
+                </TouchableOpacity>
+                <TouchableOpacity
+                  activeOpacity={1}
+                  onPress={() => setOpenModal({ open: true, data: { ...item, index: i} })}
+                >
+                  <FeatherIcon
+                    name='edit'
+                    size={22}
+                  />
+                </TouchableOpacity>
+                <TouchableOpacity
+                  activeOpacity={1}
+                  onPress={() => handleClick({ item })}
+                  style={{ marginLeft: 10 }}
+                >
+                  <FeatherIcon
+                    name='trash-2'
+                    size={22}
+                    color={theme.colors.danger500}
+                  />
+                </TouchableOpacity>
+              </View>
+            </View>
+          </ContainerList>
+        ))}
+        {!printers.list.length && (
+          <NoPrintersContainer style={{ height: HEIGHT_SCREEN/2 }}>
+            <OText
+              size={20}
+              color={theme.colors.textGray}
+              numberOfLines={2}
+              adjustsFontSizeToFit
+              style={{ paddingHorizontal: 0, opacity: 0.4 }}
+            >
+              {t('NO_PRINTERS_CONFIGURED', 'No printers configured')}
+            </OText>
+            <OButton
+              text={t('ADD_PRINTER', 'Add printer')}
+              imgRightSrc={null}
+              textStyle={styles.addButtonText}
+              style={styles.addButton}
+              bgColor={theme.colors.primary}
+              borderColor={theme.colors.primary}
+              onClick={() => setOpenModal({ open: true, data: null })}
+            />
+          </NoPrintersContainer>
+        )}
+      </View>
+      <OModal
+        hideIcons
+        entireModal
+        customClose
+        open={openModal.open}
+        style={{ paddingTop: 0, marginTop: 0 }}
+        onClose={() => setOpenModal({ open: false, data: null })}
+      >
+        <PrinterEdition
+          printer={openModal.data}
+          printersList={printers}
+          handleChangePrinter={handleClick}
+          onClose={() => setOpenModal({ open: false, data: null })}
+        />
+      </OModal>
+    </Container>
+  )
+}

package/themes/business/src/components/PrinterSettings/styles.tsx

@@ -0,0 +1,30 @@
+import styled from "styled-components/native";
+
+export const Container = styled.View`
+  margin-bottom: 50px;
+`
+
+export const ContainerList = styled.View`
+  flex-direction: row;
+  justify-content: space-between;
+  width: 100%;
+  padding: 5px 5px 5px 0;
+  border-bottom-width: 1px;
+  border-bottom-color: ${(props: any) => props.theme.colors.lightGray};
+`
+
+export const EnabledAutoPrint = styled.View`
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 0px 10px;
+`;
+
+export const NoPrintersContainer = styled.View`
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  margin-top: 40px;
+  height: 100%;
+  flex: 1;
+`

package/themes/business/src/components/ReviewCustomer/index.tsx

@@ -1,3 +1,5 @@
+
+
 import React, { useState, useEffect, useRef } from 'react'
 import {
   useLanguage,

package/themes/business/src/components/Sessions/index.tsx

@@ -116,7 +116,7 @@ export const SessionsUI = (props: SessionsParams) => {
           ) : (
             sessionsList.sessions.length > 0 ? (
               <SessionsWrapper>
-                {sessionsList.sessions.map((session: any) => (
+                {sessionsList.sessions.reverse().map((session: any) => (
                   <SessionItem key={session.id}>
                     <DurationWrapper>
                       <OText>{parseDate(session.created_at)}</OText>

package/themes/business/src/components/StoresList/index.tsx

@@ -149,10 +149,10 @@ const StoresListUI = (props: BusinessesListingParams) => {
             width={12}
             height={12}
             color={theme.colors.skyBlue}
-            style={{ marginRight: 5, marginTop: 3 }}
+            style={{ marginRight: 5 }}
           />
           <OText size={12}>
-            {t('MORE_SETTINGS_GO_TO', 'For more settings go to')}{' '}
+            {t('MORE_SETTINGS_GO_TO', 'For more settings go to ')}
           </OText>
           <TouchableOpacity onPress={() => { Linking.openURL(t('LINK_MORE_SETTINGS_GO_TO', 'https://app.ordering.co')) }}>
             <OText size={12} color={theme.colors.skyBlue}>

package/themes/business/src/components/UserFormDetails/index.tsx

@@ -36,7 +36,8 @@ export const UserFormDetailsUI = (props: any) => {
     handleCancelEdit,
     toggleIsEdit,
     isCheckout,
-    isAlsea
+    isAlsea,
+    allowDriverUpdateData
   } = props;
 
   const theme = useTheme();
@@ -66,9 +67,9 @@ export const UserFormDetailsUI = (props: any) => {
     const rules: any = {
       required: isRequiredField(field.code)
         ? t(
-            `VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`,
-            `${field.name} is required`,
-          ).replace('_attribute_', t(field.name, field.code))
+          `VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`,
+          `${field.name} is required`,
+        ).replace('_attribute_', t(field.name, field.code))
         : null,
     };
     if (field.code && field.code === 'email') {
@@ -261,90 +262,93 @@ export const UserFormDetailsUI = (props: any) => {
           sortInputFields({ values: validationFields?.fields?.checkout })
             .length > 0 && (
             <UDWrapper>
-              {sortInputFields({
-                values: validationFields.fields?.checkout,
-              }).map(
-                (field: any) =>
-                  showField &&
-                  showField(field.code) &&
-                  !isAlsea
-                  && (
-                    <React.Fragment key={field.id}>
-                      <OText style={styles.label}>
-                        {t(field?.code.toUpperCase(), field?.name)}
-                      </OText>
+              {allowDriverUpdateData && (
+                <>
+                  {sortInputFields({
+                    values: validationFields.fields?.checkout,
+                  }).map(
+                    (field: any) =>
+                      showField &&
+                      showField(field.code) &&
+                      !isAlsea
+                      && (
+                        <React.Fragment key={field.id}>
+                          <OText style={styles.label}>
+                            {t(field?.code.toUpperCase(), field?.name)}
+                          </OText>
 
-                      <Controller
-                        key={field.id}
-                        control={control}
-                        render={() => (
-                          <OInput
-                            name={field.code}
-                            placeholder={t(
-                              field.code.toUpperCase(),
-                              field?.name,
-                            )}
-                            placeholderTextColor={theme.colors.arrowColor}
-                            style={styles.inputStyle}
-                            icon={
-                              field.code === 'email'
-                                ? theme.images.general.email
-                                : theme.images.general.user
-                            }
-                            autoCapitalize={
-                              field.code === 'email' ? 'none' : 'sentences'
-                            }
-                            isDisabled={!isEdit}
-                            value={
-                              formState?.changes[field.code] ??
-                              (user && user[field.code]) ??
-                              ''
-                            }
-                            onChange={(val: any) => {
-                              field.code !== 'email'
-                                ? setValue(field.code, val.target.value)
-                                : setValue(
-                                    field.code,
-                                    val.target.value
-                                      .toLowerCase()
-                                      .replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''),
-                                  );
-                              field.code !== 'email'
-                                ? handleChangeInput(val)
-                                : handleChangeInput({
-                                    target: {
-                                      name: 'email',
-                                      value: val.target.value
+                          <Controller
+                            key={field.id}
+                            control={control}
+                            render={() => (
+                              <OInput
+                                name={field.code}
+                                placeholder={t(
+                                  field.code.toUpperCase(),
+                                  field?.name,
+                                )}
+                                placeholderTextColor={theme.colors.arrowColor}
+                                style={styles.inputStyle}
+                                icon={
+                                  field.code === 'email'
+                                    ? theme.images.general.email
+                                    : theme.images.general.user
+                                }
+                                autoCapitalize={
+                                  field.code === 'email' ? 'none' : 'sentences'
+                                }
+                                isDisabled={!isEdit}
+                                value={
+                                  formState?.changes[field.code] ??
+                                  (user && user[field.code]) ??
+                                  ''
+                                }
+                                onChange={(val: any) => {
+                                  field.code !== 'email'
+                                    ? setValue(field.code, val.target.value)
+                                    : setValue(
+                                      field.code,
+                                      val.target.value
                                         .toLowerCase()
-                                        .replace(
-                                          /[&,()%";:ç?<>{}\\[\]\s]/g,
-                                          '',
-                                        ),
-                                    },
-                                  });
-                            }}
-                            autoCorrect={field.code === 'email' && false}
-                            type={
-                              field.code === 'email'
-                                ? 'email-address'
-                                : 'default'
-                            }
-                            returnKeyType="done"
-                            autoCompleteType={
-                              field.code === 'email' ? 'email' : 'off'
-                            }
-                            selectionColor={theme.colors.primary}
-                            color={theme.colors.textGray}
+                                        .replace(/[&,()%";:ç?<>{}\\[\]\s]/g, ''),
+                                    );
+                                  field.code !== 'email'
+                                    ? handleChangeInput(val)
+                                    : handleChangeInput({
+                                      target: {
+                                        name: 'email',
+                                        value: val.target.value
+                                          .toLowerCase()
+                                          .replace(
+                                            /[&,()%";:ç?<>{}\\[\]\s]/g,
+                                            '',
+                                          ),
+                                      },
+                                    });
+                                }}
+                                autoCorrect={field.code === 'email' && false}
+                                type={
+                                  field.code === 'email'
+                                    ? 'email-address'
+                                    : 'default'
+                                }
+                                returnKeyType="done"
+                                autoCompleteType={
+                                  field.code === 'email' ? 'email' : 'off'
+                                }
+                                selectionColor={theme.colors.primary}
+                                color={theme.colors.textGray}
+                              />
+                            )}
+                            name={field.code}
+                            rules={getInputRules(field)}
+                            defaultValue={user && user[field.code]}
                           />
-                        )}
-                        name={field.code}
-                        rules={getInputRules(field)}
-                        defaultValue={user && user[field.code]}
-                      />
-                    </React.Fragment>
-                  ),
+                        </React.Fragment>
+                      ),
+                  )}
+                </>
               )}
-
               <OText style={styles.label}>{t('PASSWORD', 'Password')}</OText>
 
               <Controller
@@ -445,7 +449,7 @@ export const UserFormDetailsUI = (props: any) => {
                 </OText>
               )}
 
-              {!!showInputPhoneNumber && !isAlsea && (
+              {!!showInputPhoneNumber && !isAlsea && allowDriverUpdateData && (
                 <WrapperPhone>
                   <PhoneInputNumber
                     data={phoneInputData}
@@ -487,28 +491,28 @@ export const UserFormDetailsUI = (props: any) => {
             isEdit) ||
             (watchPassword?.length > 0 && watchConfirmPassword?.length > 0) ||
             formState?.loading) && (
-            <View style={{ flex: 1, marginLeft: 5 }}>
-              <OButton
-                text={
-                  formState.loading
-                    ? t('UPDATING', 'Updating')
-                    : t('UPDATE', 'Update')
-                }
-                bgColor={theme.colors.primary}
-                textStyle={{
-                  ...styles.btnText,
-                  color: formState.loading
-                    ? theme.colors.textGray
-                    : theme.colors.white,
-                }}
-                borderColor={theme.colors.primary}
-                isDisabled={formState.loading}
-                imgRightSrc={null}
-                style={styles.editButton}
-                onClick={handleSubmit(onSubmit)}
-              />
-            </View>
-          )}
+              <View style={{ flex: 1, marginLeft: 5 }}>
+                <OButton
+                  text={
+                    formState.loading
+                      ? t('UPDATING', 'Updating')
+                      : t('UPDATE', 'Update')
+                  }
+                  bgColor={theme.colors.primary}
+                  textStyle={{
+                    ...styles.btnText,
+                    color: formState.loading
+                      ? theme.colors.textGray
+                      : theme.colors.white,
+                  }}
+                  borderColor={theme.colors.primary}
+                  isDisabled={formState.loading}
+                  imgRightSrc={null}
+                  style={styles.editButton}
+                  onClick={handleSubmit(onSubmit)}
+                />
+              </View>
+            )}
         </EditButton>
       )}
     </>