diff --git a/src/_nav.js b/src/_nav.js
index ca45fef..56e07e3 100644
--- a/src/_nav.js
+++ b/src/_nav.js
@@ -32,18 +32,18 @@ const _nav = [
to: '/shop',
icon: ,
},
- // {
- // component: CNavItem,
- // name: 'Cart',
- // to: '/cart',
- // icon: ,
- // },
- // {
- // component: CNavItem,
- // name: 'Orders Placed',
- // to: '/orders-placed',
- // icon: ,
- // },
+ {
+ component: CNavItem,
+ name: 'Cart',
+ to: '/cart',
+ icon: ,
+ },
+ {
+ component: CNavItem,
+ name: 'Orders Placed',
+ to: '/orders-placed',
+ icon: ,
+ },
// {
// component: CNavItem,
// name: 'Product manual',
diff --git a/src/views/orders/Order.js b/src/views/orders/Order.js
index c75f44a..53da22a 100644
--- a/src/views/orders/Order.js
+++ b/src/views/orders/Order.js
@@ -19,6 +19,7 @@ import { useNavigate } from 'react-router-dom'
const Order = () => {
const [orders, setOrders] = useState([])
+
const [loading, setLoading] = useState(true)
const [page, setPage] = useState(0)
const [rowsPerPage, setRowsPerPage] = useState(5)
@@ -46,7 +47,7 @@ const Order = () => {
// Fetch orders from the API with pagination
const fetchOrders = async () => {
try {
- const response = await Axios.get('/api/get-placed-order-pd', {
+ const response = await Axios.get('/api/rd-place-order', {
headers: {
'Access-Control-Allow-Origin': '*',
Authorization: `Bearer ${token}`,
@@ -57,7 +58,8 @@ const Order = () => {
limit: rowsPerPage, // number of rows per page
},
})
- setOrders(response.data.plcaedOrders)
+ console.log('resp', response)
+ setOrders(response.data?.placedOrders ? response.data?.placedOrders : [])
setTotalOrders(response.data.totalOrders) // Ensure the API returns the total count of orders
} catch (error) {
console.error('Error fetching orders:', error)
diff --git a/src/views/orders/OrderDetails.js b/src/views/orders/OrderDetails.js
index da30708..e9f2c96 100644
--- a/src/views/orders/OrderDetails.js
+++ b/src/views/orders/OrderDetails.js
@@ -27,7 +27,7 @@ const OrderDetails = () => {
const [ownerDetails, setOwnerDetails] = useState()
const getData = async () => {
- let res = await Axios.get(`/api/v1/user/details`, {
+ let res = await Axios.get(`/apird-get-me`, {
headers: {
Authorization: `Bearer ${token}`,
},
@@ -36,11 +36,11 @@ const OrderDetails = () => {
setOwnerDetails({ ...res.data.user })
}
}
- console.log('order', order)
+
useEffect(() => {
const fetchOrderDetails = async () => {
try {
- const response = await Axios.get(`/api/get-single-placed-order-pd/${id}`, {
+ const response = await Axios.get(`/api/rd-place-order/${id}`, {
headers: {
Authorization: `Bearer ${token}`,
},
@@ -53,7 +53,7 @@ const OrderDetails = () => {
setLoading(false)
}
}
- getData()
+ // getData()
fetchOrderDetails()
}, [id])
@@ -114,11 +114,11 @@ const OrderDetails = () => {
Payment Mode: {paymentMode}
-
+ {/*
SBU: {ownerDetails?.SBU}
-
+ */}
diff --git a/src/views/pages/cart/orderConfirmation.js b/src/views/pages/cart/orderConfirmation.js
index 4153e32..51c652d 100644
--- a/src/views/pages/cart/orderConfirmation.js
+++ b/src/views/pages/cart/orderConfirmation.js
@@ -21,19 +21,17 @@ const OrderConfirmation = ({ orderId, billTo, shipTo, paymentMode, cartItem }) =
const subtotal = useSelector(selectCartSubtotal)
const [ownerDetails, setOwnerDetails] = useState()
const token = isAutheticated()
- const getData = async () => {
- let res = await Axios.get(`/api/v1/user/details`, {
- headers: {
- Authorization: `Bearer ${token}`,
- },
- })
- if (res.data.success) {
- setOwnerDetails({ ...res.data.user })
- }
- }
- useEffect(() => {
- getData()
- }, [])
+ // const getData = async () => {
+ // let res = await Axios.get(`/api/rd-get-me`, {
+ // headers: {
+ // Authorization: `Bearer ${token}`,
+ // },
+ // })
+ // if (res.data.success) {
+ // setOwnerDetails({ ...res.data.user })
+ // }
+ // }
+
// Calculate total GST for the entire cart
const totalGST = cartItem.reduce((acc, item) => {
// console.log(item)
diff --git a/src/views/pages/cart/reviewOrder.js b/src/views/pages/cart/reviewOrder.js
index 95e2e3b..bcbd2da 100644
--- a/src/views/pages/cart/reviewOrder.js
+++ b/src/views/pages/cart/reviewOrder.js
@@ -47,7 +47,7 @@ const ReviewOrder = ({
}
try {
const res = await Axios.post(
- '/api/order-place',
+ '/api/rd-place-order',
{
billTo,
shipTo,
@@ -65,9 +65,9 @@ const ReviewOrder = ({
},
},
)
- console.log(res)
+ console.log(' res of place order ', res)
if (res.status === 201) {
- setOrderId(res?.data?.placedOrder?.uniqueId)
+ setOrderId(res?.data?.order?.uniqueId)
console.log(res)
Swal.fire('Success!', 'Your order has been placed successfully.', 'success')
diff --git a/src/views/shops/shopCard.js b/src/views/shops/shopCard.js
index 18aaf5b..834fdc3 100644
--- a/src/views/shops/shopCard.js
+++ b/src/views/shops/shopCard.js
@@ -32,7 +32,7 @@ const ShopCard = ({ item }) => {
color="primary"
fullWidth
disabled={isProductInCart}
- // onClick={handleAddToCart}
+ onClick={handleAddToCart}
sx={{ marginTop: '10px' }}
>
{isProductInCart ? 'Already in Cart' : 'Add to Cart'}