From aecd2da30b8ae00b12165a6bd110a74ba22b7175 Mon Sep 17 00:00:00 2001 From: maximus49000 <39053717+maximus49000@users.noreply.github.com> Date: Sun, 6 Jan 2019 15:03:29 +0100 Subject: [PATCH 01/10] Modif tet --- .gitignore | 1 + connecthys/application/forms.py | 16 +- connecthys/application/models.py | 21 +- connecthys/application/static/img/payzen.png | Bin 0 -> 11802 bytes .../application/templates/csrf_error.html | 4 +- .../templates/inscription_noethys.html | 166 ++++++ connecthys/application/templates/login.html | 9 + .../templates/macros_historique.html | 8 +- .../templates/macros_paiement_ligne.html | 76 ++- .../application/templates/reglements.html | 42 +- .../templates/retour_paiement.html | 43 ++ .../application/templates/subscribe.html | 68 +++ connecthys/application/views.py | 519 +++++++++++------- connecthys/lib/eopayment/systempayv2.py | 14 +- connecthys/lib/eopayment/tipi_regie.py | 12 +- connecthys/temp/2019-01-03_systempay-_528476 | 0 connecthys/temp/2019-01-03_systempay-_849943 | 0 connecthys/versions.txt | 7 +- 18 files changed, 763 insertions(+), 243 deletions(-) create mode 100644 connecthys/application/static/img/payzen.png create mode 100644 connecthys/application/templates/inscription_noethys.html create mode 100644 connecthys/application/templates/retour_paiement.html create mode 100644 connecthys/application/templates/subscribe.html create mode 100644 connecthys/temp/2019-01-03_systempay-_528476 create mode 100644 connecthys/temp/2019-01-03_systempay-_849943 diff --git a/.gitignore b/.gitignore index 401d2d1..8901929 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,4 @@ $RECYCLE.BIN/ # Windows shortcuts *.lnk +*.zip diff --git a/connecthys/application/forms.py b/connecthys/application/forms.py index 9aa220b..0e06500 100644 --- a/connecthys/application/forms.py +++ b/connecthys/application/forms.py @@ -63,9 +63,21 @@ class Renseignements(FlaskForm): tel_domicile = TextField('tel_domicile') tel_mobile = TextField('tel_mobile') mail = TextField('mail') + +class InscriptionFamille(FlaskForm): + nom = TextField('nom') + prenom = TextField('prenom') + date_naiss = TextField('date_naiss') + cp_naiss = TextField('cp_naiss') + ville_naiss = TextField('ville_naiss') + rue_resid = TextField('rue_resid') + cp_resid = TextField('cp_resid') + ville_resid = TextField('ville_resid') + tel_domicile = TextField('tel_domicile') + tel_mobile = TextField('tel_mobile') + mail = TextField('mail') profession = TextField('profession') employeur = TextField('employeur') travail_tel = TextField('travail_tel') travail_mail = TextField('travail_mail') - adresse_auto = SelectField('adresse_auto', coerce=int) - + adresse_auto = SelectField('adresse_auto', coerce=int) \ No newline at end of file diff --git a/connecthys/application/models.py b/connecthys/application/models.py index 5e912a7..3979a6e 100644 --- a/connecthys/application/models.py +++ b/connecthys/application/models.py @@ -296,10 +296,15 @@ class Paiement(Base): numauto = Column(String(10)) dattrans = Column(String(15)) heurtrans = Column(String(15)) + systeme_paiement = Column(String(50)) + resultat = Column(String(50)) + message = Column(String(450)) + ventilation = Column(String(100000)) + horodatage = Column(DateTime) def __init__(self, IDpaiement=None, factures_ID=None, IDfamille=None, IDtransaction=None, refdet=None, \ - montant = 0.0, objet=None, saisie=None, resultrans=None, numauto=None, \ - dattrans=None, heurtrans=None): + montant = 0.0, objet=None, saisie=None, resultrans=None, numauto=None, dattrans=None, \ + heurtrans=None, systeme_paiement=None, resultat=None, message=None, ventilation=None, horodatage=None): if IDpaiement != None : self.IDpaiement = IDpaiement self.factures_ID = factures_ID @@ -313,6 +318,11 @@ def __init__(self, IDpaiement=None, factures_ID=None, IDfamille=None, IDtransact self.numauto = numauto self.dattrans = dattrans self.heurtrans = heurtrans + self.systeme_paiement = systeme_paiement + self.resultat = resultat + self.message = message + self.ventilation = ventilation + self.horodatage = horodatage def __repr__(self): return '' % (self.IDpaiement) @@ -361,12 +371,15 @@ class Action(Base): IDperiode = Column(Integer) ref_unique = Column(String(50), index=True) reponse = Column(String(450)) + IDpaiement = Column(Integer) + ventilation = Column(String(100000)) reservations = relationship("Reservation") renseignements = relationship("Renseignement") def __init__(self, horodatage=None, IDfamille=None, IDindividu=None, IDutilisateur=None, categorie=None, action=None, description=None, \ - commentaire=None, parametres=None, etat=None, traitement_date=None, IDperiode=None, ref_unique=None, reponse=None): + commentaire=None, parametres=None, etat=None, traitement_date=None, IDperiode=None, ref_unique=None, reponse=None, \ + IDpaiement=None, ventilation=None): if horodatage == None : self.horodatage = datetime.datetime.now() else : @@ -387,6 +400,8 @@ def __init__(self, horodatage=None, IDfamille=None, IDindividu=None, IDutilisate else : self.ref_unique = ref_unique self.reponse = reponse + self.IDpaiement = IDpaiement + self.ventilation = ventilation def GetRefUnique(self): horodatage = self.horodatage.strftime("%Y%m%d%H%M%S%f") diff --git a/connecthys/application/static/img/payzen.png b/connecthys/application/static/img/payzen.png new file mode 100644 index 0000000000000000000000000000000000000000..de9075451dbce640a6982e7d1e0c06a9fb8bea2c GIT binary patch literal 11802 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 Famille diff --git a/connecthys/application/templates/inscription_noethys.html b/connecthys/application/templates/inscription_noethys.html new file mode 100644 index 0000000..9860c8f --- /dev/null +++ b/connecthys/application/templates/inscription_noethys.html @@ -0,0 +1,166 @@ +{% extends "adminlte/base_without_nav.html" %} + +{% block title %}Connexion{% endblock %} +{% block description %}Connexion{% endblock %} +{% block bodytag %}login-page {% block skin %}{{ GetParametre('SKIN', dict_parametres, 'skin-blue') }}{% endblock %}{% endblock %} + +{% block head %} + {{ super() }} + + + + + {# Affichage de l'image de fond #} + {% set IMAGE_FOND = GetParametre("IMAGE_FOND", dict_parametres) %} + {% if IMAGE_FOND == "" %} + {% set IMAGE_FOND = "bleu.jpg" %} + {% endif %} + + + + +{% endblock %} + + + +{% block body %} + + + + + + +
+ + + + {% block copyright %}{% if GetParametre('ORGANISATEUR_NOM', dict_parametres) != '' %}{{ GetParametre('ORGANISATEUR_NOM', dict_parametres) }}{% endif %}{% endblock %} + +
+ +{% endblock %} + + +{% block scripts %} + {{ super() }} + + + +{%- endblock scripts %} diff --git a/connecthys/application/templates/login.html b/connecthys/application/templates/login.html index 29be885..7c4f36b 100644 --- a/connecthys/application/templates/login.html +++ b/connecthys/application/templates/login.html @@ -102,6 +102,15 @@ + + + diff --git a/connecthys/application/templates/macros_historique.html b/connecthys/application/templates/macros_historique.html index 95d56d0..7111a5a 100644 --- a/connecthys/application/templates/macros_historique.html +++ b/connecthys/application/templates/macros_historique.html @@ -46,8 +46,10 @@

