ordering-ui-react-native 0.17.54-release → 0.17.55-release

package/package.json

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

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

@@ -342,7 +342,7 @@ export const AcceptOrRejectOrder = (props: AcceptOrRejectOrderParams) => {
                         )}
                       </OText>
 
-                      {numberToShow ? (
+                      {!!numberToShow ? (
                         <OButton
                           bgColor="transparent"
                           borderColor={theme.colors.primary}

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

@@ -855,7 +855,7 @@ const ChatUI = (props: MessagesParams) => {
                       iconCover
                     />
 
-                    {image && !isShowSignaturePad && (
+                    {!!image && !isShowSignaturePad && (
                       <TouchableOpacity
                         style={{
                           position: 'absolute',

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

@@ -209,11 +209,11 @@ const LoginFormUI = (props: LoginParams) => {
     props.handleChangeTab(val);
 
     if (loginTab === 'email') {
-      scrollRefTab.current?.scrollToEnd({ animated: true });
+      scrollRefTab?.current?.scrollToEnd && scrollRefTab.current?.scrollToEnd({ animated: true });
     }
 
     if (loginTab === 'cellphone') {
-      scrollRefTab.current?.scrollTo({ animated: true });
+      scrollRefTab?.current?.scrollTo && scrollRefTab.current?.scrollTo({ animated: true });
     }
   };
 

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

@@ -97,7 +97,7 @@ const NewOrderNotificationUI = (props: any) => {
     if (evtType === 3 || value.author_id === user.id) return
     setTimeout(() => handlePlayNotificationSound({
       evt: evtType,
-      orderId: value?.driver ? value?.order_id : evtList[evtType].event === 'messages' ? value?.order?.id : value?.id
+      orderId: value?.driver ? value?.order_id : evtList[evtType].event === 'messages' ? value?.order?.id : value?.order_id
     }), 1000)
   }
 

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

@@ -18,7 +18,7 @@ export const NotFoundSource = (props: NotFoundSourceParams) => {
           <OIcon src={errorImage} width={260} height={220} />
         </NotFoundImage>
       )}
-      {content && conditioned && !errorImage && (
+      {!!content && conditioned && !errorImage && (
         <OText
           color={theme.colors.textSecondary}
           size={textSize ?? 18}
@@ -26,7 +26,7 @@ export const NotFoundSource = (props: NotFoundSourceParams) => {
           {content}
         </OText>
       )}
-      {content && !conditioned && (
+      {!!content && !conditioned && (
         <OText
           color={theme.colors.textSecondary}
           size={textSize ?? 18}

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

@@ -410,7 +410,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           </View>
         )}
 
-      {(!!error || error) && (
+      {(!!error || error?.length > 0) && (
         <NotFoundSource
           btnTitle={t('GO_TO_MY_ORDERS', 'Go to my orders')}
           content={

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

@@ -263,7 +263,7 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
             )}
           </>
         </OText>
-        {!order?.isLogistic && order?.delivery_type && (!order?.order_group_id || !logisticOrderStatus?.includes(order?.status)) && (
+        {!order?.isLogistic && !!order?.delivery_type && (!order?.order_group_id || !logisticOrderStatus?.includes(order?.status)) && (
           <>
             <OText size={13}>
               <OText size={13} weight='bold'>{`${t('ORDER_TYPE', 'Order Type')}: `}</OText>

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

@@ -149,7 +149,7 @@ export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
                                     keyboardShouldPersistTaps="handled"
                                     showsVerticalScrollIndicator={false}
                                 >
-                                    {order?.order_group && order?.order_group_id && order?.isLogistic ? order?.order_group?.orders.map((order: any, i: number, hash: any) => (
+                                    {order?.order_group && !!order?.order_group_id && order?.isLogistic ? order?.order_group?.orders.map((order: any, i: number, hash: any) => (
                                         <OrderDetailsInformation key={order?.id} order={order} isOrderGroup lastOrder={hash?.length === i + 1} />
                                     )) : (
                                         <OrderDetailsInformation order={order} />

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

@@ -276,7 +276,7 @@ export const OrderMessageUI = (props: OrderDetailsParams) => {
 
             <View style={styles.titleGroups}>
               <View style={styles.shadow}>
-                {order?.business?.logo ? (
+                {!!order?.business?.logo ? (
                   <OIcon
                     url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
                     style={styles.titleIcons}

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

@@ -144,7 +144,7 @@ export const OrderItem = (props: any) => {
       onPress={() => handlePressOrder({ ...order, logistic_order_id: _order?.id })}
     >
       <Card key={order.id}>
-        {allowColumns?.slaBar && (
+        {!!allowColumns?.slaBar && (
           <Timestatus
             style={{
               backgroundColor: getStatusClassName(getDelayMinutes(order)) === 'in_time'
@@ -194,7 +194,7 @@ export const OrderItem = (props: any) => {
               numberOfLines={1}
               adjustsFontSizeToFit
             >
-              {(order?.order_group_id && order?.order_group && isLogisticOrder
+              {(!!order?.order_group_id && order?.order_group && isLogisticOrder
                   ? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}`
                   : (t('NO', 'Order No.') + order.id)
                 ) + ' · '}

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

@@ -371,7 +371,7 @@ export const PreviousOrders = (props: any) => {
                       })}
                     />
                   )}
-                  {deliveryPickupBtn && deliveryPickupBtn?.includes(_ordersGrouped[k][0]?.status) && (
+                  {!!deliveryPickupBtn && deliveryPickupBtn?.includes(_ordersGrouped[k][0]?.status) && (
                     <AcceptOrRejectOrderStyle>
                       <OButton
                         text={t('PICKUP_FAILED', 'Pickup failed')}
@@ -403,7 +403,7 @@ export const PreviousOrders = (props: any) => {
                       />
                     </AcceptOrRejectOrderStyle>
                   )}
-                  {deliveryStatusCompleteBtn && deliveryStatusCompleteBtn.includes(_ordersGrouped[k][0]?.status) && (
+                  {!!deliveryStatusCompleteBtn && deliveryStatusCompleteBtn.includes(_ordersGrouped[k][0]?.status) && (
                     <AcceptOrRejectOrderStyle>
                       <OButton
                         text={t('DELIVERY_FAILED', 'Delivery Failed')}

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

@@ -161,7 +161,7 @@ const ReviewCustomerUI = (props: ReviewCustomerParams) => {
   useEffect(() => {
     if (scrollref?.current) {
       Keyboard.addListener('keyboardDidShow', () => {
-        scrollref?.current && scrollref.current.scrollToEnd()
+        scrollref?.current?.scrollToEnd && scrollref.current.scrollToEnd()
       })
     }
   }, [scrollref?.current])

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

@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, Dimensions, Linking } from 'react-native';
-import { ScrollView, TouchableOpacity } from 'react-native-gesture-handler';
+import { View, StyleSheet, Dimensions, Linking, ScrollView, TouchableOpacity } from 'react-native';
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
 import NetInfo from '@react-native-community/netinfo';
 import { useTheme } from 'styled-components/native';

package/themes/kiosk/src/components/Intro/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { StyleSheet, View, RefreshControl, ScrollView, Pressable } from 'react-native';
+import { StyleSheet, View, Pressable, TouchableOpacity } from 'react-native';
 import { useLanguage } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 
@@ -9,6 +9,7 @@ import OButton from '../../components/shared/OButton';
 import { LanguageSelector } from '../../components/LanguageSelector';
 import { LogoutPopup } from '../../components/LogoutPopup';
 import { PORTRAIT, LANDSCAPE, useDeviceOrientation } from "../../../../../src/hooks/DeviceOrientation";
+import { OIcon } from '../../components/shared';
 
 const Intro = (props: any): React.ReactElement => {
   const { navigation } = props;
@@ -41,6 +42,19 @@ const Intro = (props: any): React.ReactElement => {
     //     />
     //   }
     // >
+    <>
+      <View style={{ position: 'absolute', top: 25, right: 20, zIndex: 1000 }}>
+        <TouchableOpacity
+          onPress={() => setShowLogoutPopup(true)}
+        >
+          <OIcon
+            src={theme.images.general.menulogout}
+            width={24}
+            height={24}
+            color={theme.colors.disabledContrast}
+          />
+        </TouchableOpacity>
+      </View>
       <Pressable onPress={goBusiness}>
         <View style={{ height: orientationState?.dimensions?.height }}>
           {orientationState.orientation === PORTRAIT ? (
@@ -134,6 +148,7 @@ const Intro = (props: any): React.ReactElement => {
           />
         </View>
       </Pressable>
+    </>
     // </ScrollView>
   );
 };

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

@@ -146,7 +146,7 @@ export const BusinessBasicInformation = (
 	}
 
 	const getBusinessType = () => {
-		if (Object.keys(business).length <= 0) return t('GENERAL', 'General');
+		if (Object.keys(business || {}).length <= 0) return t('GENERAL', 'General');
 		const _types: any = [];
 		types.forEach(
 			(type) =>

package/themes/original/src/components/BusinessBasicInformation/styles.tsx

@@ -33,11 +33,6 @@ export const WrapReviews = styled.View`
   align-items: center;
   justify-content: flex-start;
 `;
-export const WrapBusinessInfo = styled.TouchableOpacity`
-  position: absolute;
-  top: 16px;
-  end: 39px;
-`;
 
 export const TitleWrapper = styled.View`
   width: 100%;
@@ -49,6 +44,7 @@ export const RibbonBox = styled.View`
   padding: 2px 8px;
   max-width: 180px;
   align-self: flex-start;
+  margin-bottom: 5px;
 
   ${(props: any) => props.bgColor && css`
     background-color: ${props.bgColor};

package/themes/original/src/components/BusinessListingSearch/styles.tsx

@@ -4,11 +4,6 @@ export const BContainer = styled.View`
   padding: 20px 40px;
 `
 
-export const WrapHeader = styled.View`
-  width: 100%;
-	padding-vertical: 20px;
-`
-
 export const SearchWrapper = styled.View`
 
 `
@@ -53,12 +48,6 @@ export const SingleBusinessContainer = styled.View`
   justify-content: space-between;
 `
 
-export const LoadMoreBusinessContainer = styled.View`
-  align-items: center;
-  justify-content: center;
-  margin-left: 20px;
-`
-
 export const TagsContainer = styled.View`
   padding-bottom: 10px;
 `
@@ -80,13 +69,6 @@ export const PriceFilterWrapper = styled.View`
   margin-bottom: 20px;
 `
 
-export const OptionTitle = styled.View`
-	margin-top: 24px;
-	${(props: any) => props.titleContent && css`
-		margin-left: ${() => props.isBusinessesSearchList ? '0' : '40px'};
-	`}
-`
-
 export const WrapperButtons = styled.View`
   flex-direction: row;
   width: 100%;

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

@@ -691,8 +691,8 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
         <ServiceForm
           navigation={navigation}
           product={currentProduct}
-          businessSlug={business.slug}
-          businessId={business.id}
+          businessSlug={business?.slug}
+          businessId={business?.id}
           professionalList={business?.professionals}
           professionalSelected={professionalSelected}
           handleChangeProfessional={handleChangeProfessionalSelected}

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -605,7 +605,6 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 						<BusinessController
 							key={`${business.id}_` + i}
 							enableIntersection
-							isCustomLayout={isChewLayout}
 							business={business}
 							isBusinessOpen={business.open}
 							handleCustomClick={handleBusinessClick}

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

@@ -63,7 +63,11 @@ const PageBannerUI = (props: any) => {
 				businessSlug: slug,
 				businessId: action.business_id,
         categoryId: action.category_id,
-        productId: action.product_id
+        productId: action.product_id,
+        isRedirect: 'business',
+        business: {
+          store: slug
+        }
 			})
     }
     const clickedBanner = pageBannerState.result.find(banner => banner.id === item?.banner_id)
@@ -121,33 +125,37 @@ const PageBannerUI = (props: any) => {
         <>
           {pageBannerState.banner?.items && pageBannerState.banner?.items.length > 0 && (
             <PageBannerWrapper>
-              <TouchableOpacity
-                style={[styles.swiperButton, { left: 25 }]}
-                onPress={() => carouselRef.current.snapToPrev()}
-              >
-                <IconAntDesign
-                  name="caretleft"
-                  color={theme.colors.white}
-                  size={13}
-                />
-              </TouchableOpacity>
-              <TouchableOpacity
-                style={[styles.swiperButton, { right: 25 }]}
-                onPress={() => carouselRef.current.snapToNext()}
-              >
-                <IconAntDesign
-                  name="caretright"
-                  color={theme.colors.white}
-                  size={13}
-                />
-              </TouchableOpacity>
+              {pageBannerState.banner?.items.length > 1 && (
+                <>
+                  <TouchableOpacity
+                    style={[styles.swiperButton, { left: 25 }]}
+                    onPress={() => carouselRef.current.snapToPrev()}
+                  >
+                    <IconAntDesign
+                      name="caretleft"
+                      color={theme.colors.white}
+                      size={13}
+                    />
+                  </TouchableOpacity>
+                  <TouchableOpacity
+                    style={[styles.swiperButton, { right: 25 }]}
+                    onPress={() => carouselRef.current.snapToNext()}
+                  >
+                    <IconAntDesign
+                      name="caretright"
+                      color={theme.colors.white}
+                      size={13}
+                    />
+                  </TouchableOpacity>
+                </>
+              )}
               <Carousel
                 ref={carouselRef}
                 loop={pageBannerState.banner?.items.length > 1}
                 data={pageBannerState.banner?.items}
                 renderItem={renderItem}
-                sliderWidth={windowWidth - 80}
-                itemWidth={windowWidth - 80}
+                sliderWidth={windowWidth}
+                itemWidth={windowWidth}
                 inactiveSlideScale={1}
                 pagingEnabled
                 removeClippedSubviews={false}

package/themes/original/src/components/PageBanner/styles.tsx

@@ -1,10 +1,7 @@
 import styled from 'styled-components/native'
 
 export const PageBannerWrapper = styled.View`
-  margin-horizontal: 40px;
-  border-radius: 8px;
   overflow: hidden;
-  margin-vertical: 30px;
   position: relative;
   flex-direction: row;
   align-items: center;