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

accepted items added

Browse Source
This commit is contained in:
Samandar Turg'unboev
2025-06-24 09:34:41 +05:00
parent 70b730fb3f
commit 11faf4a2c9
19 changed files with 957 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
messages/cn.json
View File

@@ -212,5 +212,10 @@
"qr_code": "二维码",
"created_at": "添加日期",
"download_all_items_exel": "将所有产品上传至Excel",
"select_all": "全选,"
"select_all": "全选,",
"product_inspection": "产品检验",
"enter_product": "请输入产品的追溯ID",
"confirmation": "确认",
"view_packet": "查看包裹数据",
"accepted_number": "已接收"
}

7
messages/en.json
View File

@@ -212,5 +212,10 @@
"download_all_items_exel": "Upload all products in Excel",
"select_all": "Select all",
"qr_code": "QR Code",
"created_at": "Date of joining"
"created_at": "Date of joining",
"product_inspection": "Product Inspection",
"enter_product": "Enter your product tracking ID",
"confirmation": "Confirm",
"view_packet": "View package data",
"accepted_number": "Accepted"
}

6
messages/ru.json
View File

@@ -224,7 +224,11 @@
"party_weight": "Вес партии",
"download_all_items_exel": "Загрузить все товары в Excel",
"select_all": "Выделить все",
"product_inspection": "Проверка товаров",
"enter_product": "Enter your product tracking ID",
"confirmation": "Подтверждение",
"view_packet": "Просмотреть данные посылки",
"accepted_number": "Принято",
"qr_code": "QR код",
"created_at": "Дата добавления"
}

5
messages/uz.json
View File

@@ -117,6 +117,8 @@
"create_packet": "Paket yaratish",
"update_box": "Qutni yangilash",
"update_package": "Paketni yangilash",
"view_packet": "Paketni ma'lumotlarini ko'rish",
"accepted_number": "Qabul qilingan",
"update_item": "Mahsulotni yangilash",
"no": "Yo'q",
"id": "ID",
@@ -223,6 +225,9 @@
"update_packet": "Paketni Tahrirlash",
"party_weight": "Partiya og'irligi",
"select_all": "Hammasini belgilash",
"product_inspection": "Mahsulotlarni tekshirish",
"enter_product": "Mahsulotning Trassirovka IDni kiriting",
"confirmation": "Tasdiqlash",
"qr_code": "QR kod",
"created_at": "Qo‘shilgan sana"

4
package.json
View File

@@ -3,9 +3,9 @@
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "cross-env NEXT_PUBLIC_API_URL=https://cpost.felixits.uz next dev --port=3080",
"dev": "cross-env NEXT_PUBLIC_API_URL=https://cpcargo.felixits.uz next dev --port=3080",
"build": "cross-env NEXT_PUBLIC_API_URL=https://api.cpost-express.uz next build",
"build:dev": "cross-env NEXT_PUBLIC_API_URL=https://cpost.felixits.uz next build",
"build:dev": "cross-env NEXT_PUBLIC_API_URL=https://cpcargo.felixits.uz next build",
"build:prod": "cross-env NEXT_PUBLIC_API_URL=https://api.cpost-express.uz next build",
"start": "next start",
"lint": "next lint",

9
src/app/[locale]/dashboard/packets/[box_id]/loading.tsx Normal file
View File

@@ -0,0 +1,9 @@
import { CircularProgress, Stack } from '@mui/material';
export default function DashboardLoading() {
return (
<Stack justifyContent={'center'} alignItems={'center'} p={8}>
<CircularProgress size={'64px'} />
</Stack>
);
}

5
src/app/[locale]/dashboard/packets/[box_id]/page.tsx Normal file
View File

@@ -0,0 +1,5 @@
import DashboardBoxesOnePage from '@/routes/private/boxes-one';
export default function Home() {
return <DashboardBoxesOnePage />;
}

79
src/components/common/MyTable/MyTable.tsx
View File

