From 254395f066bc69a2b7055968c8d01b5a8f07186b Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 28 Feb 2023 17:57:42 -0600 Subject: [PATCH] Se modifica el front end primer proceso de Amazon para que se puedan editar los combos --- .../ComboSelect/ComboDescripcion.tsx | 4 +- .../Components/ComboSelect/ComboFraccion.tsx | 66 +++++++++++++---- ...azonPendingClasificationInvoicesDetail.tsx | 11 +-- .../RptPendingAnswerFromAmazon.tsx | 1 + .../RptPendingAnswerFromAmazonDetail.tsx | 12 +-- .../Linking/RptAmazonLinkInvoice2Traffic.tsx | 12 ++- .../RptAmazonLinkInvoice2TrafficDetail.tsx | 27 +++---- .../DTO/DTO1868ReporteFactura.ts | 1 + .../DTO/DTO1868Transportista.ts | 5 +- .../ZincInternacional/Rpt1868Facturas.tsx | 29 +++++++- .../Transportistas/Rtp1868Transportista.tsx | 74 ++++++++++++++++++- 11 files changed, 191 insertions(+), 51 deletions(-) diff --git a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx index 6a70290..d8ea87d 100644 --- a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx +++ b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboDescripcion.tsx @@ -152,8 +152,8 @@ export function ComboDescripcion(props: IComboDescripcionProps) { onChange={(e) => changeValidacion(parseInt(e.target.value))} value={Validacion} > - {props.Detail.validaFraccionOriginal===0 ? : '' } - {props.Detail.validaFraccionOriginal===0 ? : ''} + {props.Detail.validaFraccionOriginal===1 ? : '' } + {props.Detail.validaFraccionOriginal===1 ? : ''} {props.Detail.validaFraccionOriginal===3 ? : ''} diff --git a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx index feab628..2c28cdc 100644 --- a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx +++ b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx @@ -3,9 +3,7 @@ import { Button, Col, Form, Modal, Row } from 'react-bootstrap' import * as CurrencyFormat from 'react-currency-format' import { MsgInformativo } from '../../../../Utils/Toast/msgInformativo' import { RootState } from '../../../../../store/store' -import { - updateInvoice, -} from '../../../../../store/features/Clientes/2096/AmazonInvoices' +import { updateInvoice } from '../../../../../store/features/Clientes/2096/AmazonInvoices' // Redux import { useDispatch, useSelector } from 'react-redux' import DTO2096Fraccion from '../../DTO/DTO2096Fraccion' @@ -33,13 +31,13 @@ export function ComboFraccion(props: IComboFraccionProps) { const [showModal, setShowModal] = useState(false) const [Fraccion, setFraccion] = useState(props.FraccionOriginal) const [header, setHeader] = useState('') - const [DescripcionGEMCO, setDescripcionGEMCO] = useState(props.Detail.pedimentoDescription) + const [DescripcionGEMCO, setDescripcionGEMCO] = useState( + props.Detail.pedimentoDescription + ) const [show, setShowMsg] = useState(false) const [msg, setMsg] = useState('') const [CumplimientoNormativo, setCumplimientoNormativo] = useState( - props.Detail.cumplimientoNormativo - ? props.Detail.cumplimientoNormativo - : '' + props.Detail.cumplimientoNormativo ? props.Detail.cumplimientoNormativo : '' ) const [Comentarios, setComentarios] = useState( props.Detail.comentarios @@ -116,7 +114,7 @@ export function ComboFraccion(props: IComboFraccionProps) { if (Validacion === 2) { setShowModal(true) } else if (Validacion === 1) { - /* setFraccion(props.Detail.destinationHTSCode) + /* setFraccion(props.Detail.destinationHTSCode) const data: DTO2096Fraccion = { id: props.IDDetail, fraccion: Fraccion, @@ -130,13 +128,39 @@ export function ComboFraccion(props: IComboFraccionProps) { .catch((e: Error) => { alert('Ocurrio un error' + e.message.toString()) }) */ - setFraccion(props.Detail.destinationHTSCode) - saveFraccion() + setFraccion(props.Detail.destinationHTSCode) + saveFraccion() } } }, [Validacion, UserChanged]) const saveFraccion = () => { + if (Validacion === 2) { + if (CumplimientoNormativo.length === 0) { + setHeader('Error') + setMsg( + 'Antes de poder guardar la informacion es necesario que proporcione el cumplimiento normativo' + ) + setShowMsg(true) + return + } + if (Comentarios.length === 0) { + setHeader('Error') + setMsg( + 'Antes de poder guardar la informacion es necesario que proporcione los comentarios' + ) + setShowMsg(true) + return + } + if (DescripcionGEMCO.length === 0) { + setHeader('Error') + setMsg( + 'Antes de poder guardar la informacion es necesario que proporcione la descripcion GEMCO' + ) + setShowMsg(true) + return + } + } DSAmazon.ValidaFraccionGET(Fraccion) .then((response) => { if (response.data.respuesta === 'Si') { @@ -178,10 +202,22 @@ export function ComboFraccion(props: IComboFraccionProps) { onChange={(e) => changeValidacion(parseInt(e.target.value))} value={Validacion} > - {props.Detail.validaFraccionOriginal===0 ? : '' } - {props.Detail.validaFraccionOriginal===0 ? : ''} + {props.Detail.validaFraccionOriginal === 0 ? ( + + ) : ( + '' + )} + {props.Detail.validaFraccionOriginal === 1 ? ( + + ) : ( + '' + )} - {props.Detail.validaFraccionOriginal===3 ? : ''} + {props.Detail.validaFraccionOriginal === 3 ? ( + + ) : ( + '' + )} diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoicesDetail.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoicesDetail.tsx index 0e87d0c..a1ef44c 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoicesDetail.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoicesDetail.tsx @@ -277,8 +277,8 @@ export default function RtpAmazonPendingInvoivesDetail( IDDetail={props.detail.id} FraccionOriginal={props.detail.destinationHTSCode} ConfirmaFraccion={props.detail.confirmaFraccion} - /* Deshabilitado={props.Deshabilitado} <= Asi estaba el dia 25/Ene/2023 */ - Deshabilitado={props.detail.validaFraccionOriginal === 1} + Deshabilitado={false} + /* Deshabilitado={props.detail.validaFraccionOriginal === 1} Lo cqambie el 23/Feb/2023 porque estaba deshabilitando el combo desde un principio*/ Detail={props.detail} /> @@ -291,8 +291,8 @@ export default function RtpAmazonPendingInvoivesDetail( > diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx index 1800dc2..5407569 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx @@ -636,6 +636,7 @@ export default function RptPendingAnswerFromAmazon( + { diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazonDetail.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazonDetail.tsx index 3332e39..285f031 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazonDetail.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazonDetail.tsx @@ -342,7 +342,7 @@ export default function RptPendingAnswerFromAmazonDetail( IDDetail={props.detail.id} DescripcionOriginal={props.detail.pedimentoDescription} ConfirmaDescripcion={props.detail.confirmaDescripcion} - Deshabilitado={true} + Deshabilitado={false} Detail={props.detail} /> @@ -525,7 +525,10 @@ export default function RptPendingAnswerFromAmazonDetail( - ¿Esta seguro que esta fraccion ya la autorizo Amazon? + + openLink(props.detail.itemId)}>({props.detail.itemId}) + ¿Esta seguro que esta fraccion ya la autorizo Amazon? + @@ -576,9 +579,7 @@ export default function RptPendingAnswerFromAmazonDetail( id="Comentarios" size="sm" value={ - Comentarios.length - ? Comentarios - : 'Clasificacion incorrecta.' + Comentarios } onChange={(e) => setComentarios(e.target.value)} /> @@ -601,6 +602,7 @@ export default function RptPendingAnswerFromAmazonDetail(