From f8bbf75ea6646025524d5f83edbf10a7ca42341b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 6 Feb 2023 16:08:36 -0600 Subject: [PATCH] Last changes to software --- ...RptAmazonFinishedClasificationInvoices.tsx | 121 +++++++++++++++++- ...zonFinishedClasificationInvoicesDetail.tsx | 9 ++ .../RptAmazonPendingClasificationInvoices.tsx | 8 +- .../RptPendingAnswerFromAmazon.tsx | 10 +- 4 files changed, 138 insertions(+), 10 deletions(-) diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx index 321e29a..977d7d2 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx @@ -5,6 +5,7 @@ import { Card, Col, Form, + FormCheck, Modal, Row, Table @@ -43,6 +44,7 @@ export default function RptAmazonFinishedClasificationInvoices( const [IDClasificador, setIDClasificador] = useState(0) const [Clasificador, setClasificador] = useState('') const [ShowModal, setShowModal] = useState(false) + const [ShowModalQuestion, setShowModalQuestion] = useState(false) const [header, setHeader] = useState('') const [show, setShowMsg] = useState(false) const [msg, setMsg] = useState('') @@ -69,7 +71,10 @@ export default function RptAmazonFinishedClasificationInvoices( const url = window.URL.createObjectURL(new Blob([response.data])) const link = document.createElement('a') link.href = url - link.setAttribute('download', 'Plantilla de partes '+Factura+'.xls') + link.setAttribute( + 'download', + 'Plantilla de partes ' + Factura + '.xls' + ) document.body.appendChild(link) link.click() setWaitingDialog(false) @@ -121,6 +126,48 @@ export default function RptAmazonFinishedClasificationInvoices( dispatch(updateInvoice(Obj)) } + /* const sePuedeTerminarFactura = (id: number) => { + DSAmazon.SeRecibioRespuestaDeAmazon(id) + .then((response) => { + //alert(response.data.estatus) + if (response.data.estatus === 0) { + setHeader('Error') + setMsg('Verifique que todas las partidas esten verificadas por usted') + setShowMsg(true) + return + } else if (response.data.estatus === 1) { + //TerminadeClasificar() + setShowModal(true) + } else { + setHeader('Informativo') + setMsg(response.data.respuesta) + setShowMsg(true) + return + } + }) + .catch((e: Error) => { + setHeader('Error') + setMsg('Ocurrio un error') + setShowMsg(true) + return + }) + } */ + + const TerminadeClasificar = () => { + DSAmazon.TerminaClasificarFactura(IDInvoice) + .then((response) => { + loadReport() + setShowModalQuestion(false) + }) + .catch((e: Error) => { + setIDInvoice(0) + setHeader('Error') + setMsg('Ocurrio un error ' + e.toString()) + setShowMsg(true) + return + }) + } + const returnTO = () => { DSAmazon.InvoiceReturnState(IDInvoice, 0) .then((response) => { @@ -163,6 +210,7 @@ export default function RptAmazonFinishedClasificationInvoices( id + Commercial Invoice Date Invoice Number Incoterms @@ -220,9 +268,14 @@ export default function RptAmazonFinishedClasificationInvoices( {MasterData.id} - {MasterData.estatus >= 3 ? ( + {MasterData.estatus === 2 ? (
downloadExcel(MasterData.id, MasterData.invoiceNumber)} + onClick={() => + downloadExcel( + MasterData.id, + MasterData.invoiceNumber + ) + } > ) : null} + + { + setIDInvoice(MasterData.id) + setShowModalQuestion(true) + // sePuedeTerminarFactura(MasterData.id) + }} + label="" + /> + {MasterData.commercialInvoiceDate} @@ -578,6 +645,54 @@ export default function RptAmazonFinishedClasificationInvoices(
+ + + { + setShowModal(false) + }} + size={'sm'} + dialogClassName={'modal-50w'} + > + +
+ + + + + ¿Esta seguro de terminar la factura en este proceso de clasificacion? + + + + + + + + + + + + +
+
+
+ + { diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoicesDetail.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoicesDetail.tsx index 05faecb..7bf4f51 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoicesDetail.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoicesDetail.tsx @@ -213,6 +213,15 @@ export default function RptAmazonFinishedClasificationInvoicesDetail( > + ) : props.detail.validaFraccionOriginal === 3 ? ( + + + ) : ( { + /* const existsExeptions = (IDMaster: number) => { const Exceptions = mInvoices .filter((element) => element.detail.some((sub) => sub.idHeader === IDMaster) @@ -92,7 +92,7 @@ export default function RtpAmazonPendingInvoices( ) }) return Exceptions && Exceptions.length ? Exceptions[0].length : 0 - } + } */ const descargaArchivoExcepciones = () => { setShowModalW(false) @@ -104,7 +104,7 @@ export default function RtpAmazonPendingInvoices( const url = window.URL.createObjectURL(new Blob([response.data])) const link = document.createElement('a') link.href = url - link.setAttribute('download', 'Excepciones '+Factura+'.xls') + link.setAttribute('download', 'Excepciones '+Factura+'.xlsx') document.body.appendChild(link) link.click() DSAmazon.EnviaEsperaRespuestaAmazon(IDFactura) @@ -634,6 +634,7 @@ export default function RtpAmazonPendingInvoices( + { @@ -725,6 +726,7 @@ export default function RtpAmazonPendingInvoices( + { diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx index d2bbf3e..85fd918 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswer/RptPendingAnswerFromAmazon.tsx @@ -80,7 +80,7 @@ export default function RptPendingAnswerFromAmazon( const url = window.URL.createObjectURL(new Blob([response.data])) const link = document.createElement('a') link.href = url - link.setAttribute('download', 'Excepciones '+Factura+'.xls') + link.setAttribute('download', 'Excepciones '+Factura+'.xlsx') document.body.appendChild(link) link.click() setShowModal(false) @@ -152,7 +152,7 @@ export default function RptPendingAnswerFromAmazon( //alert(response.data.estatus) if (response.data.estatus === 0) { setHeader('Error') - setMsg('Verifique que todas las partidas esten verificadas por usted') + setMsg('Verifique que todas las partidas esten checadas por usted y que cuente con el archivo de respuesta') setShowMsg(true) return } else if (response.data.estatus === 1) { @@ -697,10 +697,11 @@ export default function RptPendingAnswerFromAmazon( - + + +