ordering-ui-react-native 0.22.75 → 0.22.76-release

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

@@ -11,6 +11,7 @@ import { OrdersList } from './OrderList';
 import { AcceptOrRejectOrder } from '../AcceptOrRejectOrder';
 import { ReviewCustomer } from '../ReviewCustomer';
 import { GoogleMap } from '../GoogleMap';
+import { useOfflineActions } from '../../../../../src/context/OfflineActions';
 
 export const PreviousOrders = (props: any) => {
   const {
@@ -32,7 +33,7 @@ export const PreviousOrders = (props: any) => {
   const [, t] = useLanguage();
   const theme = useTheme();
   const [{ configs }] = useConfig();
-
+  const [{ isNetConnected, canSaveChangesOffline }] = useOfflineActions()
 
   // const [, setCurrentTime] = useState()
   const [openModal, setOpenModal] = useState(false)
@@ -41,12 +42,14 @@ export const PreviousOrders = (props: any) => {
   const [orderUpdateStatus, setOrderUpdateStatus] = useState<any>({ action: '', ids: [], body: {}, order: {} })
 
   const pastOrderStatuses = [1, 2, 5, 6, 10, 11, 12, 16, 17]
-  const viewMapStatus = [9, 18, 19, 23]
+  const viewMapStatus = [9, 18, 19, 23, 26]
+  const deliveryTypes = [1, 7]
   const deliveryPickupBtn = props.appTitle?.text?.includes('Delivery') && [3, 8, 18]
-  const deliveryStatusCompleteBtn = props.appTitle?.text?.includes('Delivery') && [9, 19, 23]
+  const deliveryStatusCompleteBtn = props.appTitle?.text?.includes('Delivery') && [9, 19, 23, 26]
   const isHideRejectButtons = configs?.reject_orders_enabled && configs?.reject_orders_enabled?.value !== '1' && !isBusinessApp
   const isEnabledOrderNotReady = configs?.order_not_ready_enabled?.value === '1'
   const isEnabledFailedPickupDriver = configs?.failed_pickup_by_driver_enabled?.value === '1'
+  const disabledActionsByInternet = !isNetConnected && canSaveChangesOffline === false
 
   const handlePressOrder = (order: any) => {
     if (order?.locked && isLogisticOrder) return
@@ -172,7 +175,7 @@ export const PreviousOrders = (props: any) => {
                       }
                       )
                   }
-                  {_ordersGrouped[k][0]?.status === 0 && (
+                  {_ordersGrouped[k][0]?.status === 0 && !disabledActionsByInternet && (
                     <AcceptOrRejectOrderStyle>
                       {!isHideRejectButtons && (
                         <OButton
@@ -208,7 +211,7 @@ export const PreviousOrders = (props: any) => {
                       />
                     </AcceptOrRejectOrderStyle>
                   )}
-                  {_ordersGrouped[k][0]?.status === 7 && (
+                  {_ordersGrouped[k][0]?.status === 7 && !disabledActionsByInternet && (
                     <View>
                       <OButton
                         text={t('READY_FOR_PICKUP', 'Ready for pickup')}
@@ -226,7 +229,7 @@ export const PreviousOrders = (props: any) => {
                     </View>
                   )}
                   {(_ordersGrouped[k][0]?.status === 8 || _ordersGrouped[k][0]?.status === 18) &&
-                    _ordersGrouped[k][0]?.delivery_type === 1 &&
+                    deliveryTypes?.includes(_ordersGrouped[k][0]?.delivery_type) && !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         <OButton
@@ -244,7 +247,8 @@ export const PreviousOrders = (props: any) => {
                         />
                       </AcceptOrRejectOrderStyle>
                     )}
-                  {_ordersGrouped[k][0]?.status === 3 && _ordersGrouped[k][0]?.delivery_type === 1 && !isHideRejectButtons && isEnabledOrderNotReady &&
+                  {_ordersGrouped[k][0]?.status === 3 && deliveryTypes?.includes(_ordersGrouped[k][0]?.delivery_type) && !isHideRejectButtons && isEnabledOrderNotReady &&
+                    !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         <OButton
@@ -282,6 +286,7 @@ export const PreviousOrders = (props: any) => {
                     )}
                   {_ordersGrouped[k][0]?.status === 4 &&
                     ![1].includes(_ordersGrouped[k][0]?.delivery_type) &&
+                    !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         {!isHideRejectButtons && (
@@ -316,6 +321,7 @@ export const PreviousOrders = (props: any) => {
                     )}
                   {!_ordersGrouped[k][0]?.user_review &&
                     pastOrderStatuses.includes(_ordersGrouped[k][0]?.status) &&
+                    !disabledActionsByInternet &&
                     (
                       <OButton
                         text={t('REVIEW_CUSTOMER', 'Review customer')}
@@ -332,74 +338,76 @@ export const PreviousOrders = (props: any) => {
                         })}
                       />
                     )}
-                  {!!deliveryPickupBtn && deliveryPickupBtn?.includes(_ordersGrouped[k][0]?.status) && isEnabledFailedPickupDriver && (
-                    <AcceptOrRejectOrderStyle>
-                      {!isHideRejectButtons && isEnabledOrderNotReady && (
+                  {!!deliveryPickupBtn && deliveryPickupBtn?.includes(_ordersGrouped[k][0]?.status) && isEnabledFailedPickupDriver &&
+                    !disabledActionsByInternet && (
+                      <AcceptOrRejectOrderStyle>
+                        {!isHideRejectButtons && isEnabledOrderNotReady && (
+                          <OButton
+                            text={t('PICKUP_FAILED', 'Pickup failed')}
+                            bgColor={theme.colors.danger100}
+                            borderColor={theme.colors.danger100}
+                            imgRightSrc={null}
+                            style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
+                            parentStyle={{ width: '45%' }}
+                            textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
+                            onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
+                              action: 'pickupFailed',
+                              order: _ordersGrouped[k][0],
+                              ids: _ordersGrouped[k].map((o: any) => o.id),
+                              handleChangeOrderStatus
+                            })}
+                          />
+                        )}
                         <OButton
-                          text={t('PICKUP_FAILED', 'Pickup failed')}
-                          bgColor={theme.colors.danger100}
-                          borderColor={theme.colors.danger100}
+                          text={t('PICKUP_COMPLETE', 'Pickup complete')}
+                          bgColor={theme.colors.success100}
+                          borderColor={theme.colors.success100}
                           imgRightSrc={null}
                           style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                          parentStyle={{ width: '45%' }}
-                          textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
-                          onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
-                            action: 'pickupFailed',
-                            order: _ordersGrouped[k][0],
-                            ids: _ordersGrouped[k].map((o: any) => o.id),
-                            handleChangeOrderStatus
-                          })}
+                          parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
+                          textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
+                          onClick={() => handleChangeOrderStatus(
+                            9,
+                            _ordersGrouped[k].map((o: any) => o.id),
+                          )}
                         />
-                      )}
-                      <OButton
-                        text={t('PICKUP_COMPLETE', 'Pickup complete')}
-                        bgColor={theme.colors.success100}
-                        borderColor={theme.colors.success100}
-                        imgRightSrc={null}
-                        style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                        parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
-                        textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
-                        onClick={() => handleChangeOrderStatus(
-                          9,
-                          _ordersGrouped[k].map((o: any) => o.id),
+                      </AcceptOrRejectOrderStyle>
+                    )}
+                  {!!deliveryStatusCompleteBtn && deliveryStatusCompleteBtn.includes(_ordersGrouped[k][0]?.status) &&
+                    !disabledActionsByInternet && (
+                      <AcceptOrRejectOrderStyle>
+                        {!isHideRejectButtons && (
+                          <OButton
+                            text={t('DELIVERY_FAILED', 'Delivery Failed')}
+                            bgColor={theme.colors.danger100}
+                            borderColor={theme.colors.danger100}
+                            imgRightSrc={null}
+                            style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
+                            parentStyle={{ width: '45%' }}
+                            textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
+                            onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
+                              action: 'deliveryFailed',
+                              order: _ordersGrouped[k][0],
+                              ids: _ordersGrouped[k].map((o: any) => o.id),
+                              handleChangeOrderStatus
+                            })}
+                          />
                         )}
-                      />
-                    </AcceptOrRejectOrderStyle>
-                  )}
-                  {!!deliveryStatusCompleteBtn && deliveryStatusCompleteBtn.includes(_ordersGrouped[k][0]?.status) && (
-                    <AcceptOrRejectOrderStyle>
-                      {!isHideRejectButtons && (
                         <OButton
-                          text={t('DELIVERY_FAILED', 'Delivery Failed')}
-                          bgColor={theme.colors.danger100}
-                          borderColor={theme.colors.danger100}
+                          text={t('DELIVERY_COMPLETE', 'Delivery complete')}
+                          bgColor={theme.colors.success100}
+                          borderColor={theme.colors.success100}
                           imgRightSrc={null}
                           style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                          parentStyle={{ width: '45%' }}
-                          textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
-                          onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
-                            action: 'deliveryFailed',
-                            order: _ordersGrouped[k][0],
-                            ids: _ordersGrouped[k].map((o: any) => o.id),
-                            handleChangeOrderStatus
-                          })}
+                          parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
+                          textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
+                          onClick={() => handleChangeOrderStatus(
+                            11,
+                            _ordersGrouped[k].map((o: any) => o.id),
+                          )}
                         />
-                      )}
-                      <OButton
-                        text={t('DELIVERY_COMPLETE', 'Delivery complete')}
-                        bgColor={theme.colors.success100}
-                        borderColor={theme.colors.success100}
-                        imgRightSrc={null}
-                        style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                        parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
-                        textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
-                        onClick={() => handleChangeOrderStatus(
-                          11,
-                          _ordersGrouped[k].map((o: any) => o.id),
-                        )}
-                      />
-                    </AcceptOrRejectOrderStyle>
-                  )}
+                      </AcceptOrRejectOrderStyle>
+                    )}
                 </OrdersGroupedItem>
               ))}
             </View>

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

