bug fix

src/shared/config/api/URLs.ts

@@ -22,4 +22,5 @@ export const API_URLS = {
   CreateOrder: `${API_V}orders/order/create/`,
   OrderList: `${API_V}orders/order/list/`,
   Refresh_Token: `${API_V}accounts/refresh/token/`,
+  Get_Me: `${API_V}accounts/me/`,
 };

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

@@ -42,7 +42,7 @@ export const product_api = {
   async search(params: {
     search?: string;
     page?: number;
-    page_szie?: number;
+    page_size?: number;
   }): Promise<AxiosResponse<SearchData>> {
     const res = await httpClient.get(`${API_URLS.Search_Product}`, { params });
     return res;

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

@@ -41,27 +41,35 @@ export interface ProductListResult {
 }
 
 export interface ProductDetail {
-  brand: string;
-  description: string;
-  expires_date: null | string;
   id: number;
-  image: string;
-  images: {
-    id: string;
-    image: string;
-  }[];
-  is_active: boolean;
+  images: { id: number; image: string }[];
   liked: boolean;
-  manufacturer: string;
-  min_quantity: number;
+  meansurement: null | string;
+  inventory_id: null | string;
+  product_id: string;
+  code: string;
   name: string;
-  price: number;
-  return_date: null | string;
-  volume: string;
-  unity: {
-    id: string;
-    name: string;
-  };
+  short_name: string;
+  weight_netto: null | string;
+  weight_brutto: null | string;
+  litr: null | string;
+  box_type_code: null | string;
+  box_quant: null | string;
+  groups: number[];
+  state: 'A' | 'P';
+  barcodes: string;
+  article_code: null | string;
+  marketing_group_code: null | string;
+  inventory_kinds: { id: number; name: string }[];
+  sector_codes: { id: number; code: string }[];
+  prices: {
+    id: number;
+    price: string;
+    price_type: {
+      id: number;
+      name: string;
+    };
+  }[];
 }
 
 export interface SearchData {
@@ -69,18 +77,7 @@ export interface SearchData {
 }
 
 export interface SearchDataPro {
-  id: number;
-  name: string;
-  image: string;
-  price: number;
-  description: string;
-  liked: boolean;
-  unity: {
-    id: string;
-    name: string;
-  };
-  min_quantity: number;
-  is_active: boolean;
+  products: ProductListResult;
 }
 
 export interface FavouriteProduct {
@@ -95,21 +92,32 @@ export interface FavouriteProduct {
 
 export interface FavouriteProductRes {
   id: number;
-  name: string;
-  image: string;
-  price: number;
-  description: string;
-  unity: {
-    id: string;
-    name: string;
-  };
-  min_quantity: number;
-  is_active: boolean;
+  images: { id: number; image: string }[];
   liked: boolean;
-  brand: null | string;
-  return_date: null | string;
-  expires_date: null | string;
-  manufacturer: null | string;
-  volume: null | string;
-  images: { id: string; image: string }[];
+  meansurement: null | string;
+  inventory_id: null | string;
+  product_id: string;
+  code: string;
+  name: string;
+  short_name: string;
+  weight_netto: null | string;
+  weight_brutto: null | string;
+  litr: null | string;
+  box_type_code: null | string;
+  box_quant: null | string;
+  groups: number[];
+  state: 'A' | 'P';
+  barcodes: string;
+  article_code: null | string;
+  marketing_group_code: null | string;
+  inventory_kinds: { id: number; name: string }[];
+  sector_codes: { id: number; code: string }[];
+  prices: {
+    id: number;
+    price: string;
+    price_type: {
+      id: number;
+      name: string;
+    };
+  }[];
 }

src/shared/config/i18n/messages/ru.json

@@ -128,12 +128,22 @@
   "Tez yetkazib berish 1-2 kun ichida": "Быстрая доставка в течение 1-2 дней",
   "Xavfsiz to'lov usullari": "Безопасные способы оплаты",
   "Buyurtma qabul qilindi!": "Заказ принят!",
+  "Xatolik yuz berdi": "Произошла ошибка",
   "Buyurtma raqami": "Номер заказа",
   "Buyurtmangiz muvaffaqiyatli qabul qilindi": "Ваш заказ успешно принят.",
   "Bosh sahifaga qaytish": "Вернуться на главную",
   "Ma'lumotlaringizni to'ldiring": "Заполните ваши данные",
   "Shaxsiy ma'lumotlar": "Личные данные",
   "Ism": "Имя",
+  "Savatcha bo'sh": "Корзина пустая",
+  "Yetkazib berish sanasini tanlang": "Выберите дату доставки",
+  "Yetkazib berish vaqtini tanlang": "Выберите время доставки",
+  "Yetkazib berish vaqti": "Время доставки",
+  "Tanlangan yetkazib berish vaqti": "Выбранное время доставки",
+  "Vaqt oralig'i": "Интервал времени",
+  "Vaqtni tanlang": "Выберите время",
+  "Sanani tanlang": "Выберите дату",
+  "Yetkazib berish sanasi": "Дата доставки",
   "Ismingiz": "Ваше имя",
   "Familiya": "Имя Фамилия",
   "Familiyangiz": "Ваше имя и фамилия",

src/shared/config/i18n/messages/uz.d.json.ts

@@ -163,7 +163,16 @@ declare const messages: {
   'Majburiy maydon': 'Majburiy maydon';
   'Xato raqam kiritildi': 'Xato raqam kiritildi';
   Orqaga: 'Orqaga';
-
+  'Xatolik yuz berdi': 'Xatolik yuz berdi';
+  "Savatcha bo'sh": "Savatcha bo'sh";
+  'Sanani tanlang': 'Sanani tanlang';
+  'Vaqtni tanlang': 'Vaqtni tanlang';
+  'Yetkazib berish sanasi': 'Yetkazib berish sanasi';
+  'Yetkazib berish sanasini tanlang': 'Yetkazib berish sanasini tanlang';
+  'Yetkazib berish vaqtini tanlang': 'Yetkazib berish vaqtini tanlang';
+  'Tanlangan yetkazib berish vaqti': 'Tanlangan yetkazib berish vaqti';
+  'Yetkazib berish vaqti': 'Yetkazib berish vaqti';
+  "Vaqt oralig'i": "Vaqt oralig'i";
   "Sevimlilar bo'sh": "Sevimlilar bo'sh";
   "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz": "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz. Mahsulotlar ro'yxatiga o'ting va yoqqan mahsulotlaringizni saqlang.";
   'Sevimli mahsulotlar': 'Sevimli mahsulotlar';

src/shared/config/i18n/messages/uz.json

@@ -160,7 +160,16 @@
   "Majburiy maydon": "Majburiy maydon",
   "Xato raqam kiritildi": "Xato raqam kiritildi",
   "Orqaga": "Orqaga",
-
+  "Xatolik yuz berdi": "Xatolik yuz berdi",
+  "Savatcha bo'sh": "Savatcha bo'sh",
+  "Sanani tanlang": "Sanani tanlang",
+  "Vaqtni tanlang": "Vaqtni tanlang",
+  "Yetkazib berish sanasi": "Yetkazib berish sanasi",
+  "Yetkazib berish sanasini tanlang": "Yetkazib berish sanasini tanlang",
+  "Yetkazib berish vaqtini tanlang": "Yetkazib berish vaqtini tanlang",
+  "Tanlangan yetkazib berish vaqti": "Tanlangan yetkazib berish vaqti",
+  "Yetkazib berish vaqti": "Yetkazib berish vaqti",
+  "Vaqt oralig'i": "Vaqt oralig'i",
   "Sevimlilar bo'sh": "Sevimlilar bo'sh",
   "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz": "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz. Mahsulotlar ro'yxatiga o'ting va yoqqan mahsulotlaringizni saqlang.",
   "Sevimli mahsulotlar": "Sevimli mahsulotlar",