Resolved conflict

This commit is contained in:
rajesh
2026-02-23 12:53:06 +05:30
parent 8b72e372a1
commit f0c15b928e
14 changed files with 98 additions and 17 deletions

View File

@@ -3173,4 +3173,25 @@
<column name="company_document" type="VARCHAR(255)"></column>
</addColumn>
</changeSet>
<changeSet id="22-02-2026_RK_132342" author="Rajesh Khore">
<insert tableName="document">
<column name="file_name" value="Comunicazione_esito_istruttoria_ammissibilita_delibera_Blue_Tongue.docx"/>
<column name="file_path" value="https://mementoresources.s3.amazonaws.com/gepafin/staging/template/Comunicazione_esito_istruttoria_ammissibilita_delibera_Blue_Tongue.docx"/>
<column name="source" value="BLUE_TONGUE"/>
<column name="type" value="DOCUMENT"/>
<column name="created_date" value="2026-02-22 00:00:00"/>
<column name="updated_date" value="2026-02-22 00:00:00"/>
</insert>
</changeSet>
<changeSet id="23-02-2026_RK_110012" author="Rajesh Khore">
<sqlFile dbms="postgresql" path="db/dump/insert_system_email_template_for_special_amendment_blue_tongue_23_02_2026.sql"/>
<addColumn tableName="application_amendment_request">
<column name="blue_tongue_field_1" type="numeric"/>
<column name="blue_tongue_field_2" type="numeric"/>
</addColumn>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,11 @@
INSERT INTO gepafin_schema.system_email_template
( template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date, email_scenario, hub_id)
VALUES( 'Special Amendment Creation Email', 'SPECIAL_APPLICATION_AMENDMENT_REQUESTED_BLUE_TONGUE', '<html>
<body style="font-family: Arial, sans-serif; color: #000; line-height: 1.6;">
<div style="padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;">
<p>Buongiorno, vi invitiamo a prendere visione del documento allegato con cui vi informiamo dell avvenuta delibera a valere sull Avviso in oggetto. </p>
<p>Distinti Saluti,</p>
<p><strong>{{email_signature}}</strong></p>
</div>
</body>
</html>', 'Comunicazione esito valutazione tecnica ed economico-finanziaria Avviso {{call_name}} ', NULL, true, false, '2026-02-22 20:00:00.000', '2026-02-22 20:00:00.000', 'SPECIAL_APPLICATION_AMENDMENT_REQUESTED_BLUE_TONGUE', NULL);

View File

@@ -428,7 +428,8 @@ mail.send.successfully=Mail sent succesfully.
email.log.fetched=Email log fetched successfully.
amendment.appropiate.status=Application amendment is not in appropiate status for this operation.
upload.company.document.to.application=Uploaded company document to application successfully.
company.document.not.found.with.ids=Company document not found. Missing IDs: {0}
company.document.not.found.with.ids=Company document not found. Missing IDs: {0}.
amount.field.not.provided= Please provide the required amount fields.

View File

@@ -420,3 +420,4 @@ email.log.fetched=Registro email recuperato correttamente.
amendment.appropiate.status=L'emendamento dell'applicazione non <20> in stato appropriato per questa operazione.
upload.company.document.to.application=Documento aziendale caricato correttamente nell'applicazione.
company.document.not.found.with.ids=Documento aziendale non trovato. ID mancanti: {0}
amount.field.not.provided= Si prega di fornire i campi obbligatori per l'importo.