Skip to content

Commit

Permalink
Gestion de l'affichage des ordres de recouvrements
Browse files Browse the repository at this point in the history
  • Loading branch information
tnicolas1 committed Mar 4, 2025
1 parent c6c7479 commit 42bbe6a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 4 deletions.
6 changes: 5 additions & 1 deletion app/models/asp/payment_request.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,11 @@ def eligible_for_rejected_or_unpaid_auto_retry?(reasons)
def reconstructed_iban
return nil unless in_state?(:paid)

coordpaie = last_transition.metadata["PAIEMENT"]["COORDPAIE"]
metadata = last_transition.metadata

return nil if metadata["PAIEMENT"].nil?

coordpaie = metadata["PAIEMENT"]["COORDPAIE"]
zonebban = coordpaie["ZONEBBAN"]
cle = coordpaie["CLECONTROL"]
code_pays = coordpaie["CODEISOPAYS"]
Expand Down
21 changes: 18 additions & 3 deletions app/views/pfmps/_payment_requests_history.html.haml
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
- @pfmp.payment_requests.order(created_at: :desc).each do |payment_request|
.gray-panel.fr-p-3w.fr-mb-3w
= render partial: "payment_requests/badges", locals: { payment_request: payment_request }

- metadata = payment_request.last_transition.metadata
- state = metadata['ORDREREVERSEMENT'] || metadata['PAIEMENT']

.fr-mt-1w
= payment_request.status_explanation
- if !state['DATEOREFFECTIF'].nil?
= t("payment_requests.state_explanations.recovery", date: state['DATEOREFFECTIF'])
- else
= payment_request.status_explanation

- if payment_request.in_state?(:paid)
.fr-mt-2w.gray-text
Montant réellement versé :
%strong= number_to_currency(payment_request.last_transition.metadata['PAIEMENT']['MTNET'].to_f)
- if !state['MTNET'].nil?
Montant réellement versé :
%strong= number_to_currency(state['MTNET'].to_f)
- if !state['MTDEMANDEOR'].nil?
Montant réclamé :
%strong= number_to_currency(state['MTDEMANDEOR'].to_f.abs)

.fr-mt-2w.gray-text
Coordonnées bancaires utilisées :
%strong= payment_request.rib&.iban || payment_request.reconstructed_iban || payment_request.student.rib(current_establishment)&.iban || "manquantes"

.fr-mt-2w.gray-text
- num_presta_doss = @pfmp.num_presta_doss
- if !num_presta_doss.nil?
Numéro de prestation dossier :
%strong= num_presta_doss

.fr-mt-2w.gray-text
Dernière mise à jour le
= l(payment_request.last_transition&.updated_at || payment_request.updated_at, format: :long)
1 change: 1 addition & 0 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ fr:
rejected: "La demande a été rejetée : %{rejected_reason}."
paid: Le paiement a été envoyé par l'agence comptable, et sera effectif dans un délai de un à trois jours ouvrables.
unpaid: "Le paiement a été refusé par l'agence comptable : %{unpaid_reason}."
recovery: "Un ordre de reversement a été envoyé par pli postal à l'élève le %{date}."
ministries:
masa: Ministère de l'Agriculture et de la Souveraineté Alimentaire (MASA)
menj: Ministère de l'Éducation Nationale et de la Jeunesse (MENJ)
Expand Down

0 comments on commit 42bbe6a

Please sign in to comment.