Samandar/gastro-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

order status update

Browse Source
This commit is contained in:
Samandar Turgunboyev
2026-02-13 15:50:53 +05:00
parent f6231229da
commit d5148aaf06
6 changed files with 331 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/features/cart/lib/api.ts
View File

@@ -13,7 +13,7 @@ export interface CartItem {
image: string;
}[];
liked: boolean;
meansurement: null | string;
meansurement: null | { id: number; name: string };
inventory_id: null | string;
product_id: string;
code: string;
@@ -31,6 +31,7 @@ export interface CartItem {
marketing_group_code: null | string;
inventory_kinds: { id: number; name: string }[];
sector_codes: { id: number; code: string }[];
balance: number;
prices: {
id: number;
price: string;

244
src/features/cart/ui/CartPage.tsx
View File

@@ -39,6 +39,12 @@ const CartPage = () => {
const [quantities, setQuantities] = useState<Record<string, string>>({});
const debounceRef = useRef<Record<string, NodeJS.Timeout | null>>({});
// O'lchov birligini formatlash uchun yordamchi funksiya
const getQuantityMessage = (qty: number, measurement: string | null) => {
if (!measurement) return `${qty} dona`;
return `${qty} ${measurement}`;
};
useEffect(() => {
if (!cartItems) return;
const initialQuantities: Record<string, string> = {};
@@ -57,8 +63,24 @@ const CartPage = () => {
body: { quantity: number };
cart_item_id: string;
}) => cart_api.update_cart_item({ body, cart_item_id }),
onSuccess: () =>
queryClient.invalidateQueries({ queryKey: ['cart_items', cart_id] }),
onSuccess: (_, variables) => {
queryClient.invalidateQueries({ queryKey: ['cart_items', cart_id] });
// Qaysi mahsulot yangilanganini topish
const item = cartItems?.find(
(i) => String(i.id) === variables.cart_item_id,
);
if (item) {
const measurementName = item.product.meansurement?.name || null;
toast.success(
`${t('Miqdor')} ${getQuantityMessage(variables.body.quantity, measurementName)} ${t('ga yangilandi')}`,
{
richColors: true,
position: 'top-center',
},
);
}
},
onError: (err: AxiosError) =>
toast.error(err.message, { richColors: true, position: 'top-center' }),
});
@@ -66,8 +88,13 @@ const CartPage = () => {
const { mutate: deleteCartItem } = useMutation({
mutationFn: ({ cart_item_id }: { cart_item_id: string }) =>
cart_api.delete_cart_item(cart_item_id),
onSuccess: () =>
queryClient.invalidateQueries({ queryKey: ['cart_items', cart_id] }),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ['cart_items', cart_id] });
toast.success(t("Savatdan o'chirildi"), {
richColors: true,
position: 'top-center',
});
},
onError: (err: AxiosError) =>
toast.error(err.message, { richColors: true, position: 'top-center' }),
});
@@ -104,15 +131,14 @@ const CartPage = () => {
const subtotal =
cartItems?.reduce((sum, item) => {
if (item.product.prices.length === 0) return sum; // narx yo'q bo'lsa qo'shmaymiz
if (item.product.prices.length === 0) return sum;
// Eng yuqori narxni olish
const maxPrice = Math.max(
...item.product.prices.map((p) => Number(p.price)),
);
return sum + maxPrice * item.quantity;
}, 0) || 0; // cartItems bo'sh bo'lsa 0 qaytaradi
}, 0) || 0;
const handleQuantityChange = (itemId: string, value: number) => {
setQuantities((prev) => ({
@@ -143,107 +169,125 @@ const CartPage = () => {
<div className="grid grid-cols-1 lg:grid-cols-3 gap-6">
<div className="lg:col-span-2">
<div className="bg-white rounded-lg shadow-md overflow-hidden">
{cartItems.map((item, index) => (
<div
key={item.id}
className={`p-6 flex relative gap-4 ${
index !== cartItems.length - 1 ? 'border-b' : ''
}`}
>
<Button
variant="destructive"
size="icon"
onClick={() =>
deleteCartItem({ cart_item_id: String(item.id) })
}
className="absolute right-2 w-7 h-7 top-2 cursor-pointer"
{cartItems.map((item, index) => {
const measurementDisplay =
item.product.meansurement?.name || 'шт.';
return (
<div
key={item.id}
className={`p-6 flex relative gap-4 ${
index !== cartItems.length - 1 ? 'border-b' : ''
}`}
>
<Trash className="size-4" />
</Button>
<div className="w-24 h-40 bg-gray-100 rounded-lg flex-shrink-0 overflow-hidden">
<Image
src={
item.product.images.length > 0
? item.product.images[0].image.includes(BASE_URL)
? item.product.images[0].image
: BASE_URL + item.product.images[0].image
: ProductBanner
<Button
variant="destructive"
size="icon"
onClick={() =>
deleteCartItem({ cart_item_id: String(item.id) })
}
alt={item.product.name}
width={500}
height={500}
unoptimized
className="object-cover"
style={{ width: '100%', height: '100%' }}
/>
</div>
className="absolute right-2 w-7 h-7 top-2 cursor-pointer"
>
<Trash className="size-4" />
</Button>
<div className="flex-1">
<h3 className="font-semibold text-lg mb-1">
{item.product.name}
</h3>
<div className="flex items-center gap-2 mb-3 max-lg:flex-col max-lg:items-start max-lg:gap-1">
<span className="text-blue-600 font-bold text-xl">
{formatPrice(
item.product.prices.length !== 0
? Math.max(
...item.product.prices.map((e) =>
Number(e.price),
),
)
: 0,
true,
)}
</span>
</div>
<div className="flex items-center border border-gray-300 rounded-lg w-max">
<button
onClick={() =>
handleQuantityChange(
String(item.id),
Number(quantities[item.id]) - 1,
)
<div className="w-24 h-40 bg-gray-100 rounded-lg flex-shrink-0 overflow-hidden">
<Image
src={
item.product.images.length > 0
? item.product.images[0].image.includes(BASE_URL)
? item.product.images[0].image
: BASE_URL + item.product.images[0].image
: ProductBanner
}
className="p-2 cursor-pointer transition rounded-lg"
>
<Minus className="w-4 h-4" />
</button>
<Input
value={quantities[item.id]}
onChange={(e) => {
const val = e.target.value.replace(/\D/g, ''); // faqat raqam
setQuantities((prev) => ({
...prev,
[item.id]: val,
}));
// Debounce bilan update
const valNum = Number(val);
if (!isNaN(valNum))
handleQuantityChange(String(item.id), valNum);
}}
type="text"
className="w-16 text-center"
alt={item.product.name}
width={500}
height={500}
unoptimized
className="object-cover"
style={{ width: '100%', height: '100%' }}
/>
</div>
<button
onClick={() =>
handleQuantityChange(
String(item.id),
Number(quantities[item.id]) + 1,
)
}
className="p-2 cursor-pointer transition rounded-lg"
>
<Plus className="w-4 h-4" />
</button>
<div className="flex-1">
<h3 className="font-semibold text-lg mb-1">
{item.product.name}
</h3>
<div className="flex items-center gap-2 mb-3 max-lg:flex-col max-lg:items-start max-lg:gap-1">
<span className="text-blue-600 font-bold text-xl">
{formatPrice(
item.product.prices.length !== 0
? Math.max(
...item.product.prices.map((e) =>
Number(e.price),
),
)
: 0,
true,
)}
</span>
<span className="text-sm text-gray-500">
/{measurementDisplay}
</span>
</div>
{/* O'lchov ko'rsatkichi */}
<p className="text-sm text-gray-500 mb-2">
{t('Miqdor')}: {quantities[item.id]} {measurementDisplay}
</p>
<div className="flex items-center border border-gray-300 rounded-lg w-max">
<button
onClick={() =>
handleQuantityChange(
String(item.id),
Number(quantities[item.id]) - 1,
)
}
className="p-2 cursor-pointer transition rounded-lg hover:bg-gray-50"
>
<Minus className="w-4 h-4" />
</button>
<div className="flex items-center gap-1 px-2">
<Input
value={quantities[item.id]}
onChange={(e) => {
const val = e.target.value.replace(/\D/g, '');
const valNum = Number(val);
setQuantities((prev) => ({
...prev,
[item.id]: val,
}));
if (!isNaN(valNum))
handleQuantityChange(String(item.id), valNum);
}}
type="text"
className="w-14 text-center border-none p-0"
/>
<span className="text-xs text-gray-500 whitespace-nowrap">
{measurementDisplay}
</span>
</div>
<button
onClick={() =>
handleQuantityChange(
String(item.id),
Number(quantities[item.id]) + 1,
)
}
className="p-2 cursor-pointer transition rounded-lg hover:bg-gray-50 disabled:opacity-50 disabled:cursor-not-allowed"
>
<Plus className="w-4 h-4" />
</button>
</div>
</div>
</div>
</div>
))}
);
})}
</div>
</div>

2
src/features/cart/ui/OrderPage.tsx
View File

@@ -298,7 +298,7 @@ const OrderPage = () => {
room_code: process.env.NEXT_PUBLIC_ROOM_CODE!,
deal_time: formatDate.format(new Date(), 'DD.MM.YYYY'),
robot_code: process.env.NEXT_PUBLIC_ROBOT_CODE!,
status: 'B#N',
status: 'D',
sales_manager_code: process.env.NEXT_PUBLIC_SALES_MANAGER_CODE!,
person_code: user?.username,
currency_code: '860',

153
src/features/product/ui/Product.tsx
View File

@@ -48,6 +48,12 @@ const ProductDetail = () => {
const [selectedImage, setSelectedImage] = useState(0);
const debounceRef = useRef<NodeJS.Timeout | null>(null);
// O'lchov birligini formatlash uchun yordamchi funksiya
const getQuantityMessage = (qty: number, measurement: string | null) => {
if (!measurement) return `${qty} dona`;
return `${qty} ${measurement}`;
};
/* ---------------- CART ITEMS ---------------- */
const { data: cartItems } = useQuery({
queryKey: ['cart_items', cart_id],
@@ -72,7 +78,8 @@ const ProductDetail = () => {
/* ---------------- DERIVED DATA ---------------- */
const price = Number(data?.prices?.[0]?.price || 0);
const maxBalance = data?.balance ?? 0; // <-- balance limit
const maxBalance = data?.balance ?? 0;
const measurementDisplay = data?.meansurement?.name || 'шт.';
/* ---------------- SYNC CART QUANTITY ---------------- */
useEffect(() => {
@@ -113,9 +120,16 @@ const ProductDetail = () => {
const { mutate: addToCart } = useMutation({
mutationFn: (body: { product: string; quantity: number; cart: string }) =>
cart_api.cart_item(body),
onSuccess: () => {
onSuccess: (_, variables) => {
queryClient.refetchQueries({ queryKey: ['cart_items'] });
toast.success(t("Mahsulot savatga qo'shildi"), { richColors: true });
const measurementName = data?.meansurement?.name || null;
toast.success(
`${getQuantityMessage(variables.quantity, measurementName)} ${t("savatga qo'shildi")}`,
{
richColors: true,
position: 'top-center',
},
);
},
onError: (err: AxiosError) => {
const msg =
@@ -129,7 +143,17 @@ const ProductDetail = () => {
cart_item_id: string;
body: { quantity: number };
}) => cart_api.update_cart_item(payload),
onSuccess: () => queryClient.refetchQueries({ queryKey: ['cart_items'] }),
onSuccess: (_, variables) => {
queryClient.refetchQueries({ queryKey: ['cart_items'] });
const measurementName = data?.meansurement?.name || null;
toast.success(
`${t('Miqdor')} ${getQuantityMessage(variables.body.quantity, measurementName)} ${t('ga yangilandi')}`,
{
richColors: true,
position: 'top-center',
},
);
},
});
/* ---------------- FAVOURITE ---------------- */
@@ -149,25 +173,12 @@ const ProductDetail = () => {
/* ---------------- HANDLERS ---------------- */
const handleAddToCart = () => {
if (quantity >= maxBalance) {
toast.warning(t(`only_available`, { maxBalance }), {
richColors: true,
position: 'top-center',
});
return;
}
if (!data || !cart_id) return;
const cartItem = cartItems?.data.cart_item.find(
(i) => Number(i.product.id) === data.id,
);
if (quantity > maxBalance) {
toast.error(t(`Faqat ${maxBalance} dona mavjud`), { richColors: true });
setQuantity(maxBalance);
return;
}
if (cartItem) {
updateCartItem({
cart_item_id: cartItem.id.toString(),
@@ -183,13 +194,6 @@ const ProductDetail = () => {
};
const handleIncrease = () => {
if (quantity >= maxBalance) {
toast.warning(t(`Faqat ${maxBalance} dona mavjud`), {
richColors: true,
position: 'top-center',
});
return;
}
setQuantity((q) => q + 1);
};
@@ -281,40 +285,65 @@ const ProductDetail = () => {
{/* INFO */}
<div>
<h1 className="text-3xl font-bold mb-2">{data?.name}</h1>
<div className="text-4xl font-bold text-blue-600 mb-4">
{formatPrice(price, true)}
{/* Narx va o'lchov birligi */}
<div className="flex items-baseline gap-2 mb-4">
<span className="text-4xl font-bold text-blue-600">
{formatPrice(price, true)}
</span>
<span className="text-xl text-gray-500">/{measurementDisplay}</span>
</div>
<p className="text-gray-600 mb-6">{data?.short_name}</p>
{/* QUANTITY */}
<div className="flex items-center gap-4 mb-6">
<button onClick={handleDecrease} className="p-2 border rounded">
<Minus />
</button>
<div className="mb-6">
<label className="block text-sm font-medium mb-2">
{t('Miqdor')}
</label>
<div className="flex items-center gap-4">
<button
onClick={handleDecrease}
className="p-2 border rounded hover:bg-gray-50"
>
<Minus />
</button>
<Input
value={quantity}
onChange={(e) => {
let v = Number(e.target.value);
if (v < 1) v = 1;
if (v > maxBalance) {
toast.warning(t(`Faqat ${maxBalance} dona mavjud`), {
richColors: true,
position: 'top-center',
});
v = maxBalance;
}
setQuantity(v);
}}
className="w-16 text-center"
/>
<div className="flex items-center gap-2">
<Input
value={quantity}
onChange={(e) => {
let v = Number(e.target.value);
if (v < 1) v = 1;
if (v > maxBalance) {
toast.warning(
`${t('Maksimal')} ${maxBalance} ${measurementDisplay}`,
{
richColors: true,
position: 'top-center',
},
);
v = maxBalance;
}
setQuantity(v);
}}
className="w-20 text-center"
/>
<span className="text-sm text-gray-500">
{measurementDisplay}
</span>
</div>
<button onClick={handleIncrease} className="p-2 border rounded">
<Plus />
</button>
<button
onClick={handleIncrease}
className="p-2 border rounded hover:bg-gray-50"
>
<Plus />
</button>
</div>
</div>
<div className="mb-6 font-semibold">
<div className="mb-6 text-xl font-semibold">
{t('Jami')}: {formatPrice(price * quantity, true)}
</div>
@@ -322,7 +351,7 @@ const ProductDetail = () => {
<div className="flex gap-3 mb-6">
<button
onClick={handleAddToCart}
className="flex-1 bg-green-600 hover:bg-green-700 text-white py-3 rounded-lg flex justify-center items-center gap-2"
className="flex-1 bg-green-600 hover:bg-green-700 text-white py-3 rounded-lg flex justify-center items-center gap-2 transition-colors"
>
<ShoppingCart />
{t('Savatga')}
@@ -330,8 +359,10 @@ const ProductDetail = () => {
<button
onClick={() => favouriteMutation.mutate(String(data?.id))}
className={`p-3 rounded-lg border ${
data?.liked ? 'border-red-500 bg-red-50' : 'border-gray-300'
className={`p-3 rounded-lg border transition-colors ${
data?.liked
? 'border-red-500 bg-red-50 hover:bg-red-100'
: 'border-gray-300 hover:bg-gray-50'
}`}
>
<Heart
@@ -339,7 +370,8 @@ const ProductDetail = () => {
/>
</button>
</div>
{/* IMPROVED UPDATED_AT WARNING */}
{/* UPDATED_AT WARNING */}
{data?.updated_at && data.payment_type === 'cash' && (
<div className="bg-yellow-50 border border-yellow-400 text-yellow-800 p-3 mb-4 rounded-md">
<p className="text-xs font-medium">
@@ -352,21 +384,12 @@ const ProductDetail = () => {
<div className={cn('grid gap-4 mt-6 border-t pt-4', 'grid-cols-2')}>
<div className="text-center">
<Truck className="mx-auto mb-1" />
{t('Bepul yetkazib berish')}
<p className="text-sm">{t('Bepul yetkazib berish')}</p>
</div>
<div className="text-center">
<Shield className="mx-auto mb-1" />
{t('Kafolat')}
<p className="text-sm">{t('Kafolat')}</p>
</div>
{/* {data?.payment_type && (
<div className="text-center">
<Banknote className="mx-auto mb-1" size={28} />
{data.payment_type === 'cash'
? t('Naqd bilan olinadi')
: t("Pul o'tkazish yo'li bilan olinadi")}
</div>
)} */}
</div>
</div>
</div>