klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-05-01 22:06:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply review comments

Browse Source
This commit is contained in:
Antoine Bartuccio 2025-04-12 22:59:25 +02:00
parent d8be9a62b5
commit d6e858e0e3
1 changed files with 7 additions and 7 deletions

14
eboutic/views.py

@ -32,6 +32,7 @@ from django.contrib.auth.mixins import (
) )
from django.core.exceptions import SuspiciousOperation from django.core.exceptions import SuspiciousOperation
from django.db import DatabaseError, transaction from django.db import DatabaseError, transaction
from django.db.utils import cached_property
from django.http import HttpRequest, HttpResponse from django.http import HttpRequest, HttpResponse
from django.shortcuts import redirect, render from django.shortcuts import redirect, render
from django.urls import reverse from django.urls import reverse
@ -112,15 +113,18 @@ class BillingInfoFormFragment(LoginRequiredMixin, FragmentMixin, UpdateView):
self.object = self.get_object() self.object = self.get_object()
return super().render_fragment(request, **kwargs) return super().render_fragment(request, **kwargs)
def get_customer(self) -> Customer: @cached_property
def customer(self) -> Customer:
return Customer.get_or_create(self.request.user)[0] return Customer.get_or_create(self.request.user)[0]
def form_valid(self, form: BillingInfoForm): def form_valid(self, form: BillingInfoForm):
form.instance.customer = self.get_customer() form.instance.customer = self.customer
return super().form_valid(form) return super().form_valid(form)
def get_object(self, *args, **kwargs): def get_object(self, *args, **kwargs):
return getattr(self.get_customer(), "billing_infos", None) # if a BillingInfo already exists, this view will behave like an UpdateView
# otherwise, it will behave like a CreateView.
return getattr(self.customer, "billing_infos", None)
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs = super().get_context_data(**kwargs) kwargs = super().get_context_data(**kwargs)
@ -177,16 +181,12 @@ class EbouticCommand(LoginRequiredMixin, UseFragmentsMixin, TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs = super().get_context_data(**kwargs) kwargs = super().get_context_data(**kwargs)
default_billing_info = None
if hasattr(self.request.user, "customer"): if hasattr(self.request.user, "customer"):
customer = self.request.user.customer customer = self.request.user.customer
kwargs["customer_amount"] = customer.amount kwargs["customer_amount"] = customer.amount
if hasattr(customer, "billing_infos"):
default_billing_info = customer.billing_infos
else: else:
kwargs["customer_amount"] = None kwargs["customer_amount"] = None
kwargs["basket"] = self.basket kwargs["basket"] = self.basket
kwargs["billing_form"] = BillingInfoForm(instance=default_billing_info)
kwargs["billing_infos"] = {} kwargs["billing_infos"] = {}
with contextlib.suppress(BillingInfo.DoesNotExist): with contextlib.suppress(BillingInfo.DoesNotExist):
kwargs["billing_infos"] = dict(self.basket.get_e_transaction_data()) kwargs["billing_infos"] = dict(self.basket.get_e_transaction_data())