@@ -79,15 +87,12 @@ const AddressAndPayment = ({
label="Bill Address"
onChange={(e) => setBillTo(e.target.value)}
>
-
-
-
+ {address &&
+ address.map((address) => (
+
+ ))}
{billToError &&
Bill Address is required}
@@ -103,16 +108,14 @@ const AddressAndPayment = ({
label="Ship Address"
onChange={(e) => setShipTo(e.target.value)}
>
-
-
-
+ {address &&
+ address.map((address) => (
+
+ ))}
+
{shipToError &&
Ship Address is required}
diff --git a/src/views/pages/cart/cart.js b/src/views/pages/cart/cart.js
index 8723c1f..a967de0 100644
--- a/src/views/pages/cart/cart.js
+++ b/src/views/pages/cart/cart.js
@@ -20,6 +20,8 @@ import {
selectCartItems,
selectCartSubtotal,
} from '../../../redux-store/CartStore/ducs'
+import { isAutheticated } from '../../../auth'
+import Axios from '../../../axios'
const TabItem = ({ label, active, complete, onClick, reference, stepNumber }) => (
{
const dispatch = useDispatch()
const [paymentMode, setPaymentMode] = useState('')
const cartItems = useSelector(selectCartItems)
- const totalItemCount = useSelector(selectCartItemCount)
- const cartSubtotal = useSelector(selectCartSubtotal)
+
+ const [address, setAddress] = useState([])
+ const token = isAutheticated()
const [value, setValue] = useState(0)
+
+ const getAddress = async () => {
+ try {
+ const res = await Axios.get('/api/shipping/address/user/address/', {
+ headers: {
+ 'Access-Control-Allow-Origin': '*',
+ Authorization: `Bearer ${token}`,
+ 'Content-Type': 'application/json',
+ },
+ })
+ console.log(res)
+ setAddress(res?.data?.UserShippingAddress)
+ } catch (error) {
+ console.log(error)
+ }
+ }
+ useEffect(() => {
+ getAddress()
+ }, [])
const handleTabChange = (event, newValue) => {
if (value === 3 && newValue !== 3) {
setPaymentMode('')
@@ -216,6 +238,7 @@ const Cart = () => {
paymentMode={paymentMode}
setPaymentMode={setPaymentMode}
handleTabChange={handleTabChange}
+ address={address}
/>
)}
diff --git a/src/views/pages/rdOrders/partialOrderModal.js b/src/views/pages/rdOrders/partialOrderModal.js
index fc7e6c5..013eb24 100644
--- a/src/views/pages/rdOrders/partialOrderModal.js
+++ b/src/views/pages/rdOrders/partialOrderModal.js
@@ -63,43 +63,45 @@ const OrderDetailsDialog = ({ open, onClose, order, onSubmit }) => {
{order?.orderItem.map((item, index) => {
- const subtotal = item.price * item.remainingQuantity
- const gstAmount = ((item.GST * item.price) / 100) * item.remainingQuantity
- const totalWithGST = subtotal + gstAmount
+ if (item.remainingQuantity > 0) {
+ const subtotal = item.price * item.remainingQuantity
+ const gstAmount = ((item.GST * item.price) / 100) * item.remainingQuantity
+ const totalWithGST = subtotal + gstAmount
- return (
-
-
- 
- {item.productId.name}
-
- ₹{item.price}
- {item.remainingQuantity}
-
-
- handleAvailabilityChange(index, Number(e.target.value))
- }
- inputProps={{
- min: 0,
- max: item.remainingQuantity,
- }}
- style={{ width: '60px', textAlign: 'center' }}
- />
-
- ₹{subtotal}
- {item.GST}%
- ₹{gstAmount}
- ₹{totalWithGST}
-
- )
+ return (
+
+
+
+ {item.productId.name}
+
+ ₹{item.price}
+ {item.remainingQuantity}
+
+
+ handleAvailabilityChange(index, Number(e.target.value))
+ }
+ inputProps={{
+ min: 0,
+ max: item.remainingQuantity,
+ }}
+ style={{ width: '60px', textAlign: 'center' }}
+ />
+
+ ₹{subtotal}
+ {item.GST}%
+ ₹{gstAmount}
+ ₹{totalWithGST}
+
+ )
+ }
})}
diff --git a/src/views/pages/rdOrders/viewOrders.js b/src/views/pages/rdOrders/viewOrders.js
index 7a83a74..a52a85e 100644
--- a/src/views/pages/rdOrders/viewOrders.js
+++ b/src/views/pages/rdOrders/viewOrders.js
@@ -119,13 +119,13 @@ const ViewOrders = () => {
}
} else if (orderStatus === 'processing') {
const processingOrderInvoice = order?.orderItem
- .filter((item) => item.remainingQuantity > 0) // Only include items with remainingQuantity > 0
+ .filter((item) => item.remainingQuantity > 0)
.map((item) => ({
...item,
productId: item.productId,
- processquantity: item.remainingQuantity, // Add processquantity only for items with remainingQuantity > 0
+ processquantity: item.remainingQuantity,
}))
- console.log(processingOrderInvoice)
+ console.log(processingOrderInvoice, 'process invoices', order._id)
const cancellationRes = await Axios.post(
`/api/pd-process-order`,
diff --git a/src/views/pages/stock/stockTable.js b/src/views/pages/stock/stockTable.js
new file mode 100644
index 0000000..aa0799f
--- /dev/null
+++ b/src/views/pages/stock/stockTable.js
@@ -0,0 +1,267 @@
+import React, { useState, useEffect } from 'react'
+import {
+ TableContainer,
+ Table,
+ TableHead,
+ TableRow,
+ TableCell,
+ TableBody,
+ Paper,
+ Typography,
+ TablePagination,
+ Skeleton,
+ TextField,
+ MenuItem,
+ Select,
+ FormControl,
+ InputLabel,
+ Grid,
+ Button,
+} from '@mui/material'
+import axios from 'axios'
+import Axios from '../../../axios'
+
+function StockTable({ apiEndpoint, totalProducts }) {
+ const [stocks, setStocks] = useState([])
+ const [loading, setLoading] = useState(true)
+ const [page, setPage] = useState(0)
+ const [rowsPerPage, setRowsPerPage] = useState(5)
+ const [category, setCategory] = useState('')
+ const [brand, setBrand] = useState('')
+ const [productName, setProductName] = useState('')
+ const [isInitialStockMode, setIsInitialStockMode] = useState(false)
+ const [initialStock, setInitialStock] = useState([])
+ const [products, setProducts] = useState()
+
+ console.log(initialStock, 'initial stock ')
+
+ const fetchProducts = async () => {
+ try {
+ const response = await Axios.get('/api/product/getAll/user/')
+ setProducts(response.data?.products || [])
+ console.log(response, 'resp of products ')
+ } catch (error) {
+ console.log(error)
+ }
+ const response = await Axios.get('/api/product/getAll/user/')
+ setProducts(response.data?.products || [])
+ }
+ // Fetch Products from Backend API
+ const fetchStocks = async () => {
+ setLoading(true)
+ try {
+ const response = await axios.get(apiEndpoint, {
+ params: { category, brand, productName, page, limit: rowsPerPage },
+ })
+ setStocks(response.data.stocks)
+ } catch (error) {
+ console.error('Error fetching products:', error)
+ } finally {
+ setLoading(false)
+ }
+ }
+ useEffect(() => {
+ fetchProducts()
+ }, [])
+ useEffect(() => {
+ fetchStocks()
+ }, [category, brand, productName, page, rowsPerPage])
+
+ // Pagination Handlers
+ const handleChangePage = (event, newPage) => setPage(newPage)
+ const handleChangeRowsPerPage = (event) => {
+ setRowsPerPage(parseInt(event.target.value, 10))
+ setPage(0)
+ }
+
+ const handleStockChange = (productId, value) => {
+ setInitialStock((prevStock) => {
+ const stockExists = prevStock.find((item) => item.productId === productId)
+
+ if (stockExists) {
+ // Update the existing stock entry
+ return prevStock.map((item) =>
+ item.productId === productId ? { ...item, stock: value } : item,
+ )
+ } else {
+ // Add a new stock entry
+ return [...prevStock, { productId, stock: value }]
+ }
+ })
+ }
+
+ const handleSubmitInitialStock = async () => {
+ try {
+ await axios.post(`${apiEndpoint}/initial-stock`, { stock: initialStock })
+ setIsInitialStockMode(false)
+ fetchProducts()
+ } catch (error) {
+ console.error('Error adding initial stock:', error)
+ }
+ }
+
+ const formatDateTime = (dateString) => {
+ const date = new Date(dateString)
+ return `${date.toDateString()}, ${formatAMPM(date)}`
+ }
+
+ const formatAMPM = (date) => {
+ let hours = date.getHours()
+ const minutes = date.getMinutes()
+ const ampm = hours >= 12 ? 'PM' : 'AM'
+ hours = hours % 12 || 12
+ return `${hours}:${minutes < 10 ? '0' + minutes : minutes} ${ampm}`
+ }
+
+ // Check if stock exists
+ const stockExists = stocks.length > 0
+
+ return (
+
+ {!stockExists && !isInitialStockMode ? (
+
+ ) : isInitialStockMode ? (
+ <>
+
+ Add Initial Stock
+
+
+
+
+
+ Product Name
+ SKU
+ Stock
+
+
+
+ {products.map((product) => (
+
+ {product.name}
+ {product.SKU}
+
+ item.productId === product._id)?.stock || ''
+ }
+ onChange={(e) => handleStockChange(product._id, e.target.value)}
+ />
+
+
+ ))}
+
+
+
+
+
+ ) : (
+ <>
+ {/* Filter Controls */}
+
+
+
+ Category
+
+
+
+
+
+ Brand
+
+
+
+
+ setProductName(e.target.value)}
+ />
+
+
+
+ {/* Products Table */}
+
+
+
+
+ Product Name
+ SKU
+ Category
+ Brand
+ Added On
+ Price
+ Stock
+
+
+
+ {loading ? (
+ Array.from(new Array(rowsPerPage)).map((_, index) => (
+
+
+
+
+
+ ))
+ ) : stocks.length > 0 ? (
+ products.map((product) => (
+
+ {product.name}
+ {product.sku}
+ {product.categoryName}
+ {product.brandName}
+ {formatDateTime(product.addedOn)}
+ {product.price.toFixed(2)}
+ {product.stock}
+
+ ))
+ ) : (
+
+
+ Data not found
+
+
+ )}
+
+
+
+
+
+ )}
+
+ )
+}
+
+export default StockTable