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

Merge pull request 'Bolivariano - Arredondamento na consulta de corrida feat bug#AL-5094' (!801) from AL-5094 into master 

Reviewed-on: adm/VentaBoletosAdm#801
Reviewed-by: Valdir Cordeiro <valdir.cordeiro@totvs.com.br>
master 1.162.0
leonardo.bolivariano 2024-10-22 12:36:25 +00:00
parent 6197d5bdea 19e5e144fc
commit 9d26fc13d3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<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.161.1</version> <version>1.162.0</version>
<packaging>war</packaging> <packaging>war</packaging>
<properties> <properties>

11
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/tarifas/EditarRedondeoController.java
View File

@ -32,6 +32,7 @@ import com.rjconsultores.ventaboletos.entidad.Redondeo;
import com.rjconsultores.ventaboletos.entidad.RedondeoCtrl; import com.rjconsultores.ventaboletos.entidad.RedondeoCtrl;
import com.rjconsultores.ventaboletos.entidad.RedondeoMarca; import com.rjconsultores.ventaboletos.entidad.RedondeoMarca;
import com.rjconsultores.ventaboletos.entidad.RedondeoOrgaoConcedente; import com.rjconsultores.ventaboletos.entidad.RedondeoOrgaoConcedente;
import com.rjconsultores.ventaboletos.service.ConstanteService;
import com.rjconsultores.ventaboletos.service.MarcaService; import com.rjconsultores.ventaboletos.service.MarcaService;
import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService; import com.rjconsultores.ventaboletos.service.OrgaoConcedenteService;
import com.rjconsultores.ventaboletos.service.RedondeoCtrlService; import com.rjconsultores.ventaboletos.service.RedondeoCtrlService;
@ -83,6 +84,8 @@ public class EditarRedondeoController extends MyGenericForwardComposer {
@Autowired @Autowired
private OrgaoConcedenteService orgaoService; private OrgaoConcedenteService orgaoService;
@Autowired
private ConstanteService constanteService;
private Combobox cmbOrgao; private Combobox cmbOrgao;
private List<OrgaoConcedente> lsOrgaoCOncendente; private List<OrgaoConcedente> lsOrgaoCOncendente;
@ -90,6 +93,8 @@ public class EditarRedondeoController extends MyGenericForwardComposer {
private List<RedondeoOrgaoConcedente> lsRedondeoOrgao; private List<RedondeoOrgaoConcedente> lsRedondeoOrgao;
private Boolean configArredondamentoCentenas;
@Override @Override
public void doAfterCompose(Component comp) throws Exception { public void doAfterCompose(Component comp) throws Exception {
@ -97,6 +102,8 @@ public class EditarRedondeoController extends MyGenericForwardComposer {
lsOrgaoCOncendente = orgaoService.obtenerTodos(); lsOrgaoCOncendente = orgaoService.obtenerTodos();
configArredondamentoCentenas = constanteService.buscarValorConstantePorNomeConstanteBoolean("CONFIG_ARREDONDAMENTO_CENTENAS").booleanValue();
super.doAfterCompose(comp); super.doAfterCompose(comp);
redondeoCtrl = (RedondeoCtrl) Executions.getCurrent().getArg().get("redondeoCtrl"); redondeoCtrl = (RedondeoCtrl) Executions.getCurrent().getArg().get("redondeoCtrl");
@ -119,7 +126,7 @@ public class EditarRedondeoController extends MyGenericForwardComposer {
chkIndaplicapricing.setChecked(redondeoCtrl.getIndaplicapricing()); chkIndaplicapricing.setChecked(redondeoCtrl.getIndaplicapricing());
chkIndaplicaArtesp.setChecked(redondeoCtrl.getIndaplicaArtesp() == null ? Boolean.FALSE : redondeoCtrl.getIndaplicaArtesp()); chkIndaplicaArtesp.setChecked(redondeoCtrl.getIndaplicaArtesp() == null ? Boolean.FALSE : redondeoCtrl.getIndaplicaArtesp());
if(chkIndaplicaArtesp.isChecked()){ if(chkIndaplicaArtesp.isChecked() && !configArredondamentoCentenas){
chkIndaplicapricing.setDisabled(true); chkIndaplicapricing.setDisabled(true);
chkIndaplicadescuento.setDisabled(true); chkIndaplicadescuento.setDisabled(true);
} }
@ -460,7 +467,7 @@ public class EditarRedondeoController extends MyGenericForwardComposer {
} }
public void onClick$chkIndaplicaArtesp(){ public void onClick$chkIndaplicaArtesp(){
if(chkIndaplicaArtesp.isChecked()){ if(chkIndaplicaArtesp.isChecked() && !configArredondamentoCentenas){
chkIndaplicadescuento.setChecked(false); chkIndaplicadescuento.setChecked(false);
chkIndaplicapricing.setChecked(false); chkIndaplicapricing.setChecked(false);
chkIndaplicadescuento.setDisabled(true); chkIndaplicadescuento.setDisabled(true);