diff --git a/apps/api/src/services/conciliacion.service.ts b/apps/api/src/services/conciliacion.service.ts index cb81770..5611fd2 100644 --- a/apps/api/src/services/conciliacion.service.ts +++ b/apps/api/src/services/conciliacion.service.ts @@ -13,6 +13,8 @@ export interface ConciliacionCfdi { nombreEmisor: string; rfcReceptor: string; nombreReceptor: string; + regimenFiscalEmisor: string | null; + regimenFiscalReceptor: string | null; total: number; totalMxn: number; subtotal: number; @@ -98,6 +100,7 @@ export async function getCfdisConConciliacion( c.fecha_emision as "fechaEmision", c.rfc_emisor as "rfcEmisor", c.nombre_emisor as "nombreEmisor", c.rfc_receptor as "rfcReceptor", c.nombre_receptor as "nombreReceptor", + c.regimen_fiscal_emisor as "regimenFiscalEmisor", c.regimen_fiscal_receptor as "regimenFiscalReceptor", c.total, c.total_mxn as "totalMxn", c.subtotal, c.descuento, c.moneda, c.tipo_cambio as "tipoCambio", @@ -136,6 +139,8 @@ export async function getCfdisConConciliacion( nombreEmisor: r.nombreEmisor, rfcReceptor: r.rfcReceptor, nombreReceptor: r.nombreReceptor, + regimenFiscalEmisor: r.regimenFiscalEmisor, + regimenFiscalReceptor: r.regimenFiscalReceptor, total: Number(r.total), totalMxn: Number(r.totalMxn), subtotal: Number(r.subtotal || 0), diff --git a/apps/web/app/(dashboard)/conciliacion/page.tsx b/apps/web/app/(dashboard)/conciliacion/page.tsx index f23f032..378cd96 100644 --- a/apps/web/app/(dashboard)/conciliacion/page.tsx +++ b/apps/web/app/(dashboard)/conciliacion/page.tsx @@ -395,10 +395,19 @@ export default function ConciliacionPage() { setSortPendientes(prev => prev?.field === 'fecha' ? { field: 'fecha', dir: prev.dir === 'asc' ? 'desc' : 'asc' } : { field: 'fecha', dir: 'asc' })}> Fecha - - - - + {activeTab === 'EMITIDO' ? ( + <> + + + Régimen Emisor + + ) : ( + <> + + + Régimen Receptor + + )} setSortPendientes(prev => prev?.field === 'total' ? { field: 'total', dir: prev.dir === 'asc' ? 'desc' : 'asc' } : { field: 'total', dir: 'asc' })}> Total MXN @@ -431,14 +440,23 @@ export default function ConciliacionPage() { {toCfdiDate(cfdi.fechaPagoP || cfdi.fechaEmision).toLocaleDateString('es-MX')} - {cfdi.rfcEmisor} - - {cfdi.nombreEmisor} - - {cfdi.rfcReceptor} - - {cfdi.nombreReceptor} - + {activeTab === 'EMITIDO' ? ( + <> + {cfdi.rfcReceptor} + + {cfdi.nombreReceptor} + + {cfdi.regimenFiscalEmisor || '-'} + + ) : ( + <> + {cfdi.rfcEmisor} + + {cfdi.nombreEmisor} + + {cfdi.regimenFiscalReceptor || '-'} + + )} {formatCurrencyConciliacion(getMonto(cfdi))}