From 9c9267ed28d2021cb0640980d1e7fceaa65e052f Mon Sep 17 00:00:00 2001
From: Aristides <aristides@rjconsultores.com.br>
Date: Wed, 5 Jul 2023 15:34:54 -0300
Subject: [PATCH 1/4] fixes bug#AL2690

---
 pom.xml                                                       | 4 ++--
 .../configuracioneccomerciales/EditarConvenioController.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7a825f11..590b0bf01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.8.6</version>
+	<version>1.8.7</version>
 	<packaging>war</packaging>
   
 	<properties>
-		<modelWeb.version>1.6.4</modelWeb.version>
+		<modelWeb.version>1.6.5</modelWeb.version>
 		<flyway.version>1.5.1</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java
index 807081c8c..2108809bc 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java
@@ -1490,7 +1490,7 @@ public class EditarConvenioController extends MyGenericForwardComposer {
 		findCliente.addFilterILike("nombcliente", "%" + txtNomeCliente.getValue() + "%");
 		findCliente.addFilterEqual("activo", Boolean.TRUE);
 		findCliente.addSortAsc("nombcliente");
-		findCliente.addFilterEqual("activo", Boolean.TRUE);
+		findCliente.addSortAsc("rowId");
 		plwCliente.init(findCliente, clienteList, pagingCliente);
 
 		if (clienteList.getData().length == 0) {

From a13d0c5af3c435793a49b937184db94aff113521 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Wed, 5 Jul 2023 21:49:33 -0300
Subject: [PATCH 2/4] fixes bug AL-2895

---
 pom.xml                                         |  6 +++---
 .../catalogos/EditarPuntoVentaController.java   |  4 ++++
 web/gui/catalogos/editarPuntoVenta.zul          | 17 +++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7a825f11..851afa6f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.8.6</version>
+	<version>1.8.7</version>
 	<packaging>war</packaging>
   
 	<properties>
-		<modelWeb.version>1.6.4</modelWeb.version>
-		<flyway.version>1.5.1</flyway.version>
+		<modelWeb.version>1.6.5</modelWeb.version>
+		<flyway.version>1.5.2</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
index 1a9d57e4f..83c41d230 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
@@ -466,6 +466,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 	private Checkbox checkPtoVtaEmpresaIndMostrarCaja;
 	private Checkbox checkPtoVtaEmpresaIndImpCompCartao;
 	private Textbox txtNumeroSitef;
+	private Textbox txtMerchantStoreAdyen;
 	private Checkbox ckIsento;
 	private Checkbox checkSimulaIntegracion;
 	private Checkbox checkTodosPuntosVenta;
@@ -2827,6 +2828,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 				ptovtaEmpresa.setIndMostrarCaja(checkPtoVtaEmpresaIndMostrarCaja.isChecked());
 				ptovtaEmpresa.setIndImpCompCartao(checkPtoVtaEmpresaIndImpCompCartao.isChecked());
 				ptovtaEmpresa.setNumeroSitef(txtNumeroSitef.getText());
+				ptovtaEmpresa.setMerchantStoreAdyen(txtMerchantStoreAdyen.getText());
 
 //				if (cmbEmpresasContaBancarias.getSelectedItem() != null) {
 //					ptovtaEmpresa.setEmpresaContaBancaria((EmpresaContaBancaria) cmbEmpresasContaBancarias.getSelectedItem().getValue());
@@ -2907,6 +2909,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		checkPtoVtaEmpresaIndMostrarCaja.setChecked(false);
 		checkPtoVtaEmpresaIndImpCompCartao.setChecked(false);
 		txtNumeroSitef.setValue("");
+		txtMerchantStoreAdyen.setValue(null);
 		this.ptovtaEmpresa = null;
 		empresaContaBancariaList.setData(new ArrayList<EmpresaContaBancaria>(0));
 	}
@@ -2945,6 +2948,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		checkPtoVtaEmpresaIndMostrarCaja.setChecked(ptovtaEmpresa.getIndMostrarCaja());
 		checkPtoVtaEmpresaIndImpCompCartao.setChecked(ptovtaEmpresa.getIndImpCompCartao());
 		txtNumeroSitef.setValue(ptovtaEmpresa.getNumeroSitef());
+		txtMerchantStoreAdyen.setValue(ptovtaEmpresa.getMerchantStoreAdyen());
 	}
 
 	public void onChange$cmbConexion(Event ev) {
diff --git a/web/gui/catalogos/editarPuntoVenta.zul b/web/gui/catalogos/editarPuntoVenta.zul
index 149d022b2..9494ca785 100644
--- a/web/gui/catalogos/editarPuntoVenta.zul
+++ b/web/gui/catalogos/editarPuntoVenta.zul
@@ -511,16 +511,7 @@
 								<label
 									value="${c:l('editarPuntoVentaController.checkIndBloqueioDescontoWEB.label')}" />
 								<checkbox id="checkIndBloqueioDescontoWEB" checked="@{winEditarPuntoVenta$composer.puntoVenta.indBloquearDescontoWEB}" />
-							</row>		
-							
-							<row>
-								<label
-									value="${c:l('editarPuntoVentaController.merchantStoreAdyen.label')}" />
-								<textbox id="txtMerchantStoreAdyen"
-									 width="70%" maxlength="200"
-									 value="@{winEditarPuntoVenta$composer.puntoVenta.merchantStoreAdyen}"
-									 />
-							</row>					
+							</row>						
 						</rows>
 					</grid>
 				</tabpanel>
@@ -1480,6 +1471,12 @@
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"
 									maxlength="10" />
 							</row>
+							<row>
+								<label
+									value="${c:l('editarPuntoVentaController.merchantStoreAdyen.label')}" />
+								<textbox id="txtMerchantStoreAdyen"
+									 width="50%" maxlength="200"/>
+							</row>
 						</rows>
 					</grid>
 

From 48a52fe537de6ac0fd83f9f9626c74ff50ce3c5b Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Wed, 5 Jul 2023 21:51:40 -0300
Subject: [PATCH 3/4] fixes bug AL-2895

---
 pom.xml                                         |  6 +++---
 .../catalogos/EditarPuntoVentaController.java   |  4 ++++
 web/gui/catalogos/editarPuntoVenta.zul          | 17 +++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7a825f11..851afa6f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.8.6</version>
+	<version>1.8.7</version>
 	<packaging>war</packaging>
   
 	<properties>
-		<modelWeb.version>1.6.4</modelWeb.version>
-		<flyway.version>1.5.1</flyway.version>
+		<modelWeb.version>1.6.5</modelWeb.version>
+		<flyway.version>1.5.2</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
index 1a9d57e4f..83c41d230 100644
--- a/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
+++ b/src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
@@ -466,6 +466,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 	private Checkbox checkPtoVtaEmpresaIndMostrarCaja;
 	private Checkbox checkPtoVtaEmpresaIndImpCompCartao;
 	private Textbox txtNumeroSitef;
+	private Textbox txtMerchantStoreAdyen;
 	private Checkbox ckIsento;
 	private Checkbox checkSimulaIntegracion;
 	private Checkbox checkTodosPuntosVenta;
@@ -2827,6 +2828,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 				ptovtaEmpresa.setIndMostrarCaja(checkPtoVtaEmpresaIndMostrarCaja.isChecked());
 				ptovtaEmpresa.setIndImpCompCartao(checkPtoVtaEmpresaIndImpCompCartao.isChecked());
 				ptovtaEmpresa.setNumeroSitef(txtNumeroSitef.getText());
+				ptovtaEmpresa.setMerchantStoreAdyen(txtMerchantStoreAdyen.getText());
 
 //				if (cmbEmpresasContaBancarias.getSelectedItem() != null) {
 //					ptovtaEmpresa.setEmpresaContaBancaria((EmpresaContaBancaria) cmbEmpresasContaBancarias.getSelectedItem().getValue());
@@ -2907,6 +2909,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		checkPtoVtaEmpresaIndMostrarCaja.setChecked(false);
 		checkPtoVtaEmpresaIndImpCompCartao.setChecked(false);
 		txtNumeroSitef.setValue("");
+		txtMerchantStoreAdyen.setValue(null);
 		this.ptovtaEmpresa = null;
 		empresaContaBancariaList.setData(new ArrayList<EmpresaContaBancaria>(0));
 	}
