diff --git a/liferay-plugins-sdk-6.2/build.yello.properties b/liferay-plugins-sdk-6.2/build.yello.properties new file mode 100644 index 00000000..e000a64e --- /dev/null +++ b/liferay-plugins-sdk-6.2/build.yello.properties @@ -0,0 +1,10 @@ +# Managed by Liferay IDE (remove this comment to prevent future updates) + +#Managed by Liferay IDE (remove this comment to prevent future updates) +#Tue May 19 15:47:40 CEST 2020 +app.server.tomcat.lib.global.dir = C:/liferay-project/Paesaggistica/liferay-portal-6.2-ce-ga6-patched6.2.5/liferay-portal-6.2-ce-ga6-patched6.2.5/tomcat-7.0.62/lib/ext +app.server.tomcat.deploy.dir = C:/liferay-project/Paesaggistica/liferay-portal-6.2-ce-ga6-patched6.2.5/liferay-portal-6.2-ce-ga6-patched6.2.5/tomcat-7.0.62/webapps +app.server.parent.dir = C:/liferay-project/Paesaggistica/liferay-portal-6.2-ce-ga6-patched6.2.5/liferay-portal-6.2-ce-ga6-patched6.2.5 +app.server.tomcat.dir = C:/liferay-project/Paesaggistica/liferay-portal-6.2-ce-ga6-patched6.2.5/liferay-portal-6.2-ce-ga6-patched6.2.5/tomcat-7.0.62 +app.server.type = tomcat +app.server.tomcat.portal.dir = C:/liferay-project/Paesaggistica/liferay-portal-6.2-ce-ga6-patched6.2.5/liferay-portal-6.2-ce-ga6-patched6.2.5/tomcat-7.0.62/webapps/ROOT diff --git a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar index 521befe3..17769778 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-audit-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar index 838f0278..8aae85bc 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-bo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar index 34da0aba..91605fa4 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-kaleo-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar index 59c9e7ab..56b093dc 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-mail-manager-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar index f4b7c4ac..2868e24c 100644 Binary files a/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar and b/liferay-plugins-sdk-6.2/dist/portos-report-shared-6.2.0.1.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index f37957df..8aae85bc 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar index 0f22732e..91605fa4 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-advanced-operation-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar index b9d6cbbd..17769778 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-audit-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 4edc9dae..8aae85bc 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar index 0f22732e..91605fa4 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-kaleo-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar index b73ec071..56b093dc 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-mail-manager-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar index c88a72de..2868e24c 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-report-shared.jar differ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties index 6f448a11..7df12b76 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties @@ -993,7 +993,7 @@ label-pagamenti-note-utente = Note utente (obbligatorie su modifica degli import label-pagamenti-importo-calcolato = Importo calcolato label-pagamenti-importo-effettivo = Importo effettivo label-pagamenti-aiuto-effettivo = Se necessario, è possibile modificare il valore dell'importo. Sarà  necessario fornire una breve spiegazione del motivo nella sezione note. -label-confirm-payment-manual = Proseguendo con il pagamento MANUALE la pratica non sarà  più modificabile. Alla conferma del pagamento il sistema invierà  automaticamente la pratica alla Soprintendenza BB.CC.AA. di riferimento. Conferma di voler proseguire con l'operazione di pagamento? +label-confirm-payment-manual = Il pagamento dei “Diritti Fissi” potrà essere effettuato solo tramite la piattaforma regionale.
Proseguendo con il pagamento MANUALE la pratica non sarà  più modificabile. Alla conferma del pagamento il sistema invierà  automaticamente la pratica alla Soprintendenza BB.CC.AA. di riferimento. Conferma di voler proseguire con l'operazione di pagamento? label-confirm-payment-otf = Il pagamento è IMMEDIATO.
Procedendo si dovrà  necessariamente portare a termine la transazione.


