ordering-ui-react-native 0.22.2 → 0.22.3-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';
@@ -38,7 +39,11 @@ export const usePrinterCommands = () => {
     const paymethodsList = order?.payment_events?.filter((item: any) => item.event === 'payment').map((paymethod: any) => {
       return paymethod?.wallet_event
         ? walletName[paymethod?.wallet_event?.wallet?.type]?.name
-        : t(paymethod?.paymethod?.gateway?.toUpperCase(), paymethod?.paymethod?.name)
+        : paymethod?.paymethod?.gateway && paymethod?.paymethod?.gateway === 'cash' && order?.cash > 0
+          ? `${t(paymethod?.paymethod?.gateway?.toUpperCase(), paymethod?.paymethod?.name)} (${t('CASH_CHANGE_OF', 'Change of :amount:').replace(':amount:', parsePrice(order?.cash))})`
+          : paymethod?.paymethod?.gateway
+            ? t(paymethod?.paymethod?.gateway?.toUpperCase(), paymethod?.paymethod?.name)
+            : t(order?.paymethod?.gateway?.toUpperCase(), order?.paymethod?.name)
     })
     return paymethodsList.join(', ')
   }
@@ -47,93 +52,162 @@ export const usePrinterCommands = () => {
 
   const customerName = (order: any) => `${order?.customer?.name ?? ''} ${order?.customer?.middle_name ?? ''} ${order?.customer?.lastname ?? ''} ${order?.customer?.second_lastname ?? ''}`?.replace('  ', ' ')?.trim() ?? ''
 
-  const generateCommands = (order: any) => {
-    let commands: any = [];
+  const deliveryDate = (order: any) => {
+    const dateString = order?.delivery_datetime_utc ?? order?.delivery_datetime
+    const currentDate = new Date();
+    const receivedDate: any = new Date(order?.delivery_datetime);
+
+    const formattedDate = receivedDate <= currentDate
+      ? `${t('ASAP_ABBREVIATION', 'ASAP')}(${parseDate(dateString, { utc: !!order?.delivery_datetime_utc })})`
+      : parseDate(dateString, { utc: !!order?.delivery_datetime_utc })
+    return formattedDate
+  }
 
-    const textProps = { fontSize: 12 }
+  const generateProductsText = (order: any, { endLine }: any) => {
+    const list: any = []
 
-    const generateProductsText = () => {
-      const list: any = []
+    if (order?.products.length) {
+      order?.products.map((product: any) => {
+        list.push(`${product?.quantity}  ${product?.name} \t ${parsePrice(product.total ?? getProductPrice(product))}${endLine}`)
 
-      if (order?.products.length) {
-        order?.products.map((product: any) => {
-          list.push(`${product?.quantity}  ${product?.name} \t\t ${parsePrice(product.total ?? getProductPrice(product))}`)
+        if (product?.ingredients?.length) {
+          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: Platform.OS === 'ios' ? 10 : 18 })
+          })
+        }
 
-          product.options?.map((option: any) => {
-            list.push({ text: `\t ${option.name}`, props: { fontSize: 10 } })
+        product.options?.map((option: any) => {
+          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
-              const pos = position && position !== 'whole' ? `(${t(position.toUpperCase(), position)})` : ''
-              const string = name !== 'No'
-                ? pos
-                  ? `${quantity} x ${name} ${pos} +${parsePrice(price)}`
-                  : `${quantity} x ${name} +${parsePrice(price)}`
-                : 'No'
+          option.suboptions?.map((suboption: any) => {
+            const { quantity, name, position, price } = suboption
+            const pos = position && position !== 'whole' ? `(${t(position.toUpperCase(), position)})` : ''
+            const string = name !== 'No'
+              ? pos
+                ? `${quantity} x ${name} ${pos} +${parsePrice(price)}`
+                : `${quantity} x ${name} +${parsePrice(price)}`
+              : 'No'
 
-              list.push({ text: `\t\t ${string}`, 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')}`, props: { fontSize: 10 } })
-            list.push({ text: `\t\t ${product.comment}`, props: { fontSize: 10 } })
-          }
+        if (product.comment) {
+          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_')
-        })
-      }
+        list.push('_separator_')
+      })
+    }
+
+    return list
+  }
+
+  const paymethodsList = (order: any, { endLine }: any) => {
+    const list: any = []
 
-      return list
+    if (order?.payment_events?.length > 0) {
+      order?.payment_events.map((event: any) => {
+        const payment = event?.wallet_event
+          ? walletName[event?.wallet_event?.wallet?.type]?.name
+          : t(event?.paymethod?.name?.toUpperCase()?.replace(/ /g, '_'), event?.paymethod?.name)
+
+        const amount = (event?.paymethod?.gateway === 'cash' && order?.cash)
+          ? parsePrice(order?.cash, { currency: order?.currency })
+          : `-${parsePrice(event?.amount, { currency: order?.currency })}`
+
+        list.push(`${payment} \t ${amount}${endLine}`)
+      })
     }
 
+    return list
+  }
+
+  const replaceChars = (string: string) => {
+    const accents: any = {
+      'á': 'a',
+      'é': 'e',
+      'í': 'i',
+      'ó': 'o',
+      'ú': 'u',
+      'Á': 'A',
+      'É': 'E',
+      'Í': 'I',
+      'Ó': 'O',
+      'Ú': 'U',
+      'ü': 'u',
+      'Ü': 'U',
+      'ñ': 'n',
+      'Ñ': 'N',
+      "'": '',
+      "’": '',
+      "`": '',
+    };
+    return string.replace(/[áéíóúÁÉÍÓÚüÜñÑ'’`]/g, (match: any) => accents[match])
+  }
+
+  const generateCommands = (order: any, printMode: string = 'append') => {
+    let commands: any = [];
+
+    const isAppendMode = printMode === 'append'
+    const jumpLine = isAppendMode ? '\n' : ' '
+    const endLine = isAppendMode ? '\n' : ''
+
+    const textProps = { fontSize: Platform.OS === 'ios' ? 12 : 22 }
+
     const appends: any = [
-      { text: `${t('ORDER_NO', 'Order No.')} ${order.id}`, props: { fontSize: 16 } },
-      ' ',
-      order.orderStatus,
-      { text: `${t('DELIVERY_TYPE', 'Delivery Type')}: ${deliveryStatus[order?.delivery_type]}`, props: { fontSize: 14 } },
-      { text: `${t(`PAYMENT_METHOD${paymethodsLength(order) > 1 ? 'S' : ''}`, `Payment method${paymethodsLength(order) > 1 ? 's' : ''}`)}: ${handlePaymethodsListString(order)}`, props: { fontSize: 14 } },
-      `${t('DELIVERY_DATE', 'Delivery Date')}: ${order?.delivery_datetime_utc ? parseDate(order?.delivery_datetime_utc) : parseDate(order?.delivery_datetime, { utc: false })}`,
+      { 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: 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')}`, props: { fontSize: 14 } },
-      `${t('FULL_NAME', 'Full Name')}: ${customerName(order)}`,
-      `${t('EMAIL', 'Email')}: ${order?.customer?.email}`,
-      `${t('MOBILE_PHONE', 'Mobile Phone')}: ${order?.customer?.cellphone}`,
-      `${!!order?.customer?.phone ? `${t('MOBILE_PHONE', 'Mobile Phone')}: ${order?.customer?.phone}` : '\n'}`,
-      `${t('FULL_ADDRESS', 'Full Addres')}: ${order?.customer?.address}`,
-      `${!!order?.customer?.internal_number ? `${t('INTERNAL_NUMBER', 'Internal Number')}: ${order?.customer?.internal_number}` : '\n'}`,
-      `${!!order?.customer?.zipcode ? `${t('ZIPCODE', 'Zipcode')}: ${order?.customer?.zipcode}` : '\n'}`,
+      { 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}` : ''}`,
+      `${!!order?.customer?.phone ? `${t('MOBILE_PHONE', 'Mobile Phone')}: ${order?.customer?.phone}${endLine}` : ''}`,
+      `${t('FULL_ADDRESS', 'Full Addres')}: ${order?.customer?.address}${endLine}`,
+      `${!!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')}`, props: { fontSize: 14 } },
-      order?.business?.name,
-      order?.business?.email,
-      `${t('BUSINESS_PHONE', 'Business Phone')}: ${order?.business?.cellphone}`,
-      `${!!order?.business?.phone ? `${t('BUSINESS_PHONE', 'Business Phone')}: ${order?.business?.phone}` : '\n'}`,
-      `${t('ADDRESS', 'Address')}: ${order?.business?.address}`,
-      `${!!order?.business?.address_notes ? `${t('SPECIAL_ADDRESS', 'Special Address')}: ${order?.business?.address_notes}` : '\n'}`,
+      { 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}` : ''}`,
+      `${!!order?.business?.phone ? `${t('BUSINESS_PHONE', 'Business Phone')}: ${order?.business?.phone}${endLine}` : ''}`,
+      `${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')}`, props: { fontSize: 14 } },
-      ...generateProductsText(),
-      ' ',
-      `${t('SUBTOTAL', 'Subtotal')} \t\t ${parsePrice(order.tax_type === 1 ? (order?.summary?.subtotal + order?.summary?.tax) ?? 0 : order?.summary?.subtotal ?? 0)}`,
-      `${order?.summary?.discount > 0 ? `${order?.offer_type === 1 ? `${t('DISCOUNT', 'Discount')} (${verifyDecimals(order?.offer_rate, parsePrice)}%)` : t('DISCOUNT', 'Discount')} \t\t ${parsePrice(order?.summary?.discount)}` : '\n'}`,
-      `${order?.tax_type !== 1 ? `${t('TAX', 'Tax')} (${verifyDecimals(order?.summary?.tax_rate, parseNumber)}%) \t\t ${parsePrice(order?.summary?.tax ?? 0)}` : '\n'}`,
-      `${order?.summary?.delivery_price > 0 ? `${t('DELIVERY_FEE', 'Delivery Fee')} \t\t ${parsePrice(order?.summary?.delivery_price ?? 0)}` : '\n'}`,
-      `${t('DRIVER_TIP', 'Driver tip')} ${percentTip(order) ? `(${percentTip(order)}%)` : ''} \t\t ${parsePrice(order?.summary?.driver_tip ?? 0)}`,
-      `${t('SERVICE_FEE', 'Service Fee')} (${verifyDecimals(order?.summary?.service_fee, parseNumber)}%) \t\t ${parsePrice(order?.summary?.service_fee ?? 0)}`,
+      { 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}`,
+      `${order?.summary?.discount > 0 ? `${order?.offer_type === 1 ? `${t('DISCOUNT', 'Discount')} (${verifyDecimals(order?.offer_rate, parsePrice)}%)${endLine}` : t('DISCOUNT', 'Discount')} \t\t ${parsePrice(order?.summary?.discount)}${endLine}` : ''}`,
+      `${order?.tax_type !== 1 ? `${t('TAX', 'Tax')} (${verifyDecimals(order?.summary?.tax_rate, parseNumber)}%) \t\t ${parsePrice(order?.summary?.tax ?? 0)}${endLine}` : ''}`,
+      `${order?.summary?.delivery_price > 0 && order.delivery_type !== 2 ? `${t('DELIVERY_FEE', 'Delivery Fee')} \t\t ${parsePrice(order?.summary?.delivery_price ?? 0)}${endLine}` : ''}`,
+      `${(order?.summary?.driver_tip > 0 || order?.driver_tip > 0) && order.delivery_type !== 2 ? `${t('DRIVER_TIP', 'Driver tip')} ${percentTip(order) ? `(${percentTip(order)}%)` : ''} \t\t ${parsePrice(order?.summary?.driver_tip ?? 0)}${endLine}` : ''}`,
+      `${order?.summary?.service_fee > 0 ? `${t('SERVICE_FEE', 'Service Fee')} (${verifyDecimals(order?.summary?.service_fee, parseNumber)}%) \t\t ${parsePrice(order?.summary?.service_fee ?? 0)}${endLine}` : ''}`,
       '_separator_',
-      `${t('TOTAL', 'Total')} \t\t ${parsePrice(order?.summary?.total ?? 0)}`,
-      ' ',
-      ' ',
+      `${t('TOTAL', 'Total')} \t\t ${parsePrice(order?.summary?.total ?? 0)}${endLine}`,
+      jumpLine,
+      `${order?.payment_events?.length > 0 ? `${t('PAYMENTS', 'Payments')}${endLine}` : ''}`,
+      ...paymethodsList(order, { endLine }),
+      jumpLine,
+      jumpLine,
     ]
 
     commands = [
       ...commands,
       ...appends.map((append: any) => {
         return append === '_separator_'
-          ? { appendBitmapText: '---------------------------------------' }
+          ? { [printMode]: `-------------------------------------${endLine}` }
           : {
-            appendBitmapText: append?.text ?? append,
+            [printMode]: replaceChars(append?.text ?? append),
             ...textProps,
             ...append?.props
           }

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}
                                     />
                                 )}