8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-25 00:13:45 +00:00
Commit graph

1642 commits

Author SHA1 Message Date
Hugo LEVY-FALK
692b3b70b6 Passage du paiement par solde en paiement personnalisé. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
3e18ebb7fb Même template pour la validation de paiement. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
6957598afc Les factures validées par comnpay sont effectivement validées. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
af3cc1cf69 Typos, pep8 et company. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
0fe430d72e Ajout de comnpay + fix de l'utilisation des paiements personnalisés 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
cc4815c82c Permet la création et l'édition de moyen de paiement personnalisés. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
4da804bfe7 Invalide la facture Comnpay avant de continuer le paiement. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
2845c49ac1 Utilise un ModelForm pour les données de chèque + doc 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
3f2de5739c Retire les éléments de front en JS pour les chèques. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
24cdc2329d Autorise l'édition de facture si l'auto-souscription est interdite mais que l'on peut créer des factures. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
e0d71ed291 POC des moyens de paiements sous forme de modules. 2018-07-12 14:40:16 +02:00
Hugo LEVY-FALK
d37364ee8f Refix les erreurs d'affichage 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
decf57f0fe ReFix le AESField 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
ba25477e72 Autorise le paiement de cotisation directement en ligne (sans passer par le solde) 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
d0e0da86a5 Fix la validation de facture. 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
beff1bbd1a Ne montre pas tous les articles en vente aux utilisateurs lambdas 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
27f646c200 Afficher le bon prix c'est encore mieux 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
532214263c Faire payer le bon prix, c'est mieux 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
2eb0fc816d Paiement de cotisation en ligne possible pour les utilisateurs normaux (désactivable) 2018-07-12 14:40:15 +02:00
Hugo LEVY-FALK
6e416eacfd Autorise le paiement de cotisation directement en ligne (sans passer par le solde) 2018-07-12 14:40:15 +02:00
klafyvel
77839fa448 Merge branch 'rework_rights_ui' into 'master'
Refactor the rights info page

Closes #118

See merge request federez/re2o!181
2018-07-12 14:37:43 +02:00
Maël Kervella
08157c4565 Add context processor to get the current date 2018-07-12 12:19:26 +00:00
Maël Kervella
6a08e14165 Otimize DB request for the right page
Reimplement end_adhesion and is_adherent methods in the
query itself so it can be done in a single query and not
done for each user individually.
2018-07-12 11:56:07 +00:00
Maël Kervella
324b48d37a Translate new right page 2018-07-12 11:56:07 +00:00
Maël Kervella
6df493cfb9 Display "gid: " 2018-07-12 11:56:07 +00:00
Maël Kervella
4eeb8802f6 Use button instead of badge 2018-07-12 11:56:07 +00:00
Maël Kervella
e5f9b634a0 Remove logs/stats_droit 2018-07-12 11:56:07 +00:00
Maël Kervella
19f1e28308 Refactor display of rights in users/listright page 2018-07-12 11:56:07 +00:00
klafyvel
1f4443d857 Merge branch 'Fix_117' into 'master'
Fix #117 : Use unix_name instead of name for ldap groups

Closes #117

See merge request federez/re2o!145
2018-07-11 18:12:07 +02:00
Maël Kervella
4cbb05d294 Add a Django command to fully rebuild the LDAP 2018-07-07 18:01:04 +00:00
Maël Kervella
05a53b1c9c Add reload to do in CHANGELOG 2018-07-07 12:53:57 +00:00
Maël Kervella
5706e9064e Fix #117 : Use unix_name instead of name for ldap groups
A group in the LDAP now use the `unix_name` instead of the `name`
The `new_group` form has now a more logical order for the fields
The label for the `unix_name` is now more explicit
2018-07-07 12:53:57 +00:00
chirac
40247e326d Merge branch 'Fix_109' into 'master'
Fix #109: Remove misnamed rights

Closes #109

See merge request federez/re2o!179
2018-06-30 19:14:01 +02:00
Maël Kervella
3b2ca10e29 Fix #109: Remove misnamed rights 2018-06-27 12:21:20 +00:00
chirac
fdfd562959 Merge branch 'debugtoolbar' into 'master'
Add django-debug-toolbar support

Closes #138

See merge request federez/re2o!177
2018-06-25 13:00:19 +02:00
Maël Kervella
c82e17d5fd Add support for django-debug-toolbar 2018-06-24 22:09:36 +00:00
klafyvel
2f8ea80e7f Merge branch 'clean_api_duplicate' into 'master'
Refactor API

Closes #128

See merge request federez/re2o!172
2018-06-24 23:11:12 +02:00
klafyvel
17f3867371 Merge branch 'master' into 'clean_api_duplicate'
# Conflicts:
#   CHANGELOG.md
2018-06-24 22:57:15 +02:00
klafyvel
4854603499 Merge branch 'logo' into 'master'
Add awesome Logo

Closes #60

See merge request federez/re2o!176
2018-06-24 21:22:30 +02:00
Maël Kervella
654da8cb04 Use re2o.utils functions for optimization 2018-06-23 21:36:01 +00:00
Maël Kervella
a9cfc9aebc DNS endpoint SQL optimization 2018-06-23 21:19:11 +00:00
Maël Kervella
6367944a5e Translate base HTML page 2018-06-23 17:12:32 +00:00
Maël Kervella
67b492b17d Pip requirements for dev are in a separate file 2018-06-23 16:02:58 +00:00
chirac
460784664f Merge branch 'reactivate_welcome_mail' into 'master'
Fix #136 : Reactivate the welcome mail

Closes #136

See merge request federez/re2o!178
2018-06-23 11:51:58 +02:00
Maël Kervella
8ea85f88ce Fix #136 : Reactivate the welcome mail 2018-06-22 21:41:15 +00:00
Maël Kervella
825459d8eb Update changelog 2018-06-22 20:40:42 +00:00
Maël Kervella
ceb2c86d74 Fix #60: Change context variable so it does not get overriden by django-auth views 2018-06-22 19:22:40 +00:00
Maël Kervella
55c1da241a Support translation on home page 2018-06-22 19:22:40 +00:00
Maël Kervella
aa6fa036e8 Include logo in navbar, favicon and ogp image 2018-06-22 19:22:38 +00:00
Gwenael Le Hir
cb1073985f Add Re2o logo 2018-06-22 18:31:46 +00:00