test commit
This commit is contained in:
@@ -7,7 +7,7 @@ import Link from '@mui/material/Link'
|
||||
import Stack from '@mui/material/Stack'
|
||||
import Typography from '@mui/material/Typography'
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { Link as RouterLink, useParams, useSearchParams } from 'react-router-dom'
|
||||
import { Link as RouterLink, useNavigate, useParams, useSearchParams } from 'react-router-dom'
|
||||
import {
|
||||
confirmOrderReceived,
|
||||
createOrderPayment,
|
||||
@@ -30,6 +30,7 @@ import { orderStatusLabelRu } from '@/shared/lib/order-status-labels'
|
||||
export function OrderDetailPage() {
|
||||
const { id } = useParams()
|
||||
const qc = useQueryClient()
|
||||
const navigate = useNavigate()
|
||||
|
||||
const [searchParams] = useSearchParams()
|
||||
const paidParam = searchParams.get('paid')
|
||||
@@ -58,6 +59,14 @@ export function OrderDetailPage() {
|
||||
},
|
||||
})
|
||||
|
||||
useEffect(() => {
|
||||
const data = paymentStatusQuery.data
|
||||
if (data && (data.paid || data.status === 'canceled') && paidParam === '1') {
|
||||
qc.invalidateQueries({ queryKey: ['me', 'orders', id] })
|
||||
navigate(`/me/orders/${id}`, { replace: true })
|
||||
}
|
||||
}, [paymentStatusQuery.data, paidParam, qc, id, navigate])
|
||||
|
||||
const confirmMut = useMutation({
|
||||
mutationFn: () => confirmOrderReceived(id!),
|
||||
onSuccess: () =>
|
||||
@@ -224,7 +233,7 @@ export function OrderDetailPage() {
|
||||
{PICKUP_ADDRESS_FULL}
|
||||
</Typography>
|
||||
<Typography color="text.secondary" variant="body2">
|
||||
Заберите заказ точно ко времени, которое согласуем по телефону или в чате заказа.
|
||||
Заберите заказ ко времени, которое согласуем в чате заказа.
|
||||
</Typography>
|
||||
</Stack>
|
||||
)}
|
||||
@@ -274,7 +283,9 @@ export function OrderDetailPage() {
|
||||
isUploadPending={uploadReviewImageMut.isPending}
|
||||
submitError={reviewMut.error}
|
||||
uploadError={uploadReviewImageMut.error}
|
||||
onSubmitReview={(params) => reviewMut.mutate(params)}
|
||||
onSubmitReview={async (params) => {
|
||||
await reviewMut.mutateAsync(params)
|
||||
}}
|
||||
onUploadImage={async (file) => {
|
||||
const result = await uploadReviewImageMut.mutateAsync(file)
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user