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

bug fixed

Browse Source
This commit is contained in:
Samandar Turgunboyev
2026-02-03 18:57:14 +05:00
parent b7846c7bc9
commit 8a4682212f
10 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,11 +289,11 @@ const OrderPage = () => {
{
filial_code: 'dodge',
delivery_date: formatDate.format(deliveryDate, 'DD.MM.YYYY'),
room_code: '100',
room_code: process.env.NEXT_ROOM_CODE!,
deal_time: formatDate.format(deliveryDate, 'DD.MM.YYYY'),
robot_code: 'r2',
robot_code: process.env.NEXT_ROBOT_CODE!,
status: 'B#N',
sales_manager_code: '1',
sales_manager_code: process.env.NEXT_SALES_MANAGER_CODE!,
person_code: user?.username,
currency_code: '860',
owner_person_code: user?.username,

7
src/features/category/ui/Category.tsx
View File

@@ -1,4 +1,5 @@
'use client';
import CategoryImage from '@/assets/water-bottle.png';
import { category_api } from '@/shared/config/api/category/api';
import { BASE_URL } from '@/shared/config/api/URLs';
import { Link } from '@/shared/config/i18n/navigation';
@@ -34,7 +35,11 @@ const Category = () => {
>
<div className="flex items-center gap-4">
<Image
src={BASE_URL + category.image}
src={
category.image === null
? CategoryImage
: BASE_URL + category.image
}
alt={category.name}
width={70}
unoptimized

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

@@ -56,9 +56,11 @@ const ProductDetail = () => {
select: (res) => res.data.results,
});
/* ---------------- PRICE ---------------- */
/* ---------------- DERIVED DATA ---------------- */
const price = Number(data?.prices?.[0]?.price || 0);
const category = 'Ichimliklar'; // default category
/* ---------------- SYNC CART QUANTITY ---------------- */
useEffect(() => {
if (!data || !cartItems) return;
@@ -103,8 +105,8 @@ const ProductDetail = () => {
toast.success(t("Mahsulot savatga qo'shildi"), { richColors: true });
},
onError: (err: AxiosError) => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const msg = (err.response?.data as any)?.detail || err.message;
const msg =
(err.response?.data as { detail: string })?.detail || err.message;
toast.error(msg, { richColors: true });
},
});
@@ -124,6 +126,12 @@ const ProductDetail = () => {
queryClient.invalidateQueries({ queryKey: ['product_detail'] });
queryClient.invalidateQueries({ queryKey: ['product_list'] });
},
onError: () => {
toast.error(t('Tizimga kirilmagan'), {
richColors: true,
position: 'top-center',
});
},
});
/* ---------------- HANDLERS ---------------- */
@@ -168,20 +176,20 @@ const ProductDetail = () => {
unoptimized
height={500}
src={
data && data?.images?.length !== 0
data?.images?.length
? BASE_URL + data.images[selectedImage]?.image
: data?.images[selectedImage]?.image
? BASE_URL + data.images[selectedImage]?.image
: '/placeholder.svg'
: '/placeholder.svg'
}
alt={data?.name || 'logo'}
className="w-full h-[400px] object-contain"
/>
<Carousel className="mt-4">
<CarouselContent>
{data?.images?.map((img, i) => (
<CarouselItem key={img.id} className="basis-1/4">
{(data?.images?.length
? data.images
: [{ id: 0, image: '/placeholder.svg' }]
).map((img, i) => (
<CarouselItem key={i} className="basis-1/4">
<button
onClick={() => setSelectedImage(i)}
className={`border rounded-lg p-1 ${
@@ -191,12 +199,12 @@ const ProductDetail = () => {
}`}
>
<Image
src={BASE_URL + img.image}
alt=""
unoptimized
src={img.image!}
alt={data?.name || 'Mahsulot rasmi'}
width={120}
height={120}
className="object-contain"
unoptimized
/>
</button>
</CarouselItem>
@@ -215,7 +223,13 @@ const ProductDetail = () => {
<p className="text-gray-600 mb-6">{data?.short_name}</p>
{/* QUANTITY */}
<div className="grid grid-cols-2 gap-4 mb-6">
<div>
<span className="text-gray-500">Kategoriya:</span>
<p className="font-semibold">{category}</p>
</div>
</div>
<div className="flex items-center gap-4 mb-6">
<button
onClick={() => setQuantity((q) => Math.max(1, q - 1))}
@@ -246,7 +260,7 @@ const ProductDetail = () => {
</div>
{/* ACTIONS */}
<div className="flex gap-3">
<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"
@@ -256,7 +270,7 @@ const ProductDetail = () => {
</button>
<button
onClick={() => favouriteMutation.mutate(product)}
onClick={() => favouriteMutation.mutate(String(data?.id))}
className={`p-3 rounded-lg border ${
data?.liked ? 'border-red-500 bg-red-50' : 'border-gray-300'
}`}

12
src/features/profile/ui/Profile.tsx
View File

@@ -73,14 +73,14 @@ const Profile = () => {
<Avatar className="w-14 h-14 ring-2 ring-emerald-500 ring-offset-2 flex items-center justify-center">
<AvatarImage />
<AvatarFallback className="text-muted-foreground font-semibold">
{user?.username.slice(0, 1).toUpperCase()}
{user?.first_name.slice(0, 1).toUpperCase()}
</AvatarFallback>
</Avatar>
<div>
<p className="text-lg text-muted-foreground font-medium">
{user &&
user.username.charAt(0).toUpperCase() +
user.username.slice(1)}
user.first_name.charAt(0).toUpperCase() +
user.first_name.slice(1)}
</p>
</div>
</div>
@@ -129,14 +129,14 @@ const Profile = () => {
<Avatar className="w-10 h-10 md:w-12 md:h-12 ring-2 ring-emerald-500 ring-offset-2">
<AvatarImage />
<AvatarFallback className="text-muted-foreground font-semibold">
{user?.username?.slice(0, 1).toUpperCase()}
{user?.first_name?.slice(0, 1).toUpperCase()}
</AvatarFallback>
</Avatar>
<div>
<p className="text-md md:text-xl text-muted-foreground">
{user &&
user.username.charAt(0).toUpperCase() +
user.username.slice(1)}
user.first_name.charAt(0).toUpperCase() +
user.first_name.slice(1)}
</p>
</div>
</div>