fix bulk + fix variand
This commit is contained in:
hamid zarghami
@@ -14,8 +14,8 @@ export const useCart = () => {
|
||||
const params = useParams();
|
||||
const currentSlug = (params.name as string) || null;
|
||||
const { clear, increment, decrement, items, slug, setSlug } = useReceiptStore();
|
||||
const { mutate: mutateIncrementCart } = useIncrementCart();
|
||||
const { mutate: mutateDecrementCart } = useDecrementCart();
|
||||
const { mutate: mutateIncrementCart, isPending: isIncrementPending } = useIncrementCart();
|
||||
const { mutate: mutateDecrementCart, isPending: isDecrementPending } = useDecrementCart();
|
||||
const { mutate: mutateClearCart } = useClearCart();
|
||||
const { data: cartItems } = useGetCartItems(isSuccess);
|
||||
|
||||
@@ -53,7 +53,7 @@ export const useCart = () => {
|
||||
return {};
|
||||
}
|
||||
return cartItems.data.items.reduce((acc, item) => {
|
||||
acc[item.productId] = { quantity: item.quantity };
|
||||
acc[item.variantId] = { quantity: item.quantity };
|
||||
return acc;
|
||||
}, {} as Record<string | number, { quantity: number }>);
|
||||
} else {
|
||||
@@ -61,9 +61,7 @@ export const useCart = () => {
|
||||
}
|
||||
}, [isSuccess, cartItems?.data?.items, items]);
|
||||
|
||||
const isItemLoading = () => {
|
||||
return false;
|
||||
};
|
||||
const isCartMutating = isIncrementPending || isDecrementPending;
|
||||
|
||||
// برای کاربران لاگین شده، slug از API میآید (در cartItems.data.shopId)
|
||||
// برای کاربران لاگین نشده، slug از receiptStore میآید
|
||||
@@ -83,6 +81,6 @@ export const useCart = () => {
|
||||
addToCart,
|
||||
removeFromCart,
|
||||
clearCart,
|
||||
isItemLoading,
|
||||
isCartMutating,
|
||||
};
|
||||
};
|
||||
|
||||
@@ -29,7 +29,7 @@ export const useIncrementCart = () => {
|
||||
|
||||
if (previousCart?.data && productsData?.data) {
|
||||
const existingItem = previousCart.data.items.find(
|
||||
(item) => item.productId === String(id)
|
||||
(item) => item.variantId === String(id)
|
||||
);
|
||||
|
||||
let updatedItems: CartItem[];
|
||||
@@ -37,7 +37,7 @@ export const useIncrementCart = () => {
|
||||
|
||||
if (existingItem) {
|
||||
updatedItems = previousCart.data.items.map((item) => {
|
||||
if (item.productId === String(id)) {
|
||||
if (item.variantId === String(id)) {
|
||||
return {
|
||||
...item,
|
||||
quantity: item.quantity + 1,
|
||||
@@ -58,7 +58,7 @@ export const useIncrementCart = () => {
|
||||
const price = variant.price ?? effectivePrice;
|
||||
const discount = product.discount ?? 0;
|
||||
const newItem: CartItem = {
|
||||
productId: variantId,
|
||||
variantId,
|
||||
productTitle: product.title || product.name || "",
|
||||
quantity: 1,
|
||||
price,
|
||||
@@ -124,7 +124,7 @@ export const useDecrementCart = () => {
|
||||
if (previousCart?.data) {
|
||||
const updatedItems = previousCart.data.items
|
||||
.map((item: CartItem) => {
|
||||
if (item.productId === String(id)) {
|
||||
if (item.variantId === String(id)) {
|
||||
const newQuantity = item.quantity - 1;
|
||||
if (newQuantity <= 0) {
|
||||
return null;
|
||||
|
||||
@@ -2,7 +2,7 @@ import { api } from "@/config/axios";
|
||||
import { BulkCartItem, CartResponse, SaveAllMethod } from "../types/Types";
|
||||
|
||||
export const bulkCart = async (params: BulkCartItem) => {
|
||||
const { data } = await api.post("/public/cart/items/bulk", params);
|
||||
const { data } = await api.post("/public/cart/variant/bulk", params);
|
||||
return data;
|
||||
};
|
||||
|
||||
|
||||
@@ -8,8 +8,7 @@ export type BulkCartItem = {
|
||||
};
|
||||
|
||||
export interface CartItem {
|
||||
/** شناسه واریانت (در API ممکن است هنوز productId نامیده شود) */
|
||||
productId: string;
|
||||
variantId: string;
|
||||
productTitle: string;
|
||||
quantity: number;
|
||||
price: number;
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
'use client'
|
||||
|
||||
import MinusIcon from '@/components/icons/MinusIcon'
|
||||
import PlusIcon from '@/components/icons/PlusIcon'
|
||||
import { CartQuantityControl } from '@/components/CartQuantityControl'
|
||||
import { ef } from '@/lib/helpers/utfNumbers'
|
||||
import { useCart } from '@/app/[name]/(Dialogs)/cart/hook/useCart'
|
||||
import { motion } from 'framer-motion'
|
||||
import { getPrimaryVariantId } from '@/app/[name]/(Main)/types/Types'
|
||||
import { ArrowLeft, Clock, Cup, Heart, TruckTick } from 'iconsax-react'
|
||||
import Image from 'next/image'
|
||||
import { useParams, useRouter } from 'next/navigation'
|
||||
@@ -24,30 +23,34 @@ function ProductPage({ }: Props) {
|
||||
const { isSuccess } = useGetProfile();
|
||||
const { data: product, isLoading } = useGetProduct(id as string);
|
||||
const { data: about } = useGetAbout();
|
||||
const { items, addToCart, removeFromCart } = useCart();
|
||||
const { items, addToCart, removeFromCart, isCartMutating } = useCart();
|
||||
const [isFavorite, setIsFavorite] = useState<boolean>(false);
|
||||
const [selectedVariantId, setSelectedVariantId] = useState<string | null>(null);
|
||||
const { mutate: toggleFavorite } = useToggleFavorite();
|
||||
|
||||
const productId = product?.data?.id || id as string;
|
||||
const cartId = useMemo(() => {
|
||||
if (!product?.data) return null;
|
||||
return selectedVariantId ?? getPrimaryVariantId(product.data) ?? productId;
|
||||
}, [product?.data, selectedVariantId, productId]);
|
||||
const quantity = useMemo(() => {
|
||||
if (!selectedVariantId) return 0;
|
||||
const item = items?.[selectedVariantId];
|
||||
if (!cartId) return 0;
|
||||
const item = items?.[cartId] ?? items?.[String(cartId)];
|
||||
if (item && typeof item === 'object' && 'quantity' in item) {
|
||||
return item.quantity || 0;
|
||||
}
|
||||
return 0;
|
||||
}, [items, selectedVariantId]);
|
||||
}, [items, cartId]);
|
||||
|
||||
const handleAddToCart = () => {
|
||||
if (selectedVariantId) {
|
||||
addToCart(selectedVariantId);
|
||||
if (cartId) {
|
||||
addToCart(cartId);
|
||||
}
|
||||
};
|
||||
|
||||
const handleRemoveFromCart = () => {
|
||||
if (selectedVariantId) {
|
||||
removeFromCart(selectedVariantId);
|
||||
if (cartId) {
|
||||
removeFromCart(cartId);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -86,7 +89,7 @@ function ProductPage({ }: Props) {
|
||||
if (!product?.data) return;
|
||||
const variants = product.data.variants ?? [];
|
||||
if (!variants.length) {
|
||||
setSelectedVariantId(null);
|
||||
setSelectedVariantId(product.data.id);
|
||||
return;
|
||||
}
|
||||
setSelectedVariantId((prev) => prev ?? variants[0].id);
|
||||
@@ -252,46 +255,13 @@ function ProductPage({ }: Props) {
|
||||
|
||||
<div className='mt-12 flex justify-between items-center'>
|
||||
<span dir='ltr'>{ef(price.toLocaleString('en-US'))} T</span>
|
||||
<motion.div
|
||||
whileTap={{ scale: 1.05 }}
|
||||
className="bg-background active:drop-shadow-xs max-w-[115px] rounded-md w-full h-8 inline-flex p-1 justify-between items-center gap-2 relative overflow-hidden"
|
||||
>
|
||||
{quantity <= 0 ? (
|
||||
<button
|
||||
onClick={handleAddToCart}
|
||||
className="inline-flex w-full justify-center items-center gap-2"
|
||||
>
|
||||
<PlusIcon />
|
||||
<div className="text-sm2 pt-0.5 font-normal text-foreground">
|
||||
افزودن
|
||||
</div>
|
||||
</button>
|
||||
) : (
|
||||
<>
|
||||
<button
|
||||
onClick={handleAddToCart}
|
||||
className="bg-container hover:bg-container/60 active:bg-container/30 rounded-sm p-2 transition-colors"
|
||||
>
|
||||
<PlusIcon className="text-foreground" />
|
||||
</button>
|
||||
<motion.div
|
||||
key={quantity}
|
||||
initial={{ scale: 1 }}
|
||||
animate={{ scale: [1.2, 0.95, 1] }}
|
||||
transition={{ duration: 0.3 }}
|
||||
className="text-sm2 pt-0.5 font-semibold"
|
||||
>
|
||||
{quantity}
|
||||
</motion.div>
|
||||
<button
|
||||
onClick={handleRemoveFromCart}
|
||||
className="bg-container hover:bg-container/60 active:bg-container/30 rounded-sm p-2 transition-colors"
|
||||
>
|
||||
<MinusIcon className="text-foreground" />
|
||||
</button>
|
||||
</>
|
||||
)}
|
||||
</motion.div>
|
||||
<CartQuantityControl
|
||||
quantity={quantity}
|
||||
onAdd={handleAddToCart}
|
||||
onRemove={handleRemoveFromCart}
|
||||
isMutating={isCartMutating}
|
||||
addDisabled={!cartId}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user