ordering-ui-react-native 0.17.87 → 0.17.89

package/package.json

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

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

@@ -78,8 +78,7 @@ const MultiCheckoutUI = (props: any) => {
 
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
   const isPreOrder = configs?.preorder_status_enabled?.value === '1'
-  const maximumCarts = 5
-  const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || openCarts.length > maximumCarts || (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data)
+  const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data)
   const walletCarts = (Object.values(carts)?.filter((cart: any) => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && cart?.wallets) || null) || []
 
   const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
@@ -292,11 +291,6 @@ const MultiCheckoutUI = (props: any) => {
                   </OText>
                 </ChCartsTotal>
               )}
-              {openCarts.length > maximumCarts && (
-                <OText size={14} color={theme.colors.danger5} style={{ marginVertical: 20 }}>
-                  {t('WARNING_MAXIMUM_CARTS', 'You can only pay for a maximum of 5 carts, please discard one or more to continue.')}
-                </OText>
-              )}
             </ChCarts>
           </ChSection>
         </ChContainer>

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

@@ -70,23 +70,25 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 	const _orders = customArray || values || []
 	const uniqueOrders: any = []
 
-
 	useEffect(() => {
 		if (loading || error) return
 		const ordersReduced = _orders.map((order: any) => order?.cart_group_id
-		? _orders
-				?.filter((_order : any) => _order?.cart_group_id === order?.cart_group_id)
-				?.reduce((orderCompleted : any, currentOrder : any) => ({
-					...orderCompleted,
-					total: orderCompleted.summary?.total + currentOrder?.summary?.total,
-					business: [orderCompleted.business, currentOrder.business].flat(),
-					business_id: [orderCompleted.business_id, currentOrder.business_id].flat(),
-					id: [orderCompleted.id, currentOrder.id].flat(),
-					review: orderCompleted.review && currentOrder.review,
-					user_review: orderCompleted.user_review && currentOrder.user_review,
-					products: [orderCompleted.products, currentOrder.products].flat()
-				}))
-				: order)
+      ? _orders
+        .filter((_order: any) => _order?.cart_group_id === order?.cart_group_id)
+        .map((_o: any, _: any, _ordersList: any) => {
+          const obj = {
+            ..._o,
+            id: _ordersList.map(o => o.id),
+            review: _o.review,
+            user_review: _o.user_review,
+            total: _ordersList.reduce((acc: any, o: any) => acc + o.summary.total, 0),
+            business: _ordersList.map((o: any) => o.business),
+            business_id: _ordersList.map((o: any) => o.business_id),
+            products: _ordersList.map((o: any) => o.products)
+          }
+          return obj
+        }).find((o: any) => o)
+      : order)
 		const orders = ordersReduced?.filter((order: any) => {
 			if (!order?.cart_group_id) return true
 			const isDuplicate = uniqueOrders.includes(order?.cart_group_id)

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

@@ -11,8 +11,8 @@ import {
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { SingleProductCardParams } from '../../types';
-import { CardInfo, SoldOut, QuantityContainer, PricesContainer, RibbonBox, LogoWrapper, WrapTags, TagsContainer } from './styles';
-import { StyleSheet, View } from 'react-native';
+import { CardInfo, SoldOut, QuantityContainer, PricesContainer, RibbonBox, LogoWrapper, TagsContainer } from './styles';
+import { ScrollView, StyleSheet, TouchableWithoutFeedback, View } from 'react-native';
 import { InView } from 'react-native-intersection-observer'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import { OButton, OIcon, OText } from '../shared';
@@ -104,7 +104,7 @@ const SingleProductCardUI = React.memo((props: SingleProductCardParams) => {
 			color: '#808080',
 			textDecorationLine: 'line-through',
 			marginLeft: 7,
-			marginRight: 7
+			marginRight: 0
 		},
 		productTagsStyle: {
 			width: 30,
@@ -215,21 +215,29 @@ const SingleProductCardUI = React.memo((props: SingleProductCardParams) => {
 								{product?.offer_price !== null && !!product?.in_offer && (
 									<OText style={styles.regularPriceStyle}>{product?.offer_price ? parsePrice(product?.offer_price) : ''}</OText>
 								)}
-								{product?.tags && product?.tags.length > 0 && (
-									<WrapTags>
+								{!isPreviously && product?.tags && product?.tags.length > 0 && (
+									<ScrollView
+										showsVerticalScrollIndicator={false}
+										showsHorizontalScrollIndicator={false}
+										horizontal
+										style={{ marginLeft: 10 }}
+										contentContainerStyle={{flexGrow: 1}}
+									>
 										{product?.tags.map((tag: any, i: any) => (
-											<TagsContainer key={i}>
-												<FastImage
-													style={styles.productTagsStyle}
-													source={tag.image ? {
-														uri: optimizeImage(tag.image, 'h_250,c_limit'),
-														priority: FastImage.priority.normal,
-													} : theme?.images?.dummies?.product}
-													resizeMode={FastImage.resizeMode.cover}
-												/>
-											</TagsContainer>
+											<TouchableWithoutFeedback key={i}>
+												<TagsContainer>
+													<FastImage
+														style={styles.productTagsStyle}
+														source={tag.image ? {
+															uri: optimizeImage(tag.image, 'h_250,c_limit'),
+															priority: FastImage.priority.normal,
+														} : theme?.images?.dummies?.product}
+														resizeMode={FastImage.resizeMode.cover}
+													/>
+												</TagsContainer>
+											</TouchableWithoutFeedback>
 										))}
-									</WrapTags>
+									</ScrollView>
 								)}
 							</PricesContainer>
 							{!hideProductDescription && (

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

@@ -33,6 +33,7 @@ export const LogoWrapper = styled.View`
 export const WrapTags = styled.View`
   display: flex;
   flex-direction: row;
+  justify-content: flex-start;
   margin-left: 10px;
 `
 export const TagsContainer = styled.View`