diff --git a/pom.xml b/pom.xml
index 8ea70d104..65c396bef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.0.53
+ 1.0.54
war
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java
index 094b96680..143a52388 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/impl/RelatorioEstornoCartao.java
@@ -82,6 +82,7 @@ public class RelatorioEstornoCartao extends Relatorio {
dataResult.put("descmotivo", rset.getString("descmotivo"));
dataResult.put("adquirente", rset.getString("adquirente"));
dataResult.put("estabelecimento", rset.getString("estabelecimento"));
+ dataResult.put("nsuhost", rset.getString("nsuhost"));
this.dados.add(dataResult);
@@ -136,7 +137,21 @@ public class RelatorioEstornoCartao extends Relatorio {
sql.append(" AND c.corrida_id = dec.corrida_id ");
sql.append(" AND c.numfoliosistema = dec.numfoliosistema ");
sql.append(" AND c.indreimpresion = 1 ");
- sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo ");
+ sql.append(" AND rownum = 1), 'CANCELAMENTO') as descmotivo, ");
+
+ //SubSelect para evitar duplicacao dos registros por causa do join com a caja
+ sql.append(" COALESCE(( select ct.nsuhost ");
+ sql.append(" from caja c inner join caja_formapago cfp on cfp.caja_id = c.caja_id ");
+ sql.append(" left join caja_det_pago cdp on cdp.cajaformapago_id = cfp.cajaformapago_id ");
+ sql.append(" left join caja_tarjeta ct on ct.cajadetpago_id = cdp.cajadetpago_id ");
+ sql.append(" inner join forma_pago fp on fp.formapago_id = cfp.formapago_id ");
+ sql.append(" where ");
+ sql.append(" c.numoperacion = dec.numoperacion ");
+ sql.append(" AND c.origen_id = dec.origen_id ");
+ sql.append(" AND c.destino_id = dec.destino_id ");
+ sql.append(" AND c.corrida_id = dec.corrida_id ");
+ sql.append(" AND coalesce( ct.nsuhost, '0') <> '0' ");
+ sql.append(" AND rownum = 1), '') as nsuhost ");
sql.append(" FROM ");
@@ -187,7 +202,7 @@ public class RelatorioEstornoCartao extends Relatorio {
}
sql.append(" AND DEC.FECREGISTRO BETWEEN :data_inicial AND :data_final ");
- sql.append(" ORDER BY DEC.FECREGISTRO ");
+ sql.append(" ORDER BY e.nombempresa, DEC.FECREGISTRO ");
return sql.toString();
}
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties
index 660477569..c0979d626 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_es.properties
@@ -35,4 +35,5 @@ empresa.label=Empresa:
formaPago.label=Forma de Pagamento
pontoDeventa.label=Ponto de Venda
estabelecimento.label=Estab.
-adquirente.label=Adquirente
\ No newline at end of file
+adquirente.label=Adquirente
+nsuhost.label=NSU/Host
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties
index 38f51c05d..32e5703fb 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/internacionalizacao/RelatorioEstornoCartao_pt_BR.properties
@@ -36,4 +36,5 @@ formaPago.label=Forma de Pagamento
pontoDeventa.label=Ponto de Venda
motivoCancelamento.label=Motivo Cancelamento
estabelecimento.label=Estab.
-adquirente.label=Adquirente
\ No newline at end of file
+adquirente.label=Adquirente
+nsuhost.label=NSU/Host
\ No newline at end of file
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper
index 6f843fc3b..10b1f0dfc 100644
Binary files a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper and b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jasper differ
diff --git a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml
index 326e9f6c7..962b0873b 100644
--- a/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml
+++ b/src/java/com/rjconsultores/ventaboletos/relatorios/templates/RelatorioEstornoCartao.jrxml
@@ -44,6 +44,9 @@
+
+
+
@@ -64,173 +67,180 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
@@ -342,177 +352,184 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -521,7 +538,7 @@
-
+