@@ -1,23 +1,8 @@
import Loader from '@/components/common/Loader';
import { Scrollbar } from '@/components/common/Scrollbar';
import BaseButton from '@/components/ui-kit/BaseButton';
import BaseIconButton from '@/components/ui-kit/BaseIconButton';
import { FilterList, Search } from '@mui/icons-material';
import {
Box,
IconButton,
Stack,
SxProps,
Table,
TableBody,
TableHead,
TableRow,
Theme,
Tooltip,
Typography,
styled,
TableCell,
} from '@mui/material';
import { box_requests } from '@/data/box/box.requests';
import useRequest from '@/hooks/useRequest';
import { Box, styled, SxProps, Table, TableBody, TableCell, TableHead, TableRow, Theme } from '@mui/material';
import React from 'react';
export interface ColumnData<Data, DataKey = keyof Data> {
@@ -75,10 +60,11 @@ type Props<Data> = {
data: Data[];
loading: boolean;
onClickRow?: (data: Data) => void;
color?: string;
};
const MyTable = <Data extends { id: number | string }>(props: Props<Data>) => {
const { columns, data, loading, onClickRow } = props;
const { columns, data, loading, onClickRow, color } = props;
const isEmpty = !data?.length && !loading;
@@ -113,11 +99,63 @@ const MyTable = <Data extends { id: number | string }>(props: Props<Data>) => {
<Loader p={4} size={96} />
</StyledTableCell>
) : (
data.map((row, rowIndex) => {
data.map((row: any, rowIndex) => {
let status = undefined;
const getOneBox = useRequest(
() => {
return box_requests.find({ packetId: row.id });
},
{
selectData(data) {
const boxData = data.data.data;
return {
products_list: [
...boxData.items.map(item => {
let name = item.name;
let nameRu = item.nameRu;
return {
id: item.id,
price: item.price,
cargoId: item.cargoId,
trekId: item.trekId,
name: name,
acceptedNumber: item.acceptedNumber,
nameRu: nameRu,
amount: +item.amount,
weight: +item.weight,
};
}),
],
};
},
}
);
{
(() => {
const total = getOneBox.data?.products_list.reduce(
(acc, product) => {
console.log(product, 'totalAccepted');
acc.totalAmount += +product.amount || 0;
acc.totalAccepted += +product.acceptedNumber || 0;
return acc;
},
{ totalAmount: 0, totalAccepted: 0 }
);
status = total?.totalAmount === total?.totalAccepted;
})();
}
console.log(row, 'clent');
return (
<StyledTableRow
key={row.id}
sx={{
background: !row.hasInvoice ? 'inherit' : status ? '#a3e635' : '#f87171',
...(onClickRow
? {
cursor: 'pointer',
@@ -141,7 +179,6 @@ const MyTable = <Data extends { id: number | string }>(props: Props<Data>) => {
width: column.width,
}}
>
{/* @ts-expect-error */}
{column.renderCell ? column.renderCell(row, rowIndex) : row[column.dataKey]}
</StyledTableCell>
))}

1
src/data/box/box.model.ts
View File

@@ -52,6 +52,7 @@ export interface IBoxDetail {
nameRu: string;
amount: number;
weight: number;
acceptedNumber: number;
price: number;
totalPrice: number;
hasImage: boolean;

9
src/data/item/item.mode.ts
View File

@@ -11,9 +11,10 @@ export type Product = {
amount: number;
weight: number;
price?: number;
packetName: string;
totalPrice?: number;
status: BoxStatus;
acceptedNumber: number;
hasImage: boolean;
};
@@ -22,11 +23,11 @@ export type CreateProductBodyType = {
};
export type UpdateProductBodyType = {
itemId: number;
cargoId: string;
itemId: string | number;
trekId: string;
name: string;
nameRu: string;
amount: number;
weight: number;
acceptedNumber: number;
};

2
src/data/item/item.requests.ts
View File

@@ -8,7 +8,7 @@ export const item_requests = {
packetId?: number | string;
partyId?: number | string;
name?: string;
trekId?: string;
trekId?: string | number;
page?: number;
sort?: string;
status?: BoxStatus;

1
src/helpers/constants.ts
View File

@@ -15,6 +15,7 @@ export const pageLinks = {
},
boxes: {
index: '/dashboard/packets',
detail: (slug: string | number) => '/dashboard/packets/' + slug,
create: '/dashboard/packets/create',
edit: (slug: string | number) => '/dashboard/packets/edit/' + slug,
},

48
src/routes/private/boxes-create/DashboardCreateBox.tsx
View File

@@ -1,34 +1,31 @@
'use client';
import BaseButton from '@/components/ui-kit/BaseButton';
import BaseInput from '@/components/ui-kit/BaseInput';
import { party_requests } from '@/data/party/party.requests';
import { pageLinks } from '@/helpers/constants';
import { notifyError, notifyUnknownError } from '@/services/notification';
import { Box, Divider, FormHelperText, Grid, Stack, Typography, styled } from '@mui/material';
import { useParams, useRouter, useSearchParams } from 'next/navigation';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { useLocale } from 'use-intl';
import { Controller, useFieldArray, useForm } from 'react-hook-form';
import BaseIconButton from '@/components/ui-kit/BaseIconButton';
import { AddCircleRounded, Close } from '@mui/icons-material';
import { box_requests } from '@/data/box/box.requests';
import useRequest from '@/hooks/useRequest';
import { useMyTranslation } from '@/hooks/useMyTranslation';
import { BoxStatus, CreateBoxBodyType, UpdateBoxBodyType } from '@/data/box/box.model';
import BaseInput from '@/components/ui-kit/BaseInput';
import BaseReactSelect, { selectDefaultStyles } from '@/components/ui-kit/BaseReactSelect';
import { customer_requests } from '@/data/customers/customer.requests';
import { useAuthContext } from '@/context/auth-context';
import { useMyNavigation } from '@/hooks/useMyNavigation';
import AsyncSelect from 'react-select/async';
import { Party } from '@/data/party/party.model';
import cloneDeep from 'lodash.clonedeep';
import { item_requests } from '@/data/item/item.requests';
import get from 'lodash.get';
import Loader from '@/components/common/Loader';
import { BoxStatus, CreateBoxBodyType, UpdateBoxBodyType } from '@/data/box/box.model';
import { box_requests } from '@/data/box/box.requests';
import { Customer } from '@/data/customers/customer.model';
import { customer_requests } from '@/data/customers/customer.requests';
import { item_requests } from '@/data/item/item.requests';
import { Party } from '@/data/party/party.model';
import { party_requests } from '@/data/party/party.requests';
import { Passport } from '@/data/passport/passport.model';
import { passport_requests } from '@/data/passport/passport.request';
import { pageLinks } from '@/helpers/constants';
import { useMyNavigation } from '@/hooks/useMyNavigation';
import { useMyTranslation } from '@/hooks/useMyTranslation';
import useRequest from '@/hooks/useRequest';
import { notifyError, notifyUnknownError } from '@/services/notification';
import { AddCircleRounded, Close } from '@mui/icons-material';
import { Box, Divider, FormHelperText, Grid, Stack, Typography, styled } from '@mui/material';
import get from 'lodash.get';
import { useSearchParams } from 'next/navigation';
import React, { useEffect, useMemo, useRef, useState } from 'react';
import { Controller, useFieldArray, useForm } from 'react-hook-form';
import AsyncSelect from 'react-select/async';
const StyledCreateBox = styled(Box)`
.item-row {
@@ -160,8 +157,8 @@ const DashboardCreateBoxPage = ({ initialValues, partiesData }: Props) => {
label: initialValues?.passportName,
},
];
const n = "123ds"
n.toUpperCase()
const n = '123ds';
n.toUpperCase();
const { data: passportOptions } = useRequest(() => passport_requests.getAll({ cargoId: cargoId?.toUpperCase() }), {
enabled: !!cargoId,
selectData: data => {
@@ -185,7 +182,7 @@ const DashboardCreateBoxPage = ({ initialValues, partiesData }: Props) => {
placeholderData: [], // Kerak emas, chunki server PageAble qaytarmayapti
onSuccess(data) {
if (data?.data.data?.[0]?.id) {
setValue("passportId", initialValues?.passportId)
setValue('passportId', initialValues?.passportId);
setValue('passport_id', data.data.data[0].id);
setSelectedPassport(data.data.data[0]); // Birinchi elementni tanlash
}
@@ -251,7 +248,6 @@ const DashboardCreateBoxPage = ({ initialValues, partiesData }: Props) => {
};
const onSubmit = handleSubmit(async values => {
try {
setLoading(true);

3
src/routes/private/boxes-create/DashboardEditBox.tsx
View File

@@ -5,7 +5,6 @@ import { box_requests } from '@/data/box/box.requests';
import useRequest from '@/hooks/useRequest';
import DashboardCreateBoxPage from '@/routes/private/boxes-create/DashboardCreateBox';
import { useParams } from 'next/navigation';
import React from 'react';
type Props = {};
@@ -71,7 +70,7 @@ const DashboardEditBoxPage = (props: Props) => {
}
);
console.log(getOneBox, "pkets");
console.log(getOneBox, 'pkets');
if (getOneBox.loading || !getOneBox.data) {
return <Loader p={8} size={96} />;

322
src/routes/private/boxes-one/BoxesOne.tsx Normal file
View File

@@ -0,0 +1,322 @@
'use client';
import Loader from '@/components/common/Loader';
import BaseInput from '@/components/ui-kit/BaseInput';
import { useAuthContext } from '@/context/auth-context';
import { BoxStatus } from '@/data/box/box.model';
import { box_requests } from '@/data/box/box.requests';
import { useMyTranslation } from '@/hooks/useMyTranslation';
import useRequest from '@/hooks/useRequest';
import { Box, Divider, Grid, Stack, Typography, styled } from '@mui/material';
import { useParams } from 'next/navigation';
import { useMemo } from 'react';
const StyledViewBox = styled(Box)`
.item-row {
display: flex;
align-items: center;
justify-content: space-between;
gap: 16px;
}
.item-row-field {
flex: 1;
}
& > * {
flex: 1 1 auto;
}
`;
const DashboardBoxesOnePage = () => {
const params = useParams();
const box_id = params.box_id as string;
const { isAdmin: isAdminUser } = useAuthContext();
const t = useMyTranslation();
const { data: boxData, loading } = useRequest(() => box_requests.find({ packetId: box_id }), {
selectData(data) {
const boxData = data.data.data;
return {
id: +box_id,
box_name: boxData.packet.name,
net_weight: +boxData.packet.brutto,
box_weight: +boxData.packet.boxWeight,
box_type: boxData.packet.boxType,
box_size: boxData.packet.volume,
passportName: boxData.packet.passportName,
status: boxData.packet.status,
packetId: box_id,
partyId: +boxData.packet.partyId,
partyName: boxData.packet.partyName,
passportId: boxData.client?.passportId,
client_id: boxData.packet?.cargoId,
clientName: boxData.client?.passportName,
products_list: boxData.items.map(item => ({
id: item.id,
price: item.price,
cargoId: item.cargoId,
trekId: item.trekId,
name: item.name,
nameRu: item.nameRu,
amount: +item.amount,
acceptedNumber: item.acceptedNumber,
weight: +item.weight,
})),
};
},
});
const boxStatuses = useMemo(() => {
const statuses: { label: string; value: BoxStatus }[] = [
{
label: t('READY_TO_INVOICE'),
value: 'READY_TO_INVOICE',
},
];
if (isAdminUser) {
statuses.push({
label: t('READY'),
value: 'READY',
});
}
return statuses;
}, [isAdminUser, t]);
if (loading || !boxData) {
return <Loader p={8} size={96} />;
}
return (
<StyledViewBox
width={1}
mb={3}
sx={{
padding: '28px',
borderRadius: '16px',
backgroundColor: '#fff',
}}
>
<Box>
<Typography variant='h5' mb={3.5}>
{t('view_packet')}
</Typography>
<Grid container columnSpacing={2.5} rowSpacing={3} mb={3.5}>
<Grid item xs={5}>
<Typography fontSize='18px' fontWeight={500} color='#5D5850' mb={2}>
{t('party_name')}
</Typography>
<Typography sx={{ width: '100%', border: '1px solid gray', padding: '8px', borderRadius: '12px' }}>
{boxData.partyName || '-'}
</Typography>
</Grid>
<Grid item xs={5}>
<Typography fontSize='18px' fontWeight={500} color='#5D5850' mb={2}>
{t('cargo_id')}
</Typography>
<Typography sx={{ width: '100%', border: '1px solid gray', padding: '8px', borderRadius: '12px' }}>
{boxData.client_id || '-'}
</Typography>
</Grid>
<Grid item xs={5}>
<Typography fontSize='18px' fontWeight={500} color='#5D5850' mb={2}>
{t('passport')}
</Typography>
<Typography sx={{ width: '100%', border: '1px solid gray', padding: '8px', borderRadius: '12px' }}>
{boxData.passportName || '-'}
</Typography>
</Grid>
<Grid item xs={12}>
<Stack
sx={{
borderRadius: '8px',
border: '2px solid #3489E4',
background: '#FFF',
padding: '24px',
}}
>
{boxData.products_list.map((product, index: number) => {
//
//
let totalPrice = 0;
try {
const p = +product.price * +product.amount;
if (!Number.isNaN(p)) {
totalPrice = p;
}
} catch (error) {}
return (
<Box key={index} mb={1.5}>
<Box className='item-row' mb={1.5}>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('track_id')}
</Typography>
<BaseInput
InputProps={{
startAdornment: (
<Box
sx={{
backgroundColor: '#EBEFF5',
color: '#929191',
alignSelf: 'stretch',
height: 'auto',
display: 'flex',
alignItems: 'center',
pl: '10px',
pr: '10px',
borderRadius: '8px 0 0 8px',
}}
>
<span>ID</span>
</Box>
),
}}
fullWidth
placeholder={t('id')}
disabled
defaultValue={product.trekId}
sx={{
'.MuiInputBase-root': {
paddingLeft: 0,
},
}}
/>
</Box>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('name')}
</Typography>
<BaseInput
fullWidth
mainBorderColor='#D8D8D8'
placeholder={t('name')}
defaultValue={product.name}
disabled
/>
</Box>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{'NAME_RU'}
</Typography>
<BaseInput
defaultValue={product.nameRu}
disabled
fullWidth
mainBorderColor='#D8D8D8'
placeholder={t('name')}
InputProps={{
sx: {
'&.Mui-disabled': {
color: '!important',
},
'& input.Mui-disabled': {
color: 'black !important',
},
},
}}
/>
</Box>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('quantity')}
</Typography>
<BaseInput
fullWidth
type='number'
mainBorderColor='#D8D8D8'
placeholder={t('quantity')}
defaultValue={product.amount}
disabled
/>
</Box>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('accepted_number')}
</Typography>
<BaseInput
fullWidth
type='number'
inputProps={{ step: 'any', min: 0, type: 'number' }}
mainBorderColor='#D8D8D8'
placeholder={t('accepted_number')}
defaultValue={product.acceptedNumber === null ? 0 : product.acceptedNumber}
disabled
/>
</Box>
<>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('weight')}
</Typography>
<Stack direction={'row'} alignItems={'center'} spacing={2.5}>
<BaseInput
fullWidth
type='text'
inputProps={{
step: 0.1,
}}
mainBorderColor='#D8D8D8'
placeholder={t('weight')}
defaultValue={product.weight}
disabled
/>
</Stack>
</Box>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('price')}
</Typography>
<BaseInput
fullWidth
type='text'
inputProps={{
step: 0.1,
}}
defaultValue={product.price}
disabled
mainBorderColor='#D8D8D8'
placeholder={t('price')}
/>
</Box>
<Box className='item-row-field'>
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('total_price')}
</Typography>
<BaseInput
fullWidth
type='number'
inputProps={{
step: 0.001,
}}
disabled
value={totalPrice}
mainBorderColor='#D8D8D8'
placeholder={t('total_price')}
/>
</Box>
</>
</Box>
<Divider color='#EBEFF6' />
</Box>
);
})}
</Stack>
</Grid>
</Grid>
</Box>
</StyledViewBox>
);
};
export default DashboardBoxesOnePage;

1
src/routes/private/boxes-one/index.ts Normal file
View File

@@ -0,0 +1 @@
export { default } from './BoxesOne';

221
src/routes/private/boxes/DashboardBoxesPage.tsx
View File

@@ -9,6 +9,8 @@ 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 { Product, UpdateProductBodyType } from '@/data/item/item.mode';
import { item_requests } from '@/data/item/item.requests';
import { DEFAULT_PAGE_SIZE, pageLinks } from '@/helpers/constants';
import useInput from '@/hooks/useInput';
import { useMyNavigation } from '@/hooks/useMyNavigation';
@@ -17,13 +19,32 @@ import useRequest from '@/hooks/useRequest';
import { file_service } from '@/services/file-service';
import { notifyUnknownError } from '@/services/notification';
import { getStatusColor } from '@/theme/getStatusBoxStyles';
import { Add, Circle, Delete, Download, Edit, FilterList, FilterListOff, Search } from '@mui/icons-material';
import { Box, Button, Stack, Typography } from '@mui/material';
import { Add, Circle, Delete, Download, Edit, FilterList, FilterListOff, RemoveRedEye, Search } from '@mui/icons-material';
import { Box, Button, Card, CardContent, Modal, Stack, TextField, Typography } from '@mui/material';
import { useEffect, useMemo, useState } from 'react';
import { useForm } from 'react-hook-form';
type Props = {};
const style = {
position: 'absolute',
top: '50%',
left: '50%',
transform: 'translate(-50%, -50%)',
width: 400,
bgcolor: 'background.paper',
border: '2px solid #000',
boxShadow: 24,
display: 'flex',
flexDirection: 'column',
gap: '10px',
p: 4,
};
const DashboardBoxesPage = (props: Props) => {
const [open, setOpen] = useState(false);
const handleOpen = () => setOpen(true);
const handleClose = () => setOpen(false);
const t = useMyTranslation();
const navigation = useMyNavigation();
const { isAdmin } = useAuthContext();
@@ -31,6 +52,7 @@ const DashboardBoxesPage = (props: Props) => {
const [pageSize] = useState(DEFAULT_PAGE_SIZE);
const { value: keyword, onChange: handleKeyword, setValue: setKeyword } = useInput('');
const [boxStatusFilter, setBoxStatusFilter] = useState<BoxStatus | undefined>(undefined);
const [trackId, setTrackId] = useState<string>();
const [deleteIds, setDeleteIds] = useState<number[]>([]);
const [downloadIds, setDownloadIds] = useState<number[]>([]);
@@ -61,6 +83,31 @@ const DashboardBoxesPage = (props: Props) => {
}
);
const getListQuery = useRequest(
() =>
item_requests.getAll({
page: page,
trekId: trackId,
}),
{
dependencies: [page, trackId],
selectData(data) {
return data.data.data;
},
}
);
const [values, setValues] = useState<{ [trackId: string]: number | '' }>({});
const handleAmountChange = (event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>, max: number, trackId: string) => {
const val = Number(event.target.value);
if (val >= 1 && val <= max) {
setValues(prev => ({ ...prev, [trackId]: val }));
} else if (event.target.value === '') {
setValues(prev => ({ ...prev, [trackId]: '' }));
}
};
const {
data: list,
totalElements,
@@ -185,6 +232,62 @@ const DashboardBoxesPage = (props: Props) => {
dataKey: 'totalItems',
label: t('count_of_items'),
width: 120,
renderCell: data => {
const getOneBox = useRequest(
() => {
return box_requests.find({ packetId: data.id });
},
{
selectData(data) {
const boxData = data.data.data;
return {
products_list: [
...boxData.items.map(item => {
let name = item.name;
let nameRu = item.nameRu;
return {
id: item.id,
price: item.price,
cargoId: item.cargoId,
trekId: item.trekId,
name: name,
acceptedNumber: item.acceptedNumber,
nameRu: nameRu,
amount: +item.amount,
weight: +item.weight,
};
}),
],
};
},
}
);
return (
<div>
{(() => {
const total = getOneBox.data?.products_list.reduce(
(acc, product) => {
console.log(product, 'totalAccepted');
acc.totalAmount += +product.amount || 0;
acc.totalAccepted += +product.acceptedNumber || 0;
return acc;
},
{ totalAmount: 0, totalAccepted: 0 }
);
return (
<Typography>
{total?.totalAmount} | {total?.totalAccepted}
</Typography>
);
})()}
</div>
);
},
},
{
dataKey: 'totalNetWeight',
@@ -272,6 +375,13 @@ const DashboardBoxesPage = (props: Props) => {
return (
<ActionPopMenu
buttons={[
{
icon: <RemoveRedEye sx={{ path: { color: '#3489E4' } }} />,
label: t('view_packet'),
onClick: () => {
navigation.push(pageLinks.dashboard.boxes.detail(data.id));
},
},
{
icon: <Edit sx={{ path: { color: '#3489E4' } }} />,
label: t('edit'),
@@ -307,6 +417,53 @@ const DashboardBoxesPage = (props: Props) => {
},
},
];
const [items, setItems] = useState<Product>();
const [loaer, setLoading] = useState(false);
const {
register,
control,
handleSubmit,
watch,
setValue,
formState: { errors },
} = useForm<Product>({
defaultValues: {
trekId: items?.trekId,
name: items?.name,
nameRu: items?.nameRu,
amount: items?.amount,
weight: items?.weight,
acceptedNumber: Number(values),
},
});
const updateItems = async (item: Product, acceptedNumber: number) => {
try {
setLoading(true);
const updateBody: UpdateProductBodyType = {
itemId: item.id,
acceptedNumber,
amount: item.amount,
name: item.name,
nameRu: item.nameRu,
trekId: item.trekId,
weight: item.weight,
};
await item_requests.update(updateBody);
// Ma'lumotni yangilab olamiz
getListQuery.refetch();
getBoxesQuery.refetch();
setValues(prev => ({ ...prev, [item.trekId]: '' }));
} catch (error) {
notifyUnknownError(error);
} finally {
setLoading(false);
}
};
return (
<Box>
@@ -314,6 +471,66 @@ const DashboardBoxesPage = (props: Props) => {
<BaseButton colorVariant='blue' startIcon={<Add />} href={pageLinks.dashboard.boxes.create}>
{t('create_packet')}
</BaseButton>
<Button onClick={handleOpen}>{t('product_inspection')}</Button>
<Modal open={open} onClose={handleClose} aria-labelledby='modal-modal-title' aria-describedby='modal-modal-description'>
<Box sx={style}>
<Typography id='modal-modal-title' variant='h6' component='h2'>
{t('product_inspection')}
</Typography>
<Typography id='modal-modal-description' sx={{ mt: 2 }}>
{t('enter_product')}
</Typography>
<TextField
id='outlined-basic'
label={t('track_id')}
variant='outlined'
onChange={e => setTrackId(e.target.value)}
/>
{trackId && trackId.length > 0 && (
<>
{getListQuery.loading ? (
<Typography sx={{ mt: 2 }}>{t('loading')}...</Typography> // yoki <CircularProgress />
) : getListQuery.data?.data && getListQuery.data?.data.length > 0 ? (
getListQuery.data?.data.map(e => (
<Box key={e.id} sx={{ width: '100%', display: 'flex', flexDirection: 'column' }}>
<Card sx={{ minWidth: 275, mb: 2 }}>
<CardContent>
<Typography sx={{ fontSize: 14 }}>
{t('track_id')}: {e.trekId}
</Typography>
<Typography sx={{ fontSize: 14 }}>Nomi: {e.name || e.nameRu}</Typography>
<Typography sx={{ fontSize: 14 }}>Mahsulot soni: {e.amount}</Typography>
<Typography sx={{ fontSize: 14 }}>Paket nomi: {e?.packetName}</Typography>
</CardContent>
</Card>
<TextField
id={`amount-${e.trekId}`}
label='Mahsulot soni'
type='number'
sx={{ width: '100%' }}
value={values[e.trekId] ?? ''}
onChange={change => handleAmountChange(change, e.amount, e.trekId)}
inputProps={{ min: 1, max: e.amount }}
/>
<Button
sx={{ mt: '10px' }}
onClick={() => {
if (values[e.trekId] !== '') {
updateItems(e, Number(values[e.trekId]));
}
}}
>
{t('confirmation')}
</Button>
</Box>
))
) : (
<Typography sx={{ mt: 2 }}>{t('no_products_found') || 'Mahsulot topilmadi'}</Typography>
)}
</>
)}
</Box>
</Modal>
</Stack>
<Box
width={1}

17
src/routes/private/clients/DashboardClientsPage.tsx
View File

@@ -29,6 +29,7 @@ const DashboardClientsPage = (props: Props) => {
const [page, setPage] = useState(1);
const [pageSize] = useState(DEFAULT_PAGE_SIZE);
const { value: keyword, onChange: handleKeyword, setValue: setKeyword } = useInput('');
const { value: name, onChange: handleName, setValue: setName } = useInput('');
const { value: aviaCargoIdValue, onChange: handleAviaCargoIdValue, setValue: setAviaCargoIdValue } = useInput('');
const { value: autoCargoIdValue, onChange: handleAutoCargoIdValue, setValue: setAutoCargoIdValue } = useInput('');
@@ -42,7 +43,8 @@ const DashboardClientsPage = (props: Props) => {
() =>
customer_requests.getAll({
page: page,
clientName: keyword,
clientName: name,
autoCargoId: keyword,
}),
{
selectData(data) {
@@ -112,6 +114,7 @@ const DashboardClientsPage = (props: Props) => {
setPage(1);
setKeyword('');
setAviaCargoIdValue('');
setName('');
setAutoCargoIdValue('');
};
@@ -136,7 +139,7 @@ const DashboardClientsPage = (props: Props) => {
getClientsQuery.refetch();
}, 350);
return () => clearTimeout(timeoutId);
}, [keyword, aviaCargoIdValue, autoCargoIdValue]);
}, [keyword, aviaCargoIdValue, autoCargoIdValue, name]);
const columns: ColumnData<Customer>[] = [
{
@@ -332,13 +335,21 @@ const DashboardClientsPage = (props: Props) => {
{/* onChange={handleAutoCargoIdValue}*/}
{/* placeholder={t('auto_cargo_id')}*/}
{/*/>*/}
<BaseInput
InputProps={{
startAdornment: <Search color='primary' />,
}}
value={name}
onChange={handleName}
placeholder={t('name')}
/>
<BaseInput
InputProps={{
startAdornment: <Search color='primary' />,
}}
value={keyword}
onChange={handleKeyword}
placeholder={'Kargo ID'}
placeholder={t('id')}
/>
<BaseButton colorVariant='gray' startIcon={<FilterListOff />} size='small' onClick={resetFilter}>

291
src/routes/private/real-boxes-create/DashboardCreateRealBox.tsx
View File

@@ -34,7 +34,7 @@ import {
import { useQuery } from '@tanstack/react-query';
import get from 'lodash.get';
import { useSearchParams } from 'next/navigation';
import { useEffect, useRef, useState } from 'react';
import { useEffect, useMemo, useState } from 'react';
import { Controller, useFieldArray, useForm } from 'react-hook-form';
const StyledCreateBox = styled(Box)`
@@ -67,9 +67,26 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
const t = useMyTranslation();
const params = useSearchParams();
const { push } = useMyNavigation();
const [partyId, setPartyId] = useState<number | string>('');
const [partyId, setPartyId] = useState<number | string>(initialValues?.partyId || '');
const [loading, setLoading] = useState(false);
const selectMenuProps = useMemo(
() => ({
PaperProps: { style: { maxHeight: 280 } },
autoFocus: false,
disableAutoFocus: true,
disableEnforceFocus: true,
disableRestoreFocus: true,
disableScrollLock: true,
}),
[]
);
// Barcha box/packetlarni barcha sahifadan yuklash uchun state
const [allPackets, setAllPackets] = useState<any[]>([]);
// Barcha mahsulotlarni barcha sahifadan yuklash uchun map
const [allItemsMap, setAllItemsMap] = useState<{ [packetId: number]: any[] }>({});
const {
control,
handleSubmit,
@@ -94,6 +111,65 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
},
});
// Paketlar va mahsulotlarni yuklash
const [isLoadingPackets, setIsLoadingPackets] = useState(false);
useEffect(() => {
const fetchAllPackets = async () => {
if (!partyId) {
setAllPackets([]);
return;
}
setIsLoadingPackets(true);
let packets: any[] = [];
let totalPages = 1;
try {
const firstRes = await box_requests.getAll({ partyId, page: 1 });
const firstData = firstRes?.data?.data;
packets = firstData?.data || [];
totalPages = firstData?.totalPages || 1;
if (totalPages > 1) {
const promises = [];
for (let page = 2; page <= totalPages; page++) {
promises.push(box_requests.getAll({ partyId, page }));
}
const results = await Promise.all(promises);
results.forEach(res => {
const data = res?.data?.data;
packets = [...packets, ...(data?.data || [])];
});
}
} catch (e) {}
setAllPackets(packets);
setIsLoadingPackets(false);
};
fetchAllPackets();
}, [partyId]);
const fetchAllItemsForPacket = async (packetId: number) => {
let items: any[] = [];
let totalPages = 1;
try {
const firstRes = await item_requests.getAll({ packetId, page: 1 });
const firstData = firstRes?.data?.data;
items = firstData?.data || [];
totalPages = firstData?.totalPages || 1;
if (totalPages > 1) {
const promises = [];
for (let page = 2; page <= totalPages; page++) {
promises.push(item_requests.getAll({ packetId, page }));
}
const results = await Promise.all(promises);
results.forEach(res => {
const data = res?.data?.data;
items = [...items, ...(data?.data || [])];
});
}
} catch (e) {}
setAllItemsMap(prev => ({ ...prev, [packetId]: items }));
return items;
};
useEffect(() => {
if (initialValues) {
reset({
@@ -111,9 +187,15 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
if (initialValues.partyId) {
setPartyId(initialValues.partyId);
}
if (initialValues.paketIds) {
initialValues.paketIds.forEach((paket: any) => {
fetchAllItemsForPacket(paket.id);
});
}
}
}, [initialValues, reset]);
// useFieldArray keyName="key" orqali unique key
const { fields, append, remove } = useFieldArray({
control,
name: 'packetItemDtos',
@@ -165,21 +247,16 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
}
});
const handlePacketChange = (index: number, value: number) => {
setValue(`packetItemDtos.${index}.packetId`, value);
setValue(`packetItemDtos.${index}.itemDtos`, []);
};
const appendPacket = () => {
append({ packetId: 0, itemDtos: [] });
setTimeout(() => {
document.activeElement instanceof HTMLElement && document.activeElement.blur();
}, 0);
};
const removePacket = (index: number) => {
remove(index);
};
const [packetSearchTerm, setPacketSearchTerm] = useState('');
const packetSearchInputRef = useRef<HTMLInputElement>(null);
const handlePartyChange = (event: any) => {
const selectedParty = parties.find(p => p.id === event.target.value);
@@ -190,113 +267,76 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
}
};
const [paketName, setPaketName] = useState<string>('');
const PacketRow = ({ index, field }: { index: number; field: any }) => {
const packetId = watch(`packetItemDtos.${index}.packetId`);
const [itemsPage, setItemsPage] = useState(1);
const [itemsList, setItemsList] = useState<any[]>([]);
const [itemsHasMore, setItemsHasMore] = useState(true);
const itemScrollRef = useRef<HTMLDivElement>(null);
const [packetsPage, setPacketsPage] = useState(1);
const [packetsList, setPacketsList] = useState<any[]>([]);
const [packetsHasMore, setPacketsHasMore] = useState(true);
const [selectedProductNames, setSelectedProductNames] = useState<{ [packetIndex: number]: { [productId: number]: string } }>({});
const [paketName, setPaketName] = useState<string>('');
const [lastPacketId, setLastPacketId] = useState<number | null>(null);
const { isLoading: isLoadingProducts } = useQuery({
queryKey: ['product-list', packetId, itemsPage],
queryFn: () => item_requests.getAll({ packetId, page: itemsPage }),
enabled: !!packetId,
onSuccess: data => {
const newItems = data?.data?.data?.data || [];
setItemsList(prev => (itemsPage === 1 ? newItems : [...prev, ...newItems]));
},
});
const packetScrollRef = useRef<HTMLDivElement>(null);
const [keyword, setKeyword] = useState<string>('');
const { isFetching: isLoadingPackets } = useQuery({
queryKey: ['packets-list', partyId, keyword, packetsPage],
queryFn: () => box_requests.getAll({ partyId, cargoId: keyword, page: packetsPage }),
enabled: !!partyId,
onSuccess: data => {
const newPackets = data?.data?.data?.data || [];
setPacketsList(prev => (packetsPage === 1 ? newPackets : [...prev, ...newPackets]));
const totalPages = data?.data?.data?.totalPages || 0;
setPacketsHasMore(packetsPage < totalPages);
},
const [selectedProductNames, setSelectedProductNames] = useState<{ [productId: number]: string }>({});
const packetsList = keyword ? allPackets.filter(p => (p.name || '').toLowerCase().includes(keyword.toLowerCase())) : allPackets;
const itemsList = allItemsMap[packetId] || [];
const loadingItems = !allItemsMap[packetId] && !!packetId;
useEffect(() => {
if (packetId && !allItemsMap[packetId]) {
fetchAllItemsForPacket(packetId);
}
}, [packetId]);
useEffect(() => {
if (packetId && field?.itemDtos?.length && itemsList.length) {
const names: { [productId: number]: string } = {};
field.itemDtos.forEach((id: number) => {
const prod = itemsList.find(p => p.id === id);
names[id] = prod?.name || prod?.nameRu || String(id);
});
const handlePacketScroll = (e: React.UIEvent<HTMLDivElement>) => {
const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
const isNearBottom = scrollHeight - scrollTop - clientHeight < 50;
if (isNearBottom && !isLoadingPackets && packetsHasMore) {
setPacketsPage(prev => prev + 1);
setSelectedProductNames(names);
}
};
}, [field?.itemDtos, itemsList, packetId]);
const handleItemScroll = (e: React.UIEvent<HTMLDivElement>) => {
const { scrollTop, scrollHeight, clientHeight } = e.currentTarget;
const isNearBottom = scrollHeight - scrollTop - clientHeight < 50;
if (isNearBottom && !isLoadingProducts && itemsHasMore) {
setItemsPage(prev => prev + 1);
}
};
const handleProductChange = (packetIndex: number, product: any, checked: boolean) => {
const handleProductChange = (product: any, checked: boolean) => {
setSelectedProductNames(prev => {
const prevNames = prev[packetIndex] || {};
if (checked) {
return { ...prev, [packetIndex]: { ...prevNames, [product.id]: product.name || product.nameRu || String(product.id) } };
return { ...prev, [product.id]: product.name || product.nameRu || String(product.id) };
} else {
const newNames = { ...prevNames };
const newNames = { ...prev };
delete newNames[product.id];
return { ...prev, [packetIndex]: newNames };
return newNames;
}
});
};
useEffect(() => {
const element = document.getElementById(`packet-select-${index}`);
if (element) {
element.scrollIntoView({ behavior: 'smooth', block: 'center' });
}
}, [fields.length]);
const handleSelectAllProducts = async () => {
if (!packetId) return;
let allProducts: any[] = [];
let page = 1;
let totalPages = 1;
try {
do {
const res = await item_requests.list({ packetId, page });
const data = res?.data?.data;
const products = data?.data || [];
totalPages = data?.totalPages || 1;
allProducts = [...allProducts, ...products];
page++;
} while (page <= totalPages);
} catch (e) {
// error silent
let allProducts = allItemsMap[packetId] || [];
if (!allProducts.length) {
allProducts = await fetchAllItemsForPacket(packetId);
}
if (allProducts.length > 0) {
setValue(
`packetItemDtos.${index}.itemDtos`,
allProducts.map((p: any) => p.id)
);
setSelectedProductNames((prev: any) => ({
...prev,
[index]: allProducts.reduce(
setSelectedProductNames(
allProducts.reduce(
(acc, p) => ({
...acc,
[p.id]: p.name || p.nameRu || String(p.id),
}),
{}
),
}));
)
);
}
};
const handleClearAll = () => {
setValue(`packetItemDtos.${index}.itemDtos`, []);
setSelectedProductNames((prev: any) => ({ ...prev, [index]: {} }));
setSelectedProductNames({});
};
return (
@@ -315,59 +355,45 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
justifyContent={'space-between'}
alignItems={'center'}
>
<OutlinedInput onChange={e => setKeyword(e.target.value)} />
<OutlinedInput onChange={e => setKeyword(e.target.value)} autoFocus={false} />
<div style={{ width: '100%' }}>
<FormControl fullWidth>
<InputLabel id={`packet-select-label-${index}`}>{t('packet')}</InputLabel>
<Controller
name={`packetItemDtos.${index}.packetId`}
control={control}
rules={{ required: requiredText }}
render={({ field }) => (
<>
render={({ field: selectField }) => (
<Select
{...field}
{...selectField}
autoFocus={false}
labelId={`packet-select-label-${index}`}
id={`packet-select-${index}`}
label={t('packet')}
value={field.value || ''}
disabled={isLoadingPackets}
renderValue={selected =>
paketName || packetsList.find(p => p.id === selected)?.name || t('select')
}
MenuProps={{
PaperProps: {
style: { maxHeight: 280 },
ref: packetScrollRef,
onScroll: handlePacketScroll,
},
disableAutoFocus: true,
autoFocus: false,
}}
onClick={e => e.stopPropagation()}
MenuProps={selectMenuProps}
onChange={e => {
field.onChange(e);
const selected = packetsList.find(p => p.id === e.target.value);
setPaketName(selected?.name || '');
e.stopPropagation();
selectField.onChange(e);
}}
value={selectField.value || ''}
renderValue={selected => {
const selectedPacket = packetsList.find(p => p.id === selected);
return selectedPacket ? selectedPacket.name : t('loading');
}}
>
{isLoadingPackets && packetsList.length === 0 ? (
{isLoadingPackets ? (
<MenuItem disabled>
<CircularProgress size={24} />
</MenuItem>
) : packetsList.length === 0 ? (
<MenuItem disabled>{t('not_found') || 'Paketlar topilmadi'}</MenuItem>
) : (
packetsList.map(packet => (
<MenuItem key={packet.id} value={packet.id} onClick={() => setPaketName(packet.name)}>
<MenuItem key={packet.id} value={packet.id}>
{packet.name}
</MenuItem>
))
)}
{isLoadingPackets && packetsList.length > 0 && (
<MenuItem disabled>
<CircularProgress size={20} />
</MenuItem>
)}
</Select>
</>
)}
/>
{!!get(errors, `packetItemDtos.${index}.packetId`) && (
@@ -388,7 +414,6 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
)}
</div>
</Box>
{packetId && (
<Box mt={2} sx={{ width: '100%' }}>
<Box display='flex' justifyContent='space-between' alignItems='center' mb={2}>
@@ -404,7 +429,7 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
</Button>
</Box>
</Box>
{isLoadingProducts && itemsList.length === 0 ? (
{loadingItems ? (
<CircularProgress />
) : (
<FormControl fullWidth>
@@ -415,23 +440,14 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
<Select
{...field}
multiple
MenuProps={{
PaperProps: {
style: { maxHeight: 280 },
ref: itemScrollRef,
onScroll: handleItemScroll,
},
disableAutoFocus: true,
autoFocus: false,
}}
MenuProps={selectMenuProps}
renderValue={selected => (
<Box sx={{ display: 'flex', flexWrap: 'wrap', gap: 0.5 }}>
{(selected as any[]).map(id => {
return (
{(selected as any[]).map((id: number) => (
<Chip
key={id}
label={
selectedProductNames[index]?.[id] ||
selectedProductNames[id] ||
itemsList.find(p => p.id === id)?.name ||
itemsList.find(p => p.id === id)?.nameRu ||
id
@@ -439,11 +455,10 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
onDelete={e => {
e.stopPropagation();
field.onChange(field.value.filter((x: any) => x !== id));
handleProductChange(index, { id }, false);
handleProductChange({ id }, false);
}}
/>
);
})}
))}
</Box>
)}
>
@@ -461,7 +476,7 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
newValue = field.value.filter((x: any) => x !== product.id);
}
field.onChange(newValue);
handleProductChange(index, product, checked);
handleProductChange(product, checked);
}}
>
<Checkbox checked={field.value.includes(product.id)} />
@@ -489,11 +504,10 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
backgroundColor: '#fff',
}}
>
<Box component='form' onSubmit={onSubmit}>
<Box component='form' onSubmit={onSubmit} sx={{ overflowAnchor: 'none' }}>
<Typography variant='h5' mb={3.5}>
{editMode ? t('update_box') : t('create_box')}
</Typography>
<Grid container columnSpacing={2.5} rowSpacing={3} mb={3.5}>
<Grid item xs={12}>
<Typography fontSize='18px' fontWeight={500} color='#5D5850' mb={2}>
@@ -510,6 +524,7 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
{...field}
labelId='party-select-label'
label={t('party_name')}
MenuProps={selectMenuProps}
onChange={e => {
field.onChange(e);
handlePartyChange(e);
@@ -534,7 +549,6 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
{!!errors.partyId && <FormHelperText sx={{ color: 'red' }}>{requiredText}</FormHelperText>}
</FormControl>
</Grid>
<Grid item xs={12}>
<Stack
sx={{
@@ -552,13 +566,12 @@ const DashboardCreateRealBoxPage = ({ initialValues, partiesData }: Props) => {
<PacketRow key={field.key} index={index} field={field} />
))}
<BaseButton variant='outlined' onClick={appendPacket} startIcon={<AddCircleRounded />} sx={{ mt: 2 }}>
{t('add_packet')}
{t('add_more')}
</BaseButton>
</div>
</Stack>
</Grid>
</Grid>
<BaseButton variant='contained' type='submit' disabled={loading} fullWidth sx={{ py: 1.5 }}>
{loading ? <CircularProgress size={24} color='inherit' /> : editMode ? t('update_box') : t('create_box')}
</BaseButton>