diff --git a/shop/models.py b/shop/models.py index b32f2f6..4206074 100644 --- a/shop/models.py +++ b/shop/models.py @@ -466,11 +466,8 @@ class Payment(models.Model): 'shop.Order', on_delete=models.PROTECT, verbose_name=_('pedido'), related_name='payments' ) user = models.ForeignKey(User, blank=True, null=True, on_delete=models.PROTECT, verbose_name=_('cliente')) - creation_date = models.DateTimeField(auto_now_add=True, verbose_name=_('Fecha de creación')) - metadata = models.JSONField(default=dict, verbose_name=_('Metadata')) - method = models.CharField( max_length=6, choices=MethodChoices.choices, default=MethodChoices.REDSYS, verbose_name=_('método de pago') ) diff --git a/users/tests/test_login.py b/users/tests/test_login.py index c7a3f84..70f67ea 100644 --- a/users/tests/test_login.py +++ b/users/tests/test_login.py @@ -8,13 +8,19 @@ User = get_user_model() class TestLogin(TestCase): def setUp(self) -> None: self.password = 'theonering' - self.user = User.objects.create(username='sauron', email='sauron@mordor.middleearth') + self.user = User.objects.create( + username='sauron', + email='sauron@mordor.middleearth' + ) self.user.set_password(self.password) self.user.save() def test_login(self): - response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password}) + response = self.client.post(reverse('users:login'), { + 'username': self.user.username, + 'password': self.password + }) assert response.status_code == 302 assert response.url == reverse('web:index') @@ -24,7 +30,10 @@ class TestLogin(TestCase): assert response.status_code == 200 def test_login_already_logged_in(self): - response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password}) + response = self.client.post(reverse('users:login'), { + 'username': self.user.username, + 'password': self.password + }) assert response.status_code == 302 assert response.url == reverse('web:index') @@ -34,60 +43,76 @@ class TestLogin(TestCase): assert response.url == reverse('web:index') def test_login_failed(self): - response = self.client.post( - reverse('users:login'), {'username': self.user.username, 'password': 'wrongpassword'} - ) + response = self.client.post(reverse('users:login'), { + 'username': self.user.username, + 'password': 'wrongpassword' + }) assert response.status_code == 400 def test_login_then_logout(self): - response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password}) + response = self.client.post(reverse('users:login'), { + 'username': self.user.username, + 'password': self.password + }) assert response.status_code == 302 assert response.url == reverse('web:index') - response = self.client.post(reverse('web:logout')) + response = self.client.post(reverse('users:logout')) assert response.status_code == 302 assert response.url == reverse('web:index') def test_logout_already_logged_out(self): - response = self.client.post(reverse('web:logout')) + response = self.client.post(reverse('users:logout')) assert response.status_code == 302 assert response.url == reverse('web:index') def test_login_then_get_logout(self): - response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password}) + response = self.client.post(reverse('users:login'), { + 'username': self.user.username, + 'password': self.password + }) assert response.status_code == 302 assert response.url == reverse('web:index') - response = self.client.get(reverse('web:logout')) + response = self.client.get(reverse('users:logout')) assert response.status_code == 302 assert response.url == reverse('web:index') def test_login_then_get_my_account(self): - response = self.client.post(reverse('users:login'), {'username': self.user.username, 'password': self.password}) + response = self.client.post(reverse('users:login'), { + 'username': self.user.username, + 'password': self.password + }) assert response.status_code == 302 assert response.url == reverse('web:index') - response = self.client.get(reverse('web:my_account')) + response = self.client.get(reverse('users:my_account')) assert response.status_code == 200 def test_login_redirection_to_my_account(self): - url = f'{reverse("users:login")}?next={reverse("web:my_account")}' - response = self.client.post(url, {'username': self.user.username, 'password': self.password}) + url = f'{reverse("users:login")}?next={reverse("users:my_account")}' + response = self.client.post(url, { + 'username': self.user.username, + 'password': self.password + }) assert response.status_code == 302 - assert response.url == f'{reverse("web:index")}?next={reverse("web:my_account")}' + assert response.url == f'{reverse("web:index")}?next={reverse("users:my_account")}' response = self.client.get(response.url) assert response.status_code == 302 - assert response.url == reverse('web:my_account') + assert response.url == reverse('users:my_account') def test_login_redirection_to_my_orders(self): url = f'{reverse("users:login")}?next={reverse("web:orders")}' - response = self.client.post(url, {'username': self.user.username, 'password': self.password}) + response = self.client.post(url, { + 'username': self.user.username, + 'password': self.password + }) assert response.status_code == 302 assert response.url == f'{reverse("web:index")}?next={reverse("web:orders")}' diff --git a/web/templates/components/cart/add_to_cart.html b/web/templates/components/cart/add_to_cart.html index 578715a..57b496b 100644 --- a/web/templates/components/cart/add_to_cart.html +++ b/web/templates/components/cart/add_to_cart.html @@ -3,10 +3,9 @@ {% csrf_token %} -
- - diff --git a/web/templates/components/cart/cart.html b/web/templates/components/cart/cart.html index b88a223..7015f9b 100644 --- a/web/templates/components/cart/cart.html +++ b/web/templates/components/cart/cart.html @@ -10,7 +10,7 @@
{% for item in items %} -
+
@@ -155,10 +155,10 @@ {% translate 'País' %}
@@ -276,7 +276,7 @@
+ class="space-y-4 rounded-lg p-4 shadow-md sm:p-6">

{% translate 'Resumen del pedido' %}

@@ -324,10 +324,13 @@
- +
+ +
+
{% translate 'o' %} diff --git a/web/templates/components/cart/cart_navbar.html b/web/templates/components/cart/cart_navbar.html index 34877df..548fba9 100644 --- a/web/templates/components/cart/cart_navbar.html +++ b/web/templates/components/cart/cart_navbar.html @@ -49,7 +49,7 @@