ordering-ui-react-native 0.22.45 → 0.22.46-release

package/themes/business/src/components/OrderDetails/usePrinterCommands.tsx

@@ -1,3 +1,4 @@
+import { Platform } from 'react-native'
 import { useConfig, useUtils, useLanguage} from 'ordering-components/native'
 
 import { verifyDecimals, getProductPrice } from '../../utils';
@@ -70,14 +71,14 @@ export const usePrinterCommands = () => {
         list.push(`${product?.quantity}  ${product?.name} \t ${parsePrice(product.total ?? getProductPrice(product))}${endLine}`)
 
         if (product?.ingredients?.length) {
-          list.push({ text: `\t ${t('INGREDIENTS', 'Ingredients')}:${endLine}`, props: { fontSize: 10 } })
+          list.push({ text: `\t ${t('INGREDIENTS', 'Ingredients')}:${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 10 : 18 } })
           product?.ingredients?.map((ingredient: any) => {
-            list.push({ text: `\t ${t('NO', 'No')} ${ingredient.name}${endLine}` , fontSize: 10 })
+            list.push({ text: `\t ${t('NO', 'No')} ${ingredient.name}${endLine}` , fontSize: Platform.OS === 'ios' ? 10 : 18 })
           })
         }
 
         product.options?.map((option: any) => {
-          list.push({ text: `\t ${option.name}${endLine}`, props: { fontSize: 10 } })
+          list.push({ text: `\t ${option.name}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 10 : 18 } })
 
           option.suboptions?.map((suboption: any) => {
             const { quantity, name, position, price } = suboption
@@ -88,13 +89,13 @@ export const usePrinterCommands = () => {
                 : `${quantity} x ${name} +${parsePrice(price)}`
               : 'No'
 
-            list.push({ text: `\t\t ${string}${endLine}`, props: { fontSize: 10 } })
+            list.push({ text: `\t\t ${string}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 10 : 18 } })
           })
         })
 
         if (product.comment) {
-          list.push({ text: `\t ${t('COMMENT', 'Comment')}${endLine}`, props: { fontSize: 10 } })
-          list.push({ text: `\t\t ${product.comment}${endLine}`, props: { fontSize: 10 } })
+          list.push({ text: `\t ${t('COMMENT', 'Comment')}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 10 : 18 } })
+          list.push({ text: `\t\t ${product.comment}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 10 : 18 } })
         }
 
         list.push('_separator_')
@@ -154,18 +155,18 @@ export const usePrinterCommands = () => {
     const jumpLine = isAppendMode ? '\n' : ' '
     const endLine = isAppendMode ? '\n' : ''
 
-    const textProps = { fontSize: 12 }
+    const textProps = { fontSize: Platform.OS === 'ios' ? 12 : 22 }
 
     const appends: any = [
-      { text: `${t('ORDER_NO', 'Order No.')} ${order.id}${endLine}`, props: { fontSize: 16 } },
+      { text: `${t('ORDER_NO', 'Order No.')} ${order.id}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 16 : 24 } },
       jumpLine,
       `${order.orderStatus}${endLine}`,
-      { text: `${t('ORDER_TYPE', 'Order Type')}: ${deliveryStatus[order?.delivery_type]}${endLine}`, props: { fontSize: 14 } },
-      { text: `${t(`PAYMENT_METHOD${paymethodsLength(order) > 1 ? 'S' : ''}`, `Payment method${paymethodsLength(order) > 1 ? 's' : ''}`)}: ${handlePaymethodsListString(order)}${endLine}`, props: { fontSize: 14 } },
-      `${!!order?.delivery_option ? `${t('DELIVERY_PREFERENCE', 'Delivery Preference')}: ${t(order?.delivery_option?.name?.toUpperCase()?.replace(/ /g, '_'), order?.delivery_option?.name)}${endLine}` : ''}`,
-      `${t('DELIVERY_DATE', 'Delivery Date')}: ${deliveryDate(order)}${endLine}`,
+      { text: `${t('ORDER_TYPE', 'Order Type')}: ${deliveryStatus[order?.delivery_type]}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 14 : 22 } },
+      { text: `${t(`PAYMENT_METHOD${paymethodsLength(order) > 1 ? 'S' : ''}`, `Payment method${paymethodsLength(order) > 1 ? 's' : ''}`)}: ${handlePaymethodsListString(order)}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 14 : 22 } },
+      `${!!order?.delivery_option ? { text: `${t('DELIVERY_PREFERENCE', 'Delivery Preference')}: ${t(order?.delivery_option?.name?.toUpperCase()?.replace(/ /g, '_'), order?.delivery_option?.name)}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 14 : 22 } } : ''}`,
+      { text: `${t('DELIVERY_DATE', 'Delivery Date')}: ${deliveryDate(order)}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 14 : 22 } },
       '_separator_',
