update price

src/features/cart/ui/CartPage.tsx

@@ -146,6 +146,12 @@ const CartPage = () => {
     });
   };
 
+  const price = cartItems?.map((item) =>
+    item.product.prices.find((p) => p.price_type.code === '1')
+      ? item.product.prices.find((p) => p.price_type.code === '1')?.price
+      : Math.min(...item.product.prices.map((p) => Number(p.price))),
+  );
+
   if (isLoading)
     return (
       <div className="min-h-screen flex items-center justify-center">
@@ -177,10 +183,15 @@ const CartPage = () => {
   const subtotal =
     cartItems.reduce((sum, item) => {
       if (!item.product.prices.length) return sum;
-      const price = Math.min(
+
-        ...item.product.prices.map((p) => Number(p.price)),
+      const price = item.product.prices.find((p) => p.price_type.code === '1')
-      );
+        ? Number(
+            item.product.prices.find((p) => p.price_type.code === '1')?.price,
+          )
+        : Math.min(...item.product.prices.map((p) => Number(p.price)));
+
       const qty = quantities[item.id] ?? item.quantity;
+
       return sum + price * qty;
     }, 0) || 0;
 
@@ -243,12 +254,7 @@ const CartPage = () => {
 
                     <div className="flex items-center gap-2 mb-3">
                       <span className="text-blue-600 font-bold text-xl">
-                        {formatPrice(
+                        {formatPrice(Number(price), true)}
-                          Math.min(
-                            ...item.product.prices.map((p) => Number(p.price)),
-                          ),
-                          true,
-                        )}
                       </span>
                       <span className="text-sm text-gray-500">
                         /{measurementDisplay}

src/features/cart/ui/OrderPage.tsx

@@ -139,11 +139,13 @@ const OrderPage = () => {
       if (item.product.prices.length === 0) return sum; // narx yo'q bo'lsa qo'shmaymiz
 
       // Eng yuqori narxni olish
-      const maxPrice = Math.min(
+      const maxPrice = item.product.prices.find(
-        ...item.product.prices.map((p) => Number(p.price)),
+        (p) => p.price_type.code === '1',
-      );
+      )
+        ? item.product.prices.find((p) => p.price_type.code === '1')?.price
+        : Math.min(...item.product.prices.map((p) => Number(p.price)));
 
-      return sum + maxPrice * item.quantity;
+      return sum + Number(maxPrice) * item.quantity;
     }, 0) || 0; // cartItems bo'sh bo'lsa 0 qaytaradi
 
   const [coords, setCoords] = useState({

src/features/product/ui/Product.tsx

@@ -213,7 +213,9 @@ const ProductDetail = () => {
   };
 
   const subtotal = data?.prices?.length
-    ? Math.min(...data.prices.map((p) => Number(p.price)))
+    ? data.prices.find((p) => p.price_type.code === '1')
+      ? data.prices.find((p) => p.price_type.code === '1')?.price
+      : Math.min(...data.prices.map((p) => Number(p.price)))
     : 0;
 
   /* ---------------- LOADING ---------------- */
@@ -250,7 +252,7 @@ const ProductDetail = () => {
 
           <div className="flex items-baseline gap-2 mb-4">
             <span className="text-4xl font-bold text-blue-600">
-              {formatPrice(subtotal, true)}
+              {formatPrice(Number(subtotal), true)}
             </span>
             <span className="text-xl text-gray-500">/{measurementDisplay}</span>
           </div>
@@ -298,7 +300,7 @@ const ProductDetail = () => {
           </div>
 
           <div className="mb-6 text-xl font-semibold">
-            {t('Jami')}: {formatPrice(subtotal * numericQty, true)}
+            {t('Jami')}: {formatPrice(Number(subtotal) * numericQty, true)}
           </div>
 
           <div className="flex gap-3">

src/shared/config/api/product/type.ts

@@ -40,6 +40,7 @@ export interface ProductListResult {
     price_type: {
       id: number;
       name: string;
+      code: string;
     };
   }[];
   balance: number;
@@ -76,6 +77,7 @@ export interface ProductDetail {
     price_type: {
       id: number;
       name: string;
+      code: string;
     };
   }[];
 }
@@ -131,6 +133,7 @@ export interface FavouriteProductRes {
     price_type: {
       id: number;
       name: string;
+      code: string;
     };
   }[];
 }

src/widgets/categories/ui/product-card.tsx

@@ -184,6 +184,10 @@ export function ProductCard({
     },
   });
 
+  const price = product.prices.find((p) => p.price_type.code === '1')
+    ? product.prices.find((p) => p.price_type.code === '1')?.price
+    : Math.min(...product.prices.map((p) => Number(p.price)));
+
   /** ❌ Error */
   if (error) {
     return (
@@ -242,10 +246,7 @@ export function ProductCard({
           <div className="p-3 sm:p-4 space-y-2 flex-1">
             {product.prices.length > 0 && (
               <p className="text-lg font-bold">
-                {formatPrice(
+                {formatPrice(Number(price), true)}
-                  Math.min(...product.prices.map((p) => Number(p.price))),
-                  true,
-                )}
                 <span className="text-sm text-slate-500 ml-1">
                   /{measurementDisplay}
                 </span>

src/widgets/navbar/ui/SearchResult.tsx

@@ -107,7 +107,9 @@ export const SearchResult = ({ query }: SearchResultProps) => {
                 ? product.images[0].image
                 : BASE_URL + product.images[0].image
               : LogosProduct;
-          const price = product.prices?.[0]?.price;
+          const price = product.prices.find((p) => p.price_type.code === '1')
+            ? product.prices.find((p) => p.price_type.code === '1')?.price
+            : Math.min(...product.prices.map((p) => Number(p.price)));
 
           return (
             <div
@@ -128,14 +130,9 @@ export const SearchResult = ({ query }: SearchResultProps) => {
                 <p className="text-sm font-medium text-slate-900 line-clamp-2">
                   {product.name}
                 </p>
-                {price && (
+                <p className="text-sm font-semibold text-[#57A595] mt-1">
-                  <p className="text-sm font-semibold text-[#57A595] mt-1">
+                  {formatPrice(Number(price), true)}
-                    {formatPrice(
+                </p>
-                      Math.min(...product.prices.map((p) => Number(p.price))),
-                      true,
-                    )}
-                  </p>
-                )}
               </div>
             </div>
           );