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

Conflict solved. Fixes bug#AL-4551

master
Fernando Abimael Alvarez Uc 2024-08-09 11:45:51 -06:00
parent 024eddb26d 892d7c301e
commit cd7d4e7498
7 changed files with 13983 additions and 52552 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>
<groupId>br.com.rjconsultores</groupId>
<artifactId>ventaboletosadm</artifactId>
<version>1.119.3</version>
<version>1.120.5</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.91.0</modelWeb.version>
<flyway.version>1.78.1</flyway.version>
<modelWeb.version>1.92.1</modelWeb.version>
<flyway.version>1.79.1</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

35
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/ingreso/EditarTipoEventoExtraController.java
View File

@ -23,6 +23,7 @@ import org.zkoss.zul.Button;
import org.zkoss.zul.Checkbox;
import org.zkoss.zul.Combobox;
import org.zkoss.zul.Comboitem;
import org.zkoss.zul.Intbox;
import org.zkoss.zul.Messagebox;
import org.zkoss.zul.Radio;
import org.zkoss.zul.Row;
@ -52,6 +53,8 @@ import com.rjconsultores.ventaboletos.web.utilerias.MyComboboxPuntoVenta;
import com.rjconsultores.ventaboletos.web.utilerias.MyGenericForwardComposer;
import com.rjconsultores.ventaboletos.web.utilerias.MyListbox;
import com.rjconsultores.ventaboletos.web.utilerias.MyTextbox;
import jxl.biff.IntegerHelper;
/**
*
* @author Rafius
@ -103,6 +106,7 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
/*Forma de Pagamento*/
private Combobox cmbEmpresaFormaPago;
private MyListbox formaPagoList;
private Intbox intboxIndQuantViasImp;
private List<TipoEventoExtraEmpresa> lsTipoEventoExtraEmpresa;
private static Logger log = LogManager.getLogger(EditarTipoEventoExtraController.class);
@ -165,8 +169,36 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
lsFormaPago = formaPagoService.obtenerTodos();
lsTipoEventoExtraFormaPago = tipoEventoExtra.getTipoeventoextraId() == null ? new ArrayList<TipoEventoExtraFormaPago>() : tipoEventoExtraFormaPagoService.buscarPorTipoEventoExtra(tipoEventoExtra);
formaPagoList.setData(lsTipoEventoExtraFormaPago);
intboxIndQuantViasImp.setValue(tipoEventoExtra.getIndQuantViasImp() == null ? 1 : tipoEventoExtra.getIndQuantViasImp());
intboxIndQuantViasImp.setConstraint(Labels.getLabel("editarFormaPagoController.lbvias.semVazio"));
}
public void onChange$intboxIndQuantViasImp(Event event) throws InterruptedException {
validateIntbox();
}
private void validateIntbox() throws InterruptedException {
Integer value = intboxIndQuantViasImp.getValue();
if (value == null) {
Messagebox.show(Labels.getLabel("editarFormaPagoController.lbvias.semVazio"), "Erro", Messagebox.OK, Messagebox.INFORMATION);
intboxIndQuantViasImp.setValue(1);
return;
}
if (value <= 0) {
Messagebox.show(Labels.getLabel("editarFormaPagoController.lbvias.semNegativo"), "Erro", Messagebox.OK, Messagebox.INFORMATION);
intboxIndQuantViasImp.setValue(1);
return;
}
if (value > 5) {
Messagebox.show(Labels.getLabel("editarFormaPagoController.lbvias.maxCinco"), "Erro", Messagebox.OK, Messagebox.INFORMATION);
intboxIndQuantViasImp.setValue(1);
return;
}
}
public void onClick$btnRemoverEmpresa(Event ev) throws InterruptedException {
if (empresasList.getSelectedItem() == null){
Messagebox.show(Labels.getLabel("editarTipoEventoExtraController.MSG.selecionarEmpresa"),
@ -243,6 +275,9 @@ public class EditarTipoEventoExtraController extends MyGenericForwardComposer {
tipoEventoExtra.setIndboleto(Boolean.FALSE);// não valida boleto
tipoEventoExtra.setPorciva(BigDecimal.ZERO);
tipoEventoExtra.setIndtipo(raTipo11.isChecked() ? "1" : "0");
tipoEventoExtra.setIndQuantViasImp(intboxIndQuantViasImp.getValue() == null
|| intboxIndQuantViasImp.getValue() <= 0
? 1 : intboxIndQuantViasImp.getValue());
Comboitem cbDescontoMonitrip = cmbCveTipoEvento.getSelectedItem();
tipoEventoExtra.setCvetipoevento(null);

8499
web/WEB-INF/i3-label_en.label
View File

File diff suppressed because it is too large Load Diff

6
web/WEB-INF/i3-label_es_MX.label
View File

@ -7451,21 +7451,17 @@ expressosPorCotizarController.lhFluecPlanilla.label = FLUEC - Planilla Ocasional
asignarBusExpreso.window.title = Viaje Expreso
expresosController.lbl.cargarFluec = Cargar FLUEC
expresosController.lbl.cargarPlaca = Cargar Placa
expresosController.lbl.placa = Número de Placa
indexController.mniExpressosDocumentos.label = Documentos
expresosController.lbl.verDetalle = Ver Detalle
expresosController.lbl.asignarBus = Asignar Bus
expresosController.lbl.fluecCargado = FLUEC Cargado
expresosController.lbl.pagoCredito = Pago Crédito
expresosController.lbl.pagadoCredito = Pagado a Crédito
expresosController.lbl.idaVuelta = Ida y Regreso
expresosController.lbl.idaVuelta = Ida
expresoController.MSG.errorArchivo = Archivo inválido o nulo
cargaContratoController.MSG.errorExpresoNull = Seleccione Expreso a Asociar Contrato
cargaContratoController.MSG.errorNumPlacaInvalidOrNull = Número de Placa Inválido o Nulo
cotizarExpresoController.MSG.emailEnviado = Cotización de Expreso Correcta
expresoController.MSG.emailNoEnviado = Ocurrió un problema. Favor de revisar logs
expresoController.MSG.asuntoCorreoCotizacion = Solicitud de Expreso Cotizada
@ -51020,4 +51016,4 @@ winMovimentacionBilhetesPuntoVenta.forminicial.label = Form.Inicial
winMovimentacionBilhetesPuntoVenta.numSerie.label = Série
winMovimentacionBilhetesPuntoVenta.origem.label = Origen
winMovimentacionBilhetesPuntoVenta.puntoventa.label = Ag.
winMovimentacionBilhetesPuntoVenta.tipoMovimentacion.label = Naturaleza
winMovimentacionBilhetesPuntoVenta.tipoMovimentacion.label = Naturaleza

49482
web/WEB-INF/i3-label_fr_FR.label
View File

File diff suppressed because it is too large Load Diff

8500
web/WEB-INF/i3-label_pt_BR.label
View File

File diff suppressed because it is too large Load Diff

7
web/gui/ingreso/editarTipoEventoExtra.zul
View File

@ -119,7 +119,12 @@
value="@{winEditarTipoEventoExtra$composer.tipoEventoExtra.contaContabil}"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
</row>
<row>
<label id="lbIndQuantViasImp" value="${c:l('editarFormaPagoController.lbvias.value')}" tooltiptext="${c:l('editarFormaPagoController.lbvias.mouseover')}"/>
<intbox id="intboxIndQuantViasImp" width="80px" value="@{winEditarTipoEventoExtra$composer.tipoEventoExtra.indQuantViasImp}" />
</row>
<row spans="2">
<checkbox id="chkValidarEstoque"
checked="@{winEditarTipoEventoExtra$composer.tipoEventoExtra.indValidarEstoque}"