diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar index 884a49a6..158564ae 100644 Binary files a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar and b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.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 c325462c..1adc3001 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 @@ -899,6 +899,7 @@ causale-pagamento-bolli = Causale Pagamento Bolli importo-bolli = Importo Bolli importo-spese-istruttoria = Importo Spese Istruttoria numero-bollettino =Numero Marca da Bollo e Data +label-codice-bollettino =Codice bollettino errore-lenght-bollettino = Il limite massimo di 250 caratteri รจ stato superato pag-nuove-costruzioni = Pagamento Nuove Costruzioni 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 2d126c60..474a2028 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=2966 - build.date=1707408695550 + build.number=2970 + build.date=1707838344827 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_form_window.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_form_window.jsp new file mode 100644 index 00000000..51b47fce --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_form_window.jsp @@ -0,0 +1,134 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@include file="/html/init.jsp"%> +<% +String formName = ParamUtil.getString(request, "formName", "fm"); +String titolo = ParamUtil.getString(request, "titolo", "Invio"); +String buttonId = ParamUtil.getString(request, "buttonId", "sumbit-button"); +String buttonConferma = ParamUtil.getString(request, "buttonConferma", "Modifica"); +String buttonAnnulla = ParamUtil.getString(request, "buttonAnnulla", "Annulla"); +String width = ParamUtil.getString(request, "width", "700"); +String height = ParamUtil.getString(request, "height"); +String contentDiv = ParamUtil.getString(request, "contentDiv", "saveAndCloseDiv"); +boolean buttonBar = ParamUtil.getBoolean(request, "buttonBar", true); +String randomId = StringUtil.randomId(); +String onClick = ParamUtil.getString(request, "onClick"); +boolean externalForm = ParamUtil.getBoolean(request, "externalForm", false); +boolean okVisible = ParamUtil.getBoolean(request, "okVisible", true); +%> + +
+
+

+ +
+ + +AUI().ready('aui-modal', 'aui-io-request', 'aui-form-validator', function(A) { + var modal = new A.Modal({ + bodyContent: A.one('#<%=contentDiv%>'), + width: <%= width %>, + <% + if (!height.equals(StringPool.BLANK)) { + %> + height: <%= height %>, + <% + } + %> + centered: true, + destroyOnHide: false, + headerContent: '

<%= titolo %>

', + modal: true, + render: '#saveAndCloseModal_<%= randomId %>', + visible: false, + close: false, + }).render(); + <% + if (buttonBar) { + %> + modal.addToolbar( + [ + { + label: '<%= buttonAnnulla %>', + on: { + click: function() { + modal.hide(); + } + } + }, + <% + if (okVisible) { + %> + { + label: '<%= buttonConferma %>', + cssClass: 'btn-primary', + on: { + click: function() { + <% + if (Validator.isNotNull(onClick)) { + out.print(onClick); + } else { + %> + submitForm(document.<%= formName %>); + var formValidator = Liferay.Form.get('<%= formName %>') + .formValidator; + <% + if (externalForm) { + %> + if (!formValidator.hasErrors()) { + A.one('#confirmClose_<%= randomId %>') + .set('value', 'true'); + } else { + alert("Attenzione!\nCampi richiesti non compilati correttamente"); + } + modal.hide(); + <% + } else { + %> + if (!formValidator.hasErrors()) { + modal.hide(); + A.one('#confirmClose_<%= randomId %>') + .set('value', 'true'); + } + <% + } + %> + <% + } + %> + } + } + } + <% + } + %> + ] + ); + <% + } + %> + + A.one('#<%= buttonId %>').on('click', function() { + A.one('#<%=contentDiv%>').show(); + modal.show(); + }); + + window.alert = function(msg) { + $('.message').text(msg); + $('.customAlert').css('animation', 'fadeIn 0.3s linear'); + $('.customAlert').css('display', 'inline'); + setTimeout(function() { + $('.customAlert').css('animation', 'none'); + }, 100); + }; + + $(function(){ + $('.confirmButton').click(function(){ + $('.customAlert').css('animation', 'fadeOut 0.3s linear'); + setTimeout(function(){ + $('.customAlert').css('animation', 'none'); + $('.customAlert').css('display', 'none'); + }, 100); + }); + }); +}); + \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp index 5595a8c5..8d5edeb3 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp @@ -79,7 +79,39 @@ %> - + +
+ <% + String buttonFormId = "pagamentoFormButton_" + index; + String contentFormId = "pagamentoFormContent_" + index; + String formNameBollettino = "fmPagamenti_" + index; + %> + + + +
+ + + + + +
+ + + + + + + + +
+ <% String[] notAllowed = new String[]{}; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp new file mode 100644 index 00000000..4d964271 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp @@ -0,0 +1,44 @@ +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page import="java.util.Locale"%> +<%@page import="com.liferay.portal.kernel.util.Validator"%> +<%@page import="java.text.NumberFormat"%> +<%@page import="java.math.BigDecimal"%> +<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%> +<%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%> +<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%> + +<%@ include file="/html/init.jsp" %> + +<% + long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId",0l); + long idPagamento = ParamUtil.getLong(request, "idPagamento", 0l); + String formName = ParamUtil.getString(request, "formName", "fm"); + + DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId); + Pagamento objPagamento = PagamentoLocalServiceUtil.fetchPagamento(idPagamento); + + long companyId = company.getCompanyId(); + + String portletNamespace = renderResponse.getNamespace(); + String redirect = currentURL+"#"+portletNamespace+"tab="+portletNamespace+"page_pagamenti"; + +%> + + +
+ <%-- + + + + + --%> + + + + 250 + + + +
+ \ No newline at end of file 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 884a49a6..158564ae 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/html/fascicolofe/verify_fascicolo_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fascicolo_calcolo.jsp index 4d1e05b6..68913c2d 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 @@ -205,8 +205,8 @@ action="<%=allegatoFilePagamentoURL%>">
- 250 - + 250 + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp index cc950c83..70e0eb07 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp @@ -109,15 +109,19 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request); -
+
<%= LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli") %>
-
+
+ + 250 + + -
+
<%= LanguageUtil.get(pageContext, "text-pagamento-manuale-oneri") %>
-
+