diff --git a/messages/cn.json b/messages/cn.json index a27643f..8e02a14 100644 --- a/messages/cn.json +++ b/messages/cn.json @@ -218,5 +218,6 @@ "confirmation": "确认", "view_packet": "查看包裹数据", "accepted_number": "已接收", - "print": "打印" + "print": "打印", + "accepted_not": "未被接受" } diff --git a/messages/en.json b/messages/en.json index fd8f624..69f92bf 100644 --- a/messages/en.json +++ b/messages/en.json @@ -218,5 +218,6 @@ "confirmation": "Confirm", "view_packet": "View package data", "accepted_number": "Accepted", - "print": "Print" + "print": "Print", + "accepted_not": "Not accepted" } diff --git a/messages/ru.json b/messages/ru.json index 9f1cf58..c348616 100644 --- a/messages/ru.json +++ b/messages/ru.json @@ -231,5 +231,6 @@ "accepted_number": "Принято", "qr_code": "QR код", "created_at": "Дата добавления", - "print": "Печать" + "print": "Печать", + "accepted_not": "Не принято" } diff --git a/messages/uz.json b/messages/uz.json index 63040b9..554cfae 100644 --- a/messages/uz.json +++ b/messages/uz.json @@ -119,6 +119,7 @@ "update_package": "Paketni yangilash", "view_packet": "Paketni ma'lumotlarini ko'rish", "accepted_number": "Qabul qilingan", + "accepted_not": "Qabul qilinmagan", "update_item": "Mahsulotni yangilash", "no": "Yo'q", "id": "ID", diff --git a/src/routes/private/boxes-one/BoxesOne.tsx b/src/routes/private/boxes-one/BoxesOne.tsx index 642de94..94802f5 100644 --- a/src/routes/private/boxes-one/BoxesOne.tsx +++ b/src/routes/private/boxes-one/BoxesOne.tsx @@ -7,6 +7,8 @@ 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 CheckCircleIcon from '@mui/icons-material/CheckCircle'; +import DangerousIcon from '@mui/icons-material/Dangerous'; import { Box, Divider, Grid, Stack, Typography, styled } from '@mui/material'; import { useParams } from 'next/navigation'; import { useMemo } from 'react'; @@ -162,150 +164,74 @@ const DashboardBoxesOnePage = () => { {t('track_id')} - - ID - - ), - }} - fullWidth - placeholder={t('id')} - disabled - defaultValue={product.trekId} - sx={{ - '.MuiInputBase-root': { - paddingLeft: 0, - }, - }} - /> - - - - {t('name')} - - - - - - {'NAME_RU'} - - - - - - {t('quantity')} - - - - - - {t('accepted_number')} - - - - <> - - - {t('weight')} - - - - - - - - {t('price')} - + + ID + + ), }} - defaultValue={product.price} - disabled - mainBorderColor='#D8D8D8' - placeholder={t('price')} - /> - - - - {t('total_price')} - - + + {product.acceptedNumber === product.amount ? ( + <> + + + {t('accepted_number')} + + + ) : ( + <> + + + {t('accepted_not')} + + + )} + - + diff --git a/src/routes/private/boxes-print/BoxesPrint.tsx b/src/routes/private/boxes-print/BoxesPrint.tsx index 80e2112..ddb1bcd 100644 --- a/src/routes/private/boxes-print/BoxesPrint.tsx +++ b/src/routes/private/boxes-print/BoxesPrint.tsx @@ -1,6 +1,4 @@ -import InstagramChanel from '@/../public/instagram.png'; import Logo from '@/../public/logo.jpeg'; -import TelegramChanel from '@/../public/telegram.jpg'; import { Box, Typography } from '@mui/material'; import Image from 'next/image'; import { forwardRef } from 'react'; @@ -75,15 +73,10 @@ const BoxesPrint = forwardRef(({ boxData, key } }} > CPOST EXPRESS CARGO - - Reys: {boxData?.partyName}-{boxData?.client_id} - - TEL: +(998) 90 113 44 77 + TEL: +(998) 95 126 44 77 + Reys: {boxData?.partyName} - - - telegram - instagram + {boxData?.client_id}