pablo/shoppy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: ruff'ed

Browse Source
This commit is contained in:
Pablo Moreno
2025-05-02 08:38:57 +02:00
parent 32b36b81b3
commit 48b53d851a
62 changed files with 2019 additions and 3655 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/apps.py
+2 -2
View File
@@ -2,8 +2,8 @@ from django.apps import AppConfig
class WebConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "web"
default_auto_field = 'django.db.models.BigAutoField'
name = 'web'
def ready(self):
from .signals import rebuild_theme
web/context_processors.py
+4 -6
View File
@@ -4,12 +4,10 @@ from web.models import WebSettings
def web_settings(request):
settings = WebSettings.load()
navbar_categories = ProductCategory.objects.filter(
hidden=False, show_in_navbar=True
)
navbar_categories = ProductCategory.objects.filter(hidden=False, show_in_navbar=True)
return {
"web_title": settings.web_title,
"logo": settings.logo_32.url if settings.logo_32 else "",
"navbar_categories": navbar_categories,
'web_title': settings.web_title,
'logo': settings.logo_32.url if settings.logo_32 else '',
'navbar_categories': navbar_categories,
}
web/forms.py
+1 -9
View File
@@ -42,12 +42,4 @@ class CreateOrderForm(forms.Form):
class CustomerAddressForm(forms.ModelForm):
class Meta:
model = CustomerAddress
fields = (
"vat_id",
"full_name",
"address",
"address_town",
"address_zip",
"address_state",
"address_phone",
)
fields = ('vat_id', 'full_name', 'address', 'address_town', 'address_zip', 'address_state', 'address_phone')
web/management/commands/build_tailwind_theme.py
+5 -19
View File
@@ -26,7 +26,7 @@ class Command(BaseCommand):
def handle(self, *args, **options):
web_settings = WebSettings.load()
path = os.path.join(settings.BASE_DIR, "web", "static", "css", "main.css")
path = os.path.join(settings.BASE_DIR, 'web', 'static', 'css', 'main.css')
colors = []
for color_name, data in web_settings.theme_colors.items():
@@ -34,23 +34,9 @@ class Command(BaseCommand):
color = Color(color_name, index, value)
colors.append(color)
result = str(
render_to_string(
"theme/main.css.template",
context={"colors": colors},
)
)
with open(path, "w") as f:
result = str(render_to_string('theme/main.css.template', context={'colors': colors}))
with open(path, 'w') as f:
f.write(result)
subprocess.run(
[
"tailwindcss",
"-i",
"web/static/css/main.css",
"-o",
"web/static/css/styles.css",
"--minify",
]
)
call_command("collectstatic", "--no-input")
subprocess.run(['tailwindcss', '-i', 'web/static/css/main.css', '-o', 'web/static/css/styles.css', '--minify'])
call_command('collectstatic', '--no-input')
web/migrations/0001_initial.py
+40 -119
View File
@@ -4,171 +4,92 @@ from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = []
operations = [
migrations.CreateModel(
name="WebSettings",
name='WebSettings',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('web_title', models.CharField(max_length=32, verbose_name='título de la web')),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
'web_description',
models.CharField(blank=True, default='', max_length=128, verbose_name='descripción de la web'),
),
('logo', models.ImageField(blank=True, null=True, upload_to='assets', verbose_name='logo de la web')),
(
"web_title",
models.CharField(max_length=32, verbose_name="título de la web"),
),
(
"web_description",
'business_name',
models.CharField(
blank=True,
default="",
max_length=128,
verbose_name="descripción de la web",
),
),
(
"logo",
models.ImageField(
blank=True,
null=True,
upload_to="assets",
verbose_name="logo de la web",
),
),
(
"business_name",
models.CharField(
blank=True,
help_text="nombre fiscal del comercio",
help_text='nombre fiscal del comercio',
max_length=128,
null=True,
verbose_name="nombre de negocio",
verbose_name='nombre de negocio',
),
),
(
"business_vat_id",
models.CharField(
blank=True,
max_length=16,
null=True,
verbose_name="CIF del negocio",
),
'business_vat_id',
models.CharField(blank=True, max_length=16, null=True, verbose_name='CIF del negocio'),
),
(
"business_brand",
'business_brand',
models.CharField(
blank=True,
help_text="marca o nombre comercial que se va a mostrar en la web",
help_text='marca o nombre comercial que se va a mostrar en la web',
max_length=64,
null=True,
verbose_name="marca de negocio",
verbose_name='marca de negocio',
),
),
(
"business_address",
'business_address',
models.CharField(blank=True, max_length=64, null=True, verbose_name='dirección de negocio'),
),
(
'business_state',
models.CharField(
blank=True,
max_length=64,
null=True,
verbose_name="dirección de negocio",
blank=True, max_length=32, null=True, verbose_name='unidad territorial del negocio'
),
),
(
"business_state",
'business_zip',
models.CharField(blank=True, max_length=16, null=True, verbose_name='código postal del negocio'),
),
(
'business_phone',
models.CharField(
blank=True,
max_length=32,
null=True,
verbose_name="unidad territorial del negocio",
blank=True, max_length=16, null=True, verbose_name='número de teléfono de contacto'
),
),
(
"business_zip",
models.CharField(
blank=True,
max_length=16,
null=True,
verbose_name="código postal del negocio",
),
'business_email',
models.EmailField(blank=True, max_length=80, null=True, verbose_name='e-mail de contacto'),
),
(
"business_phone",
models.CharField(
blank=True,
max_length=16,
null=True,
verbose_name="número de teléfono de contacto",
),
),
(
"business_email",
'business_email_2',
models.EmailField(
blank=True,
max_length=80,
null=True,
verbose_name="e-mail de contacto",
blank=True, max_length=80, null=True, verbose_name='e-mail secundario de contacto'
),
),
(
"business_email_2",
models.EmailField(
blank=True,
max_length=80,
null=True,
verbose_name="e-mail secundario de contacto",
),
'bg_color',
models.CharField(blank=True, default='', max_length=9, null=True, verbose_name='color de fondo'),
),
(
"bg_color",
models.CharField(
blank=True,
default="",
max_length=9,
null=True,
verbose_name="color de fondo",
),
'theme_color',
models.CharField(blank=True, default='', max_length=9, null=True, verbose_name='color de tema'),
),
(
"theme_color",
models.CharField(
blank=True,
default="",
max_length=9,
null=True,
verbose_name="color de tema",
),
'logo_240',
models.ImageField(blank=True, null=True, upload_to='assets', verbose_name='logo 240x240'),
),
(
"logo_240",
models.ImageField(
blank=True,
null=True,
upload_to="assets",
verbose_name="logo 240x240",
),
),
(
"logo_128",
models.ImageField(
blank=True,
null=True,
upload_to="assets",
verbose_name="logo 128x128",
),
'logo_128',
models.ImageField(blank=True, null=True, upload_to='assets', verbose_name='logo 128x128'),
),
],
options={
"verbose_name": "ajustes de la web",
"verbose_name_plural": "ajustes de la web",
},
),
options={'verbose_name': 'ajustes de la web', 'verbose_name_plural': 'ajustes de la web'},
)
]
web/migrations/0002_remove_websettings_logo_240_websettings_logo_256.py
+5 -13
View File
@@ -4,21 +4,13 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("web", "0001_initial"),
]
dependencies = [('web', '0001_initial')]
operations = [
migrations.RemoveField(
model_name="websettings",
name="logo_240",
),
migrations.RemoveField(model_name='websettings', name='logo_240'),
migrations.AddField(
model_name="websettings",
name="logo_256",
field=models.ImageField(
blank=True, null=True, upload_to="assets", verbose_name="logo 256x256"
),
model_name='websettings',
name='logo_256',
field=models.ImageField(blank=True, null=True, upload_to='assets', verbose_name='logo 256x256'),
),
]
web/migrations/0003_websettings_theme_colors.py
+5 -10
View File
@@ -4,17 +4,12 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("web", "0002_remove_websettings_logo_240_websettings_logo_256"),
]
dependencies = [('web', '0002_remove_websettings_logo_240_websettings_logo_256')]
operations = [
migrations.AddField(
model_name="websettings",
name="theme_colors",
field=models.JSONField(
default=dict, verbose_name="colores del tema", blank=True
),
),
model_name='websettings',
name='theme_colors',
field=models.JSONField(default=dict, verbose_name='colores del tema', blank=True),
)
]
web/migrations/0004_websettings_logo_32_websettings_logo_64.py
+7 -14
View File
@@ -4,24 +4,17 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("web", "0003_websettings_theme_colors"),
]
dependencies = [('web', '0003_websettings_theme_colors')]
operations = [
migrations.AddField(
model_name="websettings",
name="logo_32",
field=models.ImageField(
blank=True, null=True, upload_to="assets", verbose_name="logo 32x32"
),
model_name='websettings',
name='logo_32',
field=models.ImageField(blank=True, null=True, upload_to='assets', verbose_name='logo 32x32'),
),
migrations.AddField(
model_name="websettings",
name="logo_64",
field=models.ImageField(
blank=True, null=True, upload_to="assets", verbose_name="logo 64x64"
),
model_name='websettings',
name='logo_64',
field=models.ImageField(blank=True, null=True, upload_to='assets', verbose_name='logo 64x64'),
),
]
web/mixins.py
+4 -10
View File
@@ -22,7 +22,7 @@ class PaginatedQuerysetMixin:
def get_paginated_queryset(self, qs):
paginator = Paginator(qs, self.objects_per_page)
page = self.request.GET.get("page", 1)
page = self.request.GET.get('page', 1)
qs = paginator.get_page(page)
return qs
@@ -30,9 +30,7 @@ class PaginatedQuerysetMixin:
class StylingMixin:
placeholder_for_field = {}
styled_fields = []
classes = {
"input-text",
}
classes = {'input-text'}
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -42,11 +40,7 @@ class StylingMixin:
for field_name in self.styled_fields:
field = self.fields[field_name]
field.required = True
field.widget.attrs.update({"class": " ".join(self.classes)})
field.widget.attrs.update({'class': ' '.join(self.classes)})
if self.placeholder_for_field.get(field_name):
field.widget.attrs.update(
{
"placeholder": self.placeholder_for_field.get(field_name),
}
)
field.widget.attrs.update({'placeholder': self.placeholder_for_field.get(field_name)})
web/models.py
+25 -69
View File
@@ -9,101 +9,57 @@ from config.models import SingletonModel
class WebSettings(SingletonModel):
web_title = models.CharField(
max_length=32, blank=False, verbose_name=_("título de la web")
)
web_description = models.CharField(
max_length=128, blank=True, default="", verbose_name=_("descripción de la web")
)
logo = models.ImageField(
blank=True, null=True, upload_to="assets", verbose_name=_("logo de la web")
)
web_title = models.CharField(max_length=32, blank=False, verbose_name=_('título de la web'))
web_description = models.CharField(max_length=128, blank=True, default='', verbose_name=_('descripción de la web'))
logo = models.ImageField(blank=True, null=True, upload_to='assets', verbose_name=_('logo de la web'))
business_name = models.CharField(
max_length=128,
blank=True,
null=True,
verbose_name=_("nombre de negocio"),
help_text=_("nombre fiscal del comercio"),
)
business_vat_id = models.CharField(
max_length=16, blank=True, null=True, verbose_name=_("CIF del negocio")
verbose_name=_('nombre de negocio'),
help_text=_('nombre fiscal del comercio'),
)
business_vat_id = models.CharField(max_length=16, blank=True, null=True, verbose_name=_('CIF del negocio'))
business_brand = models.CharField(
max_length=64,
blank=True,
null=True,
verbose_name=_("marca de negocio"),
help_text=_("marca o nombre comercial que se va a mostrar en la web"),
verbose_name=_('marca de negocio'),
help_text=_('marca o nombre comercial que se va a mostrar en la web'),
)
business_address = models.CharField(
max_length=64, blank=True, null=True, verbose_name=_("dirección de negocio")
)
business_address = models.CharField(max_length=64, blank=True, null=True, verbose_name=_('dirección de negocio'))
business_state = models.CharField(
max_length=32,
blank=True,
null=True,
verbose_name=_("unidad territorial del negocio"),
)
business_zip = models.CharField(
max_length=16,
blank=True,
null=True,
verbose_name=_("código postal del negocio"),
max_length=32, blank=True, null=True, verbose_name=_('unidad territorial del negocio')
)
business_zip = models.CharField(max_length=16, blank=True, null=True, verbose_name=_('código postal del negocio'))
business_phone = models.CharField(
max_length=16,
blank=True,
null=True,
verbose_name=_("número de teléfono de contacto"),
)
business_email = models.EmailField(
max_length=80, blank=True, null=True, verbose_name=_("e-mail de contacto")
max_length=16, blank=True, null=True, verbose_name=_('número de teléfono de contacto')
)
business_email = models.EmailField(max_length=80, blank=True, null=True, verbose_name=_('e-mail de contacto'))
business_email_2 = models.EmailField(
max_length=80,
blank=True,
null=True,
verbose_name=_("e-mail secundario de contacto"),
max_length=80, blank=True, null=True, verbose_name=_('e-mail secundario de contacto')
)
bg_color = models.CharField(
max_length=9,
default="",
blank=True,
null=True,
verbose_name=_("color de fondo"),
)
theme_color = models.CharField(
max_length=9, default="", blank=True, null=True, verbose_name=_("color de tema")
)
bg_color = models.CharField(max_length=9, default='', blank=True, null=True, verbose_name=_('color de fondo'))
theme_color = models.CharField(max_length=9, default='', blank=True, null=True, verbose_name=_('color de tema'))
logo_256 = models.ImageField(
upload_to="assets", blank=True, null=True, verbose_name=_("logo 256x256")
)
logo_128 = models.ImageField(
upload_to="assets", blank=True, null=True, verbose_name=_("logo 128x128")
)
logo_64 = models.ImageField(
upload_to="assets", blank=True, null=True, verbose_name=_("logo 64x64")
)
logo_32 = models.ImageField(
upload_to="assets", blank=True, null=True, verbose_name=_("logo 32x32")
)
theme_colors = models.JSONField(
default=dict, verbose_name=_("colores del tema"), blank=True
)
logo_256 = models.ImageField(upload_to='assets', blank=True, null=True, verbose_name=_('logo 256x256'))
logo_128 = models.ImageField(upload_to='assets', blank=True, null=True, verbose_name=_('logo 128x128'))
logo_64 = models.ImageField(upload_to='assets', blank=True, null=True, verbose_name=_('logo 64x64'))
logo_32 = models.ImageField(upload_to='assets', blank=True, null=True, verbose_name=_('logo 32x32'))
theme_colors = models.JSONField(default=dict, verbose_name=_('colores del tema'), blank=True)
def get_resized_logo(self, size):
width, height = size
image = Image.open(self.logo)
image = image.resize(size, Image.Resampling.LANCZOS)
buffer = BytesIO()
image.save(fp=buffer, format="PNG")
image.save(fp=buffer, format='PNG')
return ContentFile(buffer.getvalue(), name=f"logo_{width}.png")
return ContentFile(buffer.getvalue(), name=f'logo_{width}.png')
def save(self, *args, **kwargs):
if self.logo:
@@ -115,5 +71,5 @@ class WebSettings(SingletonModel):
super().save(*args, **kwargs)
class Meta:
verbose_name = _("ajustes de la web")
verbose_name_plural = _("ajustes de la web")
verbose_name = _('ajustes de la web')
verbose_name_plural = _('ajustes de la web')
web/settings.py
+1 -1
View File
@@ -1 +1 @@
ANONYMOUS_CART_ID_COOKIE_NAME = "caid"
ANONYMOUS_CART_ID_COOKIE_NAME = 'caid'
web/signals.py
+5 -5
View File
@@ -6,13 +6,13 @@ from shop.signals import clear_cart, send_order_email
from web.models import WebSettings
@receiver(clear_cart, dispatch_uid="clear_cart")
def create_payment_from_redsys(sender, **kwargs):
cart = Cart.objects.get(hash=kwargs.get("cart_id"))
@receiver(clear_cart, dispatch_uid='clear_cart')
def clear_cart(sender, **kwargs):
cart = Cart.objects.get(hash=kwargs.get('cart_id'))
CartItem.objects.filter(cart=cart).delete()
@receiver(send_order_email, dispatch_uid="send_order_email")
@receiver(send_order_email, dispatch_uid='send_order_email')
def create_payment_from_redsys(sender, **kwargs):
pass
@@ -20,6 +20,6 @@ def create_payment_from_redsys(sender, **kwargs):
@receiver(post_save, sender=WebSettings)
def rebuild_theme(sender, instance: WebSettings, **kwargs):
try:
call_command("build_tailwind_theme")
call_command('build_tailwind_theme')
except Exception:
pass
web/tests/test_cart.py
+20 -47
View File
@@ -10,22 +10,20 @@ from web.settings import ANONYMOUS_CART_ID_COOKIE_NAME
class TestCart(TestCase, CreateProductsMixin):
def setUp(self):
self.product = self.create_product()
self.user = User.objects.create_user("vader", "darth@vader.com", "ihatesand")
self.user = User.objects.create_user('vader', 'darth@vader.com', 'ihatesand')
def test_anonymous_cart(self):
assert Cart.objects.count() == 0
response = self.client.get(reverse("web:cart_dropdown"))
response = self.client.get(reverse('web:cart_dropdown'))
assert response.status_code == 200
cart = Cart.objects.all().first()
assert cart is not None
assert response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME).value == str(
cart.uuid
)
assert response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME).value == str(cart.uuid)
def test_logged_user_without_cart(self):
assert Cart.objects.count() == 0
self.client.force_login(self.user)
response = self.client.get(reverse("web:cart_dropdown"))
response = self.client.get(reverse('web:cart_dropdown'))
assert response.status_code == 200
assert Cart.objects.count() == 1
assert not response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME)
@@ -33,7 +31,7 @@ class TestCart(TestCase, CreateProductsMixin):
def test_logged_user_with_cart(self):
Cart.objects.create(user=self.user)
self.client.force_login(self.user)
response = self.client.get(reverse("web:cart_dropdown"))
response = self.client.get(reverse('web:cart_dropdown'))
assert response.status_code == 200
assert not response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME)
@@ -41,17 +39,12 @@ class TestCart(TestCase, CreateProductsMixin):
quantity = 2
assert Cart.objects.count() == 0
response = self.client.post(
reverse("web:add_cart_item"),
{"product": self.product.pk, "quantity": quantity},
)
response = self.client.post(reverse('web:add_cart_item'), {'product': self.product.pk, 'quantity': quantity})
assert response.status_code == 201
cart = Cart.objects.all().first()
assert cart is not None
assert response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME).value == str(
cart.uuid
)
assert response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME).value == str(cart.uuid)
cart_item = CartItem.objects.filter(cart=cart).first()
assert cart_item is not None
@@ -63,10 +56,7 @@ class TestCart(TestCase, CreateProductsMixin):
assert Cart.objects.count() == 0
self.client.force_login(self.user)
response = self.client.post(
reverse("web:add_cart_item"),
{"product": self.product.pk, "quantity": quantity},
)
response = self.client.post(reverse('web:add_cart_item'), {'product': self.product.pk, 'quantity': quantity})
assert response.status_code == 201
cart = Cart.objects.all().first()
@@ -83,10 +73,7 @@ class TestCart(TestCase, CreateProductsMixin):
Cart.objects.create(user=self.user)
self.client.force_login(self.user)
response = self.client.post(
reverse("web:add_cart_item"),
{"product": self.product.pk, "quantity": quantity},
)
response = self.client.post(reverse('web:add_cart_item'), {'product': self.product.pk, 'quantity': quantity})
assert response.status_code == 201
cart = Cart.objects.all().first()
@@ -103,16 +90,10 @@ class TestCart(TestCase, CreateProductsMixin):
Cart.objects.create(user=self.user)
self.client.force_login(self.user)
response = self.client.post(
reverse("web:add_cart_item"),
{"product": self.product.pk, "quantity": quantity},
)
response = self.client.post(reverse('web:add_cart_item'), {'product': self.product.pk, 'quantity': quantity})
assert response.status_code == 201
response = self.client.post(
reverse("web:add_cart_item"),
{"product": self.product.pk, "quantity": quantity},
)
response = self.client.post(reverse('web:add_cart_item'), {'product': self.product.pk, 'quantity': quantity})
assert response.status_code == 201
cart = Cart.objects.all().first()
@@ -129,17 +110,12 @@ class TestCart(TestCase, CreateProductsMixin):
quantity = 2
assert Cart.objects.count() == 0
response = self.client.post(
reverse("web:add_cart_item"),
{"product": self.product.pk, "quantity": quantity},
)
response = self.client.post(reverse('web:add_cart_item'), {'product': self.product.pk, 'quantity': quantity})
assert response.status_code == 201
cart = Cart.objects.all().first()
assert cart is not None
assert response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME).value == str(
cart.uuid
)
assert response.cookies.get(ANONYMOUS_CART_ID_COOKIE_NAME).value == str(cart.uuid)
cart_item = CartItem.objects.filter(cart=cart).first()
assert cart_item is not None
@@ -147,8 +123,8 @@ class TestCart(TestCase, CreateProductsMixin):
assert cart_item.quantity == quantity
response = self.client.post(
reverse("web:delete_cart_item", kwargs={"pk": cart_item.pk}),
{"product": self.product.pk, "quantity": quantity},
reverse('web:delete_cart_item', kwargs={'pk': cart_item.pk}),
{'product': self.product.pk, 'quantity': quantity},
)
assert response.status_code == 204
assert CartItem.objects.filter(cart=cart).count() == 0
@@ -158,10 +134,7 @@ class TestCart(TestCase, CreateProductsMixin):
assert Cart.objects.count() == 0
self.client.force_login(self.user)
response = self.client.post(
reverse("web:add_cart_item"),
{"product": self.product.pk, "quantity": quantity},
)
response = self.client.post(reverse('web:add_cart_item'), {'product': self.product.pk, 'quantity': quantity})
assert response.status_code == 201
cart = Cart.objects.all().first()
@@ -174,15 +147,15 @@ class TestCart(TestCase, CreateProductsMixin):
assert cart_item.quantity == quantity
response = self.client.post(
reverse("web:delete_cart_item", kwargs={"pk": cart_item.pk}),
{"product": self.product.pk, "quantity": quantity},
reverse('web:delete_cart_item', kwargs={'pk': cart_item.pk}),
{'product': self.product.pk, 'quantity': quantity},
)
assert response.status_code == 204
assert CartItem.objects.filter(cart=cart).count() == 0
def test_anonymous_cart_detail_component(self):
assert Cart.objects.count() == 0
response = self.client.get(reverse("web:cart"))
response = self.client.get(reverse('web:cart'))
assert response.status_code == 200
assert Cart.objects.count() == 1
@@ -191,5 +164,5 @@ class TestCart(TestCase, CreateProductsMixin):
cart = Cart.objects.create(user=self.user)
CartItem.objects.create(cart=cart, product=self.product, quantity=1)
self.client.force_login(self.user)
response = self.client.get(reverse("web:cart"))
response = self.client.get(reverse('web:cart'))
assert response.status_code == 200
web/tests/test_category_view.py
+2 -6
View File
@@ -10,10 +10,6 @@ class TestCategoryView(TestCase, CreateProductsMixin):
self.product = self.create_product()
def test_category_view(self):
category = ProductCategory.objects.create(
name="category 1", show_in_navbar=True, hidden=False
)
response = self.client.get(
reverse("web:category_view", kwargs={"slug": category.slug})
)
category = ProductCategory.objects.create(name='category 1', show_in_navbar=True, hidden=False)
response = self.client.get(reverse('web:category_view', kwargs={'slug': category.slug}))
assert response.status_code == 200
web/tests/test_change_user_password.py
+6 -10
View File
@@ -7,22 +7,18 @@ from shop.tests.mixins import CreateProductsMixin
class TestChangeUserPassword(TestCase, CreateProductsMixin):
def setUp(self):
self.password = "ihatesand"
self.user = User.objects.create_user("vader", "darth@vader.com", self.password)
self.password = 'ihatesand'
self.user = User.objects.create_user('vader', 'darth@vader.com', self.password)
def test_update_user_info(self):
self.client.force_login(self.user)
response = self.client.get(reverse("web:change_password_component"))
response = self.client.get(reverse('web:change_password_component'))
assert response.status_code == 200
new_password = "ifnhatesandbro"
data = {
"old_password": self.password,
"new_password1": new_password,
"new_password2": new_password,
}
new_password = 'ifnhatesandbro'
data = {'old_password': self.password, 'new_password1': new_password, 'new_password2': new_password}
response = self.client.post(reverse("web:change_password_component"), data)
response = self.client.post(reverse('web:change_password_component'), data)
assert response.status_code == 200
self.user.refresh_from_db()
web/tests/test_components.py
+1 -1
View File
@@ -9,5 +9,5 @@ class TestWebComponents(TestCase, CreateProductsMixin):
self.product = self.create_product()
def test_list_products_component(self):
response = self.client.get(reverse("web:list_products"))
response = self.client.get(reverse('web:list_products'))
assert response.status_code == 200
web/tests/test_customer_addresses.py
+21 -24
View File
@@ -8,43 +8,40 @@ from shop.tests.mixins import CreateProductsMixin
class TestCustomerAddresses(TestCase, CreateProductsMixin):
def setUp(self):
self.user = User.objects.create_user("vader", "darth@vader.com", "ihatesand")
self.user = User.objects.create_user('vader', 'darth@vader.com', 'ihatesand')
self.customer_address = CustomerAddress.objects.create(
user=self.user,
full_name="Darth Vader",
full_name='Darth Vader',
address_type=CustomerAddress.Types.SHIPPING,
address="Vader Fortress",
address_town="Mustafar",
address_country="Mustafar",
address_state="Mustafar",
address_phone="612345678",
address_zip="00001",
address='Vader Fortress',
address_town='Mustafar',
address_country='Mustafar',
address_state='Mustafar',
address_phone='612345678',
address_zip='00001',
)
def test_update_customer_address(self):
self.client.force_login(self.user)
data = {
"full_name": "Anakin Skywalker",
"address": "Mos Eisley",
"address_town": "Mos Eisley",
"address_country": "Tatooine",
"address_state": "Tatooine",
"address_phone": "612345678",
"address_zip": "00001",
'full_name': 'Anakin Skywalker',
'address': 'Mos Eisley',
'address_town': 'Mos Eisley',
'address_country': 'Tatooine',
'address_state': 'Tatooine',
'address_phone': '612345678',
'address_zip': '00001',
}
response = self.client.post(
reverse(
"web:update_customer_address", kwargs={"pk": self.customer_address.pk}
),
data,
reverse('web:update_customer_address', kwargs={'pk': self.customer_address.pk}), data
)
assert response.status_code == 200
self.customer_address.refresh_from_db()
assert self.customer_address.full_name == data.get("full_name")
assert self.customer_address.address == data.get("address")
assert self.customer_address.address_town == data.get("address_town")
assert self.customer_address.address_state == data.get("address_state")
assert self.customer_address.address_phone == data.get("address_phone")
assert self.customer_address.full_name == data.get('full_name')
assert self.customer_address.address == data.get('address')
assert self.customer_address.address_town == data.get('address_town')
assert self.customer_address.address_state == data.get('address_state')
assert self.customer_address.address_phone == data.get('address_phone')
web/tests/test_index.py
+2 -5
View File
@@ -9,14 +9,11 @@ class TestIndex(TestCase, CreateProductsMixin):
self.product = self.create_product()
def test_index_view(self):
response = self.client.get(reverse("web:index"))
response = self.client.get(reverse('web:index'))
assert response.status_code == 200
def test_product_detail_view(self):
response = self.client.get(
reverse(
"web:product_detail",
kwargs={"pk": self.product.pk, "slug": self.product.slug},
)
reverse('web:product_detail', kwargs={'pk': self.product.pk, 'slug': self.product.slug})
)
assert response.status_code == 200
web/tests/test_login.py
+28 -79
View File
@@ -7,142 +7,91 @@ 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.password = 'theonering'
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("web:login"),
{
"username": self.user.username,
"password": self.password,
},
)
response = self.client.post(reverse('web:login'), {'username': self.user.username, 'password': self.password})
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
def test_login_get(self):
response = self.client.get(reverse("web:login"))
response = self.client.get(reverse('web:login'))
assert response.status_code == 200
def test_login_already_logged_in(self):
response = self.client.post(
reverse("web:login"),
{
"username": self.user.username,
"password": self.password,
},
)
response = self.client.post(reverse('web:login'), {'username': self.user.username, 'password': self.password})
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
response = self.client.get(reverse("web:login"))
response = self.client.get(reverse('web:login'))
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
def test_login_failed(self):
response = self.client.post(
reverse("web:login"),
{
"username": self.user.username,
"password": "wrongpassword",
},
reverse('web:login'), {'username': self.user.username, 'password': 'wrongpassword'}
)
assert response.status_code == 400
def test_login_then_logout(self):
response = self.client.post(
reverse("web:login"),
{
"username": self.user.username,
"password": self.password,
},
)
response = self.client.post(reverse('web:login'), {'username': self.user.username, 'password': self.password})
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
response = self.client.post(reverse("web:logout"))
response = self.client.post(reverse('web:logout'))
assert response.status_code == 302
assert response.url == reverse("web:index")
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('web:logout'))
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
def test_login_then_get_logout(self):
response = self.client.post(
reverse("web:login"),
{
"username": self.user.username,
"password": self.password,
},
)
response = self.client.post(reverse('web:login'), {'username': self.user.username, 'password': self.password})
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
response = self.client.get(reverse("web:logout"))
response = self.client.get(reverse('web:logout'))
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
def test_login_then_get_my_account(self):
response = self.client.post(
reverse("web:login"),
{
"username": self.user.username,
"password": self.password,
},
)
response = self.client.post(reverse('web:login'), {'username': self.user.username, 'password': self.password})
assert response.status_code == 302
assert response.url == reverse("web:index")
assert response.url == reverse('web:index')
response = self.client.get(reverse("web:my_account"))
response = self.client.get(reverse('web:my_account'))
assert response.status_code == 200
def test_login_redirection_to_my_account(self):
url = f'{reverse("web:login")}?next={reverse("web:my_account")}'
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:my_account")}'
)
assert response.url == f'{reverse("web:index")}?next={reverse("web:my_account")}'
response = self.client.get(response.url)
assert response.status_code == 302
assert response.url == reverse("web:my_account")
assert response.url == reverse('web:my_account')
def test_login_redirection_to_my_orders(self):
url = f'{reverse("web: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")}'
response = self.client.get(response.url)
assert response.status_code == 302
assert response.url == reverse("web:orders")
assert response.url == reverse('web:orders')
web/tests/test_manifest.py
+3 -6
View File
@@ -12,14 +12,11 @@ class TestManifest(TestCase):
def setUp(self):
self.settings = WebSettings.load()
with open(
os.path.join(settings.BASE_DIR, "web", "tests", "images", "trolley.png"),
"rb",
) as f:
file = SimpleUploadedFile("logo.png", f.read())
with open(os.path.join(settings.BASE_DIR, 'web', 'tests', 'images', 'trolley.png'), 'rb') as f:
file = SimpleUploadedFile('logo.png', f.read())
self.settings.logo = file
self.settings.save()
def test_manifest_view(self):
response = self.client.get(reverse("web:manifest_json"))
response = self.client.get(reverse('web:manifest_json'))
assert response.status_code == 200
web/tests/test_orders.py
+53 -68
View File
@@ -4,91 +4,76 @@ from django.contrib.auth.models import User
from django.test import TestCase
from django.urls import reverse
from shop.models import (
Cart,
CartItem,
CustomerAddress,
Order,
ShippingMethod,
ShopSettings,
)
from shop.models import Cart, CartItem, CustomerAddress, Order, ShippingMethod, ShopSettings
from shop.tests.mixins import CreateProductsMixin
class TestOrders(TestCase, CreateProductsMixin):
def setUp(self):
self.product = self.create_product()
self.user = User.objects.create_user(
"anakin", "anakin@skywalker.com", "ihatesand"
)
self.user = User.objects.create_user('anakin', 'anakin@skywalker.com', 'ihatesand')
self.cart_for_user = self.create_cart(user=self.user)
self.anonymous_cart = self.create_cart()
self.address = CustomerAddress.objects.create(
vat_id="11111111H",
full_name="Vader",
address="Tatooine",
address_town="Mos Eisley",
address_zip="00001",
address_state="Tatooine",
address_country="Mos Eisley",
address_phone="00000000",
vat_id='11111111H',
full_name='Vader',
address='Tatooine',
address_town='Mos Eisley',
address_zip='00001',
address_state='Tatooine',
address_country='Mos Eisley',
address_phone='00000000',
address_type=CustomerAddress.Types.BILLING,
email=self.user.email,
default=True,
)
self.shipping_method = self.create_shipping_method()
self.settings = ShopSettings.load()
self.settings.shared_secret = "sq7HjrUOBfKmC576ILgskD5srU870gJ7" # Debug secret
self.settings.shared_secret = 'sq7HjrUOBfKmC576ILgskD5srU870gJ7' # Debug secret
self.settings.save()
def create_cart(self, user=None):
cart = Cart.objects.create(
user=user,
)
CartItem.objects.create(
cart=cart,
product=self.product,
quantity=1,
)
cart = Cart.objects.create(user=user)
CartItem.objects.create(cart=cart, product=self.product, quantity=1)
return cart
def create_shipping_method(self):
product = self.create_product(sku="SM1", name="SM1", price=Decimal("1.00"))
method = ShippingMethod.objects.create(name="SM 1", shipping_product=product)
product = self.create_product(sku='SM1', name='SM1', price=Decimal('1.00'))
method = ShippingMethod.objects.create(name='SM 1', shipping_product=product)
return method
def test_logged_user_orders_page(self):
self.client.force_login(self.user)
response = self.client.get(reverse("web:orders"))
response = self.client.get(reverse('web:orders'))
assert response.status_code == 200
def test_logged_user_create_get_order_page(self):
self.client.force_login(self.user)
response = self.client.get(reverse("web:cart_detail"))
response = self.client.get(reverse('web:cart_detail'))
assert response.status_code == 200
# Crear pedido
data = {
"email": self.user.email,
"shipping_address_full_name": self.address.full_name,
"shipping_address": self.address.address,
"shipping_address_town": self.address.address_town,
"shipping_address_zip": self.address.address_zip,
"shipping_address_state": self.address.address_state,
"shipping_address_country": self.address.address_country,
"shipping_address_phone": self.address.address_phone,
"same_as_shipping": True,
"billing_address_full_name": self.address.full_name,
"billing_address": self.address.address,
"billing_address_town": self.address.address_town,
"billing_address_zip": self.address.address_zip,
"billing_address_state": self.address.address_state,
"billing_address_country": self.address.address_country,
"billing_address_phone": self.address.address_phone,
"shipping_method": self.shipping_method.pk,
'email': self.user.email,
'shipping_address_full_name': self.address.full_name,
'shipping_address': self.address.address,
'shipping_address_town': self.address.address_town,
'shipping_address_zip': self.address.address_zip,
'shipping_address_state': self.address.address_state,
'shipping_address_country': self.address.address_country,
'shipping_address_phone': self.address.address_phone,
'same_as_shipping': True,
'billing_address_full_name': self.address.full_name,
'billing_address': self.address.address,
'billing_address_town': self.address.address_town,
'billing_address_zip': self.address.address_zip,
'billing_address_state': self.address.address_state,
'billing_address_country': self.address.address_country,
'billing_address_phone': self.address.address_phone,
'shipping_method': self.shipping_method.pk,
}
response = self.client.post(reverse("web:cart_detail"), data)
response = self.client.post(reverse('web:cart_detail'), data)
assert response.status_code == 302
order = Order.objects.filter(user=self.user).first()
@@ -99,30 +84,30 @@ class TestOrders(TestCase, CreateProductsMixin):
def test_logged_user_create_get_order_page_invalid_data(self):
self.client.force_login(self.user)
response = self.client.get(reverse("web:cart_detail"))
response = self.client.get(reverse('web:cart_detail'))
assert response.status_code == 200
# Sin e-mail
data = {
"shipping_address_full_name": self.address.full_name,
"shipping_address": self.address.address,
"shipping_address_town": self.address.address_town,
"shipping_address_zip": self.address.address_zip,
"shipping_address_state": self.address.address_state,
"shipping_address_country": self.address.address_country,
"shipping_address_phone": self.address.address_phone,
"same_as_shipping": True,
"billing_address_full_name": self.address.full_name,
"billing_address": self.address.address,
"billing_address_town": self.address.address_town,
"billing_address_zip": self.address.address_zip,
"billing_address_state": self.address.address_state,
"billing_address_country": self.address.address_country,
"billing_address_phone": self.address.address_phone,
"shipping_method": self.shipping_method.pk,
'shipping_address_full_name': self.address.full_name,
'shipping_address': self.address.address,
'shipping_address_town': self.address.address_town,
'shipping_address_zip': self.address.address_zip,
'shipping_address_state': self.address.address_state,
'shipping_address_country': self.address.address_country,
'shipping_address_phone': self.address.address_phone,
'same_as_shipping': True,
'billing_address_full_name': self.address.full_name,
'billing_address': self.address.address,
'billing_address_town': self.address.address_town,
'billing_address_zip': self.address.address_zip,
'billing_address_state': self.address.address_state,
'billing_address_country': self.address.address_country,
'billing_address_phone': self.address.address_phone,
'shipping_method': self.shipping_method.pk,
}
response = self.client.post(reverse("web:cart_detail"), data)
response = self.client.post(reverse('web:cart_detail'), data)
assert response.status_code == 200
assert not Order.objects.filter(user=self.user).exists()
web/tests/test_register.py
+42 -60
View File
@@ -7,124 +7,106 @@ User = get_user_model()
class TestRegister(TransactionTestCase):
def setUp(self) -> None:
self.password = "theonering"
self.email = "sauron@mordor.middleearth"
self.first_name = "Sauron"
self.last_name = "The Lord of the Rings"
self.password = 'theonering'
self.email = 'sauron@mordor.middleearth'
self.first_name = 'Sauron'
self.last_name = 'The Lord of the Rings'
def test_get_register_page(self):
response = self.client.get(reverse("web:register"))
response = self.client.get(reverse('web:register'))
assert response.status_code == 200
def test_create_user_account(self):
response = self.client.post(
reverse("web:register"),
reverse('web:register'),
{
"email": self.email,
"password1": self.password,
"password2": self.password,
"first_name": self.first_name,
"last_name": self.last_name,
'email': self.email,
'password1': self.password,
'password2': self.password,
'first_name': self.first_name,
'last_name': self.last_name,
},
)
user = User.objects.filter(
username=self.email,
email=self.email,
first_name=self.first_name,
last_name=self.last_name,
username=self.email, email=self.email, first_name=self.first_name, last_name=self.last_name
).first()
assert user is not None
assert response.status_code == 302
assert response.url == reverse("web:login")
assert response.url == reverse('web:login')
def test_create_user_account_distinct_password(self):
response = self.client.post(
reverse("web:register"),
reverse('web:register'),
{
"email": self.email,
"password1": self.password,
"password2": "otherpassword",
"first_name": self.first_name,
"last_name": self.last_name,
'email': self.email,
'password1': self.password,
'password2': 'otherpassword',
'first_name': self.first_name,
'last_name': self.last_name,
},
)
assert not User.objects.filter(
username=self.email,
email=self.email,
first_name=self.first_name,
last_name=self.last_name,
username=self.email, email=self.email, first_name=self.first_name, last_name=self.last_name
).exists()
assert response.status_code == 400
def test_create_user_account_no_first_name(self):
response = self.client.post(
reverse("web:register"),
reverse('web:register'),
{
"email": self.email,
"password1": self.password,
"password2": "otherpassword",
"first_name": "",
"last_name": self.last_name,
'email': self.email,
'password1': self.password,
'password2': 'otherpassword',
'first_name': '',
'last_name': self.last_name,
},
)
assert not User.objects.filter(
username=self.email,
email=self.email,
first_name="",
last_name=self.last_name,
username=self.email, email=self.email, first_name='', last_name=self.last_name
).exists()
assert response.status_code == 400
def test_create_user_account_no_last_name(self):
response = self.client.post(
reverse("web:register"),
reverse('web:register'),
{
"email": self.email,
"password1": self.password,
"password2": self.password,
"first_name": self.first_name,
"last_name": "",
'email': self.email,
'password1': self.password,
'password2': self.password,
'first_name': self.first_name,
'last_name': '',
},
)
assert not User.objects.filter(
username=self.email,
email=self.email,
first_name=self.first_name,
last_name="",
username=self.email, email=self.email, first_name=self.first_name, last_name=''
).exists()
assert response.status_code == 400
def test_create_user_account_already_existing(self):
assert User.objects.all().count() == 0
User.objects.create_user(
email=self.email,
username=self.email,
)
User.objects.create_user(email=self.email, username=self.email)
response = self.client.post(
reverse("web:register"),
reverse('web:register'),
{
"email": self.email,
"password1": self.password,
"password2": self.password,
"first_name": self.first_name,
"last_name": self.last_name,
'email': self.email,
'password1': self.password,
'password2': self.password,
'first_name': self.first_name,
'last_name': self.last_name,
},
)
assert not User.objects.filter(
username=self.email,
email=self.email,
first_name=self.first_name,
last_name="",
username=self.email, email=self.email, first_name=self.first_name, last_name=''
).exists()
assert response.status_code == 400
web/tests/test_reset_password.py
+22 -57
View File
@@ -10,53 +10,36 @@ User = get_user_model()
class TestResetPassword(TransactionTestCase):
def setUp(self) -> None:
self.password = "theonering"
self.email = "sauron@mordor.middleearth"
self.first_name = "Sauron"
self.last_name = "The Lord of the Rings"
self.password = 'theonering'
self.email = 'sauron@mordor.middleearth'
self.first_name = 'Sauron'
self.last_name = 'The Lord of the Rings'
self.user = User.objects.create_user(
username=self.email,
password=self.password,
first_name=self.first_name,
last_name=self.last_name,
username=self.email, password=self.password, first_name=self.first_name, last_name=self.last_name
)
def test_get_reset_password_page(self):
response = self.client.get(reverse("web:reset_password"))
response = self.client.get(reverse('web:reset_password'))
assert response.status_code == 200
def test_reset_password(self):
response = self.client.post(
reverse("web:reset_password"),
{
"email": self.email,
},
)
response = self.client.post(reverse('web:reset_password'), {'email': self.email})
assert response.status_code == 302
assert response.url == reverse("web:reset_password_email_sent")
assert response.url == reverse('web:reset_password_email_sent')
def test_reset_password_not_existing_user(self):
response = self.client.post(
reverse("web:reset_password"),
{
"email": "vanpiro@noesiten.com",
},
)
response = self.client.post(reverse('web:reset_password'), {'email': 'vanpiro@noesiten.com'})
assert response.status_code == 302
assert response.url == reverse("web:reset_password_email_sent")
assert response.url == reverse('web:reset_password_email_sent')
def test_reset_password_confirm_get(self):
token = default_token_generator.make_token(self.user)
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
response = self.client.get(
reverse(
"web:reset_password_confirm", kwargs={"uidb64": uidb64, "token": token}
),
)
response = self.client.get(reverse('web:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}))
assert response.status_code == 200
@@ -65,20 +48,14 @@ class TestResetPassword(TransactionTestCase):
form_token = default_token_generator.make_token(self.user)
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
new_password = "89733wy29"
new_password = '89733wy29'
response = self.client.post(
reverse(
"web:reset_password_confirm", kwargs={"uidb64": uidb64, "token": token}
),
{
"token": form_token,
"new_password1": new_password,
"new_password2": new_password,
},
reverse('web:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}),
{'token': form_token, 'new_password1': new_password, 'new_password2': new_password},
)
assert response.status_code == 302
assert response.url == reverse("web:login")
assert response.url == reverse('web:login')
self.user.refresh_from_db()
assert self.user.check_password(new_password)
@@ -88,35 +65,23 @@ class TestResetPassword(TransactionTestCase):
form_token = default_token_generator.make_token(self.user)
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
new_password = "89733wy29"
new_password = '89733wy29'
response = self.client.post(
reverse(
"web:reset_password_confirm", kwargs={"uidb64": uidb64, "token": token}
),
{
"token": form_token,
"new_password1": new_password,
"new_password2": "otherpassw13",
},
reverse('web:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}),
{'token': form_token, 'new_password1': new_password, 'new_password2': 'otherpassw13'},
)
assert response.status_code == 200
def test_reset_password_confirm_invalid_token(self):
token = default_token_generator.make_token(self.user)
form_token = "invalid token"
form_token = 'invalid token'
uidb64 = urlsafe_base64_encode(force_bytes(self.user.pk))
new_password = "89733wy29"
new_password = '89733wy29'
response = self.client.post(
reverse(
"web:reset_password_confirm", kwargs={"uidb64": uidb64, "token": token}
),
{
"token": form_token,
"new_password1": new_password,
"new_password2": new_password,
},
reverse('web:reset_password_confirm', kwargs={'uidb64': uidb64, 'token': token}),
{'token': form_token, 'new_password1': new_password, 'new_password2': new_password},
)
assert response.status_code == 200
web/tests/test_user_info.py
+7 -11
View File
@@ -7,25 +7,21 @@ from shop.tests.mixins import CreateProductsMixin
class TestUserInfo(TestCase, CreateProductsMixin):
def setUp(self):
self.user = User.objects.create_user("vader", "darth@vader.com", "ihatesand")
self.user = User.objects.create_user('vader', 'darth@vader.com', 'ihatesand')
def test_update_user_info(self):
self.client.force_login(self.user)
response = self.client.get(reverse("web:user_info_component"))
response = self.client.get(reverse('web:user_info_component'))
assert response.status_code == 200
data = {
"first_name": "Anakin",
"last_name": "Skywalker",
"email": "anakin@skywalker.com",
}
data = {'first_name': 'Anakin', 'last_name': 'Skywalker', 'email': 'anakin@skywalker.com'}
response = self.client.post(reverse("web:user_info_component"), data)
response = self.client.post(reverse('web:user_info_component'), data)
assert response.status_code == 200
self.user.refresh_from_db()
assert self.user.first_name == data.get("first_name")
assert self.user.last_name == data.get("last_name")
assert self.user.email == data.get("email")
assert self.user.first_name == data.get('first_name')
assert self.user.last_name == data.get('last_name')
assert self.user.email == data.get('email')
web/tests/test_wishlist.py
+13 -38
View File
@@ -9,77 +9,52 @@ from shop.tests.mixins import CreateProductsMixin
class TestWishlist(TestCase, CreateProductsMixin):
def setUp(self):
self.product = self.create_product()
self.user = User.objects.create_user("vader", "darth@vader.com", "ihatesand")
self.user = User.objects.create_user('vader', 'darth@vader.com', 'ihatesand')
def test_logged_user_wishlist_button_for_non_wishlisted_product(self):
assert WishlistedProduct.objects.count() == 0
self.client.force_login(self.user)
response = self.client.get(
reverse("web:wishlist_button", kwargs={"pk": self.product.pk})
)
response = self.client.get(reverse('web:wishlist_button', kwargs={'pk': self.product.pk}))
assert response.status_code == 200
def test_logged_user_wishlist_button_for_wishlisted_product(self):
WishlistedProduct.objects.create(
user=self.user,
product=self.product,
)
WishlistedProduct.objects.create(user=self.user, product=self.product)
self.client.force_login(self.user)
response = self.client.get(
reverse("web:wishlist_button", kwargs={"pk": self.product.pk})
)
response = self.client.get(reverse('web:wishlist_button', kwargs={'pk': self.product.pk}))
assert response.status_code == 200
def test_logged_user_create_wishlisted_product(self):
assert WishlistedProduct.objects.count() == 0
self.client.force_login(self.user)
response = self.client.post(
reverse("web:add_to_wishlist"),
{
"product": self.product.pk,
},
)
response = self.client.post(reverse('web:add_to_wishlist'), {'product': self.product.pk})
assert response.status_code == 201
assert WishlistedProduct.objects.filter(
user=self.user, product=self.product
).exists()
assert WishlistedProduct.objects.filter(user=self.user, product=self.product).exists()
def test_not_logged_user_create_wishlisted_product(self):
assert WishlistedProduct.objects.count() == 0
response = self.client.post(
reverse("web:add_to_wishlist"),
{
"product": self.product.pk,
},
)
response = self.client.post(reverse('web:add_to_wishlist'), {'product': self.product.pk})
assert response.status_code == 400
def test_logged_user_delete_wishlisted_product(self):
wishlisted = WishlistedProduct.objects.create(
user=self.user, product=self.product
)
wishlisted = WishlistedProduct.objects.create(user=self.user, product=self.product)
self.client.force_login(self.user)
response = self.client.post(
reverse("web:delete_from_wishlist", kwargs={"pk": wishlisted.pk})
)
response = self.client.post(reverse('web:delete_from_wishlist', kwargs={'pk': wishlisted.pk}))
assert response.status_code == 204
assert not WishlistedProduct.objects.filter(
user=self.user, product=self.product
).exists()
assert not WishlistedProduct.objects.filter(user=self.user, product=self.product).exists()
def test_logged_user_wishlist(self):
WishlistedProduct.objects.create(user=self.user, product=self.product)
self.client.force_login(self.user)
response = self.client.get(reverse("web:wishlist"))
response = self.client.get(reverse('web:wishlist'))
assert response.status_code == 200
def test_not_logged_user_wishlist(self):
WishlistedProduct.objects.create(user=self.user, product=self.product)
response = self.client.get(reverse("web:wishlist"))
response = self.client.get(reverse('web:wishlist'))
assert response.status_code == 302
def test_list_wishlisted_products(self):
WishlistedProduct.objects.create(user=self.user, product=self.product)
self.client.force_login(self.user)
response = self.client.get(reverse("web:list_wishlisted_products"))
response = self.client.get(reverse('web:list_wishlisted_products'))
assert response.status_code == 200
web/urls.py
+33 -67
View File
@@ -38,86 +38,52 @@ from web.views.web import (
wishlist,
)
app_name = "web"
app_name = 'web'
i18n_resolvers = i18n_patterns(
path("", index, name="index"),
path(
_("wishlist"), login_required(wishlist, login_url=_("/login/")), name="wishlist"
),
path(_("categories/<str:slug>/"), category_view, name="category_view"),
path(_("products/<int:pk>/<str:slug>/"), product_detail, name="product_detail"),
path(_("cart/"), cart_detail, name="cart_detail"),
path(_("orders/"), login_required(orders, login_url=_("/login/")), name="orders"),
path(_("order/<str:uuid>/"), order_detail, name="order"),
path('', index, name='index'),
path(_('wishlist'), login_required(wishlist, login_url=_('/login/')), name='wishlist'),
path(_('categories/<str:slug>/'), category_view, name='category_view'),
path(_('products/<int:pk>/<str:slug>/'), product_detail, name='product_detail'),
path(_('cart/'), cart_detail, name='cart_detail'),
path(_('orders/'), login_required(orders, login_url=_('/login/')), name='orders'),
path(_('order/<str:uuid>/'), order_detail, name='order'),
# users
path(_("login/"), login, name="login"),
path(_("logout/"), logout, name="logout"),
path(_("register/"), register, name="register"),
path(_("reset-password/"), reset_password, name="reset_password"),
path(
_("reset-password/<uidb64>/<token>/"),
reset_password_confirm,
name="reset_password_confirm",
),
path(
_("reset-password/email-sent/"),
reset_password_email_sent,
name="reset_password_email_sent",
),
path(
_("my-account/"),
login_required(my_account, login_url=_("/login/")),
name="my_account",
),
path(_('login/'), login, name='login'),
path(_('logout/'), logout, name='logout'),
path(_('register/'), register, name='register'),
path(_('reset-password/'), reset_password, name='reset_password'),
path(_('reset-password/<uidb64>/<token>/'), reset_password_confirm, name='reset_password_confirm'),
path(_('reset-password/email-sent/'), reset_password_email_sent, name='reset_password_email_sent'),
path(_('my-account/'), login_required(my_account, login_url=_('/login/')), name='my_account'),
)
urlpatterns = [
# components
path("web/components/products/", list_products, name="list_products"),
path('web/components/products/', list_products, name='list_products'),
path('web/components/wishlist/', list_wishlisted_products, name='list_wishlisted_products'),
path('web/components/cart-dropdown/', cart_dropdown, name='cart_dropdown'),
path('web/components/cart/', cart, name='cart'),
path('web/components/wishlist-button/<int:pk>/', wishlist_button, name='wishlist_button'),
path(
"web/components/wishlist/",
list_wishlisted_products,
name="list_wishlisted_products",
),
path("web/components/cart-dropdown/", cart_dropdown, name="cart_dropdown"),
path("web/components/cart/", cart, name="cart"),
path(
"web/components/wishlist-button/<int:pk>/",
wishlist_button,
name="wishlist_button",
'web/components/user-info/',
login_required(user_info_component, login_url=_('/login/')),
name='user_info_component',
),
path(
"web/components/user-info/",
login_required(user_info_component, login_url=_("/login/")),
name="user_info_component",
),
path(
"web/components/change-password/",
login_required(change_password_component, login_url=_("/login/")),
name="change_password_component",
'web/components/change-password/',
login_required(change_password_component, login_url=_('/login/')),
name='change_password_component',
),
# api
path("web/add-cart-item/", add_cart_item, name="add_cart_item"),
path("web/delete-cart-item/<int:pk>/", delete_cart_item, name="delete_cart_item"),
path("web/add-to-wishlist/", add_to_wishlist, name="add_to_wishlist"),
path(
"web/delete-from-wishlist/<int:pk>/",
delete_from_wishlist,
name="delete_from_wishlist",
),
path(
"web/customer-address/<int:pk>/",
update_customer_address,
name="update_customer_address",
),
path(
"web/customer-addresses/",
list_customer_addresses_component,
name="list_customer_addresses_component",
),
path('web/add-cart-item/', add_cart_item, name='add_cart_item'),
path('web/delete-cart-item/<int:pk>/', delete_cart_item, name='delete_cart_item'),
path('web/add-to-wishlist/', add_to_wishlist, name='add_to_wishlist'),
path('web/delete-from-wishlist/<int:pk>/', delete_from_wishlist, name='delete_from_wishlist'),
path('web/customer-address/<int:pk>/', update_customer_address, name='update_customer_address'),
path('web/customer-addresses/', list_customer_addresses_component, name='list_customer_addresses_component'),
# manifest
path("manifest.json", manifest, name="manifest_json"),
path('manifest.json', manifest, name='manifest_json'),
]
for resolver in i18n_resolvers:
web/views/components.py
+47 -81
View File
@@ -10,14 +10,7 @@ from django.views.generic import TemplateView
from config.mixins import HTMXFormComponent
from shop.filters import ProductFilter
from shop.models import (
CartItem,
CustomerAddress,
Product,
ProductPrice,
ShippingMethod,
WishlistedProduct,
)
from shop.models import CartItem, CustomerAddress, Product, ProductPrice, ShippingMethod, WishlistedProduct
from users.forms.change_password import ChangePasswordForm
from users.forms.info import UserInfoForm
from web.forms import CustomerAddressForm
@@ -27,10 +20,9 @@ from web.utils import get_or_create_cart
class ListProducts(TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin):
template_name = "web/list_products.html"
template_name = 'web/list_products.html'
queryset = Product.objects.filter(hidden=False).prefetch_related(
"images",
Prefetch("prices", queryset=ProductPrice.objects.filter(current=True), to_attr="current_prices")
'images', Prefetch('prices', queryset=ProductPrice.objects.filter(current=True), to_attr='current_prices')
)
filter_class = ProductFilter
@@ -39,27 +31,21 @@ class ListProducts(TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin):
page = self.get_paginated_queryset(qs)
return {
"current_page": page.number,
"num_pages": page.paginator.num_pages,
"page": page,
"has_next_page": page.has_next(),
"has_previous_page": page.has_previous(),
'current_page': page.number,
'num_pages': page.paginator.num_pages,
'page': page,
'has_next_page': page.has_next(),
'has_previous_page': page.has_previous(),
}
class ListWishlistedProducts(
TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin
):
template_name = "web/list_products.html"
queryset = Product.objects.filter(hidden=False).prefetch_related(
"images",
)
class ListWishlistedProducts(TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin):
template_name = 'web/list_products.html'
queryset = Product.objects.filter(hidden=False).prefetch_related('images')
filter_class = ProductFilter
def get_queryset(self):
product_ids = WishlistedProduct.objects.filter(
user=self.request.user
).values_list("product", flat=True)
product_ids = WishlistedProduct.objects.filter(user=self.request.user).values_list('product', flat=True)
return super().get_queryset().filter(pk__in=product_ids).distinct()
def get_context_data(self, **kwargs):
@@ -67,27 +53,21 @@ class ListWishlistedProducts(
page = self.get_paginated_queryset(qs)
return {
"current_page": page.number,
"num_pages": page.paginator.num_pages,
"page": page,
"has_next_page": page.has_next(),
"has_previous_page": page.has_previous(),
'current_page': page.number,
'num_pages': page.paginator.num_pages,
'page': page,
'has_next_page': page.has_next(),
'has_previous_page': page.has_previous(),
}
def cart_dropdown(request, *args, **kwargs):
cart, created = get_or_create_cart(request)
response = render(
request,
"components/cart/cart_navbar.html",
context={
"cart": cart,
},
)
response = render(request, 'components/cart/cart_navbar.html', context={'cart': cart})
if not request.user.is_authenticated:
response.set_cookie(ANONYMOUS_CART_ID_COOKIE_NAME, cart.uuid, samesite="strict")
response.set_cookie(ANONYMOUS_CART_ID_COOKIE_NAME, cart.uuid, samesite='strict')
return response
@@ -95,15 +75,13 @@ def cart(request, *args, **kwargs):
cart, created = get_or_create_cart(request)
items = CartItem.objects.filter(cart=cart)
base_total = Decimal("0.00")
tax_total = Decimal("0.00")
base_total = Decimal('0.00')
tax_total = Decimal('0.00')
for item in items:
price = ProductPrice.objects.filter(product=item.product, current=True).first()
base_total += price.price * item.quantity
tax_total += round(
price.price * Decimal(price.tax.value / 100) * item.quantity, 2
)
tax_total += round(price.price * Decimal(price.tax.value / 100) * item.quantity, 2)
total = base_total + tax_total
@@ -112,8 +90,7 @@ def cart(request, *args, **kwargs):
user=request.user, address_type=CustomerAddress.Types.BILLING, default=True
).first()
shipping_address = CustomerAddress.objects.filter(
user=request.user,
address_type=CustomerAddress.Types.SHIPPING,
user=request.user, address_type=CustomerAddress.Types.SHIPPING
).first()
else:
billing_address = None
@@ -123,62 +100,53 @@ def cart(request, *args, **kwargs):
response = render(
request,
"components/cart/cart.html",
'components/cart/cart.html',
context={
"cart": cart,
"items": items,
"total": total,
"base_total": base_total,
"tax_total": tax_total,
"billing_address": billing_address,
"shipping_address": shipping_address,
"shipping_methods": shipping_methods,
'cart': cart,
'items': items,
'total': total,
'base_total': base_total,
'tax_total': tax_total,
'billing_address': billing_address,
'shipping_address': shipping_address,
'shipping_methods': shipping_methods,
},
)
if not request.user.is_authenticated:
response.set_cookie(ANONYMOUS_CART_ID_COOKIE_NAME, cart.uuid, samesite="strict")
response.set_cookie(ANONYMOUS_CART_ID_COOKIE_NAME, cart.uuid, samesite='strict')
return response
class WishlistButton(TemplateView):
template_name = "components/products/wishlist_button.html"
template_name = 'components/products/wishlist_button.html'
def get_context_data(self, **kwargs):
product = get_object_or_404(Product, pk=self.kwargs.get("pk"))
is_wishlisted = WishlistedProduct.objects.filter(
user=self.request.user, product=product
).exists()
product = get_object_or_404(Product, pk=self.kwargs.get('pk'))
is_wishlisted = WishlistedProduct.objects.filter(user=self.request.user, product=product).exists()
return {
"is_wishlisted": is_wishlisted,
"product": product,
}
return {'is_wishlisted': is_wishlisted, 'product': product}
class UserInfoFormComponentView(HTMXFormComponent):
form_class = UserInfoForm
hx_trigger = "updated_user_info"
save_button_text = _("Actualizar datos")
hx_trigger = 'updated_user_info'
save_button_text = _('Actualizar datos')
def get_object(self) -> models.Model:
return self.request.user
def get_view_name(self):
return reverse("web:user_info_component")
return reverse('web:user_info_component')
def get_initial_values(self, instance):
return {
"email": instance.email,
"first_name": instance.first_name,
"last_name": instance.last_name,
}
return {'email': instance.email, 'first_name': instance.first_name, 'last_name': instance.last_name}
class ChangePasswordFormComponentView(HTMXFormComponent):
form_class = ChangePasswordForm
hx_trigger = "changed_password"
save_button_text = _("Cambiar contraseña")
hx_trigger = 'changed_password'
save_button_text = _('Cambiar contraseña')
def get_form(self, initial=True):
if initial:
@@ -190,16 +158,14 @@ class ChangePasswordFormComponentView(HTMXFormComponent):
return self.request.user
def get_view_name(self):
return reverse("web:change_password_component")
return reverse('web:change_password_component')
class ListCustomerAddressComponent(TemplateView):
template_name = "components/users/retrieve_update_address.html"
template_name = 'components/users/retrieve_update_address.html'
def get_context_data(self, **kwargs):
return {
"customer_addresses": CustomerAddress.objects.filter(user=self.request.user)
}
return {'customer_addresses': CustomerAddress.objects.filter(user=self.request.user)}
def update_customer_address(request, pk):
@@ -208,7 +174,7 @@ def update_customer_address(request, pk):
if form.is_valid():
form.save()
return HttpResponse(status=200, headers={"HX-Trigger": "updated_addresses"})
return HttpResponse(status=200, headers={'HX-Trigger': 'updated_addresses'})
return HttpResponse(form.errors, status=400)
web/views/users.py
+48 -85
View File
@@ -6,11 +6,7 @@ from django.contrib.auth.tokens import default_token_generator
from django.core.exceptions import ValidationError
from django.db import IntegrityError
from django.shortcuts import redirect, render, reverse
from django.utils.http import (
url_has_allowed_host_and_scheme,
urlencode,
urlsafe_base64_decode,
)
from django.utils.http import url_has_allowed_host_and_scheme, urlencode, urlsafe_base64_decode
from django.utils.text import gettext_lazy as _
from django.views.generic import TemplateView, View
@@ -22,22 +18,22 @@ User = get_user_model()
class RedirectionMixin:
redirect_to = ""
redirect_to = ''
def get_redirection(self):
return reverse(self.redirect_to)
class LoginView(View, RedirectionMixin):
template_name = "users/login.html"
redirect_to = "web:index"
template_name = 'users/login.html'
redirect_to = 'web:index'
login_form_class = LoginForm
def get_redirection(self):
next_page = self.request.GET.get("next", "")
next_page = self.request.GET.get('next', '')
if next_page:
return f"{reverse(self.redirect_to)}?next={next_page}"
return f'{reverse(self.redirect_to)}?next={next_page}'
return reverse(self.redirect_to)
@@ -54,11 +50,7 @@ class LoginView(View, RedirectionMixin):
return render(
request,
self.template_name,
{
"form": login_form,
"title": web_settings.web_title,
"description": _("inicio de sesión"),
},
{'form': login_form, 'title': web_settings.web_title, 'description': _('inicio de sesión')},
)
def post(self, request, *args, **kwargs):
@@ -67,35 +59,25 @@ class LoginView(View, RedirectionMixin):
if login_form.is_valid():
login_user(request, login_form.get_user())
if not login_form.cleaned_data.get("remember_me"):
if not login_form.cleaned_data.get('remember_me'):
request.session.set_expiry(0)
return redirect(self.get_redirection())
return render(
request,
self.template_name,
{
"form": login_form,
"errors": login_form.errors.get("__all__"),
},
status=400,
request, self.template_name, {'form': login_form, 'errors': login_form.errors.get('__all__')}, status=400
)
class RegisterView(TemplateView, RedirectionMixin):
template_name = "users/register.html"
redirect_to = "web:login"
template_name = 'users/register.html'
redirect_to = 'web:login'
form_class = RegisterForm
def get_context_data(self, **kwargs):
settings = WebSettings.load()
return {
"form": self.form_class(),
"title": settings.web_title,
"description": _("crear cuenta"),
}
return {'form': self.form_class(), 'title': settings.web_title, 'description': _('crear cuenta')}
def post(self, request, *args, **kwargs):
settings = WebSettings.load()
@@ -107,34 +89,27 @@ class RegisterView(TemplateView, RedirectionMixin):
user = form.save()
user.username = user.email
user.first_name = form.cleaned_data.get("first_name")
user.last_name = form.cleaned_data.get("last_name")
user.first_name = form.cleaned_data.get('first_name')
user.last_name = form.cleaned_data.get('last_name')
user.save()
login(request, user)
return redirect(self.get_redirection())
else:
errors = form.errors
except IntegrityError as e:
errors = [
_("Ya existe un usuario con ese correo electrónico"),
]
except IntegrityError:
errors = [_('Ya existe un usuario con ese correo electrónico')]
return render(
request,
self.template_name,
{
"form": form,
"title": settings.web_title,
"description": _("Crear cuenta"),
"errors": errors,
},
{'form': form, 'title': settings.web_title, 'description': _('Crear cuenta'), 'errors': errors},
status=400,
)
class LogoutView(View, RedirectionMixin):
redirect_to = "web:index"
redirect_to = 'web:index'
def get(self, request, *args, **kwargs):
logout_user(request)
@@ -146,31 +121,28 @@ class LogoutView(View, RedirectionMixin):
class ResetPasswordView(TemplateView):
template_name = "users/reset_password.html"
template_name = 'users/reset_password.html'
form_class = PasswordResetForm
redirect_to = "web:reset_password_email_sent"
html_reset_password_template_name = "mails/reset_password.html"
subject_template_name = "mails/subject_reset_password.txt"
redirect_to = 'web:reset_password_email_sent'
html_reset_password_template_name = 'mails/reset_password.html'
subject_template_name = 'mails/subject_reset_password.txt'
def get_email_options(self):
return {
"extra_email_context": {},
"email_template_name": self.html_reset_password_template_name,
"html_email_template_name": self.html_reset_password_template_name,
"subject_template_name": self.subject_template_name,
'extra_email_context': {},
'email_template_name': self.html_reset_password_template_name,
'html_email_template_name': self.html_reset_password_template_name,
'subject_template_name': self.subject_template_name,
}
def get_base_context(self):
settings = WebSettings.load()
return {
"title": settings.web_title,
"description": _("Restablecer contraseña"),
}
return {'title': settings.web_title, 'description': _('Restablecer contraseña')}
def get_context_data(self, **kwargs):
context = self.get_base_context()
context.update({"form": self.form_class()})
context.update({'form': self.form_class()})
return context
def post(self, request, *args, **kwargs):
@@ -178,9 +150,9 @@ class ResetPasswordView(TemplateView):
if form.is_valid():
opts = {
"use_https": request.is_secure(),
"from_email": getattr(settings, "DEFAULT_FROM_EMAIL"),
"request": request,
'use_https': request.is_secure(),
'from_email': getattr(settings, 'DEFAULT_FROM_EMAIL'),
'request': request,
}
opts.update(self.get_email_options())
@@ -188,41 +160,32 @@ class ResetPasswordView(TemplateView):
return redirect(self.redirect_to)
context = self.get_base_context()
context.update({"form": form})
context.update({'form': form})
return render(request, self.template_name, context)
class ResetPasswordEmailSent(TemplateView):
template_name = "users/reset_password_email_sent.html"
template_name = 'users/reset_password_email_sent.html'
def get_context_data(self, **kwargs):
settings = WebSettings.load()
return {
"title": settings.web_title,
"description": settings.web_description,
}
return {'title': settings.web_title, 'description': settings.web_description}
class ResetPasswordConfirmView(TemplateView):
template_name = "users/reset_password_confirm.html"
template_name = 'users/reset_password_confirm.html'
form_class = SetPasswordForm
redirect_to = "web:login"
redirect_to = 'web:login'
token_generator = default_token_generator
def get_user(self):
try:
uidb64 = self.kwargs.get("uidb64")
uidb64 = self.kwargs.get('uidb64')
uid = urlsafe_base64_decode(uidb64).decode()
user = User.objects.get(pk=uid)
except (
TypeError,
ValueError,
OverflowError,
User.DoesNotExist,
ValidationError,
):
except (TypeError, ValueError, OverflowError, User.DoesNotExist, ValidationError):
user = None
return user
@@ -235,15 +198,15 @@ class ResetPasswordConfirmView(TemplateView):
new_token = self.generate_new_token_for_user(user)
return {
"title": WebSettings.load().web_title,
"description": _("Establecer nueva contraseña"),
"form": self.form_class(user, {"token": new_token}),
"valid_token": valid_token,
"new_token": new_token,
'title': WebSettings.load().web_title,
'description': _('Establecer nueva contraseña'),
'form': self.form_class(user, {'token': new_token}),
'valid_token': valid_token,
'new_token': new_token,
}
def check_token(self, user):
token = self.kwargs.get("token")
token = self.kwargs.get('token')
valid_token = self.token_generator.check_token(user, token)
return valid_token
@@ -258,15 +221,15 @@ class ResetPasswordConfirmView(TemplateView):
class MyAccountView(TemplateView):
template_name = "users/user_details.html"
template_name = 'users/user_details.html'
def get_context_data(self, **kwargs):
addresses = CustomerAddress.objects.filter(user=self.request.user)
web_settings = WebSettings.load()
return {
"title": f"{web_settings.web_title} - Mi cuenta",
"description": f"{web_settings.web_title} - Mi cuenta",
"customer_addresses": addresses,
'title': f'{web_settings.web_title} - Mi cuenta',
'description': f'{web_settings.web_title} - Mi cuenta',
'customer_addresses': addresses,
}
web/views/web.py
+98 -162
View File
@@ -7,15 +7,7 @@ from django.utils.text import gettext_lazy as _
from django.views.decorators.http import require_http_methods
from django.views.generic import CreateView, TemplateView
from shop.models import (
CartItem,
Order,
OrderLine,
Product,
ProductCategory,
ShippingMethod,
WishlistedProduct,
)
from shop.models import CartItem, Order, OrderLine, Product, ProductCategory, ShippingMethod, WishlistedProduct
from shop.redsys import RedsysClient
from shop.utils import create_order_from_cart
from web.forms import CreateOrderForm
@@ -26,67 +18,64 @@ from web.utils import get_or_create_cart
class IndexView(TemplateView):
template_name = "web/index.html"
template_name = 'web/index.html'
def get_context_data(self, **kwargs):
settings = WebSettings.load()
return {
"title": settings.web_title,
"description": settings.web_description,
}
return {'title': settings.web_title, 'description': settings.web_description}
def get(self, request, *args, **kwargs):
if self.request.GET.get("next"):
return redirect(self.request.GET.get("next"))
if self.request.GET.get('next'):
return redirect(self.request.GET.get('next'))
return super().get(request, *args, **kwargs)
class CategoryView(TemplateView):
template_name = "web/index.html"
template_name = 'web/index.html'
def get_context_data(self, **kwargs):
settings = WebSettings.load()
slug = kwargs.get("slug")
slug = kwargs.get('slug')
category = ProductCategory.objects.get(slug=slug)
return {
"title": _(f"{settings.web_title} - {category.name}"),
"description": settings.web_description,
"category": category,
"filter_by_category": True,
'title': _(f'{settings.web_title} - {category.name}'),
'description': settings.web_description,
'category': category,
'filter_by_category': True,
}
class ProductDetail(TemplateView):
template_name = "web/product_detail.html"
template_name = 'web/product_detail.html'
def get_context_data(self, pk, slug, **kwargs):
settings = WebSettings.load()
product = get_object_or_404(Product, pk=pk)
return {
"product": product,
"title": f"{settings.web_title} - {product.name}",
"description": product.description,
"image": product.images.first(),
'product': product,
'title': f'{settings.web_title} - {product.name}',
'description': product.description,
'image': product.images.first(),
}
class CartDetail(TemplateView, CreateView):
template_name = "web/cart_detail.html"
template_name = 'web/cart_detail.html'
form_class = CreateOrderForm
def get_context_data(self, **kwargs):
web_settings = WebSettings.load()
cart, created = get_or_create_cart(self.request)
cart_items = CartItem.objects.filter(cart=cart).prefetch_related("product")
cart_items = CartItem.objects.filter(cart=cart).prefetch_related('product')
return {
"title": _(f"{web_settings.web_title} - Carrito"),
"cart": cart,
"items": cart_items,
"description": _("resumen del carrito"),
'title': _(f'{web_settings.web_title} - Carrito'),
'cart': cart,
'items': cart_items,
'description': _('resumen del carrito'),
}
def post(self, request, *args, **kwargs):
@@ -94,29 +83,29 @@ class CartDetail(TemplateView, CreateView):
if not form.is_valid():
context = self.get_context_data(**kwargs)
context.update({"errors": form.errors})
context.update({'errors': form.errors})
return self.render_to_response(context)
shipping_method_id = form.cleaned_data.get("shipping_method")
shipping_method_id = form.cleaned_data.get('shipping_method')
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')
email = form.cleaned_data.get("email")
email = form.cleaned_data.get('email')
shipping_method = get_object_or_404(ShippingMethod, pk=shipping_method_id)
@@ -139,72 +128,62 @@ class CartDetail(TemplateView, CreateView):
email=email,
)
return redirect(reverse("web:order", kwargs={"uuid": order.uuid}))
return redirect(reverse('web:order', kwargs={'uuid': order.uuid}))
class OrderDetail(TemplateView):
template_name = "web/order.html"
template_name = 'web/order.html'
def get_context_data(self, **kwargs):
order = get_object_or_404(Order, uuid=kwargs.get("uuid"))
order = get_object_or_404(Order, uuid=kwargs.get('uuid'))
redsys_client = RedsysClient()
parameters = redsys_client.get_body_for_order(order)
items = OrderLine.objects.select_related("product").filter(
items = OrderLine.objects.select_related('product').filter(order=order, product__is_shipping_method=False)
shipping_cost = OrderLine.objects.select_related('product').filter(
order=order, product__is_shipping_method=True
).aggregate(amount=Sum('total')).get('amount') or Decimal('0')
base_total = OrderLine.objects.select_related('product').filter(
order=order, product__is_shipping_method=False
)
).aggregate(amount=Sum('base_total')).get('amount') or Decimal('0')
shipping_cost = OrderLine.objects.select_related("product").filter(
order=order,
product__is_shipping_method=True,
).aggregate(amount=Sum("total")).get("amount") or Decimal("0")
base_total = OrderLine.objects.select_related("product").filter(
order=order,
product__is_shipping_method=False,
).aggregate(amount=Sum("base_total")).get("amount") or Decimal("0")
tax_total = OrderLine.objects.select_related("product").filter(
order=order,
product__is_shipping_method=False,
).aggregate(amount=Sum("taxes")).get("amount") or Decimal("0")
tax_total = OrderLine.objects.select_related('product').filter(
order=order, product__is_shipping_method=False
).aggregate(amount=Sum('taxes')).get('amount') or Decimal('0')
settings = WebSettings.load()
return {
"title": _(f"{settings.web_title} - Comprar"),
"description": _(f"{settings.web_title} - Comprar"),
"order": order,
"items": items,
"signature_version": parameters.get("Ds_SignatureVersion"),
"merchant_parameters": parameters.get("Ds_MerchantParameters"),
"signature": parameters.get("Ds_Signature"),
"redsys_target_url": redsys_client.get_target_url(),
"total": round(order.total, 2),
"base_total": round(base_total, 2),
"tax_total": round(tax_total, 2),
"shipping_cost": round(shipping_cost, 2),
'title': _(f'{settings.web_title} - Comprar'),
'description': _(f'{settings.web_title} - Comprar'),
'order': order,
'items': items,
'signature_version': parameters.get('Ds_SignatureVersion'),
'merchant_parameters': parameters.get('Ds_MerchantParameters'),
'signature': parameters.get('Ds_Signature'),
'redsys_target_url': redsys_client.get_target_url(),
'total': round(order.total, 2),
'base_total': round(base_total, 2),
'tax_total': round(tax_total, 2),
'shipping_cost': round(shipping_cost, 2),
}
class WishlistView(TemplateView):
template_name = "web/wishlist.html"
template_name = 'web/wishlist.html'
def get_context_data(self, **kwargs):
settings = WebSettings.load()
return {
"title": _(f"{settings.web_title} - Lista de deseados"),
"description": settings.web_description,
}
return {'title': _(f'{settings.web_title} - Lista de deseados'), 'description': settings.web_description}
class OrdersView(TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin):
template_name = "web/orders.html"
template_name = 'web/orders.html'
def get_queryset(self):
return Order.objects.filter(user=self.request.user).exclude(
status=Order.Statuses.STATUS_PENDING
)
return Order.objects.filter(user=self.request.user).exclude(status=Order.Statuses.STATUS_PENDING)
def get_context_data(self, **kwargs):
settings = WebSettings.load()
@@ -212,129 +191,86 @@ class OrdersView(TemplateView, FilteredQuerysetMixin, PaginatedQuerysetMixin):
page = self.get_paginated_queryset(qs)
return {
"title": _(f"{settings.web_title} - Mis pedidos"),
"page": page,
"has_next_page": page.has_next(),
"has_previous_page": page.has_previous(),
'title': _(f'{settings.web_title} - Mis pedidos'),
'page': page,
'has_next_page': page.has_next(),
'has_previous_page': page.has_previous(),
}
@require_http_methods(
[
"POST",
]
)
@require_http_methods(['POST'])
def add_cart_item(request, *args, **kwargs):
product = get_object_or_404(Product, pk=request.POST.get("product"))
product = get_object_or_404(Product, pk=request.POST.get('product'))
cart, created = get_or_create_cart(request)
response = HttpResponse(status=201, headers={"HX-Trigger": "updated-cart"})
response = HttpResponse(status=201, headers={'HX-Trigger': 'updated-cart'})
if created and request.user.is_anonymous:
response.set_cookie(ANONYMOUS_CART_ID_COOKIE_NAME, cart.uuid, samesite="strict")
response.set_cookie(ANONYMOUS_CART_ID_COOKIE_NAME, cart.uuid, samesite='strict')
# Comprobamos si existe una línea de carrito para ese carrito de ese producto
existing_cart_item = CartItem.objects.filter(cart=cart, product=product).first()
# Si existe, simplemente le sumamos la cantidad a la línea ya existente
if existing_cart_item is not None:
existing_cart_item.quantity += int(request.POST.get("quantity"))
existing_cart_item.quantity += int(request.POST.get('quantity'))
existing_cart_item.save()
# Si no, lo creamos
else:
CartItem.objects.create(
cart=cart,
quantity=request.POST.get("quantity"),
product=product,
)
CartItem.objects.create(cart=cart, quantity=request.POST.get('quantity'), product=product)
return response
@require_http_methods(
[
"POST",
]
)
@require_http_methods(['POST'])
def delete_cart_item(request, pk, *args, **kwargs):
cart, created = get_or_create_cart(request)
cart_item = get_object_or_404(CartItem, pk=pk, cart=cart)
cart_item.delete()
return HttpResponse(status=204, headers={"HX-Trigger": "updated-cart"})
return HttpResponse(status=204, headers={'HX-Trigger': 'updated-cart'})
@require_http_methods(
[
"POST",
]
)
@require_http_methods(['POST'])
def add_to_wishlist(request, *args, **kwargs):
product = get_object_or_404(Product, pk=request.POST.get("product"))
response = HttpResponse(status=201, headers={"HX-Trigger": "updated-wishlist"})
product = get_object_or_404(Product, pk=request.POST.get('product'))
response = HttpResponse(status=201, headers={'HX-Trigger': 'updated-wishlist'})
if request.user.is_anonymous:
return HttpResponse(status=400)
WishlistedProduct.objects.get_or_create(
user=request.user,
product=product,
)
WishlistedProduct.objects.get_or_create(user=request.user, product=product)
return response
@require_http_methods(
[
"POST",
]
)
@require_http_methods(['POST'])
def delete_from_wishlist(request, pk, *args, **kwargs):
wishlisted_item = get_object_or_404(
WishlistedProduct, product_id=pk, user=request.user
)
wishlisted_item = get_object_or_404(WishlistedProduct, product_id=pk, user=request.user)
wishlisted_item.delete()
return HttpResponse(status=204, headers={"HX-Trigger": "updated-wishlist"})
return HttpResponse(status=204, headers={'HX-Trigger': 'updated-wishlist'})
def manifest(request, *args, **kwargs):
settings = WebSettings.load()
data = {
"name": settings.web_title,
"short_name": settings.web_title,
"start_url": "/",
"background_color": settings.bg_color,
"theme_color": settings.theme_color,
"icons": [],
"display": "standalone",
"orientation": "portrait",
'name': settings.web_title,
'short_name': settings.web_title,
'start_url': '/',
'background_color': settings.bg_color,
'theme_color': settings.theme_color,
'icons': [],
'display': 'standalone',
'orientation': 'portrait',
}
if settings.logo:
data["icons"].append(
{
"src": settings.logo.url,
"sizes": "512x512",
"type": "image/png",
}
)
data['icons'].append({'src': settings.logo.url, 'sizes': '512x512', 'type': 'image/png'})
if settings.logo_256:
data["icons"].append(
{
"src": settings.logo_256.url,
"sizes": "256x256",
"type": "image/png",
}
)
data['icons'].append({'src': settings.logo_256.url, 'sizes': '256x256', 'type': 'image/png'})
if settings.logo_128:
data["icons"].append(
{
"src": settings.logo_128.url,
"sizes": "128x128",
"type": "image/png",
}
)
data['icons'].append({'src': settings.logo_128.url, 'sizes': '128x128', 'type': 'image/png'})
return JsonResponse(data)