diff --git a/pom.xml b/pom.xml
index f7a825f11..851afa6f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
4.0.0
br.com.rjconsultores
ventaboletosadm
- 1.8.6
+ 1.8.7
war
- 1.6.4
- 1.5.1
+ 1.6.5
+ 1.5.2
UTF-8
UTF-8
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(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 @@
-
-
-
-
-
-
+
@@ -1480,6 +1471,12 @@
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"
maxlength="10" />
+
+
+
+