From ce4d2e6216e4b6bc5dd7e003e0782321aa026a21 Mon Sep 17 00:00:00 2001
From: "gleison.cruz" <gleison.cruz@totvs.com.br>
Date: Tue, 30 May 2023 17:19:45 -0300
Subject: [PATCH] fixes bug#AL-2649

---
 pom.xml                                       |  4 +-
 ...StringDecimalToDecimalConverterScale5.java | 44 +++++++++++++++++++
 web/gui/tarifas/editarCotacao.zul             |  6 +--
 3 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 src/java/com/rjconsultores/ventaboletos/web/utilerias/StringDecimalToDecimalConverterScale5.java

diff --git a/pom.xml b/pom.xml
index 7b56d8a97..56c75af2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>br.com.rjconsultores</groupId>
 	<artifactId>ventaboletosadm</artifactId>
-	<version>1.6.5</version>
+	<version>1.6.6</version>
 	<packaging>war</packaging>
   
 	<properties>
 		<modelWeb.version>1.5.1</modelWeb.version>
-		<flyway.version>1.3.6</flyway.version>
+		<flyway.version>1.3.7</flyway.version>
     	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     	<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
diff --git a/src/java/com/rjconsultores/ventaboletos/web/utilerias/StringDecimalToDecimalConverterScale5.java b/src/java/com/rjconsultores/ventaboletos/web/utilerias/StringDecimalToDecimalConverterScale5.java
new file mode 100644
index 000000000..467149417
--- /dev/null
+++ b/src/java/com/rjconsultores/ventaboletos/web/utilerias/StringDecimalToDecimalConverterScale5.java
@@ -0,0 +1,44 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.rjconsultores.ventaboletos.web.utilerias;
+
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.Locale;
+
+import org.zkoss.zk.ui.Component;
+import org.zkoss.zkplus.databind.TypeConverter;
+
+/**
+ * 
+ * @author Administrador
+ */
+public class StringDecimalToDecimalConverterScale5 implements TypeConverter {
+
+	private static final String FORMAT = "#####0.00000";
+	
+	public Object coerceToUi(Object val, Component comp) {
+		if (val != null) {
+			String format = (String) comp.getAttribute("format");
+			if (format == null) {
+				format = FORMAT;
+			}
+			DecimalFormat df = new DecimalFormat(format, new java.text.DecimalFormatSymbols(new Locale("pt", "BR")));
+			return df.format(val);
+		}
+		return null;
+	}
+
+	public Object coerceToBean(Object val, Component cmpnt) {
+		if (val == null) {
+			return null;
+		}
+
+		if (val instanceof String) {
+			return (val.toString().trim().isEmpty()) ? (BigDecimal) null : new BigDecimal(val.toString().replace(".", "").replace(",", "."));
+		}
+		return null;
+	}
+}
diff --git a/web/gui/tarifas/editarCotacao.zul b/web/gui/tarifas/editarCotacao.zul
index 6050d584b..d68f7c7f7 100644
--- a/web/gui/tarifas/editarCotacao.zul
+++ b/web/gui/tarifas/editarCotacao.zul
@@ -54,10 +54,10 @@
 						value="${c:l('busquedaCotacaoController.valor.label')}" />
 
 					<textbox id="txtValor" width="100%" mold="rounded"
-						constraint="no empty, no zero, no negative, /([0-9]+(\,[0-9][0-9]?)?)?/"
+						constraint="no empty, no zero, no negative"
 						use="com.rjconsultores.ventaboletos.web.utilerias.MyTextboxDecimal"
-						value="@{winEditarCotacao$composer.cotacao.valor,converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverter}"
-						precision="10" scale="2" />
+						value="@{winEditarCotacao$composer.cotacao.valor,converter=com.rjconsultores.ventaboletos.web.utilerias.StringDecimalToDecimalConverterScale5}"
+						precision="10" scale="5" />
 				</row>