Merge branch 'samandar' into 'dev'

filter

See merge request azizziy/cpost!24

src/data/customers/customer.requests.ts

@@ -5,7 +5,7 @@ import omit from 'lodash.omit';
 
 export const customer_requests = {
     async getAll(params?: {
-        cargoId?: string;
+        clientName?: string;
         aviaCargoId?: string;
         autoCargoId?: string;
         page?: number;

src/routes/private/boxes/DashboardBoxesPage.tsx

@@ -1,28 +1,25 @@
 'use client';
 
 import ActionPopMenu from '@/components/common/ActionPopMenu';
-import { MyTable, ColumnData } from '@/components/common/MyTable';
+import { ColumnData, MyTable } from '@/components/common/MyTable';
 import StatusChangePopup from '@/components/common/StatusChangePopup';
 import BaseButton from '@/components/ui-kit/BaseButton';
-import BaseIconButton from '@/components/ui-kit/BaseIconButton';
 import BaseInput from '@/components/ui-kit/BaseInput';
 import BasePagination from '@/components/ui-kit/BasePagination';
 import { useAuthContext } from '@/context/auth-context';
 import { BoxStatus, BoxStatusList, IBox } from '@/data/box/box.model';
 import { box_requests } from '@/data/box/box.requests';
 import { DEFAULT_PAGE_SIZE, pageLinks } from '@/helpers/constants';
-import useDebouncedInput from '@/hooks/useDebouncedInput';
 import useInput from '@/hooks/useInput';
 import { useMyNavigation } from '@/hooks/useMyNavigation';
 import { useMyTranslation } from '@/hooks/useMyTranslation';
 import useRequest from '@/hooks/useRequest';
 import { file_service } from '@/services/file-service';
 import { notifyUnknownError } from '@/services/notification';
-import { getBoxStatusStyles, getStatusColor } from '@/theme/getStatusBoxStyles';
+import { getStatusColor } from '@/theme/getStatusBoxStyles';
-import { Add, AddCircleOutline, Circle, Delete, Download, Edit, FilterList, FilterListOff, Search, PlusOne } from '@mui/icons-material';
+import { Add, Circle, Delete, Download, Edit, FilterList, FilterListOff, Search } from '@mui/icons-material';
-import { Box, Button, Stack, Tooltip, Typography } from '@mui/material';
+import { Box, Button, Stack, Typography } from '@mui/material';
-import { useRouter } from 'next/navigation';
+import { useEffect, useMemo, useState } from 'react';
-import React, { useEffect, useMemo, useState } from 'react';
 
 type Props = {};
 
@@ -162,9 +159,11 @@ const DashboardBoxesPage = (props: Props) => {
             label: "Qo'shish",
             width: 120,
             renderCell: data => {
-                return <Button onClick={() => navigation.push(pageLinks.dashboard.boxes.edit(data.id))}>
+                return (
+                    <Button onClick={() => navigation.push(pageLinks.dashboard.boxes.edit(data.id))}>
                         <Add />
-                </Button>;
+                    </Button>
+                );
             },
         },
         {
@@ -179,7 +178,7 @@ const DashboardBoxesPage = (props: Props) => {
         },
         {
             dataKey: 'packetNetWeight',
-            label: t("weight"),
+            label: t('weight'),
             width: 120,
         },
         {
@@ -189,7 +188,7 @@ const DashboardBoxesPage = (props: Props) => {
         },
         {
             dataKey: 'totalNetWeight',
-            label: t("party_weight"),
+            label: t('party_weight'),
             width: 120,
         },
         {

src/routes/private/clients/DashboardClientsPage.tsx

@@ -1,17 +1,14 @@
 'use client';
 
 import ActionPopMenu from '@/components/common/ActionPopMenu';
-import { MyTable, ColumnData } from '@/components/common/MyTable';
+import { ColumnData, MyTable } from '@/components/common/MyTable';
 import BaseButton from '@/components/ui-kit/BaseButton';
-import BaseIconButton from '@/components/ui-kit/BaseIconButton';
 import BaseInput from '@/components/ui-kit/BaseInput';
 import BasePagination from '@/components/ui-kit/BasePagination';
 import { useAuthContext } from '@/context/auth-context';
 import { Customer } from '@/data/customers/customer.model';
 import { customer_requests } from '@/data/customers/customer.requests';
-import { Party } from '@/data/party/party.model';
+import { DEFAULT_PAGE_SIZE } from '@/helpers/constants';
-import { party_requests } from '@/data/party/party.requests';
-import { DEFAULT_PAGE_SIZE, pageLinks } from '@/helpers/constants';
 import useInput from '@/hooks/useInput';
 import { useMyTranslation } from '@/hooks/useMyTranslation';
 import useRequest from '@/hooks/useRequest';
@@ -20,9 +17,9 @@ import CreateClientModal from '@/routes/private/clients/CreateClientModal';
 import EditClientModal from '@/routes/private/clients/EditClientModal';
 import { file_service } from '@/services/file-service';
 import { notifyUnknownError } from '@/services/notification';
-import { Add, AddCircleOutline, Circle, Delete, Edit, FilterList, FilterListOff, Search } from '@mui/icons-material';
+import { Add, Delete, Edit, FilterListOff, Search } from '@mui/icons-material';
-import { Box, Stack, SvgIcon, Tooltip, Typography } from '@mui/material';
+import { Box, Stack, Typography } from '@mui/material';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
 type Props = {};
 
@@ -45,7 +42,7 @@ const DashboardClientsPage = (props: Props) => {
         () =>
             customer_requests.getAll({
                 page: page,
-                cargoId: keyword,
+                clientName: keyword,
             }),
         {
             selectData(data) {
@@ -341,7 +338,7 @@ const DashboardClientsPage = (props: Props) => {
                             }}
                             value={keyword}
                             onChange={handleKeyword}
-                            placeholder={"Kargo ID"}
+                            placeholder={'Kargo ID'}
                         />
 
                         <BaseButton colorVariant='gray' startIcon={<FilterListOff />} size='small' onClick={resetFilter}>