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

Cadastro de convenio transportadora feat bug#AL-4346' (!603) from AL-4346 into master 

Reviewed-on: adm/VentaBoletosAdm#603
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master
fabio 2024-07-18 14:33:53 +00:00
parent ce9cdce4a6 95d145cfc4
commit 0150765b43
5 changed files with 8998 additions and 8892 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.11.0</version>
<version>1.12.0</version>
<packaging>war</packaging>
<properties>
<modelWeb.version>1.84.0</modelWeb.version>
<flyway.version>1.71.0</flyway.version>
<modelWeb.version>1.85.0</modelWeb.version>
<flyway.version>1.72.0</flyway.version>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>

19
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/configuracioneccomerciales/EditarTransportadoraController.java
View File

@ -87,16 +87,14 @@ public class EditarTransportadoraController extends MyGenericForwardComposer {
btnSalvar.setVisible(transportadora.isActivo());
convenio = convenioService.buscarPelaTransportadoraId(transportadora.getTransportadoraId());
if(convenio == null) {
convenio = new ConvenioTransportadora(transportadora.getTransportadoraId());
convenio = new ConvenioTransportadora();
}
if( convenio.getTarifasConvenio() != null ) {
lsTarifaConvenio = convenio.getTarifasConvenio();
if( lsTarifaConvenio != null ) {
tarifaConvenioList.setData(lsTarifaConvenio);
}
}
preencheCombo();
preencheRadios();
}
@ -121,13 +119,15 @@ public class EditarTransportadoraController extends MyGenericForwardComposer {
Messagebox.OK, Messagebox.EXCLAMATION);
return;
}
transportadoraService.suscribir(transportadora);
transportadora = transportadoraService.suscribir(transportadora);
transportadoraList.addItemNovo(transportadora);
} else {
transportadoraService.actualizacion(transportadora);
transportadora = transportadoraService.actualizacion(transportadora);
transportadoraList.updateItem(transportadora);
}
convenio.setTransportadora(transportadora);
convenio = convenioService.suscribirActualizar(convenio);
gravarTarifasConvenio();
Messagebox.show(
@ -194,13 +194,6 @@ public class EditarTransportadoraController extends MyGenericForwardComposer {
}
}
private void preencheCombo() {
/*
ConvenioTransportadora grupo = formaPagoService.obtenerID(transportadora.getConvenioTransportadoraId());
selecionaCombo(grupo, cmbConvenio);
*/
}
private void preencheRadios() {
selecionaRadio(transportadora.getClassePagamento(), rdgClassePagamento);
selecionaRadio(convenio.getTipoConvenio(), rdgTipoConvenio);

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

File diff suppressed because it is too large Load Diff

4
web/gui/configuraciones_comerciales/negcorporativos/busquedaTransportadora.zul
View File

@ -7,7 +7,7 @@
<zk xmlns="http://www.zkoss.org/2005/zul">
<window id="winBusquedaTransportadora" border="normal"
apply="${busquedaTransportadoraController}"
height="300px" width="400px" contentStyle="overflow:auto"
height="350px" width="500px" contentStyle="overflow:auto"
title="${c:l('editarTransportadoraController.window.title')}" >
<toolbar>
@ -60,7 +60,7 @@
multiple="false">
<listhead sizable="true">
<listheader id="lhNit" image="/gui/img/create_doc.gif"
label="${c:l('label.nit')}"
label="${c:l('label.nit')}" width="20%"
sort="auto(nit)" />
<listheader id="lhNome" image="/gui/img/create_doc.gif"
label="${c:l('label.razaoSocial')}"

56
web/gui/configuraciones_comerciales/negcorporativos/editarTransportadora.zul
View File

@ -126,62 +126,6 @@
</grid>
</tabpanel>
<!-- Adicao
<tabpanel id="tbAdicao" >
<grid fixedLayout="true">
<columns>
<column width="25%" />
<column width="75%" />
</columns>
<rows>
<row>
<label id="lbValorAdicao" value="${c:l('label.valorAdicao')}" />
<decimalbox id="txtValorAdicao" maxlength="15" format="0.00"
constraint="no negative, no zero" width="100px" />
</row>
<row>
<label value="${c:l('label.descricao')}" />
<textbox id="txtDescAdicao" maxlength="255" width="95%"
use="com.rjconsultores.ventaboletos.web.utilerias.MyTextbox" />
</row>
<row id="rowIncluirAdicao" spans="2" align="middle">
<hbox >
<button id="btnAdicionar"
height="20" image="/gui/img/add.png" width="35px"
tooltiptext="${c:l('tooltiptext.btnIncluir')}" />
<button id="btnRemoverAdicao"
height="20" image="/gui/img/remove.png" width="35px"
tooltiptext="${c:l('tooltiptext.btnRemover')}" />
</hbox>
</row>
</rows>
</grid>
<grid>
<rows>
<row>
<label id="lbTotConvenio" value="${c:l('label.valor')}" />
<label id="lbTotCredito" value="${c:l('label.credito')}" />
<label id="lbTotDebito" value="${c:l('label.debito')}" />
<label id="lbTotSaldo" value="${c:l('label.saldo')}" />
</row>
<row>
<decimalbox id="txtTotConvenio" maxlength="15" format="0.00"
constraint="no negative, no zero" width="100px" />
<decimalbox id="txtTotCredito" maxlength="15" format="0.00"
constraint="no negative, no zero" width="100px" />
<decimalbox id="txtTotDebito" maxlength="15" format="0.00"
constraint="no negative, no zero" width="100px" />
<decimalbox id="txtTotSaldo" maxlength="15" format="0.00"
constraint="no negative, no zero" width="100px" />
</row>
</rows>
</grid>
</tabpanel>
-->
<!-- Tarifa -->
<tabpanel id="tbTarifa" >
<grid fixedLayout="true">