-      { text: `${t('CUSTOMER_DETAILS', 'Customer details')}${endLine}`, props: { fontSize: 14 } },
+      { text: `${t('CUSTOMER_DETAILS', 'Customer details')}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 14 : 24 } },
       `${t('FULL_NAME', 'Full Name')}: ${customerName(order)}${endLine}`,
       `${t('EMAIL', 'Email')}: ${order?.customer?.email}${endLine}`,
       `${!!order?.customer?.cellphone ? `${t('MOBILE_PHONE', 'Mobile Phone')}: ${order?.customer?.cellphone}${endLine}` : ''}`,
@@ -174,7 +175,7 @@ export const usePrinterCommands = () => {
       `${!!order?.customer?.internal_number ? `${t('INTERNAL_NUMBER', 'Internal Number')}: ${order?.customer?.internal_number}${endLine}` : ''}`,
       `${!!order?.customer?.zipcode ? `${t('ZIPCODE', 'Zipcode')}: ${order?.customer?.zipcode}${endLine}` : ''}`,
       '_separator_',
-      { text: `${t('BUSINESS_DETAILS', 'Business details')}${endLine}`, props: { fontSize: 14 } },
+      { text: `${t('BUSINESS_DETAILS', 'Business details')}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 14 : 24 } },
       `${order?.business?.name}${endLine}`,
       `${order?.business?.email}${endLine}`,
       `${!!order?.business?.cellphone ? `${t('BUSINESS_PHONE', 'Business Phone')}: ${order?.business?.cellphone}${endLine}` : ''}`,
