mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-13 13:29:23 +00:00
Implémentation 3DSv2 + résolution bugs eboutic + amélioration pages admin (#558)
Eboutic : - Implémentation de la norme 3DSecure v2 pour les paiement par carte bancaire - Amélioration générale de l'interface utilisateur - Résolution du problème avec les caractères spéciaux dans le panier sur Safari - Réparation du cookie du panier de l'eboutic qui n'était pas fonctionnel Autre : - Mise à jour de la documentation - Mise à jour des dépendances Javascript - Suppression du code inutilisé dans `subscription/models.py` - Amélioration des pages administrateur (back-office Django) Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com> Co-authored-by: Théo DURR <git@theodurr.fr> Co-authored-by: Julien Constant <julienconstant190@gmail.com>
This commit is contained in:
@ -21,20 +21,25 @@
|
||||
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
#
|
||||
|
||||
from ajax_select import make_ajax_form
|
||||
from django.contrib import admin
|
||||
|
||||
from subscription.models import Subscription
|
||||
from haystack.admin import SearchModelAdmin
|
||||
|
||||
|
||||
class SubscriptionAdmin(SearchModelAdmin):
|
||||
search_fields = [
|
||||
@admin.register(Subscription)
|
||||
class SubscriptionAdmin(admin.ModelAdmin):
|
||||
list_display = (
|
||||
"member",
|
||||
"subscription_type",
|
||||
"subscription_start",
|
||||
"subscription_end",
|
||||
"location",
|
||||
)
|
||||
search_fields = (
|
||||
"member__username",
|
||||
"subscription_start",
|
||||
"subscription_end",
|
||||
"subscription_type",
|
||||
]
|
||||
|
||||
|
||||
admin.site.register(Subscription, SubscriptionAdmin)
|
||||
)
|
||||
form = make_ajax_form(Subscription, {"member": "users"})
|
||||
|
@ -97,19 +97,12 @@ class Subscription(models.Model):
|
||||
# TODO see SubscriptionForm's clean method
|
||||
raise ValidationError(_("Subscription error"))
|
||||
|
||||
def save(self):
|
||||
def save(self, *args, **kwargs):
|
||||
super(Subscription, self).save()
|
||||
from counter.models import Customer
|
||||
|
||||
if not Customer.objects.filter(user=self.member).exists():
|
||||
last_id = (
|
||||
Customer.objects.count() + 1504
|
||||
) # Number to keep a continuity with the old site
|
||||
Customer(
|
||||
user=self.member,
|
||||
account_id=Customer.generate_account_id(last_id + 1),
|
||||
amount=0,
|
||||
).save()
|
||||
Customer.new_for_user(self.member).save()
|
||||
form = PasswordResetForm({"email": self.member.email})
|
||||
if form.is_valid():
|
||||
form.save(
|
||||
@ -177,69 +170,3 @@ class Subscription(models.Model):
|
||||
self.subscription_start <= date.today()
|
||||
and date.today() <= self.subscription_end
|
||||
)
|
||||
|
||||
|
||||
def guy_test(date, duration=4):
|
||||
print(
|
||||
str(date)
|
||||
+ " - "
|
||||
+ str(duration)
|
||||
+ " -> "
|
||||
+ str(Subscription.compute_start(date, duration))
|
||||
)
|
||||
|
||||
|
||||
def bibou_test(duration, date=date.today()):
|
||||
print(
|
||||
str(date)
|
||||
+ " - "
|
||||
+ str(duration)
|
||||
+ " -> "
|
||||
+ str(
|
||||
Subscription.compute_end(
|
||||
duration, Subscription.compute_start(date, duration)
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def guy():
|
||||
guy_test(date(2015, 7, 11))
|
||||
guy_test(date(2015, 8, 11))
|
||||
guy_test(date(2015, 2, 17))
|
||||
guy_test(date(2015, 3, 17))
|
||||
guy_test(date(2015, 1, 11))
|
||||
guy_test(date(2015, 2, 11))
|
||||
guy_test(date(2015, 8, 17))
|
||||
guy_test(date(2015, 9, 17))
|
||||
print("=" * 80)
|
||||
guy_test(date(2015, 7, 11), 1)
|
||||
guy_test(date(2015, 8, 11), 2)
|
||||
guy_test(date(2015, 2, 17), 3)
|
||||
guy_test(date(2015, 3, 17), 4)
|
||||
guy_test(date(2015, 1, 11), 1)
|
||||
guy_test(date(2015, 2, 11), 2)
|
||||
guy_test(date(2015, 8, 17), 3)
|
||||
guy_test(date(2015, 9, 17), 4)
|
||||
print("=" * 80)
|
||||
bibou_test(1, date(2015, 2, 18))
|
||||
bibou_test(2, date(2015, 2, 18))
|
||||
bibou_test(3, date(2015, 2, 18))
|
||||
bibou_test(4, date(2015, 2, 18))
|
||||
bibou_test(1, date(2015, 9, 18))
|
||||
bibou_test(2, date(2015, 9, 18))
|
||||
bibou_test(3, date(2015, 9, 18))
|
||||
bibou_test(4, date(2015, 9, 18))
|
||||
print("=" * 80)
|
||||
bibou_test(1, date(2000, 2, 29))
|
||||
bibou_test(2, date(2000, 2, 29))
|
||||
bibou_test(1, date(2000, 5, 31))
|
||||
bibou_test(1, date(2000, 7, 31))
|
||||
bibou_test(1)
|
||||
bibou_test(2)
|
||||
bibou_test(3)
|
||||
bibou_test(4)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
guy()
|
||||
|
Reference in New Issue
Block a user