fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into AL-2696

master
wallace.henrique 2023-07-06 18:10:01 -03:00
parent 9a7017ccb0 7d806964b1
commit 35daae684f
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,12 +4,12 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>br.com.rjconsultores</groupId> <groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId> <artifactId>ventaboletosadm</artifactId>
<version>1.8.7</version> <version>1.8.10</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>
<modelWeb.version>1.6.5</modelWeb.version> <modelWeb.version>1.6.7</modelWeb.version>
<flyway.version>1.5.1</flyway.version> <flyway.version>1.5.2</flyway.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties> </properties>

4
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/catalogos/EditarPuntoVentaController.java
View File

@ -466,6 +466,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
private Checkbox checkPtoVtaEmpresaIndMostrarCaja; private Checkbox checkPtoVtaEmpresaIndMostrarCaja;
private Checkbox checkPtoVtaEmpresaIndImpCompCartao; private Checkbox checkPtoVtaEmpresaIndImpCompCartao;
private Textbox txtNumeroSitef; private Textbox txtNumeroSitef;
private Textbox txtMerchantStoreAdyen;
private Checkbox ckIsento; private Checkbox ckIsento;
private Checkbox checkSimulaIntegracion; private Checkbox checkSimulaIntegracion;
private Checkbox checkTodosPuntosVenta; private Checkbox checkTodosPuntosVenta;
@ -2827,6 +2828,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
ptovtaEmpresa.setIndMostrarCaja(checkPtoVtaEmpresaIndMostrarCaja.isChecked()); ptovtaEmpresa.setIndMostrarCaja(checkPtoVtaEmpresaIndMostrarCaja.isChecked());
ptovtaEmpresa.setIndImpCompCartao(checkPtoVtaEmpresaIndImpCompCartao.isChecked()); ptovtaEmpresa.setIndImpCompCartao(checkPtoVtaEmpresaIndImpCompCartao.isChecked());
ptovtaEmpresa.setNumeroSitef(txtNumeroSitef.getText()); ptovtaEmpresa.setNumeroSitef(txtNumeroSitef.getText());
ptovtaEmpresa.setMerchantStoreAdyen(txtMerchantStoreAdyen.getText());
// if (cmbEmpresasContaBancarias.getSelectedItem() != null) { // if (cmbEmpresasContaBancarias.getSelectedItem() != null) {
// ptovtaEmpresa.setEmpresaContaBancaria((EmpresaContaBancaria) cmbEmpresasContaBancarias.getSelectedItem().getValue()); // ptovtaEmpresa.setEmpresaContaBancaria((EmpresaContaBancaria) cmbEmpresasContaBancarias.getSelectedItem().getValue());
@ -2907,6 +2909,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
checkPtoVtaEmpresaIndMostrarCaja.setChecked(false); checkPtoVtaEmpresaIndMostrarCaja.setChecked(false);
checkPtoVtaEmpresaIndImpCompCartao.setChecked(false); checkPtoVtaEmpresaIndImpCompCartao.setChecked(false);
txtNumeroSitef.setValue(""); txtNumeroSitef.setValue("");
txtMerchantStoreAdyen.setValue(null);
this.ptovtaEmpresa = null; this.ptovtaEmpresa = null;
empresaContaBancariaList.setData(new ArrayList<EmpresaContaBancaria>(0)); empresaContaBancariaList.setData(new ArrayList<EmpresaContaBancaria>(0));
} }
@ -2945,6 +2948,7 @@ public class EditarPuntoVentaController extends MyGenericForwardComposer {
checkPtoVtaEmpresaIndMostrarCaja.setChecked(ptovtaEmpresa.getIndMostrarCaja()); checkPtoVtaEmpresaIndMostrarCaja.setChecked(ptovtaEmpresa.getIndMostrarCaja());
checkPtoVtaEmpresaIndImpCompCartao.setChecked(ptovtaEmpresa.getIndImpCompCartao()); checkPtoVtaEmpresaIndImpCompCartao.setChecked(ptovtaEmpresa.getIndImpCompCartao());
txtNumeroSitef.setValue(ptovtaEmpresa.getNumeroSitef()); txtNumeroSitef.setValue(ptovtaEmpresa.getNumeroSitef());
txtMerchantStoreAdyen.setValue(ptovtaEmpresa.getMerchantStoreAdyen());
} }
public void onChange$cmbConexion(Event ev) { public void onChange$cmbConexion(Event ev) {

2
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarConvenioController.java
View File

@ -1490,7 +1490,7 @@ public class EditarConvenioController extends MyGenericForwardComposer {
findCliente.addFilterILike("nombcliente", "%" + txtNomeCliente.getValue() + "%"); findCliente.addFilterILike("nombcliente", "%" + txtNomeCliente.getValue() + "%");
findCliente.addFilterEqual("activo", Boolean.TRUE); findCliente.addFilterEqual("activo", Boolean.TRUE);
findCliente.addSortAsc("nombcliente"); findCliente.addSortAsc("nombcliente");
findCliente.addFilterEqual("activo", Boolean.TRUE); findCliente.addSortAsc("rowId");
plwCliente.init(findCliente, clienteList, pagingCliente); plwCliente.init(findCliente, clienteList, pagingCliente);
if (clienteList.getData().length == 0) { if (clienteList.getData().length == 0) {

15
web/gui/catalogos/editarPuntoVenta.zul
View File

@ -512,15 +512,6 @@
value="${c:l('editarPuntoVentaController.checkIndBloqueioDescontoWEB.label')}" /> value="${c:l('editarPuntoVentaController.checkIndBloqueioDescontoWEB.label')}" />
<checkbox id="checkIndBloqueioDescontoWEB" checked="@{winEditarPuntoVenta$composer.puntoVenta.indBloquearDescontoWEB}" /> <checkbox id="checkIndBloqueioDescontoWEB" checked="@{winEditarPuntoVenta$composer.puntoVenta.indBloquearDescontoWEB}" />
</row> </row>
<row>
<label
value="${c:l('editarPuntoVentaController.merchantStoreAdyen.label')}" />
<textbox id="txtMerchantStoreAdyen"
width="70%" maxlength="200"
value="@{winEditarPuntoVenta$composer.puntoVenta.merchantStoreAdyen}"
/>
</row>
</rows> </rows>
</grid> </grid>
</tabpanel> </tabpanel>
@ -1480,6 +1471,12 @@
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox"
maxlength="10" /> maxlength="10" />
</row> </row>
<row>
<label
value="${c:l('editarPuntoVentaController.merchantStoreAdyen.label')}" />
<textbox id="txtMerchantStoreAdyen"
width="50%" maxlength="200"/>
</row>
</rows> </rows>
</grid> </grid>