Aggiustamenti PagoPa

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

@@ -1131,6 +1131,7 @@ label.error.file.annullamento.already.exist = Impossibile generare il file di an
 
 error.geniocivilefe.pratica.allegato.ext.valid = Estensione Allegato non valida
 error.geniocivilefe.pratica.allegato.length.valid = Lunghezza massima nome file superata
+error.geniocivilefe.pagamento.bollettino = Numero marca da bollo non inserito
 
 # Manifattura Web Group, mofidica per rendere la dimensione massima degli allegati configurabile
 # da pannello di controllo. In origine era hardcoded a 20971520 byte.

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/scheduler/SchedulerGeneraProtocollo.java

@@ -1,5 +1,16 @@
 package it.tref.liferay.portos.bo.scheduler;
 
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.exception.SystemException;
+import com.liferay.portal.kernel.log.Log;
+import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.messaging.Message;
+import com.liferay.portal.kernel.messaging.MessageListener;
+import com.liferay.portal.kernel.messaging.MessageListenerException;
+import com.liferay.portal.kernel.repository.model.FileEntry;
+import com.liferay.portal.kernel.util.Validator;
+import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
+
 import it.tref.liferay.portos.bo.model.Avviso;
 import it.tref.liferay.portos.bo.service.AvvisoLocalServiceUtil;
 import it.tref.liferay.portos.bo.util.AvvisoUtil;
@@ -16,17 +27,6 @@ import java.util.Map;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import com.liferay.portal.kernel.exception.PortalException;
-import com.liferay.portal.kernel.exception.SystemException;
-import com.liferay.portal.kernel.log.Log;
-import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.messaging.Message;
-import com.liferay.portal.kernel.messaging.MessageListener;
-import com.liferay.portal.kernel.messaging.MessageListenerException;
-import com.liferay.portal.kernel.repository.model.FileEntry;
-import com.liferay.portal.kernel.util.Validator;
-import com.liferay.portlet.documentlibrary.service.DLAppLocalServiceUtil;
-
 public class SchedulerGeneraProtocollo implements MessageListener {
 
 	private static final Log _log = LogFactoryUtil.getLog(SchedulerGeneraProtocollo.class);

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=2970
+    build.number=2982
-    build.date=1707838344827
+    build.date=1708674243125
     build.auto.upgrade=true
 
 ##

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java

@@ -2272,6 +2272,13 @@ public class FascicoloFePortlet extends MVCPortlet {
 			ServiceContext serviceContext = ServiceContextFactory.getInstance(uploadRequest);
 			long pagamentoId = ParamUtil.getLong(uploadRequest, "pagamentoId");
 			String numeroBollettino = ParamUtil.getString(request, "numeroBollettino", StringPool.BLANK);
+			if(numeroBollettino.equals(StringPool.BLANK)){
+				numeroBollettino= ParamUtil.getString(uploadRequest, "numeroHBollettino", StringPool.BLANK);
+				if(!numeroBollettino.equals(StringPool.QUESTION)){
+					SessionErrors.add(request, "error.geniocivilefe.pagamento.bollettino");
+				}
+				numeroBollettino=StringPool.BLANK;
+			}
 			String sourceFileName = uploadRequest.getFileName("docFile");
 			File file = uploadRequest.getFile("docFile");
 			if (Validator.isNotNull(sourceFileName) && file != null) {

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

@@ -71,6 +71,8 @@
 <liferay-ui:error key="error.geniocivilefe.pagamento.allegato.ext.valid" message="error.geniocivilefe.pagamento.allegato.ext.valid"></liferay-ui:error>
 <liferay-ui:error key="error.geniocivilefe.pagamento.allegato.length.valid" message="error.geniocivilefe.pagamento.allegato.length.valid"></liferay-ui:error>
 <liferay-ui:error key="error.geniocivilefe.pagamento.allegato.is.request" message="error.geniocivilefe.pagamento.allegato.is.request"></liferay-ui:error>
+<liferay-ui:error key="error.geniocivilefe.pagamento.bollettino" message="error.geniocivilefe.pagamento.bollettino"></liferay-ui:error>
+
 <liferay-portlet:renderURL var="verifyURL" windowState="<%=LiferayWindowState.POP_UP.toString()%>">
 	<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/verify_fascicolo.jsp" />
 	<liferay-portlet:param name="intPraticaId" value="<%=String.valueOf(intPraticaId)%>" />
@@ -152,6 +154,7 @@
 															<aui:validator name="required" errorMessage="File Richiesto" />
 															<aui:validator name="acceptFiles" errorMessage="Errore... Formati supportati: pdf,p7m">'p7m,pdf'</aui:validator>
 														</aui:input>
+														<aui:input type="hidden" name="numeroHBollettino" value="<%=StringPool.QUESTION%>"/>
 													</div>
 
 													<aui:button-row>

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

@@ -17,6 +17,7 @@ long intPraticaId = ParamUtil.getLong(request, "intPraticaId");
 long fineLavoriId = ParamUtil.getLong(request, "fineLavoriId");
 IntPratica intPratica = IntPraticaLocalServiceUtil.getIntPratica(intPraticaId);
 FineLavori fineLavori = FineLavoriServiceUtil.getFineLavori(fineLavoriId);
+String testoPagamento = (String) company.getExpandoBridge().getAttribute("testo_pagamento", false);
 if (fineLavori == null) {
 	fineLavori = FineLavoriServiceUtil.getLastEditable(intPraticaId);
 }
@@ -43,6 +44,8 @@ if (Validator.isNotNull(pagamento)) {
 String formRicevutaPagamento = "fmRicevuta";
 String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
 %>
+<liferay-ui:error key="error.geniocivilefe.pagamento.bollettino" message="error.geniocivilefe.pagamento.bollettino"></liferay-ui:error>
+
 <liferay-portlet:renderURL var="verifyURL" windowState="<%= LiferayWindowState.POP_UP.toString() %>">
 	<liferay-portlet:param name="mvcPath" value="/html/fascicolofe/verify_fine-lavori.jsp"/>
 	<liferay-portlet:param name="intPraticaId" value="<%= String.valueOf(intPraticaId) %>"/>
@@ -109,9 +112,9 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
 										</liferay-portlet:actionURL>
 										<c:if test="<%= pagamento.getMezzo().equals(
 												PagamentoConstants.MEZZO_MANUALE) %>">
-											<div class="col-xs-8 padding_15"><span>
+											<div class="col-xs-8 padding_15">
-												<%= LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli") %>
+											<span><%= testoPagamento %></span>
-												</span>
+												<%-- <%= LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli") %> --%>
 											</div>
 											<div class="col-xs-4 padding_15 total-row">
 												<aui:form name="<%= formRicevutaPagamento %>"
@@ -187,6 +190,7 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
 															<aui:validator name="acceptFiles"
 																	errorMessage="Errore... Formati supportati: pdf,p7m">'p7m,pdf'</aui:validator>
 														</aui:input>
+														<aui:input type="hidden" name="numeroHBollettino" value="<%=StringPool.QUESTION%>"/>
 													</div>
 													<aui:button-row>
 														<aui:button type="submit" value="upload-file" />
@@ -354,7 +358,7 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
 			<div id='<%= renderResponse.getNamespace() + "saveAndCloseDiv" %>' class="hide" >
 				<%
 				String paymentConfirmText = StringPool.BLANK;
-				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>