@@ -182,7 +183,7 @@ export const usePrinterCommands = () => {
       `${t('ADDRESS', 'Address')}: ${order?.business?.address}${endLine}`,
       `${!!order?.business?.address_notes ? `${t('SPECIAL_ADDRESS', 'Special Address')}: ${order?.business?.address_notes}${endLine}` : ''}`,
       '_separator_',
-      { text: `${t('ORDER_DETAILS', 'Order Details')}${endLine}`, props: { fontSize: 14 } },
+      { text: `${t('ORDER_DETAILS', 'Order Details')}${endLine}`, props: { fontSize: Platform.OS === 'ios' ? 14 : 24 } },
       `${!!order?.comment ? `${t('ORDER_COMMENT', 'Order Comment')}: ${order?.comment}${endLine}` : ''}`,
       ...generateProductsText(order, { endLine }),
       `${t('SUBTOTAL', 'Subtotal')} \t\t ${parsePrice(order.tax_type === 1 ? (order?.summary?.subtotal + order?.summary?.tax) ?? 0 : order?.summary?.subtotal ?? 0)}${endLine}`,
@@ -204,7 +205,7 @@ export const usePrinterCommands = () => {
       ...commands,
       ...appends.map((append: any) => {
         return append === '_separator_'
-          ? { [printMode]: `---------------------------------------${endLine}` }
+          ? { [printMode]: `-------------------------------------${endLine}` }
           : {
             [printMode]: replaceChars(append?.text ?? append),
             ...textProps,

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

@@ -44,6 +44,7 @@ export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
     }>({ open: false, content: [], key: null });
 
     const logisticOrderStatus = [4, 6, 7]
+    const deliveryTypes = [1, 7]
     const isHideRejectButtons = configs?.reject_orders_enabled && configs?.reject_orders_enabled?.value !== '1'
 
     const showFloatButtonsAcceptOrReject: any = {
@@ -99,7 +100,7 @@ export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
                 <View
                     style={{
                         height:
-                            order?.status === 8 && order?.delivery_type === 1 ? 50 : 35,
+                            order?.status === 8 && deliveryTypes?.includes(order?.delivery_type) ? 50 : 35,
                     }}
                 />
 
@@ -170,7 +171,7 @@ export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
                                         secondButton={true}
                                         firstColorCustom={theme.colors.red}
                                         secondColorCustom={theme.colors.green}
-                                        widthButton={isHideRejectButtons ? '100%': '45%'}
+                                        widthButton={isHideRejectButtons ? '100%' : '45%'}
                                         isHideRejectButtons={isHideRejectButtons}
                                     />
                                 )}

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

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
-import { OText, OIconButton } from '../shared';
-import { StyleSheet, View, Platform, Alert } from 'react-native';
+import { OText, OIcon } from '../shared';
+import { StyleSheet, View, Platform, Alert, TouchableOpacity } from 'react-native';
 import {
   Content,
   OrderCustomer,
@@ -15,7 +15,7 @@ import {
   ContentInfo,
 } from './styles';
 import { useUtils, useLanguage, useConfig } from 'ordering-components/native';
-import { verifyDecimals, getProductPrice } from '../../utils';
+import { verifyDecimals, getProductPrice, getCurrenySymbol } from '../../utils';
 import { FloatingButton } from '../FloatingButton';
 import RNHTMLtoPDF from 'react-native-html-to-pdf';
 import RNPrint from 'react-native-print';
@@ -152,14 +152,14 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
           </br>
 
           ${!!order?.delivery_option
-            ? `${t('DELIVERY_PREFERENCE', 'Delivery Preference')}: ${t(order?.delivery_option?.name?.toUpperCase()?.replace(/ /g, '_'), order?.delivery_option?.name)
-            } </br>`
-            : ''
-          }
+        ? `${t('DELIVERY_PREFERENCE', 'Delivery Preference')}: ${t(order?.delivery_option?.name?.toUpperCase()?.replace(/ /g, '_'), order?.delivery_option?.name)
+        } </br>`
+        : ''
+      }
 
           ${t('DELIVERY_DATE', 'Delivery Date')}: ${deliveryDate(order)}
           </br>
-          ${t(paymethodsLength > 1 ? 'PAYMENT_METHODS' : 'PAYMENT_METHOD', paymethodsLength > 1 ? 'Payment methods' : 'Payment method')}: ${handlePaymethodsListString()}
+          ${t(paymethodsLength > 1 ? 'PAYMENT_METHODS' : 'PAYMENT_METHOD', paymethodsLength > 1 ? 'Payment methods' : 'Payment method')}: ${order?.payment_events?.length > 0 ? handlePaymethodsListString() : t(order?.paymethod?.gateway?.toUpperCase(), order?.paymethod?.name)}
         </p>
 
         <h1>${t('CUSTOMER_DETAILS', 'Customer details')}</h1>
@@ -168,9 +168,9 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
         ${t('EMAIL', 'Email')}: ${order?.customer?.email}
         </br>
          ${!!order?.customer?.cellphone
-          ? `${t('MOBILE_PHONE', 'Mobile Phone')}: ${order?.customer?.cellphone
-          } </br>`
-          : ''}
+        ? `${t('MOBILE_PHONE', 'Mobile Phone')}: ${order?.customer?.cellphone
+        } </br>`
+        : ''}
 
          ${!!order?.customer?.phone
         ? `${t('MOBILE_PHONE', 'Mobile Phone')}: ${order?.customer?.phone
@@ -196,10 +196,10 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
         ${order?.business?.email}
         </br>
         ${!!order?.business?.cellphone
-          ? `${t('BUSINESS_PHONE', 'Business Phone')}: ${order?.business?.cellphone
-          } </br>`
-          : ''
-        }
+        ? `${t('BUSINESS_PHONE', 'Business Phone')}: ${order?.business?.cellphone
+        } </br>`
+        : ''
+      }
         ${!!order?.business?.phone
         ? `${t('BUSINESS_PHONE', 'Business Phone')}: ${order?.business?.phone
         } </br>`
@@ -216,7 +216,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
         </p>
         <h1> ${t('ORDER_DETAILS', 'Order Details')}</h1>
 
-        ${order?.comment ? ('</br>'+ t('ORDER_COMMENT', 'Order Comment') + ':' + order?.comment) : ''}
+        ${order?.comment ? ('</br>' + t('ORDER_COMMENT', 'Order Comment') + ':' + order?.comment) : ''}
 
         ${order?.products.length &&
       order?.products.map(
@@ -301,7 +301,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
           </div>
 
           <div style="font-size: 26px; width: 30%; display: flex; justify-content: flex-end">
-            ${parsePrice(order?.summary?.delivery_price ?? 0)}
+            ${parsePrice(order?.summary?.delivery_price + getIncludedTaxes(true), { currency: getCurrenySymbol(order?.currency) })}
           </div>` :
         ''}
 
@@ -352,28 +352,28 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
         `}
 
         ${order?.payment_events.length &&
-          order?.payment_events.map(
-            (event: any, i: number) =>
-              `<div style="display: flex;flexDirection:row;flex-wrap:wrap">
+      order?.payment_events.map(
+        (event: any, i: number) =>
+          `<div style="display: flex;flexDirection:row;flex-wrap:wrap">
                     <div style="display:flex;width:100%">
                       <div style="display:flex; justify-content: flex-start; font-size: 26px; width: 70%">
                       ${event?.wallet_event
-                        ? walletName[event?.wallet_event?.wallet?.type]?.name
-                        : event?.paymethod?.gateway && event?.paymethod?.gateway === 'cash' && order?.cash > 0
-                          ? `${t(event?.paymethod?.gateway?.toUpperCase(), event?.paymethod?.name)} (${t('CASH_CHANGE_OF', 'Change of :amount:').replace(':amount:', parsePrice(order?.cash))})`
-                          : event?.paymethod?.gateway
-                            ? t(event?.paymethod?.gateway?.toUpperCase(), event?.paymethod?.name)
-                            : t(order?.paymethod?.gateway?.toUpperCase(), order?.paymethod?.name)}
+            ? walletName[event?.wallet_event?.wallet?.type]?.name
+            : event?.paymethod?.gateway && event?.paymethod?.gateway === 'cash' && order?.cash > 0
+              ? `${t(event?.paymethod?.gateway?.toUpperCase(), event?.paymethod?.name)} (${t('CASH_CHANGE_OF', 'Change of :amount:').replace(':amount:', parsePrice(order?.cash))})`
+              : event?.paymethod?.gateway
+                ? t(event?.paymethod?.gateway?.toUpperCase(), event?.paymethod?.name)
+                : t(order?.paymethod?.gateway?.toUpperCase(), order?.paymethod?.name)}
                       </div>
 
                       <div style="display:flex; justify-content: flex-end; font-size: 26px; width: 30%">
                         ${(event?.paymethod?.gateway === 'cash' && order?.cash)
-                          ? parsePrice(order?.cash, { currency: order?.currency })
-                          : `-${parsePrice(event?.amount, { currency: order?.currency })}`}
+            ? parsePrice(order?.cash, { currency: order?.currency })
+            : `-${parsePrice(event?.amount, { currency: order?.currency })}`}
                       </div>
                     </div>
                   </div>`
-        )}
+      )}
     </div>`;
   };
 
@@ -418,8 +418,16 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
 
   const styles = StyleSheet.create({
     btnBackArrow: {
-      maxWidth: 40,
-      height: 25,
+      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,
+      marginTop: 10
     },
     textBold: {
       fontWeight: '600',
@@ -445,18 +453,27 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
     }
   };
 
+  const getIncludedTaxes = (isDeliveryFee?: boolean) => {
+    if (!order?.taxes) return 0
+    if (order?.taxes?.length === 0) {
+      return order.tax_type === 1 ? order?.summary?.tax ?? 0 : 0
+    } else {
+      return order?.taxes.reduce((taxIncluded: number, tax: any) => {
+        return taxIncluded +
+          (((!isDeliveryFee && tax.type === 1 && tax.target === 'product') ||
+            (isDeliveryFee && tax.type === 1 && tax.target === 'delivery_fee')) ? tax.summary?.tax : 0)
+      }, 0)
+    }
+  }
+
   return (
     <>
       <Content>
         <OrderContent>
           <OrderHeader>
-            <OIconButton
-              icon={theme.images.general.arrow_left}
-              iconStyle={{ width: 20, height: 20 }}
-              borderColor={theme.colors.clear}
-              style={{ maxWidth: 40, justifyContent: 'flex-end' }}
-              onClick={() => handleArrowBack()}
-            />
+            <TouchableOpacity onPress={() => handleArrowBack()} style={styles.btnBackArrow}>
+              <OIcon src={theme.images.general.arrow_left} color={theme.colors.textGray} />
+            </TouchableOpacity>
             <OText
               style={{ marginBottom: 5 }}
               size={15}
@@ -488,7 +505,9 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
               {`${t('DELIVERY_DATE', 'Delivery Date')}: ${deliveryDate(order)}`}
             </OText>
 
-            <OText style={{ marginBottom: 5 }}>{`${t(`${paymethodsLength > 1 ? 'PAYMENT_METHODS' : 'PAYMENT_METHOD'}`, `${paymethodsLength > 1 ? 'Payment methods' : 'Payment method'}`)}: ${handlePaymethodsListString()}`}</OText>
+            <OText style={{ marginBottom: 5 }}>
+              {`${t(`${paymethodsLength > 1 ? 'PAYMENT_METHODS' : 'PAYMENT_METHOD'}`, `${paymethodsLength > 1 ? 'Payment methods' : 'Payment method'}`)}: ${order?.payment_events?.length > 0 ? handlePaymethodsListString() : t(order?.paymethod?.gateway?.toUpperCase(), order?.paymethod?.name)}`}
+            </OText>
 
           </OrderHeader>
 
@@ -564,7 +583,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
               </OText>
             )}
 
-            {order?.customer?.address_notes && (
+            {!!order?.customer?.address_notes && (
               <OText style={{ marginBottom: 5 }}>
                 {`${t('NOTES', 'Notes')}: ${order?.customer?.address_notes}`}
               </OText>
@@ -663,7 +682,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
               {t('ORDER_DETAILS', 'Order Details')}
             </OText>
 
-            {order?.comment && (
+            {!!order?.comment && (
               <OText style={{ marginBottom: 5 }}>
                 {`${t('ORDER_COMMENT', 'Order Comment')}: ${order?.comment}`}
               </OText>
@@ -742,7 +761,9 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
                   {t('DELIVERY_FEE', 'Delivery Fee')}
                 </OText>
 
-                <OText>{parsePrice(order?.summary?.delivery_price)}</OText>
+                <OText>
+                  {parsePrice(order?.summary?.delivery_price + getIncludedTaxes(true), { currency: getCurrenySymbol(order?.currency) })}
+                </OText>
               </Table>
             )}
 

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

@@ -846,6 +846,18 @@ export const OrdersListManager = (props: OrdersOptionParams) => {
       {
         key: 23,
         text: t('ORDER_DRIVER_ON_WAY', 'Driver on way')
+      },
+      {
+        key: 24,
+        text: t('ORDER_DRIVER_WAITING_FOR_ORDER', 'Driver waiting for order')
+      },
+      {
+        key: 25,
+        text: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company')
+      },
+      {
+        key: 26,
+        text: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer')
       }
     ],
     tabs: [
@@ -858,7 +870,7 @@ export const OrdersListManager = (props: OrdersOptionParams) => {
       {
         key: 1,
         text: t('IN_PROGRESS', 'In Progress'),
-        tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23],
+        tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26],
         title: 'inProgress',
       },
       {