{% if action.categorie in ("reservations", "renseignements") %}    {% endif %} - - Supprimer + + {% if action.categorie not in ("reglements",) %} + Supprimer + {% endif %} Demande en attente de traitement. {% endif %} {% endif %} @@ -55,7 +57,7 @@

Vous avez supprimé cette demande. {% endif %} {% if action.etat == "validation" %} - Votre demande a été traitée le {{ DateDDEnFr(action.traitement_date) }}. {% if action.reponse != None and action.reponse != '' %}Réponse : {{ action.reponse }}{% endif %} + Votre demande a été traitée le {{ DateDDEnFr(action.traitement_date) }}. {% if action.reponse != None and action.reponse != '' %}Réponse : {{ action.reponse }}{% endif %} {% endif %} diff --git a/connecthys/application/templates/macros_paiement_ligne.html b/connecthys/application/templates/macros_paiement_ligne.html index 233ba63..f93edc6 100644 --- a/connecthys/application/templates/macros_paiement_ligne.html +++ b/connecthys/application/templates/macros_paiement_ligne.html @@ -7,29 +7,31 @@

Payer en ligne

-

Vous pouvez payer une ou plusieurs factures en ligne à l'aide de votre carte bancaire. Le paiement est sécurisé. Cliquez sur le bouton ci-dessous pour accéder au site de notre partenaire.

+ {% if GetParametre('PAIEMENT_EN_LIGNE_SYSTEME', dict_parametres) in ("3", "4") %} + Logo Payzen +

Vous pouvez payer vos factures en ligne à l'aide de votre carte bancaire. Les transactions effectuées sur ce portail sont sécurisées par la plateforme de paiement en ligne PayZen. Cliquez sur le bouton ci-dessous pour sélectionner le montant à régler et accéder au site sécurisé de notre partenaire.

+ {% else %} +

Vous pouvez payer vos factures en ligne à l'aide de votre carte bancaire. Les transactions effectuées sur ce portail sont sécurisées par la plateforme de paiement en ligne TIPI. Cliquez sur le bouton ci-dessous pour sélectionner le montant à régler et accéder au site sécurisé de notre partenaire.

+ {% endif %}
{% endif %} - +