ordering-ui-react-native 0.23.13 → 0.23.15-test

package/package.json

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

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

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { StyleSheet, View, ActivityIndicator, TouchableOpacity } from 'react-native';
+import FastImage from 'react-native-fast-image'
 import ToggleSwitch from 'toggle-switch-react-native';
 import { useTheme } from 'styled-components/native';
 import {
@@ -99,10 +100,14 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
               onPress={() => navigation && business?.slug && navigation.navigate('BusinessProductListing', { slug: business?.slug })}
             >
               <Logo style={styles.logo}>
-                <OIcon
-                  url={optimizeImage(business?.logo, 'h_300,c_limit')}
-                  src={!business?.logo && theme?.images?.dummies?.businessLogo}
+                <FastImage
                   style={styles.icon}
+                  source={business?.logo?.includes('https') ? {
+                    uri: business?.logo,
+                    priority: FastImage.priority.high,
+                    cache: FastImage.cacheControl.immutable
+                  } : business?.logo ?? theme?.images?.dummies?.businessLogo}
+                  resizeMode={FastImage.resizeMode.cover}
                 />
               </Logo>
               <Information>

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

@@ -316,8 +316,18 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const printAction = async (printerSettings: any, commands: any, showAlert: boolean = true) => {
     try {
       var printResult = await StarPRNT.print(printerSettings?.emulation, commands, printerSettings?.portName);
+      Alert.alert(
+        'Print Result',
+        JSON.stringify(printResult),
+        [{ text: t('OK', 'Ok')}]
+      )
       showAlert && showToast(ToastType.Info, t('ORDER_PRINTED_SUCCESS', 'Order printed'), 1000)
     } catch (e) {
+      Alert.alert(
+        'Print Result',
+        JSON.stringify(e),
+        [{ text: t('OK', 'Ok')}]
+      )
       showAlert && showToast(ToastType.Error, t('ORDER_PRINTED_FAILED', 'Order not printed, connection failed'), 1000)
     }
   }
@@ -330,7 +340,11 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           orderStatus: getOrderStatus(order?.status, t)?.value
         }, printer?.printMode)
         commands.push({ appendCutPaper: StarPRNT.CutPaperAction.PartialCutWithFeed })
-
+        Alert.alert(
+          `Printer: ${printer?.model}`,
+          `Port name: ${printer?.portName}`,
+          [{ text: t('OK', 'Ok')}]
+        )
         printAction(printer, commands, idx === printerSettings.length - 1)
       })
       return
@@ -423,6 +437,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       const autoPrint = await _retrieveStoreData('auto_print_after_accept_order')
       setPrinterSettings(printers?.length && printers)
       setAutoPrintEnabled(!!autoPrint)
+      console.log('printers after', printers);
     }
 
     getStorageData()

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

@@ -65,6 +65,7 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
   const messagesReadIds = messagesReadList?.map((message: any) => message?.order_message_id)
 
   const filteredMessages = messagesReadList?.length > 0 ? messages?.messages?.filter((message: any) => !messagesReadIds?.includes(message?.id)) : messages?.messages
