fix testo pagamento

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@@ -13,8 +13,8 @@
 ##
 
     build.namespace=portos_bo
-    build.number=2983
+    build.number=2984
-    build.date=1715678263225
+    build.date=1716935320632
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_collaudo_calcolo.jsp

@@ -46,6 +46,7 @@
 	}
 	
 	String formRicevutaPagamento = "fmRicevuta";
+	String testoPagamento = (String) company.getExpandoBridge().getAttribute("testo_pagamento", false);
 	//String formSostituisciPagamento = "fmSostituisci";
 	
 	String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
@@ -63,6 +64,7 @@
 	<liferay-portlet:param name="collaudoId" value="<%= String.valueOf(collaudoId) %>" />
 </liferay-portlet:renderURL>
 
+<liferay-ui:error key="error.geniocivilefe.pagamento.bollettino" message="error.geniocivilefe.pagamento.bollettino"></liferay-ui:error>
 
 <div class="container-fluid clearfix root-calc">
 	<h2 class="title-fascicolo pull-left">Calcolo importo</h2>
@@ -118,12 +120,16 @@
 										</liferay-portlet:actionURL>
 	
 					         			<c:if test="<%= pagamento.getMezzo().equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE) %>">
-			                				<div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 padding_15">
+			                				<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8 padding_15">
-												<span><%= LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli") %></span>
+			                					<span><%= testoPagamento %></span>
 											</div>
-											<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 padding_15 total-row">
+											<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 padding_15 total-row">
 												<aui:form name="<%= formRicevutaPagamento %>" enctype="multipart/form-data" method="post" action="<%= allegatoFilePagamentoURL %>">
 													<div>
+														<aui:input label="numero-bollettino" name="numeroBollettino" type="textarea" >
+															<aui:validator name="maxLength" errorMessage="errore-lenght-bollettino">250</aui:validator>
+															<aui:validator name="required" errorMessage="Campo Richiesto" />
+														</aui:input>
 														<aui:input type="file" name="docFile" label="Ricevuta Pagamento">
 															<aui:validator name="required" errorMessage="File Richiesto" />
 															<aui:validator name="acceptFiles" errorMessage="Errore... Formati supportati: pdf,p7m">'p7m,pdf'</aui:validator>
@@ -254,7 +260,7 @@
 			<div id='<%=renderResponse.getNamespace()+"saveAndCloseDiv" %>' class="hide" >	
 				<%
 					String paymentConfirmText = "";
-				  	paymentConfirmText = LanguageUtil.get(pageContext, "label-confirm-payment-manual");
+				  	paymentConfirmText = (String) company.getExpandoBridge().getAttribute("testo_pagamento_breve", false);
 				%>
 				<span style="min-height:70px"><%= paymentConfirmText %></span>
 			</div>