ATTENZIONE:
Assicurarsi di abilitare i popup su questa pagina.
label-payment-otf-initialized = Pagamento in corso di verifica....
Qualora non sia stato effettivamente completato il sistema renderà  disponibile automaticamente la rigenerazione del pagamento dopo circa 20 min. Se il problema persiste contattare il supporto al numero 800232330 qualora non sia stato effettivamente completato label-payment-otf-rigeneration = Solo nel caso in cui si è sicuri che il pagamento non sia andato a buon fine è possibile rigenerare il pagamento in autonomia. @@ -1041,6 +1041,7 @@ label-pagVariantiPareriResi = Varianti a pareri resi: 50% di quanto dovuto per i label-pagRilascioAttestazioni = Rilascio di attestazioni e certificazioni varie label-pagConsultazioniArchivio = Consultazione d'archivio label-codice-bollettino = Codice bollettino +label-codice-marca-bollo = Codice Marca da Bollo fl-esente-bollo = Esente da bollo ai sensi di D.P.R. 26/10/1972 n. 642 e s.m.i. note = Note 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 dd6196c4..24786880 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-bo-shared.jar b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar index 75d53c91..8aae85bc 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.jar and b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-shared.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 59c9e7ab..56b093dc 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 f4b7c4ac..2868e24c 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/html/fascicolofe/navigator/common/save_actions.jspf b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf index 79021ff4..f3e8d2a5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/navigator/common/save_actions.jspf @@ -53,7 +53,8 @@ String script = "}" + "saveDettPratica(false, '{{type}}');"; %> - + + 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 1a92f6bf..c9f1fa5a 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 @@ -28,8 +28,9 @@ if (dettPratica == null) { dettPratica = DettPraticaServiceUtil.getLastCompletedByIntPratica(intPraticaId); } } -Organization organization = IntPraticaLocalServiceUtil.getOrganizationByIntPraticaId(intPraticaId); -String contoCorrente = (String) organization.getExpandoBridge().getAttribute("conto_corrente"); +//Organization organization = IntPraticaLocalServiceUtil.getOrganizationByIntPraticaId(intPraticaId); +//String contoCorrente = (String) organization.getExpandoBridge().getAttribute("conto_corrente"); +String testoPagamento = (String) company.getExpandoBridge().getAttribute("testo_pagamento", false); Map pagamenti = PagamentoLocalServiceUtil.getPagamenti(); String formName = "fmpaga"; String buttonId = "fmbutton"; @@ -160,7 +161,7 @@ switch (intPratica.getTipoRichiesta()) {
- <%= LanguageUtil.get(pageContext, "text-pagamento-completato-spese") %> + <%= LanguageUtil.get(pageContext, "text-pagamento-completato-spese") %>S
@@ -177,17 +178,19 @@ switch (intPratica.getTipoRichiesta()) { value='<%= String.valueOf(pagamentoOneri.getPagamentoId()) %>' /> -
+
+ <%= testoPagamento %> +
- + <%-- - + errorMessage="campo richiesto" /> + --%>
+
@@ -279,7 +283,7 @@ switch (intPratica.getTipoRichiesta()) { enctype="multipart/form-data" method="post" action="<%= allegatoFilePagamentoURL %>">
- @@ -823,7 +827,7 @@ switch (intPratica.getTipoRichiesta()) {

-
<%= contoCorrente %>
+
<%= testoPagamento %>
@@ -892,8 +896,12 @@ switch (intPratica.getTipoRichiesta()) {
+ <% + String paymentConfirmText = ""; + paymentConfirmText = (String) company.getExpandoBridge().getAttribute("testo_pagamento_breve", false); + %> - <%= LanguageUtil.get(pageContext, "label-confirm-payment-manual") %> + <%=paymentConfirmText%>
diff --git a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java index bc149622..ae341932 100644 --- a/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java +++ b/liferay-plugins-sdk-6.2/shared/portos-bo-shared/src/it/tref/liferay/portos/bo/shared/util/Constants.java @@ -3,6 +3,7 @@ package it.tref.liferay.portos.bo.shared.util; import java.util.HashMap; import java.util.Map; + public class Constants implements com.liferay.portal.kernel.util.Constants { public static final String ZONA_1 = "1";