From 96c88797b2fe27635ffdcbcddbefeeea9dbc244f Mon Sep 17 00:00:00 2001
From: "wallace.henrique" <wallace.henrique@BHN330100022.bh01.local>
Date: Mon, 23 Sep 2024 15:28:03 -0300
Subject: [PATCH 1/4] fixes bug#AL-4295

---
 pom.xml                                             |  2 +-
 .../ventaboletos/entidad/Categoria.java             | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 106cf4ff4..f067e18cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.109.2</version>
+	<version>1.110.0</version>
  
 	<distributionManagement>
         <repository>
diff --git a/src/com/rjconsultores/ventaboletos/entidad/Categoria.java b/src/com/rjconsultores/ventaboletos/entidad/Categoria.java
index bfce59f44..d06a9866d 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Categoria.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Categoria.java
@@ -133,6 +133,9 @@ public class Categoria implements Serializable, Auditavel<Categoria>{
 	@Column(name = "INDEMITEFORMAUTORIZACAO")
 	private Boolean indEmiteFormularioAutorizacao;
 	
+	@Column(name = "INDVENDEEMPEAPI")
+	private Boolean indVendaEmPeAPI;
+	
 	@OneToMany(mappedBy = "categoria", cascade = CascadeType.ALL)
 	private List<CategoriaFormAutorizacao> formsAutorizacao = new ArrayList<CategoriaFormAutorizacao>();
 	
@@ -378,6 +381,14 @@ public class Categoria implements Serializable, Auditavel<Categoria>{
 	public void setFormsAutorizacao(List<CategoriaFormAutorizacao> formsAutorizacao) {
 		this.formsAutorizacao = formsAutorizacao;
 	}
+
+	public Boolean getIndVendaEmPeAPI() {
+		return indVendaEmPeAPI;
+	}
+
+	public void setIndVendaEmPeAPI(Boolean indVendaEmPeAPI) {
+		this.indVendaEmPeAPI = indVendaEmPeAPI;
+	}
 	
-	
+		
 }

From b85d1b4a481812050eb0ffe02aa36765a5bf0134 Mon Sep 17 00:00:00 2001
From: Wilian Domingues Souza <wilian.domingues@totvs.com.br>
Date: Fri, 27 Sep 2024 15:53:16 -0300
Subject: [PATCH 2/4] fixes bug#AL-5017

---
 .../ventaboletos/entidad/Parada.java          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/com/rjconsultores/ventaboletos/entidad/Parada.java b/src/com/rjconsultores/ventaboletos/entidad/Parada.java
index 5e9c14312..ed40d0ec4 100644
--- a/src/com/rjconsultores/ventaboletos/entidad/Parada.java
+++ b/src/com/rjconsultores/ventaboletos/entidad/Parada.java
@@ -5,6 +5,7 @@
 package com.rjconsultores.ventaboletos.entidad;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -124,6 +125,12 @@ public class Parada implements Serializable, Auditavel<Parada> {
 	@NaoAuditar
 	Boolean isParadaConexaoRutaExcluida;
 	
+	@Column(name="latitude")
+	private BigDecimal latitude;
+	
+	@Column(name="longitude")
+	private BigDecimal longitude;
+	
 
 	public Boolean getIsParadaConexaoRutaExcluida() {
 		return isParadaConexaoRutaExcluida ==null?false:isParadaConexaoRutaExcluida;
@@ -429,5 +436,21 @@ public class Parada implements Serializable, Auditavel<Parada> {
 	public Object clone() throws CloneNotSupportedException {
 		return super.clone();
 	}
+
+	public BigDecimal getLatitude() {
+		return latitude;
+	}
+
+	public void setLatitude(BigDecimal latitude) {
+		this.latitude = latitude;
+	}
+
+	public BigDecimal getLongitude() {
+		return longitude;
+	}
+
+	public void setLongitude(BigDecimal longitude) {
+		this.longitude = longitude;
+	}
 	
 }

From 3cecb80da9f2aeb52b1f5bfa21dfbb6c9cac60bd Mon Sep 17 00:00:00 2001
From: Wilian Domingues Souza <wilian.domingues@totvs.com.br>
Date: Fri, 27 Sep 2024 16:13:55 -0300
Subject: [PATCH 3/4] bug#AL-5017

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f067e18cd..55e6eb482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.110.0</version>
+	<version>1.111.0</version>
  
 	<distributionManagement>
         <repository>

From d3ad36462588d29161441bfe11f49f8b041f83c5 Mon Sep 17 00:00:00 2001
From: "valdir.cordeiro" <valdir.cordeiro@BHN330100045.bh01.local>
Date: Sat, 28 Sep 2024 08:46:54 -0300
Subject: [PATCH 4/4] Institucionales - Entrega do Bono na bilheteria (Totalbus
 - SCO) feat bug#AL-4900

---
 pom.xml                                                     | 2 +-
 src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 55e6eb482..d7cbbc65c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ModelWeb</artifactId>
-	<version>1.111.0</version>
+	<version>1.112.0</version>
  
 	<distributionManagement>
         <repository>
diff --git a/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java b/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java
index 331754044..bd3e6e419 100644
--- a/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java
+++ b/src/com/rjconsultores/ventaboletos/enums/TipoFormapago.java
@@ -24,7 +24,8 @@ public enum TipoFormapago {
 	ADYEN(17,Labels.getLabel("editarFormaPagoController.lblAdyen.label")),
 	MERCADO_PAGO(18,Labels.getLabel("editarFormaPagoController.lblMercadoPago.label")),
 	EMBARQUE_JA(19,Labels.getLabel("editarFormaPagoController.lblEmbarqueJa.label")),
-	NEQUI(20,Labels.getLabel("editarFormaPagoController.lblNequi.label"))
+	NEQUI(20,Labels.getLabel("editarFormaPagoController.lblNequi.label")),
+	BONO(21,Labels.getLabel("editarFormaPagoController.lblBono.label"))
 	;
 	
 	private Integer valor;