ordering-ui-react-native 0.17.4 → 0.17.6

package/package.json

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

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

@@ -14,6 +14,7 @@ import { Container, WrappButton } from './styles'
 import { OButton } from '../shared';
 import { BusinessController } from '../BusinessController';
 import { SingleProductCard } from '../SingleProductCard';
+import { NotFoundSource } from '../NotFoundSource';
 import moment from 'moment';
 
 
@@ -224,6 +225,12 @@ const FavoriteListUI = (props: FavoriteParams) => {
               <BusinessSkeleton key={i} />
             ))
           )}
+          {!favoriteList?.loading && !favoriteList?.favorites?.length && (
+            <NotFoundSource
+              content={t('NOT_FOUND_FAVORITES_LIST', 'No favorites to show at this time.')
+              }
+            />
+          )}
         </>
       )}
 
@@ -250,6 +257,12 @@ const FavoriteListUI = (props: FavoriteParams) => {
               <OrderSkeleton key={i} />
             ))
           )}
+          {!favoriteList?.loading && !favoriteList?.favorites?.length && (
+            <NotFoundSource
+              content={t('NOT_FOUND_FAVORITES_LIST', 'No favorites to show at this time.')
+              }
+            />
+          )}
         </>
       )}
 
@@ -271,6 +284,12 @@ const FavoriteListUI = (props: FavoriteParams) => {
               <ProductSkeleton key={i} />
             ))
           )}
+          {!favoriteList?.loading && !favoriteList?.favorites?.length && (
+            <NotFoundSource
+              content={t('NOT_FOUND_FAVORITES_LIST', 'No favorites to show at this time.')
+              }
+            />
+          )}
         </>
       )}
 

package/themes/original/src/components/OrdersOption/PreviousProductsOrdered/index.tsx

@@ -11,6 +11,7 @@ export const PreviousProductsOrdered = (props: PreviousProductsOrderedParams) =>
   const {
     products,
     onProductClick,
+    handleUpdateProducts,
     isBusinessesSearchList
   } = props
 
@@ -28,12 +29,14 @@ export const PreviousProductsOrdered = (props: PreviousProductsOrderedParams) =>
         {products?.map((product: any) => (
             <SingleProductCard
               key={product?.id}
+              isProductId
               isSoldOut={(product.inventoried && !product.quantity)}
               product={product}
               businessId={product?.business?.id}
               onProductClick={onProductClick}
               style={style}
               productAddedToCartLength={0}
+              handleUpdateProducts={handleUpdateProducts}
             />
         ))}
       </>

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

@@ -48,7 +48,8 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		hideOrders,
 		BusinessControllerSkeletons,
 		businesses,
-		businessPaginationProps
+		businessPaginationProps,
+		handleUpdateProducts
 	} = props
 
 	const theme = useTheme();
@@ -234,6 +235,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 				<PreviousProductsOrdered
 					products={products}
 					onProductClick={onProductClick}
+					handleUpdateProducts={handleUpdateProducts}
 					isBusinessesSearchList={!!businessesSearchList}
 				/>
 			)}

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

@@ -68,7 +68,7 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 
 	const [, t] = useLanguage()
 	const [orderState] = useOrder()
-	const [{ parsePrice, optimizeImage }] = useUtils()
+	const [{ parsePrice, optimizeImage, parseDate }] = useUtils()
 
 	const [isActive, setActiveState] = useState(false)
 	// const [setHeight, setHeightState] = useState({ height: new Animated.Value(0) })
@@ -152,31 +152,44 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
 								)}
 							</ProductImage>
 						)}
-						{isCartProduct && !isCartPending && getProductMax && (
-							<ProductInfo>
-								<RNPickerSelect
-									items={productOptions}
-									onValueChange={handleChangeQuantity}
-									value={product.quantity.toString()}
-									style={pickerStyle}
-									useNativeAndroidPickerStyle={false}
-									placeholder={{}}
-									Icon={() => <View style={pickerStyle.icon}><OIcon src={theme.images.general.arrow_down} color={theme.colors.textNormal} width={8} /></View>}
-									disabled={orderState.loading}
-								/>
-							</ProductInfo>
-						)}
-						{isFromCheckout && (
-							<ProductQuantity>
-								<OText size={12} lineHeight={18}>
-									{product?.quantity}
+						{!!product?.calendar_event ? (
+							<View style={{ flex: 1, marginLeft: 10, flexDirection: 'column' }}>
+								<View>
+									<OText size={12} lineHeight={18} weight={'400'} numberOfLines={1}>{product?.name}</OText>
+								</View>
+								<OText size={10} color={theme.colors.textSecondary} style={{ marginTop: 3 }}>
+									{parseDate(product?.calendar_event?.start, { outputFormat: 'hh:mm a' })} - {parseDate(product?.calendar_event?.end, { outputFormat: 'hh:mm a' })}
 								</OText>
-							</ProductQuantity>
+							</View>
+						): (
+							<>
+								{isCartProduct && !isCartPending && getProductMax && (
+									<ProductInfo>
+										<RNPickerSelect
+											items={productOptions}
+											onValueChange={handleChangeQuantity}
+											value={product.quantity.toString()}
+											style={pickerStyle}
+											useNativeAndroidPickerStyle={false}
+											placeholder={{}}
+											Icon={() => <View style={pickerStyle.icon}><OIcon src={theme.images.general.arrow_down} color={theme.colors.textNormal} width={8} /></View>}
+											disabled={orderState.loading}
+										/>
+									</ProductInfo>
+								)}
+								{isFromCheckout && (
+									<ProductQuantity>
+										<OText size={12} lineHeight={18}>
+											{product?.quantity}
+										</OText>
+									</ProductQuantity>
+								)}
+								<View style={{ flex: 1 }}>
+									<OText size={12} lineHeight={18} weight={'400'}>{product.name}</OText>
+								</View>
+							</>
 						)}
-						<View style={{ flex: 1 }}>
-							<OText size={12} lineHeight={18} weight={'400'}>{product.name}</OText>
-						</View>
-						<View style={{ display: 'flex', flexDirection: 'column', flex: 1, alignItems: 'flex-end' }}>
+						<View style={{ display: 'flex', flexDirection: 'column', flex: 1, alignItems: 'flex-end', maxWidth: 100 }}>
 							<View style={{ flexDirection: 'row' }}>
 								<OText size={12} lineHeight={18} weight={'400'}>{parsePrice(product.total || product.price)}</OText>
 								{(productInfo().ingredients.length > 0 || productInfo().options.length > 0 || product.comment) && (

package/themes/original/src/types/index.tsx

@@ -306,6 +306,7 @@ export interface SingleProductCardParams {
 	enableIntersection?: boolean;
 	navigation?: any;
 	isPreviously?: any;
+	isProductId?: any;
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -360,6 +361,7 @@ export interface OrdersOptionParams {
 	refreshOrders?: boolean,
 	setRefreshOrders?: (value: boolean) => void,
 	handleUpdateOrderList?: (orderId: number, changes: any) => {},
+	handleUpdateProducts?: (productId: number, changes: any) => {},
 	isBusiness?: boolean,
 	isProducts?: boolean,
 	businessOrderIds?: any,
@@ -764,6 +766,8 @@ export interface OrderItAgainParams {
 
 export interface PreviousProductsOrderedParams {
 	products?: any,
+	isProductId?: boolean
 	onProductClick?: any,
 	isBusinessesSearchList?: boolean
+	handleUpdateProducts?: any
 }