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

fixes bug #10294 

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Web/trunk/ventaboletos@77214 d1611594-4594-4d17-8e1d-87c2c4800839
master
walace 2017-12-11 18:53:22 +00:00
parent ed349b1bf7
commit fe700fcd5e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/com/rjconsultores/ventaboletos/web/gui/controladores/pricing/EditarPricingEspecificoController.java
View File

@ -201,6 +201,9 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
} }
public void onClick$btnNovoPricingAgencia(Event ev) throws InterruptedException { public void onClick$btnNovoPricingAgencia(Event ev) throws InterruptedException {
if(cmbPuntoVenta.getSelectedItem() == null){
return;
}
PricingEspecificoAgencia pricingAgencia = new PricingEspecificoAgencia((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); PricingEspecificoAgencia pricingAgencia = new PricingEspecificoAgencia((PuntoVenta)cmbPuntoVenta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId());
if (pricingEspecifico.getPricingEspecificoAgenciasList().contains(pricingAgencia)) { if (pricingEspecifico.getPricingEspecificoAgenciasList().contains(pricingAgencia)) {
@ -240,6 +243,10 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
} }
public void onClick$btnNovoPricingCanal(Event ev) throws InterruptedException { public void onClick$btnNovoPricingCanal(Event ev) throws InterruptedException {
if(cmbPtovta.getSelectedItem() == null){
return;
}
PricingEspecificoCanalVendas pricingCanal = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId()); PricingEspecificoCanalVendas pricingCanal = new PricingEspecificoCanalVendas((TipoPuntoVenta)cmbPtovta.getSelectedItem().getValue(), pricingEspecifico, UsuarioLogado.getUsuarioLogado().getUsuarioId());
if (pricingEspecifico.getPricingEspecificoCanalVendasList().contains(pricingCanal)) { if (pricingEspecifico.getPricingEspecificoCanalVendasList().contains(pricingCanal)) {
@ -439,15 +446,12 @@ public class EditarPricingEspecificoController extends MyGenericForwardComposer
fechaFin.getValue(); fechaFin.getValue();
tarifaAbierto.getValue(); tarifaAbierto.getValue();
//pricingEspecifico.getPricingEspecificoOcupacionsList().clear(); List<PricingEspecificoOcupacion> pricingEspecificoOcupacionList = new ArrayList<PricingEspecificoOcupacion>();
for (Object o : pricingListEspOcupacion.getData()) { for (Object o : pricingListEspOcupacion.getData()) {
PricingEspecificoOcupacion p = (PricingEspecificoOcupacion) o; PricingEspecificoOcupacion p = (PricingEspecificoOcupacion) o;
// pricingEspecifico.setPricingEspecificoOcupacionsList(new ArrayList<PricingEspecificoOcupacion>()); pricingEspecificoOcupacionList.add(p);
if(!pricingEspecifico.getPricingEspecificoOcupacionsList().contains(p)){
pricingEspecifico.getPricingEspecificoOcupacionsList().add(p);
}
} }
pricingEspecifico.setPricingEspecificoOcupacionsList(pricingEspecificoOcupacionList);
List<PricingEspecificoCanalVendas> pecv = (List<PricingEspecificoCanalVendas>) pricingListEspCanal.getModel(); List<PricingEspecificoCanalVendas> pecv = (List<PricingEspecificoCanalVendas>) pricingListEspCanal.getModel();
for (PricingEspecificoCanalVendas pricingEspecificoCanalVendas : pecv) { for (PricingEspecificoCanalVendas pricingEspecificoCanalVendas : pecv) {