+  const cateringTypes = [7, 8]
 
   const styles = StyleSheet.create({
     icons: {
@@ -228,12 +229,18 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
       <OrderHeader>
         {!props.isCustomView ? (
           <OText size={13} style={{ marginBottom: 5 }}>
-            {deliveryDate()}
+            <>
+              {cateringTypes.includes(order?.delivery_type) ? `${t('CREATED_AT', 'Created at')}: ${parseDate(order?.created_at)}\n` : ''}
+              {cateringTypes.includes(order?.delivery_type) ? `${t('PLACED_TO', 'Placed to')}: ` : ''}{deliveryDate()}
+            </>
           </OText>
         ) : (
           <Header style={{ alignItems: 'center' }}>
             <OText size={13} style={{ marginBottom: 5 }}>
-              {deliveryDate()}
+              <>
+                {cateringTypes.includes(order?.delivery_type) ? `${t('CREATED_AT', 'Created at')}: ${parseDate(order?.created_at)}\n` : ''}
+                {cateringTypes.includes(order?.delivery_type) ? `${t('PLACED_TO', 'Placed to')}: ` : ''}{deliveryDate()}
+              </>
             </OText>
 
             {(!order?.isLogistic || (!logisticOrderStatus?.includes(order?.status) && !order?.order_group)) && (

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

@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import { StyleSheet, TouchableOpacity, FlatList, RefreshControl } from 'react-native';
+import FastImage from 'react-native-fast-image';
 import { useTheme } from 'styled-components/native';
 import { useLanguage, useUtils } from 'ordering-components/native';
 import { Card, Logo, Information, Header, Badge } from './styles';
@@ -302,10 +303,14 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
               activeOpacity={1}>
               <Card key={order?.id}>
                 <Logo style={styles.logo}>
-                  <OIcon
-                    url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
-                    src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
+                  <FastImage
                     style={styles.icon}
+                    source={order.business?.logo?.includes('https') ? {
+                      uri: order.business?.logo,
+                      priority: FastImage.priority.high,
+                      cache: FastImage.cacheControl.immutable
+                    } : order.business?.logo ?? theme?.images?.dummies?.businessLogo}
+                    resizeMode={FastImage.resizeMode.cover}
                   />
                 </Logo>
                 <Information>

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

@@ -171,7 +171,8 @@ export const OrderItem = React.memo((props: any) => {
             style={styles.icon}
             source={order.business?.logo?.includes('https') ? {
               uri: order.business?.logo,
-              priority: FastImage.priority.normal,
+              priority: FastImage.priority.high,
+              cache: FastImage.cacheControl.immutable
             } : order.business?.logo ?? theme?.images?.dummies?.businessLogo}
             resizeMode={FastImage.resizeMode.cover}
           />

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

@@ -63,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,

package/themes/original/src/components/OrderDetails/index.tsx

@@ -134,6 +134,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const directionTypes = [2, 3, 4, 5]
   const activeStatus = [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26]
   const reorderStatus = [1, 2, 5, 6, 10, 11, 12]
+  const cateringTypes = [7, 8]
   const [isPickup, setIsPickup] = useState(order?.delivery_type === 2)
   const enabledPoweredByOrdering = configs?.powered_by_ordering_module?.value
   const isGiftCardOrder = !order?.business_id
@@ -361,7 +362,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }, [props?.order?.error, props?.order?.loading])
 
-
   useEffect(() => {
     if (!order?.delivery_type) return
     setIsPickup(order?.delivery_type === 2)
@@ -461,15 +461,18 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               <NavBar
                 hideArrowLeft
                 title={`${t('ORDER', 'Order')} #${order?.id}`}
-                titleAlign={'center'}
+                titleAlign={'left'}
                 showCall={false}
                 btnStyle={{ paddingLeft: 0 }}
                 style={{ marginTop: Platform.OS === 'ios' ? 0 : 20 }}
                 titleWrapStyle={{ paddingHorizontal: 0 }}
-                titleStyle={{ marginRight: 0, marginLeft: 0 }}
+                titleStyle={{ marginRight: 0, marginLeft: 0, paddingHorizontal: 0 }}
                 subTitle={!hideDeliveryDate && <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
                   {activeStatus.includes(order?.status) ? (
-                    <OrderEta order={order} />
+                    <>
+                      {cateringTypes.includes(order?.delivery_type) ? `${t('CREATED_AT', 'Created at')}: ${parseDate(order?.created_at)}\n` : ''}
+                      {cateringTypes.includes(order?.delivery_type) ? `${t('PLACED_TO', 'Placed to')}:` : ''} <OrderEta order={order} />
+                    </>
                   ) : (
                     parseDate(order?.reporting_data?.at[`status:${order.status}`])
                   )}