@@ -10,6 +10,7 @@ export const Card = styled.View`
 export const Logo = styled.View`
   height: 65px;
   width: 65px;
+  align-self: ${({ hasExternalAndGroup }: any) => hasExternalAndGroup ? 'center' : 'auto'};
 `;
 
 export const Information = styled.View`
@@ -17,7 +18,7 @@ export const Information = styled.View`
   justify-content: flex-start;
   margin-horizontal: 5px;
   flex: 1;
-  max-height: 60px;
+  max-height: ${({ hasExternalAndGroup }: any) => hasExternalAndGroup ? '75px' : '60px'};
 `;
 
 export const MyOrderOptions = styled.View`

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

@@ -0,0 +1,33 @@
+import React, { useEffect, useState } from 'react'
+import { useTheme } from 'styled-components/native'
+import { OText } from '../shared'
+
+export const MessageAlert = ({ message, resetMsg }: any) => {
+  const theme = useTheme()
+
+  const [text, setText] = useState(message)
+
+  useEffect(() => {
+    setText(message)
+  }, [message])
+
+  useEffect(() => {
+    if (text) {
+      setTimeout(() => {
+        setText(null)
+        resetMsg()
+      }, 2000);
+    }
+  }, [text])
+
+  return (
+    text ? (
+      <OText
+        size={14}
+        color={theme.colors.danger500}
+      >
+        {text}
+      </OText>
+    ) : null
+  )
+}

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

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
-import { Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
+import { StarPRNT } from 'react-native-star-prnt';
+import { ActivityIndicator, Dimensions, SafeAreaView, StyleSheet, View } from 'react-native';
 import SelectDropdown from 'react-native-select-dropdown'
 import { useLanguage } from 'ordering-components/native'
 import { useTheme } from 'styled-components/native'
@@ -20,47 +21,36 @@ import {
 import { Container } from '../../layouts/Container'
 import { OText, OInput, OIcon, OButton } from '../shared'
 
-const printerList = [
-  { nickname: 'mPOP', model: 'mPOP', emulation: 'StarPRNT', portName1: 'BT:mPOP', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'FVP10', model: 'FVP10', emulation: 'StarLine', portName1: 'BT:FVP10', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP100', model: 'TSP100', emulation: 'StarGraphic', portName1: 'BT:TSP100', type: 1, ip: '', printMode: 'appendBitmapText' },
-  { nickname: 'TSP100IV', model: 'TSP100IV', emulation: 'StarLine', portName1: 'BT:TSP100iv', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP65011', model: 'TSP65011', emulation: 'StarLine', portName1: 'BT:TSP65011', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP7001', model: 'TSP7001', emulation: 'StarLine', portName1: 'BT:TSP7001', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'TSP80011', model: 'TSP80011', emulation: 'StarLine', portName1: 'BT:TSP80011', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SP700', model: 'SP700', emulation: 'StarDotImpact', portName1: 'BT:SP700', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S210i', model: 'SM-S210i', emulation: 'EscPosMobile', portName1: 'BT:SMS210i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S220i', model: 'SM-S220i', emulation: 'EscPosMobile', portName1: 'BT:SMS220i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S230i', model: 'SM-S230i', emulation: 'EscosMobile', portName1: 'BT:SMS230i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T300i/T300', model: 'SM-T300i/T300', emulation: 'EscPosMobile', portName1: 'BT:SMT300i/T300', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T400i', model: 'SM-T400i', emulation: 'EscosMobile', portName1: 'BT:SMT400i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-L200', model: 'SM-L200', emulation: 'StarPRNT', portName1: 'BT:SML200', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-L300', model: 'SM-L300', emulation: 'StarPRNT', portName1: 'BT:SML300', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'BSC10', model: 'BSC10', emulation: 'EscPos', portName1: 'BT:BSC10', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S210i StarPRNT', model: 'SM-S210i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMS210i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S220i StarPRNT', model: 'SM-S220i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMS220i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-S230i StarPRNT', model: 'SM-S230i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMS230i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T300i/T300 StarPRNT', model: 'SM-T300i/T300 StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMT300i', type: 1, ip: '', printMode: 'append' },
-  { nickname: 'SM-T400i StarPRNT', model: 'SM-T400i StarPRNT', emulation: 'StarPRNT', portName1: 'BT:SMT400i', type: 1, ip: '', printMode: 'append' },
-]
+import { PRINTERS } from './printerList'
+import { MessageAlert } from './MessageAlert'
+
+const printerList = PRINTERS.map(printer => ({
+  ...printer,
+  ip: '',
+  type: 1,
+  nickname: printer.model,
+  portName1: `BT:${printer.model.split(' ')[0]}`,
+  bt: `BT:${printer.model.split(' ')[0]}`
+}))
 
 export const PrinterEdition = (props: any) => {
-  const {
-    printer,
-    onClose
-  } = props
+  const { printer, onClose } = props
 
   const HEIGHT_SCREEN = Dimensions.get('window').height
   const [, t] = useLanguage()
   const theme = useTheme()
-  const { handleSubmit, control, setValue, watch } = useForm();
+  const { control, setValue, watch } = useForm()
+
+  const [currentPrinter, setCurrentPrinter] = useState(printer)
+  const [discoverPort, setDiscoverPort] = useState({ loading: false, msg: null })
 
   const watchIp = watch('ip')
+  const watchBt = watch('bt')
   const watchNickname = watch('nickname')
-  const isErrorIp = !/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(watchIp)
-  const isErrorNickname = watchNickname && !/^[a-zA-Z0-9\s]+$/i.test(watchNickname)
-
-  const [currentPrinter, setCurrentPrinter] = useState(printer)
+  const errorIP = !/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i.test(watchIp)
+  const errorBT = !/^[^\n]*$/i.test(watchBt) || !watchBt
+  const isErrorInput = currentPrinter?.type === 2 ? errorIP : errorBT
+  const isErrorNickname = watchNickname && !/^[^\n]*$/i.test(watchNickname)
 
   const styles = StyleSheet.create({
     icons: {
@@ -73,9 +63,13 @@ export const PrinterEdition = (props: any) => {
       paddingRight: 10
     },
     inputStyle: {
-      height: 40,
       borderWidth: 1,
       borderRadius: 8,
+      color: theme.colors.arrowColor,
+      borderColor: theme.colors.inputSignup,
+      backgroundColor: theme.colors.transparent,
+      minHeight: 50,
+      maxHeight: 50
     },
     savePrinterBtnText: {
       color: theme.colors.white,
@@ -98,6 +92,36 @@ export const PrinterEdition = (props: any) => {
     })
   }
 
+  const portDiscovery = async () => {
+    try {
+      setDiscoverPort({ ...discoverPort, loading: true })
+      let printers = await StarPRNT.portDiscovery('Bluetooth');
+
+      if (printers?.length) {
+        setValue('bt', printers[0]?.portName)
+        setCurrentPrinter({
+          ...currentPrinter,
+          ['bt']: printers[0]?.portName
+        })
+      }
+      setTimeout(() => {
+        setDiscoverPort({
+          ...discoverPort,
+          loading: false,
+          msg: !printers?.length
+            ? t('NO_PRINTERS_FOUND', 'No printers found')
+            : null
+        })
+      }, 1000);
+    } catch (e) {
+      setValue('bt', currentPrinter?.portName)
+      setCurrentPrinter({
+        ...currentPrinter,
+        ['bt']: currentPrinter?.portName
+      })
+    }
+  }
+
   const onSubmit = () => {
     handleChangePrinter({ edit: !!printer, isAdd: !printer })
     onClose && onClose()
@@ -105,6 +129,7 @@ export const PrinterEdition = (props: any) => {
 
   useEffect(() => {
     currentPrinter?.ip && setValue('ip', currentPrinter?.ip)
+    currentPrinter?.bt && setValue('bt', currentPrinter?.bt)
     currentPrinter?.nickname && setValue('nickname', currentPrinter?.nickname)
   }, [currentPrinter?.type])
 
@@ -281,51 +306,93 @@ export const PrinterEdition = (props: any) => {
                 {t('CONNECTION_VIA_LAN', 'Via LAN')}
               </OText>
             </WrapperIcon>
-            {currentPrinter?.type === 2 && (
-              <>
-                <View style={{ flexDirection: 'row' }}>
-                  <Controller
-                    control={control}
-                    name={'ip'}
-                    rules={{
-                      required: t('VALIDATION_ERROR_IP_ADDRESS_REQUIRED', 'Ip address is required'),
-                      pattern: {
-                        value: /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i,
-                        message: t('INVALID_ERROR_IP_ADDRESS', 'Invalid ip address')
-                      }
-                    }}
-                    defaultValue={currentPrinter?.ip ?? ''}
-                    render={() => (
-                      <OInput
-                        placeholder={t('IP_ADDRESS', 'Ip address')}
-                        placeholderTextColor={theme.colors.arrowColor}
-                        style={{
-                          ...styles.inputStyle,
-                          borderColor: isErrorIp ? theme.colors.danger500 : theme.colors.tabBar
-                        }}
-                        value={currentPrinter?.ip ?? ''}
-                        selectionColor={theme.colors.primary}
-                        color={theme.colors.textGray}
-                        onChange={(value: any) => {
-                          setValue('ip', value)
-                          setCurrentPrinter({
-                            ...currentPrinter,
-                            ip: value
-                          })
-                        }}
-                      />
-                    )}
-                  />
-                </View>
+            <View style={{ flexDirection: 'column', marginTop: 30 }}>
+              {currentPrinter?.type === 1 && (
                 <OText
                   size={14}
-                  color={theme.colors.tabBar}
-                  style={{ paddingTop: 5, paddingLeft: 10 }}
+                  color={theme.colors.toastInfo}
+                  style={{ marginBottom: 10 }}
                 >
-                  {`${t('EXAMPLE_SHORT', 'Ex:')} 8.8.8.8`}
+                  {t('SEARCH_AVAILABLE_PRINTER_MESSAGE', 'Use the search icon to find an available printer')}
                 </OText>
-              </>
-            )}
+              )}
+              <View style={{ flexDirection: 'row', alignItems: 'center' }}>
+                <Controller
+                  control={control}
+                  name={currentPrinter?.type === 2 ? 'ip' : 'bt'}
+                  rules={{
+                    required: currentPrinter?.type === 2
+                      ? t('VALIDATION_ERROR_IP_ADDRESS_REQUIRED', 'Ip address is required')
+                      : t('VALIDATION_ERROR_BLUETOOTH_PORN_REQUIRED', 'Bluetooth port name is required'),
+                    pattern: {
+                      value: currentPrinter?.type === 2
+                        ? /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i
+                        : /^[a-zA-Z0-9]+$/i,
+                      message: currentPrinter?.type === 2
+                        ? t('INVALID_ERROR_IP_ADDRESS', 'Invalid ip address')
+                        : t('INVALID_ERROR_BLUETOOTH_PORT_NAME', 'Invalid bluetooth port name')
+                    }
+                  }}
+                  defaultValue={currentPrinter?.type === 2 ? currentPrinter?.ip ?? '' : currentPrinter?.bt ?? ''}
+                  render={() => (
+                    <OInput
+                      placeholder={currentPrinter?.type === 2
+                        ? t('IP_ADDRESS', 'Ip address')
+                        : t('BLUETOOTH_PORT', 'Bluetooth port')
+                      }
+                      placeholderTextColor={theme.colors.arrowColor}
+                      style={{
+                        ...styles.inputStyle,
+                        borderColor: isErrorInput ? theme.colors.danger500 : theme.colors.tabBar
+                      }}
+                      value={currentPrinter?.type === 2 ? currentPrinter?.ip ?? '' : currentPrinter?.bt ?? ''}
+                      selectionColor={theme.colors.primary}
+                      color={theme.colors.textGray}
+                      onChange={(value: any) => {
+                        setValue(currentPrinter?.type === 2 ? 'ip' : 'bt', value)
+                        setCurrentPrinter({
+                          ...currentPrinter,
+                          [currentPrinter?.type === 2 ? 'ip' : 'bt']: value
+                        })
+                      }}
+                    />
+                  )}
+                />
+                {currentPrinter?.type === 1 && (
+                  <>
+                    {!discoverPort.loading ? (
+                      <FAIcons
+                        name='search'
+                        size={22}
+                        color={theme.colors.primary}
+                        style={{ marginLeft: 10 }}
+                        onPress={() => portDiscovery()}
+                      />
+                    ) : (
+                      <ActivityIndicator
+                        size="small"
+                        style={{ marginLeft: 10 }}
+                        color={theme.colors.primary}
+                      />
+                    )}
+                  </>
+                )}
+              </View>
+            </View>
+            <OText
+              size={14}
+              color={theme.colors.tabBar}
+              style={{ paddingTop: 5, paddingLeft: 10 }}
+            >
+              {discoverPort.msg ? (
+                <MessageAlert
+                  message={discoverPort.msg}
+                  resetMsg={() => setDiscoverPort({ ...discoverPort, msg: null })}
+                />
+              ) : (
+                `${t('EXAMPLE_SHORT', 'Ex:')} ${currentPrinter?.type === 2 ? '8.8.8.8' : currentPrinter?.portName1}`
+              )}
+            </OText>
           </WrapperIcons>
         )}
       </ContainerEdition>
@@ -341,6 +408,7 @@ export const PrinterEdition = (props: any) => {
         isDisabled={
           isErrorNickname ||
           !currentPrinter?.model ||
+          currentPrinter?.type === 1 && !currentPrinter?.bt ||
           currentPrinter?.type === 2 && !currentPrinter?.ip
         }
         onClick={() => onSubmit()}

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

@@ -0,0 +1,23 @@
+export const PRINTERS = [
+  { model: 'mPOP', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'FVP10', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP100', emulation: 'StarGraphic', printMode: 'appendBitmapText' },
+  { model: 'TSP100IV', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP65011', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP7001', emulation: 'StarLine', printMode: 'append' },
+  { model: 'TSP80011', emulation: 'StarLine', printMode: 'append' },
+  { model: 'SP700', emulation: 'StarDotImpact', printMode: 'append' },
+  { model: 'SM-S210i', emulation: 'EscPosMobile', printMode: 'append' },
+  { model: 'SM-S220i', emulation: 'EscPosMobile', printMode: 'append' },
+  { model: 'SM-S230i', emulation: 'EscosMobile', printMode: 'append' },
+  { model: 'SM-T300i/T300', emulation: 'EscPosMobile', printMode: 'append' },
+  { model: 'SM-T400i', emulation: 'EscosMobile', printMode: 'append' },
+  { model: 'SM-L200', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-L300', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'BSC10', emulation: 'EscPos', bt: 'BT:BSC10', printMode: 'append' },
+  { model: 'SM-S210i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-S220i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-S230i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-T300i/T300 StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+  { model: 'SM-T400i StarPRNT', emulation: 'StarPRNT', printMode: 'append' },
+]

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

@@ -102,7 +102,7 @@ export const PrinterSettings = (props: any) => {
         type: type ?? _currentPrinter?.type ?? 1,
         ip: ip ?? _currentPrinter?.ip ?? '',
         portName: (type ?? _currentPrinter?.type) === 1 || !ip
-          ? item.portName1 ?? _currentPrinter?.portName1
+          ? item?.bt ?? item.portName1 ?? _currentPrinter?.portName1
           : `TCP:${ip}`
       }
       edit ? (_printers[idx] = _item) : _printers.push(_item)

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

@@ -22,6 +22,7 @@ import {
 } from './styles';
 import { OText, OAlert } from '../shared';
 import { ProductItemAccordionParams } from '../../types';
+import { getCurrenySymbol } from '../../utils';
 
 export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
   const {
@@ -71,26 +72,24 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
   const parseOptions = typeof productInfo().options === 'string' ? JSON.parse(productInfo().options) : productInfo().options
 
   const getProductPrice = (product: any) => {
-    let subOptionPrice = 0;
-    if (product?.options?.length > 0 && product?.options[0]?.suboptions?.length > 0) {
-      for (const option of product?.options) {
-        for (const suboption of option?.suboptions) {
-          subOptionPrice += suboption.quantity * suboption.price;
+    let subOptionPrice = 0
+    if (Array.isArray(product?.options)) {
+      if (product.options?.length > 0) {
+        for (const option of product.options) {
+          for (const suboption of option.suboptions) {
+            subOptionPrice += suboption.quantity * ((['left', 'right'].includes(suboption.position)) ? (suboption.half_price ?? suboption.price) : suboption.price)
+          }
         }
       }
     }
 
-    const price = product.quantity * (product.price + subOptionPrice);
-    return parseFloat(price.toFixed(2));
-  };
+    const price = product.quantity * (product.price + subOptionPrice)
+    return parseFloat(price.toFixed(2))
+  }
 
   const getFormattedSubOptionName = ({ quantity, name, position, price }: any) => {
-    if (name !== 'No') {
-      const pos = position ? `(${position})` : '';
-      return `${quantity} x ${name} ${pos} +${price}`
-    } else {
-      return 'No';
-    }
+    const pos = position ? `(${position})` : ''
+    return `${quantity} x ${name} ${pos} +${price}`
   };
 
   /*useEffect(() => {
@@ -160,7 +159,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
               }}>
               <View style={{ flexDirection: 'row' }}>
                 <OText size={12} color={theme.colors.textGray}>
-                  {parsePrice(getProductPrice(product), { currency })}
+                  {parsePrice(getProductPrice(product), { currency: getCurrenySymbol(currency) })}
                 </OText>
 
                 {(
@@ -281,7 +280,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
                                   suboption.position,
                                 )
                                 : '',
-                            price: parsePrice(suboption.price, { currency }),
+                            price: (['left', 'right'].includes(suboption.position)) ? parsePrice(suboption.half_price ?? suboption.price, { currency: getCurrenySymbol(currency) }) : parsePrice(suboption.price, { currency: getCurrenySymbol(currency) }),
                           })}
                         </OText>
                       </ProductSubOption>