From 118cce6dd322cf54477af7177b71ea414aee57fd Mon Sep 17 00:00:00 2001 From: alfonso Date: Sat, 12 Aug 2023 15:08:34 -0500 Subject: [PATCH] v3.1.0 --- package.json | 2 +- .../Components/ComboSelect/ComboFraccion.tsx | 2 +- .../RptAmazonFinishedClasificationInvoices.tsx | 15 +++++++++++++++ .../RptAmazonPendingClasificationInvoices.tsx | 10 +++------- .../RptPendingAnswerFromAmazon.tsx | 2 +- 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 2b2bb25..3958cc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gemco", - "version": "3.0.0", + "version": "3.1.0", "homepage": ".", "private": true, "dependencies": { diff --git a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx index 74593e1..d4f9493 100644 --- a/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx +++ b/src/Components/Clientes/Amazon/Components/ComboSelect/ComboFraccion.tsx @@ -209,7 +209,7 @@ export function ComboFraccion(props: IComboFraccionProps) { - + {/* */} ) : ( '' diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx index fa22ed7..514bb84 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/Finished/RptAmazonFinishedClasificationInvoices.tsx @@ -161,6 +161,13 @@ export default function RptAmazonFinishedClasificationInvoices( }) } + function getReceiver(Cadena: string, char1: string[1], char2: string[1]) { + return Cadena.slice( + Cadena.indexOf(char1) + 1, + Cadena.lastIndexOf(char2), + ); + } + return (
@@ -195,6 +202,7 @@ export default function RptAmazonFinishedClasificationInvoices( Commercial Invoice Date Invoice Number + Receiver Incoterms HAWB Qty Unit of measure @@ -300,6 +308,13 @@ export default function RptAmazonFinishedClasificationInvoices( {MasterData.invoiceNumber} + + {mInvoices + .filter((value) => value.id === MasterData.id) + .map((row) => { + return getReceiver(row.detail[0].amazonShipmentReferenceId,'_','_') + })} + {MasterData.incoterms} diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoices.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoices.tsx index 594c7b2..c9686c5 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoices.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/Pending/RptAmazonPendingClasificationInvoices.tsx @@ -313,7 +313,6 @@ export default function RtpAmazonPendingInvoices( return false } if (BOTEnabled) { - // if (!row.max) { setWaitingMessage('BOT trabajando...') setWaitingDialog(true) DSAmazon.ClasificacionBOT(row.id) @@ -335,9 +334,6 @@ export default function RtpAmazonPendingInvoices( setWaitingDialog(false) return }) - /* } else { - toggleExpandRow(row) - } */ } } @@ -356,7 +352,7 @@ export default function RtpAmazonPendingInvoices( - + {/* - + */}
@@ -449,7 +445,7 @@ export default function RtpAmazonPendingInvoices( Commercial Invoice Date Invoice Number - Name + Receiver Incoterms Qty Unit of measure Tot Qty diff --git a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswerFromAmazon/RptPendingAnswerFromAmazon.tsx b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswerFromAmazon/RptPendingAnswerFromAmazon.tsx index aa82847..dbbb9fd 100644 --- a/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswerFromAmazon/RptPendingAnswerFromAmazon.tsx +++ b/src/Components/Clientes/Amazon/Reportes/Clasification/WaitingAnswerFromAmazon/RptPendingAnswerFromAmazon.tsx @@ -305,7 +305,7 @@ export default function RptPendingAnswerFromAmazon( Commercial Invoice Date Invoice Number - Name + Receiver Incoterms Qty Unit of measure Tot Qty