Order #234
- {order.status}
+ {status}
@@ -96,12 +93,14 @@ function OrderDetailsModal({ close, order }: ModalProps) {
@@ -110,4 +109,95 @@ function OrderDetailsModal({ close, order }: ModalProps) {
);
}
-export default OrderDetailsModal;
+function Edit({
+ edit,
+ order,
+ status,
+}: {
+ edit: () => void;
+ order: Order;
+ status: (nstat: string) => void;
+}) {
+ const validStatuses = [
+ 'Pending',
+ 'Failed',
+ 'Canceled',
+ 'Paid',
+ 'Shipping',
+ 'Delivered',
+ 'Returned',
+ 'Completed',
+ ];
+ const dispatch = useAppDispatch();
+ return (
+
+
+
+ Edit Order Status
+
+
+
+
+
+
+
+
+
+ );
+}
+
+export default function OrderDetailsModal({
+ close,
+ order,
+ cancel,
+}: ModalProps) {
+ const [edit, setEdit] = useState(false);
+ const [status, setStatus] = useState(order.status);
+ return edit ? (
+
setEdit(false)}
+ order={order}
+ status={(nstat) => setStatus(nstat)}
+ />
+ ) : (
+ setEdit(true)}
+ status={status}
+ />
+ );
+}
diff --git a/src/components/Orders/Orders.tsx b/src/components/Orders/Orders.tsx
index 437bdf4c..f0bc430a 100644
--- a/src/components/Orders/Orders.tsx
+++ b/src/components/Orders/Orders.tsx
@@ -125,6 +125,7 @@ export function Orders() {
setSelected(-1)}
order={orders.find((order) => order.id === selected) as Order}
+ cancel={(id: number) => dispatch(cancelOrder(id))}
/>
)}
diff --git a/src/components/home/ProductCard.tsx b/src/components/home/ProductCard.tsx
index 0e7755b9..5afa3a60 100644
--- a/src/components/home/ProductCard.tsx
+++ b/src/components/home/ProductCard.tsx
@@ -1,18 +1,22 @@
import { useNavigate } from 'react-router-dom';
+import { useState } from 'react';
import { FaRegHeart, FaHeart } from 'react-icons/fa';
import { useAppDispatch, useAppSelector } from '@/app/hooks';
+import Cart from '@/interfaces/cart';
import {
addToWishlist,
removeFromWishlist,
} from '@/features/Products/ProductSlice';
import { Product } from '@/types/Product';
-import { addCartItem } from '@/features/Cart/cartSlice';
+import { addCartItem, removeCartItem } from '@/features/Cart/cartSlice';
+import { showSuccessToast } from '@/utils/ToastConfig';
interface ProductCardProps {
product: Product;
}
function ProductCard({ product }: ProductCardProps) {
+ const [cartId, setCartId] = useState