diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml index d98455cb..2bde6d91 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml @@ -1364,6 +1364,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java index 6ff59a74..ab8d7cf9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoClp.java @@ -100,6 +100,7 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento attributes.put("otf", getOtf()); attributes.put("otfCreateDate", getOtfCreateDate()); attributes.put("emailPending", getEmailPending()); + attributes.put("numeroBollettino", getNumeroBollettino()); attributes.put("oldPagamentoId", getOldPagamentoId()); return attributes; @@ -259,6 +260,12 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento setEmailPending(emailPending); } + String numeroBollettino = (String)attributes.get("numeroBollettino"); + + if (numeroBollettino != null) { + setNumeroBollettino(numeroBollettino); + } + Long oldPagamentoId = (Long)attributes.get("oldPagamentoId"); if (oldPagamentoId != null) { @@ -863,6 +870,30 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento } } + @Override + public String getNumeroBollettino() { + return _numeroBollettino; + } + + @Override + public void setNumeroBollettino(String numeroBollettino) { + _numeroBollettino = numeroBollettino; + + if (_pagamentoRemoteModel != null) { + try { + Class clazz = _pagamentoRemoteModel.getClass(); + + Method method = clazz.getMethod("setNumeroBollettino", + String.class); + + method.invoke(_pagamentoRemoteModel, numeroBollettino); + } + catch (Exception e) { + throw new UnsupportedOperationException(e); + } + } + } + @Override public long getOldPagamentoId() { return _oldPagamentoId; @@ -1027,6 +1058,7 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento clone.setOtf(getOtf()); clone.setOtfCreateDate(getOtfCreateDate()); clone.setEmailPending(getEmailPending()); + clone.setNumeroBollettino(getNumeroBollettino()); clone.setOldPagamentoId(getOldPagamentoId()); return clone; @@ -1080,7 +1112,7 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento @Override public String toString() { - StringBundler sb = new StringBundler(53); + StringBundler sb = new StringBundler(55); sb.append("{uuid="); sb.append(getUuid()); @@ -1132,6 +1164,8 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento sb.append(getOtfCreateDate()); sb.append(", emailPending="); sb.append(getEmailPending()); + sb.append(", numeroBollettino="); + sb.append(getNumeroBollettino()); sb.append(", oldPagamentoId="); sb.append(getOldPagamentoId()); sb.append("}"); @@ -1141,7 +1175,7 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento @Override public String toXmlString() { - StringBundler sb = new StringBundler(82); + StringBundler sb = new StringBundler(85); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Pagamento"); @@ -1247,6 +1281,10 @@ public class PagamentoClp extends BaseModelImpl implements Pagamento "emailPending"); + sb.append( + "numeroBollettino"); sb.append( "oldPagamentoId implements Pagamento private boolean _otf; private Date _otfCreateDate; private boolean _emailPending; + private String _numeroBollettino; private long _oldPagamentoId; private BaseModel _pagamentoRemoteModel; private Class _clpSerializerClass = it.tref.liferay.portos.bo.service.ClpSerializer.class; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java index 5b457689..35263bcd 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoModel.java @@ -468,6 +468,21 @@ public interface PagamentoModel extends BaseModel, StagedGroupedModel */ public void setEmailPending(boolean emailPending); + /** + * Returns the numero bollettino of this pagamento. + * + * @return the numero bollettino of this pagamento + */ + @AutoEscape + public String getNumeroBollettino(); + + /** + * Sets the numero bollettino of this pagamento. + * + * @param numeroBollettino the numero bollettino of this pagamento + */ + public void setNumeroBollettino(String numeroBollettino); + /** * Returns the old pagamento ID of this pagamento. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java index 5aeb3eff..3e43d5d4 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoSoap.java @@ -56,6 +56,7 @@ public class PagamentoSoap implements Serializable { soapModel.setOtf(model.getOtf()); soapModel.setOtfCreateDate(model.getOtfCreateDate()); soapModel.setEmailPending(model.getEmailPending()); + soapModel.setNumeroBollettino(model.getNumeroBollettino()); soapModel.setOldPagamentoId(model.getOldPagamentoId()); return soapModel; @@ -317,6 +318,14 @@ public class PagamentoSoap implements Serializable { _emailPending = emailPending; } + public String getNumeroBollettino() { + return _numeroBollettino; + } + + public void setNumeroBollettino(String numeroBollettino) { + _numeroBollettino = numeroBollettino; + } + public long getOldPagamentoId() { return _oldPagamentoId; } @@ -350,5 +359,6 @@ public class PagamentoSoap implements Serializable { private boolean _otf; private Date _otfCreateDate; private boolean _emailPending; + private String _numeroBollettino; private long _oldPagamentoId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java index 7587cc67..716ea90b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/model/PagamentoWrapper.java @@ -75,6 +75,7 @@ public class PagamentoWrapper implements Pagamento, ModelWrapper { attributes.put("otf", getOtf()); attributes.put("otfCreateDate", getOtfCreateDate()); attributes.put("emailPending", getEmailPending()); + attributes.put("numeroBollettino", getNumeroBollettino()); attributes.put("oldPagamentoId", getOldPagamentoId()); return attributes; @@ -234,6 +235,12 @@ public class PagamentoWrapper implements Pagamento, ModelWrapper { setEmailPending(emailPending); } + String numeroBollettino = (String)attributes.get("numeroBollettino"); + + if (numeroBollettino != null) { + setNumeroBollettino(numeroBollettino); + } + Long oldPagamentoId = (Long)attributes.get("oldPagamentoId"); if (oldPagamentoId != null) { @@ -804,6 +811,26 @@ public class PagamentoWrapper implements Pagamento, ModelWrapper { _pagamento.setEmailPending(emailPending); } + /** + * Returns the numero bollettino of this pagamento. + * + * @return the numero bollettino of this pagamento + */ + @Override + public java.lang.String getNumeroBollettino() { + return _pagamento.getNumeroBollettino(); + } + + /** + * Sets the numero bollettino of this pagamento. + * + * @param numeroBollettino the numero bollettino of this pagamento + */ + @Override + public void setNumeroBollettino(java.lang.String numeroBollettino) { + _pagamento.setNumeroBollettino(numeroBollettino); + } + /** * Returns the old pagamento ID of this pagamento. * diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java index d5bea9d3..57fa9e9a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java @@ -471,7 +471,8 @@ public interface PagamentoLocalService extends BaseLocalService, throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public void updatePagamentoManuale(long pagamentoId, byte[] content, + public void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java index dfb02473..39595b64 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java @@ -311,7 +311,7 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { _methodName54 = "updatePagamentoManuale"; _methodParameterTypes54 = new String[] { - "long", "byte[][]", "java.lang.String", + "long", "java.lang.String", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; @@ -2207,7 +2207,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { } @Override - public void updatePagamentoManuale(long pagamentoId, byte[] content, + public void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, @@ -2219,6 +2220,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService { new Object[] { pagamentoId, + ClpSerializer.translateInput(numeroBollettino), + ClpSerializer.translateInput(content), ClpSerializer.translateInput(sourceFileName), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java index 44490086..70b3dc7a 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java @@ -588,15 +588,16 @@ public class PagamentoLocalServiceUtil { url, serviceContext); } - public static void updatePagamentoManuale(long pagamentoId, byte[] content, + public static void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { getService() - .updatePagamentoManuale(pagamentoId, content, sourceFileName, - serviceContext); + .updatePagamentoManuale(pagamentoId, numeroBollettino, content, + sourceFileName, serviceContext); } public static void updatePagamentoManualeFromImport(long pagamentoId, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java index b3ea8917..29d3e9b6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java @@ -630,14 +630,15 @@ public class PagamentoLocalServiceWrapper implements PagamentoLocalService, } @Override - public void updatePagamentoManuale(long pagamentoId, byte[] content, + public void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { - _pagamentoLocalService.updatePagamentoManuale(pagamentoId, content, - sourceFileName, serviceContext); + _pagamentoLocalService.updatePagamentoManuale(pagamentoId, + numeroBollettino, content, sourceFileName, serviceContext); } @Override diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java index 7a3eddc5..628144e9 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java @@ -83,7 +83,8 @@ public interface PagamentoService extends BaseService, InvokableService { throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException; - public void updatePagamentoManuale(long pagamentoId, byte[] content, + public void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java index f3ddef39..47661fa5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java @@ -55,7 +55,7 @@ public class PagamentoServiceClp implements PagamentoService { _methodName6 = "updatePagamentoManuale"; _methodParameterTypes6 = new String[] { - "long", "byte[][]", "java.lang.String", + "long", "java.lang.String", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; } @@ -232,7 +232,8 @@ public class PagamentoServiceClp implements PagamentoService { } @Override - public void updatePagamentoManuale(long pagamentoId, byte[] content, + public void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, @@ -244,6 +245,8 @@ public class PagamentoServiceClp implements PagamentoService { new Object[] { pagamentoId, + ClpSerializer.translateInput(numeroBollettino), + ClpSerializer.translateInput(content), ClpSerializer.translateInput(sourceFileName), diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java index 05ceda17..ef272af6 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java @@ -92,15 +92,16 @@ public class PagamentoServiceUtil { getService().annullaPagamento(pagamentoId, serviceContext); } - public static void updatePagamentoManuale(long pagamentoId, byte[] content, + public static void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { getService() - .updatePagamentoManuale(pagamentoId, content, sourceFileName, - serviceContext); + .updatePagamentoManuale(pagamentoId, numeroBollettino, content, + sourceFileName, serviceContext); } public static void clearService() { diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java index fa270301..f9136df2 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java @@ -87,14 +87,15 @@ public class PagamentoServiceWrapper implements PagamentoService, } @Override - public void updatePagamentoManuale(long pagamentoId, byte[] content, + public void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws com.liferay.portal.kernel.exception.PortalException, com.liferay.portal.kernel.exception.SystemException, java.io.IOException { - _pagamentoService.updatePagamentoManuale(pagamentoId, content, - sourceFileName, serviceContext); + _pagamentoService.updatePagamentoManuale(pagamentoId, numeroBollettino, + content, sourceFileName, serviceContext); } /** diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql index 3ecffccf..be5831dc 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql @@ -644,6 +644,7 @@ create table portos_bo_Pagamento ( otf BOOLEAN, otfCreateDate DATE null, emailPending BOOLEAN, + numeroBollettino VARCHAR(75) null, oldPagamentoId LONG ); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml index db087ae2..91b4f4f7 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml @@ -710,6 +710,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml index 12db0b30..031a0845 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml @@ -746,6 +746,7 @@ + diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml index 384aaa2d..dfd14e82 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml @@ -912,6 +912,7 @@ TIMESTAMP + 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 b86411c4..ee578c70 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 @@ -977,6 +977,7 @@ label-pagAltriCasiPaesaggistici = Altri casi label-pagVariantiPareriResi = Varianti a pareri resi: 50% di quanto dovuto per i progetti approvati label-pagRilascioAttestazioni = Rilascio di attestazioni e certificazioni varie label-pagConsultazioniArchivio = Consultazione d'archivio +label-codice-bollettino = Codice bollettino 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-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java index b4873295..e6dfb52b 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/startup/DatabaseUpdateAction.java @@ -194,6 +194,10 @@ public class DatabaseUpdateAction extends SimpleAction { + "ADD COLUMN pagConsultazioniArchivio DOUBLE NULL"); } + if (!hasColumn("portos_bo_pagamento", "numerobollettino")) { + s.executeUpdate("ALTER TABLE portos_bo_pagamento ADD COLUMN numerobollettino VARCHAR(75) NULL"); + } + } catch (SQLException e) { _log.error("Errore di accesso al database: ", e); throw new ActionException(e); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java index 30c7a9f5..102f7787 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoCacheModel.java @@ -38,7 +38,7 @@ public class PagamentoCacheModel implements CacheModel, Externalizable { @Override public String toString() { - StringBundler sb = new StringBundler(53); + StringBundler sb = new StringBundler(55); sb.append("{uuid="); sb.append(uuid); @@ -90,6 +90,8 @@ public class PagamentoCacheModel implements CacheModel, sb.append(otfCreateDate); sb.append(", emailPending="); sb.append(emailPending); + sb.append(", numeroBollettino="); + sb.append(numeroBollettino); sb.append(", oldPagamentoId="); sb.append(oldPagamentoId); sb.append("}"); @@ -220,6 +222,14 @@ public class PagamentoCacheModel implements CacheModel, } pagamentoImpl.setEmailPending(emailPending); + + if (numeroBollettino == null) { + pagamentoImpl.setNumeroBollettino(StringPool.BLANK); + } + else { + pagamentoImpl.setNumeroBollettino(numeroBollettino); + } + pagamentoImpl.setOldPagamentoId(oldPagamentoId); pagamentoImpl.resetOriginalValues(); @@ -254,6 +264,7 @@ public class PagamentoCacheModel implements CacheModel, otf = objectInput.readBoolean(); otfCreateDate = objectInput.readLong(); emailPending = objectInput.readBoolean(); + numeroBollettino = objectInput.readUTF(); oldPagamentoId = objectInput.readLong(); } @@ -360,6 +371,14 @@ public class PagamentoCacheModel implements CacheModel, objectOutput.writeBoolean(otf); objectOutput.writeLong(otfCreateDate); objectOutput.writeBoolean(emailPending); + + if (numeroBollettino == null) { + objectOutput.writeUTF(StringPool.BLANK); + } + else { + objectOutput.writeUTF(numeroBollettino); + } + objectOutput.writeLong(oldPagamentoId); } @@ -388,5 +407,6 @@ public class PagamentoCacheModel implements CacheModel, public boolean otf; public long otfCreateDate; public boolean emailPending; + public String numeroBollettino; public long oldPagamentoId; } \ No newline at end of file diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java index dac674ab..c4ef636c 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/model/impl/PagamentoModelImpl.java @@ -92,9 +92,10 @@ public class PagamentoModelImpl extends BaseModelImpl { "otf", Types.BOOLEAN }, { "otfCreateDate", Types.TIMESTAMP }, { "emailPending", Types.BOOLEAN }, + { "numeroBollettino", Types.VARCHAR }, { "oldPagamentoId", Types.BIGINT } }; - public static final String TABLE_SQL_CREATE = "create table portos_bo_Pagamento (uuid_ VARCHAR(75) null,pagamentoId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,classPk LONG,className VARCHAR(75) null,fileEntryId LONG,oldFileEntryId LONG,tipoPagamento VARCHAR(75) null,url STRING null,codice VARCHAR(75) null,causale VARCHAR(75) null,mezzo VARCHAR(75) null,codiceFiscaleCommittente VARCHAR(75) null,importo VARCHAR(75) null,utilizzata VARCHAR(75) null,utilizzataSostituita VARCHAR(75) null,otf BOOLEAN,otfCreateDate DATE null,emailPending BOOLEAN,oldPagamentoId LONG)"; + public static final String TABLE_SQL_CREATE = "create table portos_bo_Pagamento (uuid_ VARCHAR(75) null,pagamentoId LONG not null primary key,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,groupId LONG,intPraticaId LONG,classPk LONG,className VARCHAR(75) null,fileEntryId LONG,oldFileEntryId LONG,tipoPagamento VARCHAR(75) null,url STRING null,codice VARCHAR(75) null,causale VARCHAR(75) null,mezzo VARCHAR(75) null,codiceFiscaleCommittente VARCHAR(75) null,importo VARCHAR(75) null,utilizzata VARCHAR(75) null,utilizzataSostituita VARCHAR(75) null,otf BOOLEAN,otfCreateDate DATE null,emailPending BOOLEAN,numeroBollettino VARCHAR(75) null,oldPagamentoId LONG)"; public static final String TABLE_SQL_DROP = "drop table portos_bo_Pagamento"; public static final String ORDER_BY_JPQL = " ORDER BY pagamento.pagamentoId ASC"; public static final String ORDER_BY_SQL = " ORDER BY portos_bo_Pagamento.pagamentoId ASC"; @@ -160,6 +161,7 @@ public class PagamentoModelImpl extends BaseModelImpl model.setOtf(soapModel.getOtf()); model.setOtfCreateDate(soapModel.getOtfCreateDate()); model.setEmailPending(soapModel.getEmailPending()); + model.setNumeroBollettino(soapModel.getNumeroBollettino()); model.setOldPagamentoId(soapModel.getOldPagamentoId()); return model; @@ -250,6 +252,7 @@ public class PagamentoModelImpl extends BaseModelImpl attributes.put("otf", getOtf()); attributes.put("otfCreateDate", getOtfCreateDate()); attributes.put("emailPending", getEmailPending()); + attributes.put("numeroBollettino", getNumeroBollettino()); attributes.put("oldPagamentoId", getOldPagamentoId()); return attributes; @@ -409,6 +412,12 @@ public class PagamentoModelImpl extends BaseModelImpl setEmailPending(emailPending); } + String numeroBollettino = (String)attributes.get("numeroBollettino"); + + if (numeroBollettino != null) { + setNumeroBollettino(numeroBollettino); + } + Long oldPagamentoId = (Long)attributes.get("oldPagamentoId"); if (oldPagamentoId != null) { @@ -869,6 +878,22 @@ public class PagamentoModelImpl extends BaseModelImpl return _originalEmailPending; } + @JSON + @Override + public String getNumeroBollettino() { + if (_numeroBollettino == null) { + return StringPool.BLANK; + } + else { + return _numeroBollettino; + } + } + + @Override + public void setNumeroBollettino(String numeroBollettino) { + _numeroBollettino = numeroBollettino; + } + @JSON @Override public long getOldPagamentoId() { @@ -954,6 +979,7 @@ public class PagamentoModelImpl extends BaseModelImpl pagamentoImpl.setOtf(getOtf()); pagamentoImpl.setOtfCreateDate(getOtfCreateDate()); pagamentoImpl.setEmailPending(getEmailPending()); + pagamentoImpl.setNumeroBollettino(getNumeroBollettino()); pagamentoImpl.setOldPagamentoId(getOldPagamentoId()); pagamentoImpl.resetOriginalValues(); @@ -1191,6 +1217,14 @@ public class PagamentoModelImpl extends BaseModelImpl pagamentoCacheModel.emailPending = getEmailPending(); + pagamentoCacheModel.numeroBollettino = getNumeroBollettino(); + + String numeroBollettino = pagamentoCacheModel.numeroBollettino; + + if ((numeroBollettino != null) && (numeroBollettino.length() == 0)) { + pagamentoCacheModel.numeroBollettino = null; + } + pagamentoCacheModel.oldPagamentoId = getOldPagamentoId(); return pagamentoCacheModel; @@ -1198,7 +1232,7 @@ public class PagamentoModelImpl extends BaseModelImpl @Override public String toString() { - StringBundler sb = new StringBundler(53); + StringBundler sb = new StringBundler(55); sb.append("{uuid="); sb.append(getUuid()); @@ -1250,6 +1284,8 @@ public class PagamentoModelImpl extends BaseModelImpl sb.append(getOtfCreateDate()); sb.append(", emailPending="); sb.append(getEmailPending()); + sb.append(", numeroBollettino="); + sb.append(getNumeroBollettino()); sb.append(", oldPagamentoId="); sb.append(getOldPagamentoId()); sb.append("}"); @@ -1259,7 +1295,7 @@ public class PagamentoModelImpl extends BaseModelImpl @Override public String toXmlString() { - StringBundler sb = new StringBundler(82); + StringBundler sb = new StringBundler(85); sb.append(""); sb.append("it.tref.liferay.portos.bo.model.Pagamento"); @@ -1365,6 +1401,10 @@ public class PagamentoModelImpl extends BaseModelImpl "emailPending"); + sb.append( + "numeroBollettino"); sb.append( "oldPagamentoId private boolean _emailPending; private boolean _originalEmailPending; private boolean _setOriginalEmailPending; + private String _numeroBollettino; private long _oldPagamentoId; private long _originalOldPagamentoId; private boolean _setOriginalOldPagamentoId; diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java index ae64e66c..f367a103 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java @@ -321,7 +321,7 @@ public class PagamentoLocalServiceClpInvoker { _methodName242 = "updatePagamentoManuale"; _methodParameterTypes242 = new String[] { - "long", "byte[][]", "java.lang.String", + "long", "java.lang.String", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; @@ -702,8 +702,9 @@ public class PagamentoLocalServiceClpInvoker { if (_methodName242.equals(name) && Arrays.deepEquals(_methodParameterTypes242, parameterTypes)) { PagamentoLocalServiceUtil.updatePagamentoManuale(((Long)arguments[0]).longValue(), - (byte[])arguments[1], (java.lang.String)arguments[2], - (com.liferay.portal.service.ServiceContext)arguments[3]); + (java.lang.String)arguments[1], (byte[])arguments[2], + (java.lang.String)arguments[3], + (com.liferay.portal.service.ServiceContext)arguments[4]); return null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java index 3ec744eb..dd3b24d5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java @@ -55,7 +55,7 @@ public class PagamentoServiceClpInvoker { _methodName187 = "updatePagamentoManuale"; _methodParameterTypes187 = new String[] { - "long", "byte[][]", "java.lang.String", + "long", "java.lang.String", "byte[][]", "java.lang.String", "com.liferay.portal.service.ServiceContext" }; } @@ -105,8 +105,9 @@ public class PagamentoServiceClpInvoker { if (_methodName187.equals(name) && Arrays.deepEquals(_methodParameterTypes187, parameterTypes)) { PagamentoServiceUtil.updatePagamentoManuale(((Long)arguments[0]).longValue(), - (byte[])arguments[1], (java.lang.String)arguments[2], - (com.liferay.portal.service.ServiceContext)arguments[3]); + (java.lang.String)arguments[1], (byte[])arguments[2], + (java.lang.String)arguments[3], + (com.liferay.portal.service.ServiceContext)arguments[4]); return null; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java index 59c36431..f3936348 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java @@ -107,13 +107,14 @@ public class PagamentoServiceSoap { } } - public static void updatePagamentoManuale(long pagamentoId, byte[] content, + public static void updatePagamentoManuale(long pagamentoId, + java.lang.String numeroBollettino, byte[] content, java.lang.String sourceFileName, com.liferay.portal.service.ServiceContext serviceContext) throws RemoteException { try { - PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, content, - sourceFileName, serviceContext); + PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, + numeroBollettino, content, sourceFileName, serviceContext); } catch (Exception e) { _log.error(e, e); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java index b085d400..9a658770 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java @@ -594,7 +594,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { } - public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName, + public void updatePagamentoManuale(long pagamentoId, String numeroBollettino, byte[] content, String sourceFileName, ServiceContext serviceContext) throws IOException, PortalException, SystemException { Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId); @@ -634,6 +634,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl { mimeType, title, description, changeLog, content, serviceContext); fileEntryId = fileEntry.getFileEntryId(); + pagamento.setNumeroBollettino(numeroBollettino); pagamento.setFileEntryId(fileEntryId); pagamento = pagamentoLocalService.updatePagamento(pagamento); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java index 79af8076..f81a5224 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java @@ -100,7 +100,7 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { } } - public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName, + public void updatePagamentoManuale(long pagamentoId, String numeroBollettino, byte[] content, String sourceFileName, ServiceContext serviceContext) throws IOException, PortalException, SystemException { Pagamento pagamento = PagamentoLocalServiceUtil.getPagamento(pagamentoId); @@ -108,7 +108,7 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl { if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(userId, pagamento.getClassPk())) { pagamentoLocalService - .updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext); + .updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName, serviceContext); } else { throw new SystemException("pagamento manuale aggiornabile solo da titolare digitale del " + pagamento.getClassName()); diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java index 8dbf29df..627905df 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/persistence/PagamentoPersistenceImpl.java @@ -5769,6 +5769,7 @@ public class PagamentoPersistenceImpl extends BasePersistenceImpl 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 8eeffde0..5e695ff6 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=2651 - build.date=1601893192808 + build.number=2654 + build.date=1601903918911 build.auto.upgrade=true ## 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 dbe50c95..d0c454b0 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 @@ -2830,13 +2830,13 @@ public class FascicoloFePortlet extends MVCPortlet { if (!SessionErrors.isEmpty(actionRequest)) { PortalUtil.copyRequestParameters(actionRequest, actionResponse); } else { + String numeroBollettino = ParamUtil.getString(actionRequest, "numeroBollettino"); byte[] content = FileUtil.getBytes(file); // DettPraticaServiceUtil.updatePagamentoManuale(pagamentoId, // pagamento.getDettPraticaId(), // content, // sourceFileName, serviceContext); - PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, content, sourceFileName, - serviceContext); + PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName, serviceContext); } } catch (Exception e) { 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 73cba5de..baaee8eb 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 @@ -183,7 +183,7 @@ -
+
@@ -197,10 +197,17 @@
-
+
+ +
+ + + +
+
@@ -304,7 +311,7 @@
+ class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding_15"> + class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding_15 total-row"> + +
+ + + +
+