pagamentoImpl.setOtf(pagamento.isOtf());
pagamentoImpl.setOtfCreateDate(pagamento.getOtfCreateDate());
pagamentoImpl.setEmailPending(pagamento.isEmailPending());
+ pagamentoImpl.setNumeroBollettino(pagamento.getNumeroBollettino());
pagamentoImpl.setOldPagamentoId(pagamento.getOldPagamentoId());
return pagamentoImpl;
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
index 39775bf7..2d126c60 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
+++ b/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=2954
- build.date=1706804621576
+ build.number=2966
+ build.date=1707408695550
build.auto.upgrade=true
##
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
index 08566c26..884a49a6 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar
index bf0aac14..0b1f673d 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar
index 5e6c9802..047a6e9f 100644
Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java
index 974077b6..38c0e1e9 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/fe/portlet/FascicoloFePortlet.java
@@ -2271,6 +2271,7 @@ public class FascicoloFePortlet extends MVCPortlet {
UploadPortletRequest uploadRequest = PortalUtil.getUploadPortletRequest(request);
ServiceContext serviceContext = ServiceContextFactory.getInstance(uploadRequest);
long pagamentoId = ParamUtil.getLong(uploadRequest, "pagamentoId");
+ String numeroBollettino = ParamUtil.getString(request, "numeroBollettino", StringPool.BLANK);
String sourceFileName = uploadRequest.getFileName("docFile");
File file = uploadRequest.getFile("docFile");
if (Validator.isNotNull(sourceFileName) && file != null) {
@@ -2291,7 +2292,7 @@ public class FascicoloFePortlet extends MVCPortlet {
PortalUtil.copyRequestParameters(request, response);
} else {
byte[] content = FileUtil.getBytes(file);
- PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext);
+ PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, content, numeroBollettino, sourceFileName, serviceContext);
}
} catch (Exception e) {
PortalUtil.copyRequestParameters(request, response);
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify-payment-guide.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify-payment-guide.jsp
index 2d88d49c..4b9366b2 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify-payment-guide.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify-payment-guide.jsp
@@ -1,8 +1,8 @@
-Il pagamento dei “Diritti Fissi” potrà essere effettuato solo tramite la piattaforma regionale https://pagamenti.regione.sicilia.it/static/.
+Il pagamento dei “Diritti Fissi” potrà essere effettuato solo tramite la piattaforma regionale https://pagamenti.regione.sicilia.it/static/.
Per effettuare il pagamento seguire i seguenti step:
-
-
connettersi alla piattaforma https://pagamenti.regione.sicilia.it/static/
+ connettersi alla piattaforma https://pagamenti.regione.sicilia.it/static/
-
Selezionare il pulsante “accedi al servizio”
diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp
index 111be7d1..4d1e05b6 100644
--- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp
+++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp
@@ -197,13 +197,17 @@
-
+
<%=LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli")%>
-