fix: ui fix 2

apps/retail/components/header/index.tsx

@@ -29,7 +29,8 @@ const cartIconBlackList: string[] = [
   '/paymentMode',
   '/signUp',
   '/invoiceDetails',
-  '/'
+  '/',
+  '/cart'
 ]
 
 const backIconList = ['/', '/signin']
@@ -128,10 +129,10 @@ const TopHeader: React.FC<TopHeaderProps> = ({ handleMenuClick }) => {
       >
         <Box className={styles.top_header_wrapper}>
           <Box>
-            {/* <Image
-              src="/images/Suppliflow_app_logo.svg"
+            <Image
+              src="/images/headerLogo.svg"
               alt="App logo"
-            /> */}
+            />
           </Box>
           <Flex columnGap={['10px', '10px', '2rem', '2rem']}>
             {!homeIconBlackList.includes(router.pathname) && (

apps/retail/lib/config.ts

@@ -0,0 +1 @@
+export const DOMAIN = 'retail:1.1.0'

apps/retail/pages/cart/cart.tsx

@@ -8,6 +8,7 @@ import { Cart as BecknCart } from '@beckn-ui/becknified-components'
 import { useSelectMutation } from '@services/select'
 import { getSelectPayload } from './cart.utils'
 import { cartActions } from '@store/cart-slice'
+import { DOMAIN } from '@lib/config'
 
 import { ICartRootState } from '@lib/types'
 import { DiscoveryRootState } from '@store/discovery-slice'
@@ -24,7 +25,7 @@ const Cart = () => {
   const { transactionId, productList } = useSelector((state: DiscoveryRootState) => state.discovery)
 
   useEffect(() => {
-    fetchQuotes(getSelectPayload(items, transactionId))
+    fetchQuotes(getSelectPayload(items, transactionId, DOMAIN))
   }, [totalQuantity])
 
   const onOrderClick = () => {
@@ -53,7 +54,7 @@ const Cart = () => {
               dispatch(cartActions.removeItemFromCart(id))
             }
           })),
-          loader: { text: 'Loading....' },
+          loader: { text: 'Loading cart' },
           orderSummary: {
             totalAmount: {
               price: totalAmount

apps/retail/pages/cart/cart.utils.tsx

@@ -37,8 +37,8 @@ export const getSelectPayload = (inputData: any, transactionId: string, domain =
         const orderIndex = orders.findIndex(order => order.provider.id === item.providerId)
         const newItem = {
           id: item.id,
-          selected: {
-            quantity: {
+          quantity: {
+            selected: {
               count: item.quantity
             }
           }
@@ -52,9 +52,11 @@ export const getSelectPayload = (inputData: any, transactionId: string, domain =
             provider: {
               id: item.providerId
             },
-            fulfillments: item.fulfillments.map(fulfillment => ({
-              id: fulfillment.id
-            }))
+            fulfillments:
+              item.fulfillments &&
+              item.fulfillments.map(fulfillment => ({
+                id: fulfillment.id
+              }))
           })
         }
       })

apps/retail/pages/checkout/checkout.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { Box, Flex, Text, Stack, Checkbox } from '@chakra-ui/react'
-
+import { DOMAIN } from '@lib/config'
 import { useLanguage } from '../../hooks/useLanguage'
 
 import { CartItemForRequest, DataPerBpp, ICartRootState, TransactionIdRootState } from '@lib/types/cart'
@@ -18,7 +18,7 @@ import { Checkout } from '@beckn-ui/becknified-components'
 
 import { Router, useRouter } from 'next/router'
 import { ShippingFormInitialValuesType } from '@beckn-ui/becknified-components'
-import { CheckoutRootState } from '@store/checkout-slice'
+import { CheckoutRootState, checkoutActions } from '@store/checkout-slice'
 import { cartActions } from '@store/cart-slice'
 import cart from '@beckn-ui/becknified-components/src/components/cart'
 
@@ -62,15 +62,16 @@ const CheckoutPage = () => {
     pinCode: '75001'
   })
 
+  const [isBillingSame, setIsBillingSame] = useState(true)
+
   const router = useRouter()
   const initRequest = useRequest()
   const dispatch = useDispatch()
   const [initialize, { isLoading }] = useInitMutation()
   const { t, locale } = useLanguage()
   const cartItems = useSelector((state: ICartRootState) => state.cart.items)
-  const totalAmount = useSelector((state: ICartRootState) => state.cart.totalAmount)
   const initResponse = useSelector((state: CheckoutRootState) => state.checkout.initResponse)
-  console.log('Dank init', initResponse)
+  const isBillingSameRedux = useSelector((state: CheckoutRootState) => state.checkout.isBillingSame)
   const { transactionId, productList } = useSelector((state: DiscoveryRootState) => state.discovery)
 
   useEffect(() => {
@@ -119,9 +120,13 @@ const CheckoutPage = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [billingFormData])
 
+  // useEffect(()=>{
+  //   setIsBillingSame(isBillingSameRedux)
+  // },[])
+
   const formSubmitHandler = (data: any) => {
     if (data) {
-      getInitPayload(data, billingFormData, cartItems, transactionId)
+      getInitPayload(data, billingFormData, cartItems, transactionId, DOMAIN)
         .then(res => {
           console.log('Dank checkout', res)
           return initialize(res)
@@ -163,7 +168,7 @@ const CheckoutPage = () => {
               title: singleItem.name,
               description: singleItem.short_desc,
               quantity: singleItem.quantity,
-              priceWithSymbol: `${t.currencySymbol}${totalAmount}`,
+              priceWithSymbol: `${t.currencySymbol}${singleItem.totalPrice}`,
               image: singleItem.images[0].url
             }))
           },
@@ -187,6 +192,11 @@ const CheckoutPage = () => {
             sectionTitle: 'Billing',
             formTitle: 'Add Billing Details',
             isBilling: true,
+            isChecked: isBillingSameRedux,
+            onCheckChange: () => {
+              // setIsBillingSame(!isBillingSame)
+              dispatch(checkoutActions.setIsBillingSame({ isBillingSame: !isBillingSameRedux }))
+            },
             showDetails: isInitResultPresent(),
             shippingDetails: {
               name: submittedDetails.name,

apps/retail/pages/checkout/checkout.utils.tsx

@@ -174,7 +174,8 @@ export const getInitPayload = async (
   deliveryAddress: any,
   billingAddress: any,
   cartItems: any,
-  transaction_id: string
+  transaction_id: string,
+  domain: string = 'retail:1.1.0'
 ) => {
   const cityData = await geocodeFromPincode(deliveryAddress.pinCode)
 
@@ -192,7 +193,7 @@ export const getInitPayload = async (
         transaction_id: transaction_id,
         bpp_id: bpp_id,
         bpp_uri: items[0].bpp_uri,
-        domain: 'retail'
+        domain: domain
       },
       message: {
         orders: transformOrdersByProvider(items)
@@ -214,8 +215,8 @@ export const getInitPayload = async (
       const providerId = group[0].providerId
       const items = group.map(item => ({
         id: item.id,
-        selected: {
-          quantity: {
+        quantity: {
+          selected: {
             count: item.quantity
           }
         }

apps/retail/pages/product.tsx

@@ -2,19 +2,25 @@ import Router from 'next/router'
 import React, { useEffect, useState } from 'react'
 import { ProductDetailPage } from '@beckn-ui/becknified-components'
 import { RetailItem } from '@lib/products'
+import { ProductCard } from '@beckn-ui/becknified-components'
 import { LocalStorage, ICartProduct, ICart, LocalStorageCart, LocalStorageCartItem } from '@lib/types'
 import { cartActions } from '@store/cart-slice'
 import { useDispatch, useSelector } from 'react-redux'
+import useResponsive from '@beckn-ui/becknified-components/src/hooks/useResponsive'
 import { toast } from 'react-toastify'
 import { setLocalStorage, getLocalStorage, addLocalStorage } from '@utils/localstorage'
 import { fromBinary } from '@utils/common-utils'
+import { useRouter } from 'next/router'
 import { DiscoveryRootState } from '@store/discovery-slice'
 import { Box, Flex, useTheme } from '@chakra-ui/react'
 import { Button, CustomThemeType, Input, Typography } from '@beckn-ui/molecules'
 
 const Product = () => {
   const theme = useTheme<CustomThemeType>()
   const selectedProduct = useSelector((state: DiscoveryRootState) => state.discovery.selectedProduct)
+  const productList = useSelector((state: DiscoveryRootState) => state.discovery.productList)
+  const { isMobile, isTablet, isDesktop } = useResponsive()
+  console.log('Dank list', productList, isMobile, isTablet, isDesktop)
   const dispatch = useDispatch()
   const [counter, setCounter] = useState(1)
   const [totalPrice, setTotalPrice] = useState(selectedProduct.item.price.value)
@@ -34,22 +40,33 @@ const Product = () => {
       setTotalPrice(newTotalPrice)
     }
   }
+  const router = useRouter()
 
   if (!selectedProduct) {
     return <></>
   }
   return (
-    <Box
-      className="hideScroll"
-      maxH={'calc(100vh - 100px)'}
-      overflowY="scroll"
-    >
+    <>
       <ProductDetailPage
         schema={{
           productSummary: {
             imageSrc: selectedProduct.item.images[0].url,
             name: selectedProduct.item.name,
             secondaryDescription: selectedProduct.item.long_desc,
+            // secondaryCTAs:[
+            //   {
+            //     text: 'Add to cart',
+            //     handleClick: () => {
+            //       dispatch(
+            //         cartActions.addItemToCart({
+            //           product: selectedProduct,
+            //           quantity: 1
+            //         })
+            //       )
+            //       toast.success('Product added to cart')
+            //     }
+            //   }
+            // ],
             starRating: {
               rating: 4.5,
               size: 20,
@@ -128,8 +145,50 @@ const Product = () => {
           }}
         />
       </Box>
-    </Box>
+    </>
   )
 }
 
 export default Product
+
+{
+  /* {
+      !(isMobile || isTablet) && <Flex overflow='hidden'>
+        {
+      Array(5).fill([...productList]).flat().map((singleItem,idx)=>{
+        const { item } = singleItem
+        const product = {
+          id: item.id,
+          images: item.images.map(singleImage => singleImage.url),
+          name: item.name,
+          price: item.price.value,
+          rating: '4',
+          shortDesc: item.short_desc
+        }
+        return (
+          <ProductCard
+            key={idx}
+            productClickHandler={e => {
+              e.preventDefault()
+              dispatch(discoveryActions.addSingleProduct({ product: singleItem }))
+              router.push({
+                pathname: '/product',
+                query: {
+                  id: item.id,
+                  search: searchKeyword
+                }
+              })
+            }}
+            product={product}
+            currency={item.price.currency}
+          />
+        )
+
+      })
+    }
+
+
+      </Flex>
+
+    } */
+}