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

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request azizziy/cpost!47
This commit is contained in:
Azizbek Usmonov
2025-06-30 16:01:02 +05:00
parent 9c6f06b994 5e4ac84799
commit 15997a48c5
6 changed files with 74 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
messages/cn.json
View File

@@ -218,5 +218,6 @@
"confirmation": "确认", "confirmation": "确认",
"view_packet": "查看包裹数据", "view_packet": "查看包裹数据",
"accepted_number": "已接收", "accepted_number": "已接收",
"print": "打印" "print": "打印",
"accepted_not": "未被接受"
} }

3
messages/en.json
View File

@@ -218,5 +218,6 @@
"confirmation": "Confirm", "confirmation": "Confirm",
"view_packet": "View package data", "view_packet": "View package data",
"accepted_number": "Accepted", "accepted_number": "Accepted",
"print": "Print" "print": "Print",
"accepted_not": "Not accepted"
} }

3
messages/ru.json
View File

@@ -231,5 +231,6 @@
"accepted_number": "Принято", "accepted_number": "Принято",
"qr_code": "QR код", "qr_code": "QR код",
"created_at": "Дата добавления", "created_at": "Дата добавления",
"print": "Печать" "print": "Печать",
"accepted_not": "Не принято"
} }

1
messages/uz.json
View File

@@ -119,6 +119,7 @@
"update_package": "Paketni yangilash", "update_package": "Paketni yangilash",
"view_packet": "Paketni ma'lumotlarini ko'rish", "view_packet": "Paketni ma'lumotlarini ko'rish",
"accepted_number": "Qabul qilingan", "accepted_number": "Qabul qilingan",
"accepted_not": "Qabul qilinmagan",
"update_item": "Mahsulotni yangilash", "update_item": "Mahsulotni yangilash",
"no": "Yo'q", "no": "Yo'q",
"id": "ID", "id": "ID",

202
src/routes/private/boxes-one/BoxesOne.tsx
View File

@@ -7,6 +7,8 @@ import { BoxStatus } from '@/data/box/box.model';
import { box_requests } from '@/data/box/box.requests'; import { box_requests } from '@/data/box/box.requests';
import { useMyTranslation } from '@/hooks/useMyTranslation'; import { useMyTranslation } from '@/hooks/useMyTranslation';
import useRequest from '@/hooks/useRequest'; import useRequest from '@/hooks/useRequest';
import CheckCircleIcon from '@mui/icons-material/CheckCircle';
import DangerousIcon from '@mui/icons-material/Dangerous';
import { Box, Divider, Grid, Stack, Typography, styled } from '@mui/material'; import { Box, Divider, Grid, Stack, Typography, styled } from '@mui/material';
import { useParams } from 'next/navigation'; import { useParams } from 'next/navigation';
import { useMemo } from 'react'; import { useMemo } from 'react';
@@ -162,150 +164,74 @@ const DashboardBoxesOnePage = () => {
<Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}> <Typography fontSize={'18px'} fontWeight={500} color='#5D5850' mb={2}>
{t('track_id')} {t('track_id')}
</Typography> </Typography>
<BaseInput <Box sx={{ display: 'flex' }}>
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 <BaseInput
fullWidth InputProps={{
type='text' startAdornment: (
inputProps={{ <Box
step: 0.1, 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>
),
}} }}
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 fullWidth
type='number' placeholder={t('id')}
inputProps={{
step: 0.001,
}}
disabled disabled
value={totalPrice} defaultValue={product.trekId}
mainBorderColor='#D8D8D8' sx={{
placeholder={t('total_price')} '.MuiInputBase-root': {
paddingLeft: 0,
},
}}
/> />
<Box
sx={{
display: 'flex',
alignItems: 'center',
width: '30%',
marginLeft: '10px',
gap: '10px',
}}
>
{product.acceptedNumber === product.amount ? (
<>
<CheckCircleIcon color='success' />
<Typography
fontSize={'18px'}
fontWeight={500}
color='#5D5850'
sx={{ textAlign: 'center' }}
>
{t('accepted_number')}
</Typography>
</>
) : (
<>
<DangerousIcon color='error' />
<Typography
fontSize={'18px'}
fontWeight={500}
color='#5D5850'
sx={{ textAlign: 'center' }}
>
{t('accepted_not')}
</Typography>
</>
)}
</Box>
</Box> </Box>
</> </Box>
</Box> </Box>
<Divider color='#EBEFF6' /> <Divider color='#EBEFF6' />
</Box> </Box>

13
src/routes/private/boxes-print/BoxesPrint.tsx
View File

@@ -1,6 +1,4 @@
import InstagramChanel from '@/../public/instagram.png';
import Logo from '@/../public/logo.jpeg'; import Logo from '@/../public/logo.jpeg';
import TelegramChanel from '@/../public/telegram.jpg';
import { Box, Typography } from '@mui/material'; import { Box, Typography } from '@mui/material';
import Image from 'next/image'; import Image from 'next/image';
import { forwardRef } from 'react'; import { forwardRef } from 'react';
@@ -75,15 +73,10 @@ const BoxesPrint = forwardRef<HTMLDivElement, BoxesPrintProps>(({ boxData, key }
}} }}
> >
<Typography sx={{ color: 'black', fontSize: '8px' }}>CPOST EXPRESS CARGO</Typography> <Typography sx={{ color: 'black', fontSize: '8px' }}>CPOST EXPRESS CARGO</Typography>
<Typography sx={{ color: 'black', fontSize: '8px' }}> <Typography sx={{ color: 'black', fontSize: '8px' }}>TEL: +(998) 95 126 44 77</Typography>
Reys: {boxData?.partyName}-{boxData?.client_id} <Typography sx={{ color: 'black', fontSize: '14px' }}>Reys: {boxData?.partyName}</Typography>
</Typography>
<Typography sx={{ color: 'black', fontSize: '8px' }}>TEL: +(998) 90 113 44 77</Typography>
</Box> </Box>
</Box> <Typography sx={{ color: 'black', fontSize: '40px', marginLeft: '20px' }}>{boxData?.client_id}</Typography>
<Box sx={{ display: 'flex', gap: '8px', marginTop: '5px', marginRight: '5px' }}>
<Image alt='telegram' src={TelegramChanel} width={50} height={50} priority unoptimized />
<Image alt='instagram' src={InstagramChanel} width={50} height={50} priority unoptimized />
</Box> </Box>
</Box> </Box>
</Box> </Box>