From 7d021ebaa0c0ef6b467fe11e627e0dff315e9376 Mon Sep 17 00:00:00 2001 From: Pablo Moreno Date: Fri, 3 Jan 2025 14:21:21 +0100 Subject: [PATCH] chore: blacked --- shop/models.py | 6 ++++-- shop/utils.py | 4 ++-- web/templates/components/cart/cart.html | 4 ++-- web/views/web.py | 26 ++++++++++++------------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/shop/models.py b/shop/models.py index 472c55c..71112a5 100644 --- a/shop/models.py +++ b/shop/models.py @@ -356,8 +356,10 @@ class Order(TimestampedModel): default=Decimal("0"), max_digits=13, decimal_places=2, verbose_name=_("total") ) - user = models.ForeignKey(User, blank=True, null=True, on_delete=models.PROTECT, verbose_name=_("cliente")) - email = models.EmailField(blank=True, verbose_name=_('e-mail')) + user = models.ForeignKey( + User, blank=True, null=True, on_delete=models.PROTECT, verbose_name=_("cliente") + ) + email = models.EmailField(blank=True, verbose_name=_("e-mail")) # Datos de facturación billing_address = models.CharField( diff --git a/shop/utils.py b/shop/utils.py index 07c6f4b..cc88759 100644 --- a/shop/utils.py +++ b/shop/utils.py @@ -90,13 +90,13 @@ def create_order_from_cart( email="", ): order = Order.objects.create( - billing_address=f'{billing_address_full_name} {billing_address_address}', + billing_address=f"{billing_address_full_name} {billing_address_address}", billing_city=billing_address_town, billing_state=billing_address_state, billing_country=billing_address_country, billing_zip=billing_address_zip, contact_phone=shipping_address_phone, - shipping_address=f'{shipping_address_address} {shipping_address_full_name}', + shipping_address=f"{shipping_address_address} {shipping_address_full_name}", shipping_city=shipping_address_town, shipping_state=shipping_address_state, shipping_country=shipping_address_country, diff --git a/web/templates/components/cart/cart.html b/web/templates/components/cart/cart.html index be816b9..b118897 100644 --- a/web/templates/components/cart/cart.html +++ b/web/templates/components/cart/cart.html @@ -265,12 +265,12 @@
-
-
+
{% endif %} {% endfor %} diff --git a/web/views/web.py b/web/views/web.py index a4b6757..7c56b79 100644 --- a/web/views/web.py +++ b/web/views/web.py @@ -94,20 +94,20 @@ class CartDetail(TemplateView, CreateView): cart, created = get_or_create_cart(request) - billing_address_full_name = form.cleaned_data.get('billing_address_full_name') - billing_address_address = form.cleaned_data.get('billing_address') - billing_address_town = form.cleaned_data.get('billing_address_town') - billing_address_state = form.cleaned_data.get('billing_address_state') - billing_address_country = form.cleaned_data.get('billing_address_country') - billing_address_zip = form.cleaned_data.get('billing_address_zip') + billing_address_full_name = form.cleaned_data.get("billing_address_full_name") + billing_address_address = form.cleaned_data.get("billing_address") + billing_address_town = form.cleaned_data.get("billing_address_town") + billing_address_state = form.cleaned_data.get("billing_address_state") + billing_address_country = form.cleaned_data.get("billing_address_country") + billing_address_zip = form.cleaned_data.get("billing_address_zip") - shipping_address_full_name = form.cleaned_data.get('shipping_address_full_name') - shipping_address_address = form.cleaned_data.get('shipping_address') - shipping_address_town = form.cleaned_data.get('shipping_address_town') - shipping_address_state = form.cleaned_data.get('shipping_address_state') - shipping_address_country = form.cleaned_data.get('shipping_address_country') - shipping_address_zip = form.cleaned_data.get('shipping_address_zip') - shipping_address_phone = form.cleaned_data.get('shipping_address_phone') + shipping_address_full_name = form.cleaned_data.get("shipping_address_full_name") + shipping_address_address = form.cleaned_data.get("shipping_address") + shipping_address_town = form.cleaned_data.get("shipping_address_town") + shipping_address_state = form.cleaned_data.get("shipping_address_state") + shipping_address_country = form.cleaned_data.get("shipping_address_country") + shipping_address_zip = form.cleaned_data.get("shipping_address_zip") + shipping_address_phone = form.cleaned_data.get("shipping_address_phone") shipping_method = get_object_or_404(ShippingMethod, pk=shipping_method_id)