@@ -2945,6 +2948,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
 		checkPtoVtaEmpresaIndMostrarCaja.setChecked(ptovtaEmpresa.getIndMostrarCaja());
 		checkPtoVtaEmpresaIndImpCompCartao.setChecked(ptovtaEmpresa.getIndImpCompCartao());
 		txtNumeroSitef.setValue(ptovtaEmpresa.getNumeroSitef());
+		txtMerchantStoreAdyen.setValue(ptovtaEmpresa.getMerchantStoreAdyen());
 	}
 
 	public void onChange$cmbConexion(Event ev) {
diff --git a/web/gui/catalogos/editarPuntoVenta.zul b/web/gui/catalogos/editarPuntoVenta.zul
index 149d022b2..9494ca785 100644
--- a/web/gui/catalogos/editarPuntoVenta.zul
+++ b/web/gui/catalogos/editarPuntoVenta.zul
@@ -511,16 +511,7 @@
 								<label
 									value="${c:l('editarPuntoVentaController.checkIndBloqueioDescontoWEB.label')}" />
 								<checkbox id="checkIndBloqueioDescontoWEB" checked="@{winEditarPuntoVenta$composer.puntoVenta.indBloquearDescontoWEB}" />
-							</row>		
-							
-							<row>
-								<label
-									value="${c:l('editarPuntoVentaController.merchantStoreAdyen.label')}" />
-								<textbox id="txtMerchantStoreAdyen"
-									 width="70%" maxlength="200"
-									 value="@{winEditarPuntoVenta$composer.puntoVenta.merchantStoreAdyen}"
-									 />
-							</row>					
+							</row>						
 						</rows>
 					</grid>
 				</tabpanel>
@@ -1480,6 +1471,12 @@
 									use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"
 									maxlength="10" />
 							</row>
+							<row>
+								<label
+									value="${c:l('editarPuntoVentaController.merchantStoreAdyen.label')}" />
+								<textbox id="txtMerchantStoreAdyen"
+									 width="50%" maxlength="200"/>
+							</row>
 						</rows>
 					</grid>
 

From cd669b59db2993a75d30c88bddfc94f5e686c924 Mon Sep 17 00:00:00 2001
From: Lucas <lucas.taia@totvs.com.br>
Date: Wed, 5 Jul 2023 21:56:17 -0300
Subject: [PATCH 4/4] fixes bug AL-2895

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 851afa6f9..cf0216302 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.8.7</version>
+	<version>1.8.8</version>
 	<packaging>war</packaging>
   
 	<properties>
-		<modelWeb.version>1.6.5</modelWeb.version>
+		<modelWeb.version>1.6.6</modelWeb.version>
 		<flyway.version>1.5.2</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>