ordering-ui-react-native 0.21.6 → 0.21.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.21.6",
+  "version": "0.21.8",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

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

@@ -80,6 +80,9 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
     !parseInt(configs?.driver_tip_use_custom?.value, 10) &&
     verifyDecimals(order?.summary?.driver_tip, parseNumber);
 
+  const customerName = `${order?.customer?.name ?? ''} ${order?.customer?.middle_name ?? ''} ${order?.customer?.lastname ?? ''} ${order?.customer?.second_lastname ?? ''
+    }`?.replace('  ', ' ')?.trim() ?? ''
+
   const orderSummary = () => {
     return `
     <div>
@@ -100,9 +103,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
         </p>
 
         <h1>${t('CUSTOMER_DETAILS', 'Customer details')}</h1>
-        <p style="font-size: 27px"> ${t('FULL_NAME', 'Full Name')}: ${order?.customer?.name
-      } ${order?.customer?.middle_name} ${order?.customer?.lastname} ${order?.customer?.second_lastname
-      }
+        <p style="font-size: 27px"> ${t('FULL_NAME', 'Full Name')}: ${customerName}
         </br>
         ${t('EMAIL', 'Email')}: ${order?.customer?.email}
         </br>
@@ -339,9 +340,6 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
     }
   };
 
-  const customerName = `${order?.customer?.name ?? ''} ${order?.customer?.middle_name ?? ''} ${order?.customer?.lastname ?? ''} ${order?.customer?.second_lastname ?? ''
-    }`?.replace('  ', ' ')?.trim() ?? ''
-
   return (
     <>
       <Content>

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

@@ -96,8 +96,8 @@ export const OrderItem = (props: any) => {
   const getDelayMinutes = (order: any) => {
     const cdtToutc = moment(order?.delivery_datetime).utc().format('YYYY-MM-DD HH:mm:ss')
     const _delivery = order?.delivery_datetime_utc
-      ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
-      : parseDate(cdtToutc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
+      ? parseDate(order?.delivery_datetime_utc)
+      : parseDate(cdtToutc)
     const _eta = order?.eta_time
     const diffTimeAsSeconds = moment(_delivery, 'YYYY-MM-DD hh:mm A').add(_eta, 'minutes').diff(moment().utc(), 'seconds')
     return Math.ceil(diffTimeAsSeconds / 60)
@@ -199,7 +199,7 @@ export const OrderItem = (props: any) => {
                   : (t('NO', 'Order No.') + order.id)
                 ) + ' · '}
               {order?.delivery_datetime_utc
-                ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'MM/DD/YY · HH:mm a' })
+                ? parseDate(order?.delivery_datetime_utc)
                 : parseDate(order?.delivery_datetime, { utc: false })}
             </OText>
             {((currentTabSelected === 'pending' || currentTabSelected === 'inProgress') && allowColumns?.timer) && (