Ultimos cambios

AmazonRelease1.1
unknown 2 years ago
parent c7b06906b5
commit 8c13d4e741
  1. 52
      src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx
  2. 18
      src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoices.tsx
  3. 9
      src/Components/Login/login.tsx

@ -33,6 +33,14 @@ export interface IRptAmazonFinishedClasificationInvoicesProps {}
export default function RptAmazonFinishedClasificationInvoices( export default function RptAmazonFinishedClasificationInvoices(
props: IRptAmazonFinishedClasificationInvoicesProps props: IRptAmazonFinishedClasificationInvoicesProps
) { ) {
const [Usuario, setUsuario] = useState(() => {
const stickyValue = window.localStorage.getItem('UserId')
return stickyValue !== null ? JSON.parse(stickyValue) : ''
})
const [Perfil, setPerfil] = useState(() => {
const stickyValue = window.localStorage.getItem('Perfil')
return stickyValue !== null ? JSON.parse(stickyValue) : 0
})
const dispatch = useDispatch() const dispatch = useDispatch()
const mInvoices = useSelector( const mInvoices = useSelector(
(state: RootState) => state.AmazonInvoices.Invoice (state: RootState) => state.AmazonInvoices.Invoice
@ -126,34 +134,7 @@ export default function RptAmazonFinishedClasificationInvoices(
dispatch(updateInvoice(Obj)) dispatch(updateInvoice(Obj))
} }
/* const sePuedeTerminarFactura = (id: number) => { const TerminadeClasificar = () => {
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) DSAmazon.TerminaClasificarFactura(IDInvoice)
.then((response) => { .then((response) => {
loadReport() loadReport()
@ -229,7 +210,20 @@ export default function RptAmazonFinishedClasificationInvoices(
</thead> </thead>
<tbody> <tbody>
{mInvoices {mInvoices
? mInvoices.map((MasterData) => { ? mInvoices .filter((a) => {
if (
a.clasificador === parseInt(Usuario) &&
Perfil !== 'Clasificador lider'
) {
return a
} else if (
['Clasificador lider', 'Administrador'].includes(
Perfil
)
) {
return a
}
}).map((MasterData) => {
return ( return (
<> <>
<tr <tr

@ -76,24 +76,6 @@ export default function RtpAmazonPendingInvoices(
dispatch(updateInvoice(Obj)) dispatch(updateInvoice(Obj))
} }
/* const existsExeptions = (IDMaster: number) => {
const Exceptions = mInvoices
.filter((element) =>
element.detail.some((sub) => sub.idHeader === IDMaster)
)
.map((element) => {
let newElt = Object.assign({}, element) // copies element
return newElt.detail.filter(
(child) =>
child.idHeader === IDMaster &&
child.destinationHTSCode.replaceAll('.', '').trim() !==
child.fraccionGEMCO &&
child.validaFraccionOriginal !== 3
)
})
return Exceptions && Exceptions.length ? Exceptions[0].length : 0
} */
const descargaArchivoExcepciones = () => { const descargaArchivoExcepciones = () => {
setShowModalW(false) setShowModalW(false)
setWaitingMessage('Archivo de excepciones') setWaitingMessage('Archivo de excepciones')

@ -14,6 +14,7 @@ import { AxiosError } from 'axios'
import { MsgInformativo } from '../Utils/Toast/msgInformativo' import { MsgInformativo } from '../Utils/Toast/msgInformativo'
import logo from '../../images/GEMCO_mini.png' import logo from '../../images/GEMCO_mini.png'
import { Dashboard } from '../Dashboard/Dashboard' import { Dashboard } from '../Dashboard/Dashboard'
import { Alert, Card } from 'react-bootstrap'
export const Login: React.FC<{}> = () => { export const Login: React.FC<{}> = () => {
const dispatch = useDispatch() const dispatch = useDispatch()
@ -28,6 +29,13 @@ export const Login: React.FC<{}> = () => {
return ( return (
<div> <div>
{!userLogued ? ( {!userLogued ? (
<div>
{/* <div> <Alert variant="warning">
<Alert.Heading>Aviso importante!</Alert.Heading>
<p>
Proximanate esteremos reunicando el contenido de este servidor de aplicaciones, al nuevo dominio de aplicaciones: https://www.gemcousa.mx
</p>
</Alert></div> */}
<div id='login'> <div id='login'>
<div className='container'> <div className='container'>
<div <div
@ -146,6 +154,7 @@ export const Login: React.FC<{}> = () => {
}} }}
/> />
</div> </div>
</div>
) : ( ) : (
<div><Dashboard/></div> <div><Dashboard/></div>
)} )}

Loading…
Cancel
Save