Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into feature/GEPAFINBE-167

This commit is contained in:
rajesh
2025-02-25 12:14:10 +05:30
74 changed files with 1508 additions and 195 deletions

View File

@@ -10,7 +10,8 @@ spring.h2.console.enabled=true
isVatCheckGloballyDisabled = false
isMailSendingEnabled = true
default_System_Receiver_Email=antonio.manca@bflows.net
isPecServiceEnabled = false
#default_System_Receiver_Email=antonio.manca@bflows.net
gepafin_email=rinaldo.bonazzo@bflows.net
rinaldo_email=rinaldo.bonazzo@bflows.net
carlo_email=test@test.test

View File

@@ -9,7 +9,8 @@ spring.jpa.show-sql=true
base-url=http://localhost:8080
isMailSendingEnabled = false
default_System_Receiver_Email=test@test.test
isPecServiceEnabled = false
#default_System_Receiver_Email=test@test.test
gepafin_email=test@test.test
rinaldo_email=test@test.test
carlo_email=test@test.test

View File

@@ -16,7 +16,8 @@ spid.ipd.base.url=https://login.regione.umbria.it
active.profile.folder=production
isMailSendingEnabled = true
default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
isPecServiceEnabled = true
#default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
gepafin_email=bandi@pec.gepafin.it
rinaldo_email=rinaldo.bonazzo@bflows.net
carlo_email=carlo.mancosu@bflows.net

View File

@@ -7,7 +7,8 @@ spring.datasource.password=sa
spring.h2.console.enabled=true
base-url=http://localhost:8080
isMailSendingEnabled = false
default_System_Receiver_Email=test@test.test
isPecServiceEnabled = false
#default_System_Receiver_Email=test@test.test
gepafin_email=test@test.test
rinaldo_email=test@test.test
carlo_email=test@test.test

View File

@@ -2380,6 +2380,17 @@
path="db/dump/update_system_email_template_application_rejected_04_02_2025.sql"/>
</changeSet>
<changeSet id="14-02-2025_PK_124000" author="Piyush Kag">
<addColumn tableName="COMPANY">
<column name="JSON" type="TEXT"/>
</addColumn>
<sqlFile dbms="postgresql"
path="db/dump/insert_json_column_in_company_data_06_02_2025.sql"/>
<dropColumn tableName="USER_WITH_COMPANY" columnName="JSON"/>
</changeSet>
<changeSet id="06-02-2025_NK_155519" author="Nisha Kashyap">
<addColumn tableName="call">
<column name="number_of_check" type="numeric"></column>
@@ -2514,6 +2525,10 @@
<changeSet id="24-02-2025_RK_125145" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/updated_json_template_for_notification_24_02_2025.sql"/>
<changeSet id="17-02-2025_PK_025237" author="Piyush Kag">
<renameColumn tableName="call"
oldColumnName="product_id"
newColumnName="appointment_template_id"/>
</changeSet>
</databaseChangeLog>

View File

@@ -0,0 +1,16 @@
UPDATE COMPANY C
SET JSON = (
SELECT U.JSON
FROM USER_WITH_COMPANY U
WHERE U.COMPANY_ID = C.ID
AND U.JSON IS NOT NULL
AND U.JSON <> ''
ORDER BY U.ID ASC
LIMIT 1
)
WHERE EXISTS (
SELECT 1 FROM USER_WITH_COMPANY U
WHERE U.COMPANY_ID = C.ID
AND U.JSON IS NOT NULL
AND U.JSON <> ''
);

View File

@@ -166,6 +166,11 @@ validation.field.max_length=Field {0} must be no more than {1} characters long.
validation.field.pattern=Field {0} does not match the required pattern.
validation.field.not_null=Field {0} must not be null.
validation.field.not_empty=Field {0} must not be empty.
validation.field.max_value=Field {0} must be no more than {1}.
validation.field.min_value=Field {0} must be greater than {1}.
validation.field.min.checkbox=Field {0} should be checked for atleast {1}.
validation.field.max.checkbox=Field {0} should have only {1} checked.
current.form.incomplete=Current form is not filled.
flow.not.found=Flow not found.
@@ -385,3 +390,7 @@ company.document.copied.successfully = Company Document Copied successfully.
invalid.expiration.date = Invalid Expiration Date
appointment.cannot.be.created = Appointment cannot be created because call doesn't have the template id.
appointment.not.created = Appointment not created please try again.
validation.failed.checklist=Validation failed for checklist.

View File

@@ -160,6 +160,11 @@ validation.field.max_length=Il campo {0} deve essere lungo al massimo {1} caratt
validation.field.pattern=Il campo {0} non corrisponde al modello richiesto.
validation.field.not_null=Il campo {0} non deve essere nullo.
validation.field.not_empty=Il campo {0} non deve essere vuoto.
validation.field.max_value=Il campo {0} non deve essere pi<70> grande di {1}.
validation.field.min_value=Il campo {0} deve essere maggiore di {1}.
validation.field.min.checkbox=Il campo {0} dovrebbe essere controllato almeno per {1}.
validation.field.max.checkbox=Il campo {0} dovrebbe avere solo {1} selezionato.
current.form.incomplete=il modulo corrente non ? compilato
flow.not.found=Flow not found.
validation.message=Messaggi di convalida.
@@ -376,3 +381,6 @@ category.cannot.be.deleted = La categoria non può essere eliminata perché è a
invalid.expiration.date = Data di scadenza non valida
appointment.cannot.be.created = Impossibile creare l'appuntamento perch<63> la chiamata non ha l'ID del modello di appuntamento.
appointment.not.created = Appuntamento non creato, riprova
validation.failed.checklist=Convalida fallita per la checklist.