diff --git a/packages/api/src/business/validations/titre-etape-updation-validate.test.ts b/packages/api/src/business/validations/titre-etape-updation-validate.test.ts index 710c44093d81371bb0507b9f21fb794b980b4132..b40c5d2e4c0dbf03acd7223bf67c64ed361c7001 100644 --- a/packages/api/src/business/validations/titre-etape-updation-validate.test.ts +++ b/packages/api/src/business/validations/titre-etape-updation-validate.test.ts @@ -153,7 +153,6 @@ describe('valide l’étape avant de l’enregistrer', () => { "le document "Documents cartographiques" (car) est obligatoire", "le document "Dossier de demande" (dom) est obligatoire", "le document "Formulaire de demande" (for) est obligatoire", - "le document "Justificatif de paiement" (jpa) est obligatoire", "Il y a des documents d'entreprise obligatoires, mais il n'y a pas de titulaire", ] `) diff --git a/packages/common/src/permissions/etape-form.test.ts b/packages/common/src/permissions/etape-form.test.ts index f755b18ab3230c5b6bf1f428e774ec0135d78ab0..690af134e8b2b7397066f8dca8df3c2dd0b8a65b 100644 --- a/packages/common/src/permissions/etape-form.test.ts +++ b/packages/common/src/permissions/etape-form.test.ts @@ -533,7 +533,7 @@ test('getDocumentsTypes', () => { "description": undefined, "id": "jpa", "nom": "Justificatif de paiement", - "optionnel": false, + "optionnel": true, }, { "id": "lem", @@ -634,7 +634,7 @@ test('getDocumentsTypes', () => { "description": undefined, "id": "jpa", "nom": "Justificatif de paiement", - "optionnel": false, + "optionnel": true, }, { "id": "lem", diff --git a/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts b/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts index 87cedbceeb86ed3de203d3b3415e4a27f52ea2e9..68de2f3f3e1efcd9127140d30776d3c3d1b4cd0c 100644 --- a/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts +++ b/packages/common/src/static/titresTypes_demarchesTypes_etapesTypes/documents.ts @@ -373,7 +373,7 @@ const TDEDocumentsTypes = { [DOCUMENTS_TYPES_IDS.dossierLoiSurLEau]: { optionnel: true }, [DOCUMENTS_TYPES_IDS.dossierDeDemande]: { optionnel: false }, [DOCUMENTS_TYPES_IDS.formulaireDeDemande]: { optionnel: false }, - [DOCUMENTS_TYPES_IDS.justificatifDePaiement]: { optionnel: false }, + [DOCUMENTS_TYPES_IDS.justificatifDePaiement]: { optionnel: true }, [DOCUMENTS_TYPES_IDS.documentsCartographiques]: { optionnel: false }, }, }, diff --git a/packages/ui/src/components/etape-edition.stories_snapshots_AffichageAide.html b/packages/ui/src/components/etape-edition.stories_snapshots_AffichageAide.html index fff546484bb93365b8686eebadfd702f82b42de8..a9ab0e5b700b43163272ed329375b1d4d0fe13df 100644 --- a/packages/ui/src/components/etape-edition.stories_snapshots_AffichageAide.html +++ b/packages/ui/src/components/etape-edition.stories_snapshots_AffichageAide.html @@ -174,14 +174,6 @@ <!----> </button></td> </tr> - <tr> - <td class="fr-label--disabled">Justificatif de paiement</td> - <td>-</td> - <td>-</td> - <td style="display: flex; justify-content: end;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-add-line" title="Ajouter un document Justificatif de paiement" aria-label="Ajouter un document Justificatif de paiement" type="button"> - <!----> - </button></td> - </tr> </tbody> </table> </div> diff --git a/packages/ui/src/components/etape-edition.stories_snapshots_DemandeArmComplete.html b/packages/ui/src/components/etape-edition.stories_snapshots_DemandeArmComplete.html index 5cecafb6ef42b10cde645897154aef80eacad036..3abe6d8c42394cf3ab7eb66cda4a88fcd9494cef 100644 --- a/packages/ui/src/components/etape-edition.stories_snapshots_DemandeArmComplete.html +++ b/packages/ui/src/components/etape-edition.stories_snapshots_DemandeArmComplete.html @@ -345,20 +345,6 @@ </button></div> </td> </tr> - <tr> - <td>Justificatif de paiement</td> - <td style="white-space: pre-line;"> - <!----> - </td> - <td>Public</td> - <td> - <div style="display: flex; justify-content: end; align-items: center;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-edit-line" title="Modifier le document de Justificatif de paiement" aria-label="Modifier le document de Justificatif de paiement" type="button"> - <!----> - </button><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-delete-bin-line fr-ml-1w" title="Supprimer le document de Justificatif de paiement" aria-label="Supprimer le document de Justificatif de paiement" type="button"> - <!----> - </button></div> - </td> - </tr> </tbody> </table> </div> @@ -374,7 +360,22 @@ <th scope="col" style="display: flex; justify-content: end;">Action</th> </tr> </thead> - <tbody></tbody> + <tbody> + <tr> + <td>Justificatif de paiement</td> + <td style="white-space: pre-line;"> + <!----> + </td> + <td>Public</td> + <td> + <div style="display: flex; justify-content: end; align-items: center;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-edit-line" title="Modifier le document de Justificatif de paiement" aria-label="Modifier le document de Justificatif de paiement" type="button"> + <!----> + </button><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-delete-bin-line fr-ml-1w" title="Supprimer le document de Justificatif de paiement" aria-label="Supprimer le document de Justificatif de paiement" type="button"> + <!----> + </button></div> + </td> + </tr> + </tbody> </table> </div><button class="fr-btn fr-btn--secondary fr-btn--md fr-icon-add-line fr-btn--icon-right fr-mt-1w" title="Ajouter un document complémentaire" aria-label="Ajouter un document complémentaire" type="button" style="align-self: end;">Ajouter</button> </div> diff --git a/packages/ui/src/components/etape-edition.stories_snapshots_Modification.html b/packages/ui/src/components/etape-edition.stories_snapshots_Modification.html index 75af596e279ed6e5df7bb9dda247a69020bc5e31..9295c4247d332f3343dbbdcaef8ba4472226a848 100644 --- a/packages/ui/src/components/etape-edition.stories_snapshots_Modification.html +++ b/packages/ui/src/components/etape-edition.stories_snapshots_Modification.html @@ -174,14 +174,6 @@ <!----> </button></td> </tr> - <tr> - <td class="fr-label--disabled">Justificatif de paiement</td> - <td>-</td> - <td>-</td> - <td style="display: flex; justify-content: end;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-add-line" title="Ajouter un document Justificatif de paiement" aria-label="Ajouter un document Justificatif de paiement" type="button"> - <!----> - </button></td> - </tr> </tbody> </table> </div> diff --git a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_ArmMecanise.html b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_ArmMecanise.html index d7c9bb4fc1f7c873dfc940ec393e382991f2a7e7..086c04e6af371aa2af7a8a34dcfa373877ae4219 100644 --- a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_ArmMecanise.html +++ b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_ArmMecanise.html @@ -64,14 +64,6 @@ <!----> </button></td> </tr> - <tr> - <td class="fr-label--disabled">Justificatif de paiement</td> - <td>-</td> - <td>-</td> - <td style="display: flex; justify-content: end;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-add-line" title="Ajouter un document Justificatif de paiement" aria-label="Ajouter un document Justificatif de paiement" type="button"> - <!----> - </button></td> - </tr> </tbody> </table> </div> diff --git a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Complet.html b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Complet.html index c196ca8d9fff0ca9acf67855c4916a420153e96e..38bb4ec599a6a5d72c1bb77a21bdc1787453d159 100644 --- a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Complet.html +++ b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Complet.html @@ -50,20 +50,6 @@ </button></div> </td> </tr> - <tr> - <td>Justificatif de paiement</td> - <td style="white-space: pre-line;"> - <!----> - </td> - <td>Visible par les administrations</td> - <td> - <div style="display: flex; justify-content: end; align-items: center;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-edit-line" title="Modifier le document de Justificatif de paiement" aria-label="Modifier le document de Justificatif de paiement" type="button"> - <!----> - </button><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-delete-bin-line fr-ml-1w" title="Supprimer le document de Justificatif de paiement" aria-label="Supprimer le document de Justificatif de paiement" type="button"> - <!----> - </button></div> - </td> - </tr> </tbody> </table> </div> @@ -92,6 +78,20 @@ </button></div> </td> </tr> + <tr> + <td>Justificatif de paiement</td> + <td style="white-space: pre-line;"> + <!----> + </td> + <td>Visible par les administrations</td> + <td> + <div style="display: flex; justify-content: end; align-items: center;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-edit-line" title="Modifier le document de Justificatif de paiement" aria-label="Modifier le document de Justificatif de paiement" type="button"> + <!----> + </button><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-delete-bin-line fr-ml-1w" title="Supprimer le document de Justificatif de paiement" aria-label="Supprimer le document de Justificatif de paiement" type="button"> + <!----> + </button></div> + </td> + </tr> </tbody> </table> </div><button class="fr-btn fr-btn--secondary fr-btn--md fr-icon-add-line fr-btn--icon-right fr-mt-1w" title="Ajouter un document complémentaire" aria-label="Ajouter un document complémentaire" type="button" style="align-self: end;">Ajouter</button> diff --git a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Empty.html b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Empty.html index e033a9359e6adc4a19ff906d8a5ddffbc3a66357..8984f7b62eb8915dc4371017154899d9b94e74c6 100644 --- a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Empty.html +++ b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Empty.html @@ -34,14 +34,6 @@ <!----> </button></td> </tr> - <tr> - <td class="fr-label--disabled">Justificatif de paiement</td> - <td>-</td> - <td>-</td> - <td style="display: flex; justify-content: end;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-add-line" title="Ajouter un document Justificatif de paiement" aria-label="Ajouter un document Justificatif de paiement" type="button"> - <!----> - </button></td> - </tr> </tbody> </table> </div> diff --git a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_EnConstruction.html b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_EnConstruction.html index d7c9bb4fc1f7c873dfc940ec393e382991f2a7e7..086c04e6af371aa2af7a8a34dcfa373877ae4219 100644 --- a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_EnConstruction.html +++ b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_EnConstruction.html @@ -64,14 +64,6 @@ <!----> </button></td> </tr> - <tr> - <td class="fr-label--disabled">Justificatif de paiement</td> - <td>-</td> - <td>-</td> - <td style="display: flex; justify-content: end;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-add-line" title="Ajouter un document Justificatif de paiement" aria-label="Ajouter un document Justificatif de paiement" type="button"> - <!----> - </button></td> - </tr> </tbody> </table> </div> diff --git a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Rempli.html b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Rempli.html index 4aafe79b3fe7dacc8411ba161466185a12ae0312..c8bba2f5af852cb9c093b99e11c96e75d10bb096 100644 --- a/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Rempli.html +++ b/packages/ui/src/components/etape/etape-documents-edit.stories_snapshots_Rempli.html @@ -38,14 +38,6 @@ <!----> </button></td> </tr> - <tr> - <td class="fr-label--disabled">Justificatif de paiement</td> - <td>-</td> - <td>-</td> - <td style="display: flex; justify-content: end;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-add-line" title="Ajouter un document Justificatif de paiement" aria-label="Ajouter un document Justificatif de paiement" type="button"> - <!----> - </button></td> - </tr> </tbody> </table> </div> diff --git a/packages/ui/src/components/etape/etape-edit-form.stories_snapshots_Default.html b/packages/ui/src/components/etape/etape-edit-form.stories_snapshots_Default.html index d60e6f2cf9181c2c4afc4f02b3b91a50da16d0a6..d873175d8d376dfd3eeac7a231d58644e3e75054 100644 --- a/packages/ui/src/components/etape/etape-edit-form.stories_snapshots_Default.html +++ b/packages/ui/src/components/etape/etape-edit-form.stories_snapshots_Default.html @@ -225,14 +225,6 @@ <!----> </button></td> </tr> - <tr> - <td class="fr-label--disabled">Justificatif de paiement</td> - <td>-</td> - <td>-</td> - <td style="display: flex; justify-content: end;"><button class="fr-btn fr-btn--secondary fr-btn--sm fr-icon-add-line" title="Ajouter un document Justificatif de paiement" aria-label="Ajouter un document Justificatif de paiement" type="button"> - <!----> - </button></td> - </tr> </tbody> </table> </div>