Add numeroBollettino

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service.xml

@@ -1307,6 +1307,7 @@
 		<column name="otf" type="boolean" />
 		<column name="otfCreateDate" type="Date" />
 		<column name="emailPending" type="boolean" />
+		<column name="numeroBollettino" type="String" />
 
 		<column name="oldPagamentoId" type="long" />
 

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<Pagamento> 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<Pagamento> 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<Pagamento> 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<Pagamento> 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<Pagamento> 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<Pagamento> 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<Pagamento> implements Pagamento
 
 	@Override
 	public String toXmlString() {
-		StringBundler sb = new StringBundler(82);
+		StringBundler sb = new StringBundler(85);
 
 		sb.append("<model><model-name>");
 		sb.append("it.tref.liferay.portos.bo.model.Pagamento");
@@ -1247,6 +1281,10 @@ public class PagamentoClp extends BaseModelImpl<Pagamento> implements Pagamento
 			"<column><column-name>emailPending</column-name><column-value><![CDATA[");
 		sb.append(getEmailPending());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>numeroBollettino</column-name><column-value><![CDATA[");
+		sb.append(getNumeroBollettino());
+		sb.append("]]></column-value></column>");
 		sb.append(
 			"<column><column-name>oldPagamentoId</column-name><column-value><![CDATA[");
 		sb.append(getOldPagamentoId());
@@ -1283,6 +1321,7 @@ public class PagamentoClp extends BaseModelImpl<Pagamento> 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;

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<Pagamento>, 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.
 	 *

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;
 }

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<Pagamento> {
 		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<Pagamento> {
 			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> {
 		_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.
 	*

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalService.java

@@ -456,7 +456,8 @@ public interface PagamentoLocalService extends BaseLocalService,
 	public int countByIntPratica_Visible(long intPraticaId)
 		throws 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,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceClp.java

@@ -296,7 +296,7 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService {
 		_methodName51 = "updatePagamentoManuale";
 
 		_methodParameterTypes51 = new String[] {
-				"long", "byte[][]", "java.lang.String",
+				"long", "java.lang.String", "byte[][]", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
@@ -2092,7 +2092,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,
@@ -2104,6 +2105,8 @@ public class PagamentoLocalServiceClp implements PagamentoLocalService {
 				new Object[] {
 					pagamentoId,
 					
+				ClpSerializer.translateInput(numeroBollettino),
+					
 				ClpSerializer.translateInput(content),
 					
 				ClpSerializer.translateInput(sourceFileName),

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceUtil.java

@@ -566,15 +566,16 @@ public class PagamentoLocalServiceUtil {
 		return getService().countByIntPratica_Visible(intPraticaId);
 	}
 
-	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,
+			.updatePagamentoManuale(pagamentoId, numeroBollettino, content,
-			serviceContext);
+			sourceFileName, serviceContext);
 	}
 
 	public static void updatePagamentoManualeFromImport(long pagamentoId,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoLocalServiceWrapper.java

@@ -606,14 +606,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,
+		_pagamentoLocalService.updatePagamentoManuale(pagamentoId,
-			sourceFileName, serviceContext);
+			numeroBollettino, content, sourceFileName, serviceContext);
 	}
 
 	@Override

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoService.java

@@ -65,7 +65,7 @@ public interface PagamentoService extends BaseService, InvokableService {
 		throws java.lang.Throwable;
 
 	public void updatePagamentoManuale(long pagamentoId, byte[] content,
-		java.lang.String sourceFileName,
+		java.lang.String numeroBollettino, java.lang.String sourceFileName,
 		com.liferay.portal.service.ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceClp.java

@@ -35,7 +35,7 @@ public class PagamentoServiceClp implements PagamentoService {
 		_methodName3 = "updatePagamentoManuale";
 
 		_methodParameterTypes3 = new String[] {
-				"long", "byte[][]", "java.lang.String",
+				"long", "byte[][]", "java.lang.String", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 	}
@@ -92,7 +92,7 @@ public class PagamentoServiceClp implements PagamentoService {
 
 	@Override
 	public void updatePagamentoManuale(long pagamentoId, byte[] content,
-		java.lang.String sourceFileName,
+		java.lang.String numeroBollettino, java.lang.String sourceFileName,
 		com.liferay.portal.service.ServiceContext serviceContext)
 		throws com.liferay.portal.kernel.exception.PortalException,
 			com.liferay.portal.kernel.exception.SystemException,
@@ -105,6 +105,8 @@ public class PagamentoServiceClp implements PagamentoService {
 					
 				ClpSerializer.translateInput(content),
 					
+				ClpSerializer.translateInput(numeroBollettino),
+					
 				ClpSerializer.translateInput(sourceFileName),
 					
 				ClpSerializer.translateInput(serviceContext)

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceUtil.java

@@ -64,14 +64,14 @@ public class PagamentoServiceUtil {
 	}
 
 	public static void updatePagamentoManuale(long pagamentoId, byte[] content,
-		java.lang.String sourceFileName,
+		java.lang.String numeroBollettino, 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,
+			.updatePagamentoManuale(pagamentoId, content, numeroBollettino,
-			serviceContext);
+			sourceFileName, serviceContext);
 	}
 
 	public static void clearService() {

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/service/it/tref/liferay/portos/bo/service/PagamentoServiceWrapper.java

@@ -58,13 +58,13 @@ public class PagamentoServiceWrapper implements PagamentoService,
 
 	@Override
 	public void updatePagamentoManuale(long pagamentoId, byte[] content,
-		java.lang.String sourceFileName,
+		java.lang.String numeroBollettino, 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);
+			numeroBollettino, sourceFileName, serviceContext);
 	}
 
 	/**

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/sql/tables.sql

@@ -636,6 +636,7 @@ create table portos_bo_Pagamento (
 	otf BOOLEAN,
 	otfCreateDate DATE null,
 	emailPending BOOLEAN,
+	numeroBollettino VARCHAR(250) null,
 	oldPagamentoId LONG
 );
 

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-hbm.xml

@@ -656,6 +656,7 @@
 		<property name="otf" type="com.liferay.portal.dao.orm.hibernate.BooleanType" />
 		<property name="otfCreateDate" type="org.hibernate.type.TimestampType" />
 		<property name="emailPending" type="com.liferay.portal.dao.orm.hibernate.BooleanType" />
+		<property name="numeroBollettino" type="com.liferay.portal.dao.orm.hibernate.StringType" />
 		<property name="oldPagamentoId" type="com.liferay.portal.dao.orm.hibernate.LongType" />
 	</class>
 	<class name="it.tref.liferay.portos.bo.model.impl.ParereGeologoImpl" table="portos_bo_ParereGeo">

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-model-hints.xml

@@ -706,6 +706,9 @@
 		<field name="otf" type="boolean" />
 		<field name="otfCreateDate" type="Date" />
 		<field name="emailPending" type="boolean" />
+		<field name="numeroBollettino" type="String">
+			<hint name="max-length">250</hint>
+		</field>
 		<field name="oldPagamentoId" type="long" />
 	</model>
 	<model name="it.tref.liferay.portos.bo.model.ParereGeologo">

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/META-INF/portlet-orm.xml

@@ -844,6 +844,7 @@
 				<temporal>TIMESTAMP</temporal>
 			</basic>
 			<basic name="emailPending" />
+			<basic name="numeroBollettino" />
 			<basic name="oldPagamentoId" />
 			<transient name="modelAttributes" />
 			<transient name="primaryKey" />

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

@@ -884,6 +884,7 @@ label-integrazione-13 = Variante
 campo-richiesto = Campo Obbligatorio
 campo-non-valido = I dati immessi non sono validi
 
+
 ## Pagamenti ##
 mezzo-pagamento = Mezzo Pagamento
 mezzo-pagamento-oneri = Mezzo Pagamento Spese Istruttoria
@@ -897,6 +898,8 @@ causale-pagamento-oneri = Causale Pagamento Spese Istruttoria
 causale-pagamento-bolli = Causale Pagamento Bolli
 importo-bolli = Importo Bolli
 importo-spese-istruttoria = Importo Spese Istruttoria
+numero-bollettino =Numero Marca da Bollo e Data
+errore-lenght-bollettino = Il limite massimo di 250 caratteri è stato superato
 
 pag-nuove-costruzioni = Pagamento Nuove Costruzioni
 pag-adeguamento-sismico = Pagamento Adeguamento Sismico

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<Pagamento>,
 	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<Pagamento>,
 		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<Pagamento>,
 		}
 
 		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<Pagamento>,
 		otf = objectInput.readBoolean();
 		otfCreateDate = objectInput.readLong();
 		emailPending = objectInput.readBoolean();
+		numeroBollettino = objectInput.readUTF();
 		oldPagamentoId = objectInput.readLong();
 	}
 
@@ -360,6 +371,14 @@ public class PagamentoCacheModel implements CacheModel<Pagamento>,
 		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<Pagamento>,
 	public boolean otf;
 	public long otfCreateDate;
 	public boolean emailPending;
+	public String numeroBollettino;
 	public long oldPagamentoId;
 }

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<Pagamento>
 			{ "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(250) 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<Pagamento>
 		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<Pagamento>
 		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<Pagamento>
 			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<Pagamento>
 		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<Pagamento>
 		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<Pagamento>
 
 		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<Pagamento>
 
 	@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<Pagamento>
 		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<Pagamento>
 
 	@Override
 	public String toXmlString() {
-		StringBundler sb = new StringBundler(82);
+		StringBundler sb = new StringBundler(85);
 
 		sb.append("<model><model-name>");
 		sb.append("it.tref.liferay.portos.bo.model.Pagamento");
@@ -1365,6 +1401,10 @@ public class PagamentoModelImpl extends BaseModelImpl<Pagamento>
 			"<column><column-name>emailPending</column-name><column-value><![CDATA[");
 		sb.append(getEmailPending());
 		sb.append("]]></column-value></column>");
+		sb.append(
+			"<column><column-name>numeroBollettino</column-name><column-value><![CDATA[");
+		sb.append(getNumeroBollettino());
+		sb.append("]]></column-value></column>");
 		sb.append(
 			"<column><column-name>oldPagamentoId</column-name><column-value><![CDATA[");
 		sb.append(getOldPagamentoId());
@@ -1419,6 +1459,7 @@ public class PagamentoModelImpl extends BaseModelImpl<Pagamento>
 	private boolean _emailPending;
 	private boolean _originalEmailPending;
 	private boolean _setOriginalEmailPending;
+	private String _numeroBollettino;
 	private long _oldPagamentoId;
 	private long _originalOldPagamentoId;
 	private boolean _setOriginalOldPagamentoId;

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoLocalServiceClpInvoker.java

@@ -306,7 +306,7 @@ public class PagamentoLocalServiceClpInvoker {
 		_methodName227 = "updatePagamentoManuale";
 
 		_methodParameterTypes227 = new String[] {
-				"long", "byte[][]", "java.lang.String",
+				"long", "java.lang.String", "byte[][]", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 
@@ -667,8 +667,9 @@ public class PagamentoLocalServiceClpInvoker {
 		if (_methodName227.equals(name) &&
 				Arrays.deepEquals(_methodParameterTypes227, parameterTypes)) {
 			PagamentoLocalServiceUtil.updatePagamentoManuale(((Long)arguments[0]).longValue(),
-				(byte[])arguments[1], (java.lang.String)arguments[2],
+				(java.lang.String)arguments[1], (byte[])arguments[2],
-				(com.liferay.portal.service.ServiceContext)arguments[3]);
+				(java.lang.String)arguments[3],
+				(com.liferay.portal.service.ServiceContext)arguments[4]);
 
 			return null;
 		}

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/base/PagamentoServiceClpInvoker.java

@@ -35,7 +35,7 @@ public class PagamentoServiceClpInvoker {
 		_methodName172 = "updatePagamentoManuale";
 
 		_methodParameterTypes172 = new String[] {
-				"long", "byte[][]", "java.lang.String",
+				"long", "byte[][]", "java.lang.String", "java.lang.String",
 				"com.liferay.portal.service.ServiceContext"
 			};
 	}
@@ -58,7 +58,8 @@ public class PagamentoServiceClpInvoker {
 				Arrays.deepEquals(_methodParameterTypes172, 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[3],
+				(com.liferay.portal.service.ServiceContext)arguments[4]);
 
 			return null;
 		}

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/http/PagamentoServiceSoap.java

@@ -63,12 +63,12 @@ import java.rmi.RemoteException;
  */
 public class PagamentoServiceSoap {
 	public static void updatePagamentoManuale(long pagamentoId, byte[] content,
-		java.lang.String sourceFileName,
+		java.lang.String numeroBollettino, java.lang.String sourceFileName,
 		com.liferay.portal.service.ServiceContext serviceContext)
 		throws RemoteException {
 		try {
 			PagamentoServiceUtil.updatePagamentoManuale(pagamentoId, content,
-				sourceFileName, serviceContext);
+				numeroBollettino, sourceFileName, serviceContext);
 		}
 		catch (Exception e) {
 			_log.error(e, e);

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoLocalServiceImpl.java

@@ -440,7 +440,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 	}
 
 	@Override
-	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 = getPagamento(pagamentoId);
@@ -471,6 +471,7 @@ public class PagamentoLocalServiceImpl extends PagamentoLocalServiceBaseImpl {
 					changeLog, content, serviceContext);
 			fileEntryId = fileEntry.getFileEntryId();
 			pagamento.setFileEntryId(fileEntryId);
+			pagamento.setNumeroBollettino(numeroBollettino);
 			pagamento = updatePagamento(pagamento);
 			if (DettPratica.class.getName().equals(pagamento.getClassName())) {
 				dettPraticaLocalService.updateEsitoPagamento(pagamentoId, pagamento.getClassPk(), fileEntryId,

liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/PagamentoServiceImpl.java

@@ -42,14 +42,14 @@ public class PagamentoServiceImpl extends PagamentoServiceBaseImpl {
 	 */
 
 	@Override
-	public void updatePagamentoManuale(long pagamentoId, byte[] content, String sourceFileName,
+	public void updatePagamentoManuale(long pagamentoId, byte[] content, String numeroBollettino, String sourceFileName,
 			ServiceContext serviceContext) throws IOException, PortalException, SystemException {
 
 		Pagamento pagamento = pagamentoLocalService.getPagamento(pagamentoId);
 		long userId = findTitolare(pagamentoId);
 
 		if (getUserId() == userId || DelegheUtil.hasDelegaPagamento(getUser(), getUserId(), pagamento.getClassPk())) {
-			pagamentoLocalService.updatePagamentoManuale(pagamentoId, content, sourceFileName, serviceContext);
+			pagamentoLocalService.updatePagamentoManuale(pagamentoId, numeroBollettino, content, sourceFileName, serviceContext);
 		} else {
 			throw new SystemException("pagamento manuale aggiornabile solo da titolare digitale del "
 					+ pagamento.getClassName());

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<Pagamento>
 		pagamentoImpl.setOtf(pagamento.isOtf());
 		pagamentoImpl.setOtfCreateDate(pagamento.getOtfCreateDate());
 		pagamentoImpl.setEmailPending(pagamento.isEmailPending());
+		pagamentoImpl.setNumeroBollettino(pagamento.getNumeroBollettino());
 		pagamentoImpl.setOldPagamentoId(pagamento.getOldPagamentoId());
 
 		return pagamentoImpl;

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.number=2966
-    build.date=1706804621576
+    build.date=1707408695550
     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

@@ -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);

liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify-payment-guide.jsp

@@ -1,8 +1,8 @@
-<p><span style="font-size:11pt;">Il pagamento dei &ldquo;Diritti Fissi&rdquo; potr&agrave; essere effettuato solo tramite la piattaforma regionale&nbsp;</span><a href="https://pagamenti.regione.sicilia.it/static/"><u><span style="color:#1155cc;font-size:11pt;">https://pagamenti.regione.sicilia.it/static/</span></u></a><span style="font-size:11pt;">.</span></p>
+<p><span style="font-size:11pt;">Il pagamento dei &ldquo;Diritti Fissi&rdquo; potr&agrave; essere effettuato solo tramite la piattaforma regionale&nbsp;</span><a href="https://pagamenti.regione.sicilia.it/static/" target="_blank"><u><span style="color:#1155cc;font-size:11pt;">https://pagamenti.regione.sicilia.it/static/</span></u></a><span style="font-size:11pt;">.</span></p>
 <p><span style="font-size:11pt;">Per effettuare il pagamento seguire i seguenti step:</span></p>
 <ol>
     <li style="list-style-type:decimal;font-size:11pt;">
-        <p><span style="font-size:11pt;">connettersi alla piattaforma&nbsp;</span><a href="https://pagamenti.regione.sicilia.it/static/"><u><span style="color:#1155cc;font-size:11pt;">https://pagamenti.regione.sicilia.it/static/</span></u></a></p>
+        <p><span style="font-size:11pt;">connettersi alla piattaforma&nbsp;</span><a href="https://pagamenti.regione.sicilia.it/static/" target="_blank"><u><span style="color:#1155cc;font-size:11pt;">https://pagamenti.regione.sicilia.it/static/</span></u></a></p>
     </li>
     <li style="list-style-type:decimal;font-size:11pt;">
         <p><span style="font-size:11pt;">Selezionare il pulsante &ldquo;accedi al servizio&rdquo;</span></p>

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

@@ -197,13 +197,17 @@
 
 										<c:if
 											test="<%= pagamentoBolli.getMezzo().equalsIgnoreCase(PagamentoConstants.MEZZO_MANUALE)%>">
-											<div class="col-xs-10 col-sm-10 col-md-10 col-lg-10 padding_15">
+											<div class="col-xs-8 col-sm-8 col-md-8 col-lg-8 padding_15">
 												<span><%=LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli")%></span>
 											</div>
-											<div class="col-xs-2 col-sm-2 col-md-2 col-lg-2 padding_15 total-row">
+											<div class="col-xs-4 col-sm-4 col-md-4 col-lg-4 padding_15 total-row">
 												<aui:form name="<%=formRicevutaPagamento%>" enctype="multipart/form-data" method="post"
 													action="<%=allegatoFilePagamentoURL%>">
 													<div>
+														<aui:input label="numero-bollettino" name="numeroBollettino" type="textarea" >
+														<aui:validator name="maxLength" errorMessage="errore-lenght-bollettino">250</aui:validator>
+														<aui:validator name="required" errorMessage="Campo Richiesto" />
+														</aui:input>
 														<aui:input type="file" name="docFile" label="Ricevuta Pagamento">
 															<aui:validator name="required" errorMessage="File Richiesto" />
 															<aui:validator name="acceptFiles" errorMessage="Errore... Formati supportati: pdf,p7m">'p7m,pdf'</aui:validator>