ordering-ui-react-native 0.23.67 → 0.23.69

package/package.json

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

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

@@ -470,7 +470,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
     }
   }, [isNetConnected, JSON.stringify(offlineActionsState.orders)]);
 
-
   const handleInitAnimation = () => {
     Animated.timing(
       spinValue,
@@ -682,6 +681,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
           {!currentOrdersGroup?.error?.length &&
             currentOrdersGroup?.orders?.length > 0 &&
             currentTabSelected !== 'logisticOrders' &&
+            !currentOrdersGroup?.loading &&
             (
               <PreviousOrders
                 orders={ordersFormatted}
@@ -701,6 +701,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
             )}
           {!logisticOrders?.error?.length &&
             logisticOrders && logisticOrders?.orders?.length > 0 &&
+            !logisticOrders?.loading &&
             currentTabSelected === 'logisticOrders' && (
               <PreviousOrders
                 orders={logisticOrders?.orders?.filter((order: any) => !order?.expired).map((order: any) => ({ ...order, isLogistic: true }))}
@@ -719,11 +720,10 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
                 (currentOrdersGroup?.pagination?.total === null && isNetConnected) ||
                 logisticOrders?.loading
               ) &&
-              !currentOrdersGroup?.error?.length &&
-              !currentOrdersGroup?.orders?.length
+              !currentOrdersGroup?.error?.length
             ) || internetLoading
           ) && (
-              <View>
+              <View style={{ marginTop: 10 }}>
                 {[...Array(5)].map((_, i) => (
                   <Placeholder key={i} Animation={Fade}>
                     <View
@@ -775,7 +775,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
               (currentOrdersGroup?.error?.length ||
                 currentOrdersGroup?.orders?.length === 0)) ||
               (currentTabSelected === 'logisticOrders' &&
-                (logisticOrders && logisticOrders?.error?.length > 0 || logisticOrders?.orders?.length === 0 || !logisticOrders?.orders?.some(order => !order?.expired)))
+                (logisticOrders && !logisticOrders?.loading && (logisticOrders?.error?.length > 0 || logisticOrders?.orders?.length === 0 || !logisticOrders?.orders?.some(order => !order?.expired))))
             ) &&
             (
               <NotFoundSource

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

@@ -171,7 +171,7 @@ export const OrderItem = React.memo((props: any) => {
             timeState={order?.time_status}
           />
         )}
-        <Logo style={styles.logo}>
+        <Logo style={styles.logo} hasExternalAndGroup={showExternalId && order?.order_group_id}>
           <FastImage
             style={styles.icon}
             source={order.business?.logo?.includes('https') ? {
@@ -182,7 +182,7 @@ export const OrderItem = React.memo((props: any) => {
             resizeMode={FastImage.resizeMode.cover}
           />
         </Logo>
-        <Information>
+        <Information hasExternalAndGroup={showExternalId && order?.order_group_id}>
           {!!order?.order_group_id && (
             <OText>
               <OText>{(t('INVOICE_GROUP_NO', 'Group No.') + order?.order_group_id)}</OText>
@@ -217,7 +217,7 @@ export const OrderItem = React.memo((props: any) => {
             </NotificationIcon>
           )}
           <View>
-            {!order?.order_group_id && showExternalId && !order?.order_group && (
+            {showExternalId && (
               <OText
                 style={styles.date}
                 color={theme.colors.unselectText}

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/original/src/components/OrderDetails/index.tsx

@@ -474,10 +474,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   {activeStatus.includes(order?.status) ? (
                     <>
                       {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} />
+                      {cateringTypes.includes(order?.delivery_type) ? `${t('PLACED_TO', 'Placed to')}:` : ''} <OrderEta order={order} outputFormat={`YYYY-MM-DD ${configs?.general_hour_format?.value}`}  />
                     </>
                   ) : (
-                    parseDate(order?.reporting_data?.at[`status:${order.status}`])
+                    parseDate(order?.reporting_data?.at[`status:${order.status}`], { outputFormat: `YYYY-MM-DD ${configs?.general_hour_format?.value}` })
                   )}
                 </OText>}
               />