ordering-ui-react-native 0.14.97 → 0.14.98

package/package.json

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

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

@@ -96,11 +96,24 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	}
 
 	const onProductClick = (product: any) => {
-    onRedirect('ProductDetails', {
-			product: product,
-      businessSlug: business.slug,
-      businessId: business.id,
-		})
+		const cartProduct = currentCart?.products?.find((cproduct: any) => cproduct?.id === product?.id)
+		if (cartProduct) {
+			onRedirect('ProductDetails', {
+				businessId:  business.id,
+				isCartProduct: true,
+				productCart: cartProduct,
+				businessSlug: business?.slug,
+				categoryId: cartProduct?.category_id,
+				productId: cartProduct?.id,
+			})
+		} else {
+			onRedirect('ProductDetails', {
+				product: product,
+				businessSlug: business.slug,
+				businessId: business.id,
+			})
+		}
+
 	}
 
 	const handleCancel = () => {

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

@@ -77,25 +77,18 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
 	const editMode = typeof product?.code !== 'undefined';
 
 	const removeToBalance = editMode ? product?.quantity : 0;
-	const cart = orderState.carts[`businessId:${businessId}`];
-	const productCart = cart?.products?.find(
-		(prod: any) => prod.id === product?.id,
-	);
-	const totalBalance = (productCart?.quantity || 0) - removeToBalance;
+	const cartProducts: any = Object.values(orderState.carts).reduce((products: any, _cart: any) => [...products, ..._cart?.products], [])
+	const productBalance = cartProducts.reduce((sum: any, _product: any) => sum + (_product.id === product?.id ? _product.quantity : 0), 0)
+
+	const totalBalance = (productBalance || 0) - removeToBalance
 
 	const maxCartProductConfig =
 		(stateConfig.configs.max_product_amount
 			? parseInt(stateConfig.configs.max_product_amount)
 			: 100) - totalBalance;
 
-	const productBalance =
-		(cart?.products?.reduce(
-			(sum: any, _product: any) =>
-				sum + (product && _product.id === product?.id ? _product.quantity : 0),
-			0,
-		) || 0) - removeToBalance;
 	let maxCartProductInventory =
-		(product?.inventoried ? product?.quantity : undefined) - productBalance;
+		(product?.inventoried ? product?.quantity : undefined) - totalBalance;
 	maxCartProductInventory = !isNaN(maxCartProductInventory)
 		? maxCartProductInventory
 		: maxCartProductConfig;